[PATCH v4 4/7] ARM: dts: rockchip: add rockchip,gpio-controller property to gpio nodes

From: Johan Jonker
Date: Thu Feb 23 2023 - 14:47:28 EST

Next message: Johan Jonker: "[PATCH v4 5/7] arm64: dts: rockchip: add rockchip,gpio-controller property to gpio nodes"
Previous message: Paul E. McKenney: "Re: [PATCH 00/13] Rename k[v]free_rcu() single argument to k[v]free_rcu_mightsleep()"
In reply to: Johan Jonker: "[PATCH v4 3/7] gpio: gpio-rockchip: parse rockchip,gpio-controller property for bank id"
Next in thread: Johan Jonker: "[PATCH v4 5/7] arm64: dts: rockchip: add rockchip,gpio-controller property to gpio nodes"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Add a rockchip,gpio-controller property to Rockchip gpio nodes to be
independent from aliases and probe order for our bank id.

Signed-off-by: Johan Jonker <jbx6244@xxxxxxxxx>
---
---
arch/arm/boot/dts/rk3036.dtsi | 3 +++
arch/arm/boot/dts/rk3066a.dtsi | 6 ++++++
arch/arm/boot/dts/rk3128.dtsi | 4 ++++
arch/arm/boot/dts/rk3188.dtsi | 4 ++++
arch/arm/boot/dts/rk322x.dtsi | 4 ++++
arch/arm/boot/dts/rk3288.dtsi | 9 +++++++++
arch/arm/boot/dts/rv1108.dtsi | 4 ++++
arch/arm/boot/dts/rv1126.dtsi | 5 +++++
8 files changed, 39 insertions(+)

diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
index 78686fc72..ef748dc5d 100644
--- a/arch/arm/boot/dts/rk3036.dtsi
+++ b/arch/arm/boot/dts/rk3036.dtsi
@@ -582,6 +582,7 @@
clocks = <&cru PCLK_GPIO0>;

gpio-controller;
+ rockchip,gpio-controller = <0>;
#gpio-cells = <2>;

interrupt-controller;
@@ -595,6 +596,7 @@
clocks = <&cru PCLK_GPIO1>;

gpio-controller;
+ rockchip,gpio-controller = <1>;
#gpio-cells = <2>;

interrupt-controller;
@@ -608,6 +610,7 @@
clocks = <&cru PCLK_GPIO2>;

gpio-controller;
+ rockchip,gpio-controller = <2>;
#gpio-cells = <2>;

interrupt-controller;
diff --git a/arch/arm/boot/dts/rk3066a.dtsi b/arch/arm/boot/dts/rk3066a.dtsi
index de9915d94..cc20b4214 100644
--- a/arch/arm/boot/dts/rk3066a.dtsi
+++ b/arch/arm/boot/dts/rk3066a.dtsi
@@ -280,6 +280,7 @@
clocks = <&cru PCLK_GPIO0>;

gpio-controller;
+ rockchip,gpio-controller = <0>;
#gpio-cells = <2>;

interrupt-controller;
@@ -293,6 +294,7 @@
clocks = <&cru PCLK_GPIO1>;

gpio-controller;
+ rockchip,gpio-controller = <1>;
#gpio-cells = <2>;

interrupt-controller;
@@ -306,6 +308,7 @@
clocks = <&cru PCLK_GPIO2>;

gpio-controller;
+ rockchip,gpio-controller = <2>;
#gpio-cells = <2>;

interrupt-controller;
@@ -319,6 +322,7 @@
clocks = <&cru PCLK_GPIO3>;

gpio-controller;
+ rockchip,gpio-controller = <3>;
#gpio-cells = <2>;

interrupt-controller;
@@ -332,6 +336,7 @@
clocks = <&cru PCLK_GPIO4>;

gpio-controller;
+ rockchip,gpio-controller = <4>;
#gpio-cells = <2>;

interrupt-controller;
@@ -345,6 +350,7 @@
clocks = <&cru PCLK_GPIO6>;

gpio-controller;
+ rockchip,gpio-controller = <6>;
#gpio-cells = <2>;

