Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56f2b894 authored by Heiko Stuebner's avatar Heiko Stuebner
Browse files

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: default avatarHeiko Stuebner <heiko@sntech.de>
Tested-by: default avatarMax Schwarz <max.schwarz@online.de>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent ac4eba8e

arch/arm/boot/dts/rk3066a.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ 


		pinctrl@20008000 {

			compatible = "rockchip,rk3066a-pinctrl";

			reg = <0x20008000 0x150>;

			rockchip,grf = <&grf>;

			#address-cells = <1>;

			#size-cells = <1>;

			ranges;

arch/arm/boot/dts/rk3188.dtsi

+4 −5
Original line number Diff line number Diff line
@@ -75,17 +75,16 @@ 


		pinctrl@20008000 {

			compatible = "rockchip,rk3188-pinctrl";

			reg = <0x20008000 0xa0>,

			      <0x20008164 0x1a0>;

			reg-names = "base", "pull";

			rockchip,grf = <&grf>;

			rockchip,pmu = <&pmu>;



			#address-cells = <1>;

			#size-cells = <1>;

			ranges;



			gpio0: gpio0@0x2000a000 {

				compatible = "rockchip,rk3188-gpio-bank0";

				reg = <0x2000a000 0x100>,

				      <0x20004064 0x8>;

				reg = <0x2000a000 0x100>;

				interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&clk_gates8 9>;

arch/arm/boot/dts/rk3xxx.dtsi

+7 −2
Original line number Diff line number Diff line
@@ -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;