diff options
| author | Heiko Stuebner <heiko@sntech.de> | 2014-04-29 22:02:52 +0200 |
|---|---|---|
| committer | Heiko Stuebner <heiko@sntech.de> | 2014-05-10 01:41:20 +0200 |
| commit | 56f2b894dcf455ffd31bd2e8e96a074249aeb4ba (patch) | |
| tree | 44a06681e54aef5918b485f82d71cbdb18759304 /arch/arm/boot/dts/rk3xxx.dtsi | |
| parent | ARM: dts: rockchip: add root compatible properties (diff) | |
| download | linux-56f2b894dcf455ffd31bd2e8e96a074249aeb4ba.tar.xz linux-56f2b894dcf455ffd31bd2e8e96a074249aeb4ba.zip | |
ARM: dts: rockchip: convert pinctrl nodes to new bindings
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>
Diffstat (limited to 'arch/arm/boot/dts/rk3xxx.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/rk3xxx.dtsi | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/rk3xxx.dtsi b/arch/arm/boot/dts/rk3xxx.dtsi index 26e5a968d49d..2adf1cc9e85d 100644 --- a/arch/arm/boot/dts/rk3xxx.dtsi +++ b/arch/arm/boot/dts/rk3xxx.dtsi @@ -31,11 +31,16 @@ reg = <0x1013c000 0x100>; }; - pmu@20004000 { - compatible = "rockchip,rk3066-pmu"; + pmu: pmu@20004000 { + compatible = "rockchip,rk3066-pmu", "syscon"; reg = <0x20004000 0x100>; }; + grf: grf@20008000 { + compatible = "syscon"; + reg = <0x20008000 0x200>; + }; + gic: interrupt-controller@1013d000 { compatible = "arm,cortex-a9-gic"; interrupt-controller; |