renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-19 10:44:14 +08:00
Code

ARM: dts: rockchip: convert pinctrl nodes to new bindings

Browse Source 
Introduce the grf syscon and convert the pinctrl drivers for rk3066 and rk3188
to use it, instead of mapping the grf registers themselfs.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Tested-by: Max Schwarz <max.schwarz@online.de>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Heiko Stuebner 2014-04-29 22:02:52 +02:00
parent ac4eba8e6d
commit 56f2b894dc
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/rk3066a.dtsi
View File

@ -79,7 +79,7 @@
pinctrl@20008000 { pinctrl@20008000 {
compatible = "rockchip,rk3066a-pinctrl"; compatible = "rockchip,rk3066a-pinctrl";
reg = <0x20008000 0x150>; rockchip,grf = <&grf>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;

9
arch/arm/boot/dts/rk3188.dtsi
View File

@ -75,17 +75,16 @@
pinctrl@20008000 { pinctrl@20008000 {
compatible = "rockchip,rk3188-pinctrl"; compatible = "rockchip,rk3188-pinctrl";
reg = <0x20008000 0xa0>, rockchip,grf = <&grf>;
<0x20008164 0x1a0>; rockchip,pmu = <&pmu>;
reg-names = "base", "pull";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
gpio0: gpio0@0x2000a000 { gpio0: gpio0@0x2000a000 {
compatible = "rockchip,rk3188-gpio-bank0"; compatible = "rockchip,rk3188-gpio-bank0";
reg = <0x2000a000 0x100>, reg = <0x2000a000 0x100>;
<0x20004064 0x8>;
interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clk_gates8 9>; clocks = <&clk_gates8 9>;

9
arch/arm/boot/dts/rk3xxx.dtsi
View File

@ -31,11 +31,16 @@
reg = <0x1013c000 0x100>; reg = <0x1013c000 0x100>;
}; };
pmu@20004000 { pmu: pmu@20004000 {
compatible = "rockchip,rk3066-pmu"; compatible = "rockchip,rk3066-pmu", "syscon";
reg = <0x20004000 0x100>; reg = <0x20004000 0x100>;
}; };
grf: grf@20008000 {
compatible = "syscon";
reg = <0x20008000 0x200>;
};
gic: interrupt-controller@1013d000 { gic: interrupt-controller@1013d000 {
compatible = "arm,cortex-a9-gic"; compatible = "arm,cortex-a9-gic";
interrupt-controller; interrupt-controller;