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

A patch from »pinctrl-rockchip: Change wrong initial assumptions« in state Mainline for linux-kernel

From: Heiko Stuebner <heiko@...> Date: Tue, 29 Apr 2014 22:02:52 +0200

Commit-Message

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@...>

Patch-Comment

arch/arm/boot/dts/rk3066a.dtsi | 2 +- arch/arm/boot/dts/rk3188.dtsi | 9 ++++----- arch/arm/boot/dts/rk3xxx.dtsi | 9 +++++++-- 3 files changed, 12 insertions(+), 8 deletions(-)

Statistics

  • 12 lines added
  • 8 lines removed

Changes

------------------------ arch/arm/boot/dts/rk3066a.dtsi ------------------------
index 4d4dfbb..048c5de 100644
@@ -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 -------------------------
index ed9a70a..a494fb0 100644
@@ -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 -------------------------
index 26e5a96..2adf1cc9e 100644
@@ -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;
 
 

Recent Patches

About Us

Sed lacus. Donec lectus. Nullam pretium nibh ut turpis. Nam bibendum. In nulla tortor, elementum vel, tempor at, varius non, purus. Mauris vitae nisl nec metus placerat consectetuer.

Read More...