interrupt-controller;
diff --git a/arch/arm/boot/dts/rk3128.dtsi b/arch/arm/boot/dts/rk3128.dtsi
index b63bd4ad3..01c8a6b33 100644
--- a/arch/arm/boot/dts/rk3128.dtsi
+++ b/arch/arm/boot/dts/rk3128.dtsi
@@ -476,6 +476,7 @@
interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cru PCLK_GPIO0>;
gpio-controller;
+ rockchip,gpio-controller = <0>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
@@ -487,6 +488,7 @@
interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cru PCLK_GPIO1>;
gpio-controller;
+ rockchip,gpio-controller = <1>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
@@ -498,6 +500,7 @@
interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cru PCLK_GPIO2>;
gpio-controller;
+ rockchip,gpio-controller = <2>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
@@ -509,6 +512,7 @@
interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cru PCLK_GPIO3>;
gpio-controller;
+ rockchip,gpio-controller = <3>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi
index 44b54af0b..583ba942c 100644
--- a/arch/arm/boot/dts/rk3188.dtsi
+++ b/arch/arm/boot/dts/rk3188.dtsi
@@ -231,6 +231,7 @@
clocks = <&cru PCLK_GPIO0>;

gpio-controller;
+ rockchip,gpio-controller = <0>;
#gpio-cells = <2>;

interrupt-controller;
@@ -244,6 +245,7 @@
clocks = <&cru PCLK_GPIO1>;

gpio-controller;
+ rockchip,gpio-controller = <1>;
#gpio-cells = <2>;

interrupt-controller;
@@ -257,6 +259,7 @@
clocks = <&cru PCLK_GPIO2>;

gpio-controller;
+ rockchip,gpio-controller = <2>;
#gpio-cells = <2>;

interrupt-controller;
@@ -270,6 +273,7 @@
clocks = <&cru PCLK_GPIO3>;

gpio-controller;
+ rockchip,gpio-controller = <3>;
#gpio-cells = <2>;

interrupt-controller;
diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi
index ffc16d6b9..e03203bc1 100644
--- a/arch/arm/boot/dts/rk322x.dtsi
+++ b/arch/arm/boot/dts/rk322x.dtsi
@@ -955,6 +955,7 @@
clocks = <&cru PCLK_GPIO0>;

gpio-controller;
+ rockchip,gpio-controller = <0>;
#gpio-cells = <2>;

interrupt-controller;
@@ -968,6 +969,7 @@
clocks = <&cru PCLK_GPIO1>;

gpio-controller;
+ rockchip,gpio-controller = <1>;
#gpio-cells = <2>;

interrupt-controller;
@@ -981,6 +983,7 @@
clocks = <&cru PCLK_GPIO2>;

gpio-controller;
+ rockchip,gpio-controller = <2>;
#gpio-cells = <2>;

interrupt-controller;
@@ -994,6 +997,7 @@
clocks = <&cru PCLK_GPIO3>;

gpio-controller;
+ rockchip,gpio-controller = <3>;
#gpio-cells = <2>;

interrupt-controller;
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index 2ca76b69a..937fec4b8 100644
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -1431,6 +1431,7 @@
clocks = <&cru PCLK_GPIO0>;

gpio-controller;
+ rockchip,gpio-controller = <0>;
#gpio-cells = <2>;

interrupt-controller;
@@ -1444,6 +1445,7 @@
clocks = <&cru PCLK_GPIO1>;

gpio-controller;
+ rockchip,gpio-controller = <1>;
#gpio-cells = <2>;

interrupt-controller;
@@ -1457,6 +1459,7 @@
clocks = <&cru PCLK_GPIO2>;

gpio-controller;
+ rockchip,gpio-controller = <2>;
#gpio-cells = <2>;

interrupt-controller;
@@ -1470,6 +1473,7 @@
clocks = <&cru PCLK_GPIO3>;

gpio-controller;
+ rockchip,gpio-controller = <3>;
#gpio-cells = <2>;

interrupt-controller;
@@ -1483,6 +1487,7 @@
clocks = <&cru PCLK_GPIO4>;

gpio-controller;
+ rockchip,gpio-controller = <4>;
#gpio-cells = <2>;

interrupt-controller;
@@ -1496,6 +1501,7 @@
clocks = <&cru PCLK_GPIO5>;

gpio-controller;
+ rockchip,gpio-controller = <5>;
#gpio-cells = <2>;

interrupt-controller;
@@ -1509,6 +1515,7 @@
clocks = <&cru PCLK_GPIO6>;

gpio-controller;
+ rockchip,gpio-controller = <6>;
#gpio-cells = <2>;

interrupt-controller;
@@ -1522,6 +1529,7 @@
clocks = <&cru PCLK_GPIO7>;

gpio-controller;
+ rockchip,gpio-controller = <7>;
#gpio-cells = <2>;

interrupt-controller;
@@ -1535,6 +1543,7 @@
clocks = <&cru PCLK_GPIO8>;

gpio-controller;
+ rockchip,gpio-controller = <8>;
#gpio-cells = <2>;

interrupt-controller;
diff --git a/arch/arm/boot/dts/rv1108.dtsi b/arch/arm/boot/dts/rv1108.dtsi
index abf3006f0..0dca27d09 100644
--- a/arch/arm/boot/dts/rv1108.dtsi
+++ b/arch/arm/boot/dts/rv1108.dtsi
@@ -602,6 +602,7 @@
clocks = <&cru PCLK_GPIO0_PMU>;

gpio-controller;
+ rockchip,gpio-controller = <0>;
#gpio-cells = <2>;

interrupt-controller;
@@ -615,6 +616,7 @@
clocks = <&cru PCLK_GPIO1>;

gpio-controller;
+ rockchip,gpio-controller = <1>;
#gpio-cells = <2>;

interrupt-controller;
@@ -628,6 +630,7 @@
clocks = <&cru PCLK_GPIO2>;

gpio-controller;
+ rockchip,gpio-controller = <2>;
#gpio-cells = <2>;

interrupt-controller;
@@ -641,6 +644,7 @@
clocks = <&cru PCLK_GPIO3>;

gpio-controller;
+ rockchip,gpio-controller = <3>;
#gpio-cells = <2>;

interrupt-controller;
diff --git a/arch/arm/boot/dts/rv1126.dtsi b/arch/arm/boot/dts/rv1126.dtsi
index 1f07d0a4f..51e8e1741 100644
--- a/arch/arm/boot/dts/rv1126.dtsi
+++ b/arch/arm/boot/dts/rv1126.dtsi
@@ -433,6 +433,7 @@
interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&pmucru PCLK_GPIO0>, <&pmucru DBCLK_GPIO0>;
gpio-controller;
+ rockchip,gpio-controller = <0>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
@@ -444,6 +445,7 @@
interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cru PCLK_GPIO1>, <&cru DBCLK_GPIO1>;
gpio-controller;
+ rockchip,gpio-controller = <1>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
@@ -455,6 +457,7 @@
interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cru PCLK_GPIO2>, <&cru DBCLK_GPIO2>;
gpio-controller;
+ rockchip,gpio-controller = <2>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
@@ -466,6 +469,7 @@
interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cru PCLK_GPIO3>, <&cru DBCLK_GPIO3>;
gpio-controller;
+ rockchip,gpio-controller = <3>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
@@ -477,6 +481,7 @@
interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cru PCLK_GPIO4>, <&cru DBCLK_GPIO4>;
gpio-controller;
+ rockchip,gpio-controller = <4>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
--
2.20.1

Next message: Johan Jonker: "[PATCH v4 5/7] arm64: dts: rockchip: add rockchip,gpio-controller property to gpio nodes"
Previous message: Paul E. McKenney: "Re: [PATCH 00/13] Rename k[v]free_rcu() single argument to k[v]free_rcu_mightsleep()"
In reply to: Johan Jonker: "[PATCH v4 3/7] gpio: gpio-rockchip: parse rockchip,gpio-controller property for bank id"
Next in thread: Johan Jonker: "[PATCH v4 5/7] arm64: dts: rockchip: add rockchip,gpio-controller property to gpio nodes"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]