[PATCH v3 2/3] ARM: dts: rockchip: change gpio nodenames

Heiko Stübner heiko at sntech.de
Wed Oct 13 16:07:16 PDT 2021


Am Donnerstag, 7. Oktober 2021, 16:40:18 CEST schrieb Johan Jonker:
> Currently all gpio nodenames are sort of identical to there label.
> Nodenames should be of a generic type, so change them all.
> 
> Signed-off-by: Johan Jonker <jbx6244 at gmail.com>
> Reviewed-by: Linus Walleij <linus.walleij at linaro.org>

Acked-by: Heiko Stuebner <heiko at sntech.de>

> ---
>  arch/arm/boot/dts/rk3036.dtsi  |  6 +++---
>  arch/arm/boot/dts/rk3066a.dtsi | 12 ++++++------
>  arch/arm/boot/dts/rk3188.dtsi  |  8 ++++----
>  arch/arm/boot/dts/rk322x.dtsi  |  8 ++++----
>  arch/arm/boot/dts/rk3288.dtsi  | 18 +++++++++---------
>  arch/arm/boot/dts/rv1108.dtsi  |  8 ++++----
>  6 files changed, 30 insertions(+), 30 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
> index ffa9bc7ed..9d2d44381 100644
> --- a/arch/arm/boot/dts/rk3036.dtsi
> +++ b/arch/arm/boot/dts/rk3036.dtsi
> @@ -575,7 +575,7 @@
>  		#size-cells = <1>;
>  		ranges;
>  
> -		gpio0: gpio0 at 2007c000 {
> +		gpio0: gpio at 2007c000 {
>  			compatible = "rockchip,gpio-bank";
>  			reg = <0x2007c000 0x100>;
>  			interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
> @@ -588,7 +588,7 @@
>  			#interrupt-cells = <2>;
>  		};
>  
> -		gpio1: gpio1 at 20080000 {
> +		gpio1: gpio at 20080000 {
>  			compatible = "rockchip,gpio-bank";
>  			reg = <0x20080000 0x100>;
>  			interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
> @@ -601,7 +601,7 @@
>  			#interrupt-cells = <2>;
>  		};
>  
> -		gpio2: gpio2 at 20084000 {
> +		gpio2: gpio at 20084000 {
>  			compatible = "rockchip,gpio-bank";
>  			reg = <0x20084000 0x100>;
>  			interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;
> diff --git a/arch/arm/boot/dts/rk3066a.dtsi b/arch/arm/boot/dts/rk3066a.dtsi
> index ae4055428..6688a1a3b 100644
> --- a/arch/arm/boot/dts/rk3066a.dtsi
> +++ b/arch/arm/boot/dts/rk3066a.dtsi
> @@ -273,7 +273,7 @@
>  		#size-cells = <1>;
>  		ranges;
>  
> -		gpio0: gpio0 at 20034000 {
> +		gpio0: gpio at 20034000 {
>  			compatible = "rockchip,gpio-bank";
>  			reg = <0x20034000 0x100>;
>  			interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
> @@ -286,7 +286,7 @@
>  			#interrupt-cells = <2>;
>  		};
>  
> -		gpio1: gpio1 at 2003c000 {
> +		gpio1: gpio at 2003c000 {
>  			compatible = "rockchip,gpio-bank";
>  			reg = <0x2003c000 0x100>;
>  			interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
> @@ -299,7 +299,7 @@
>  			#interrupt-cells = <2>;
>  		};
>  
> -		gpio2: gpio2 at 2003e000 {
> +		gpio2: gpio at 2003e000 {
>  			compatible = "rockchip,gpio-bank";
>  			reg = <0x2003e000 0x100>;
>  			interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;
> @@ -312,7 +312,7 @@
>  			#interrupt-cells = <2>;
>  		};
>  
> -		gpio3: gpio3 at 20080000 {
> +		gpio3: gpio at 20080000 {
>  			compatible = "rockchip,gpio-bank";
>  			reg = <0x20080000 0x100>;
>  			interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>;
> @@ -325,7 +325,7 @@
>  			#interrupt-cells = <2>;
>  		};
>  
> -		gpio4: gpio4 at 20084000 {
> +		gpio4: gpio at 20084000 {
>  			compatible = "rockchip,gpio-bank";
>  			reg = <0x20084000 0x100>;
>  			interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>;
> @@ -338,7 +338,7 @@
>  			#interrupt-cells = <2>;
>  		};
>  
> -		gpio6: gpio6 at 2000a000 {
> +		gpio6: gpio at 2000a000 {
>  			compatible = "rockchip,gpio-bank";
>  			reg = <0x2000a000 0x100>;
>  			interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
> diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi
> index 2c606494b..3e5786e07 100644
> --- a/arch/arm/boot/dts/rk3188.dtsi
> +++ b/arch/arm/boot/dts/rk3188.dtsi
> @@ -223,7 +223,7 @@
>  		#size-cells = <1>;
>  		ranges;
>  
> -		gpio0: gpio0 at 2000a000 {
> +		gpio0: gpio at 2000a000 {
>  			compatible = "rockchip,rk3188-gpio-bank0";
>  			reg = <0x2000a000 0x100>;
>  			interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
> @@ -236,7 +236,7 @@
>  			#interrupt-cells = <2>;
>  		};
>  
> -		gpio1: gpio1 at 2003c000 {
> +		gpio1: gpio at 2003c000 {
>  			compatible = "rockchip,gpio-bank";
>  			reg = <0x2003c000 0x100>;
>  			interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
> @@ -249,7 +249,7 @@
>  			#interrupt-cells = <2>;
>  		};
>  
> -		gpio2: gpio2 at 2003e000 {
> +		gpio2: gpio at 2003e000 {
>  			compatible = "rockchip,gpio-bank";
>  			reg = <0x2003e000 0x100>;
>  			interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;
> @@ -262,7 +262,7 @@
>  			#interrupt-cells = <2>;
>  		};
>  
> -		gpio3: gpio3 at 20080000 {
> +		gpio3: gpio at 20080000 {
>  			compatible = "rockchip,gpio-bank";
>  			reg = <0x20080000 0x100>;
>  			interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>;
> diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi
> index 75af99c76..3e36cec36 100644
> --- a/arch/arm/boot/dts/rk322x.dtsi
> +++ b/arch/arm/boot/dts/rk322x.dtsi
> @@ -946,7 +946,7 @@
>  		#size-cells = <1>;
>  		ranges;
>  
> -		gpio0: gpio0 at 11110000 {
> +		gpio0: gpio at 11110000 {
>  			compatible = "rockchip,gpio-bank";
>  			reg = <0x11110000 0x100>;
>  			interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>;
> @@ -959,7 +959,7 @@
>  			#interrupt-cells = <2>;
>  		};
>  
> -		gpio1: gpio1 at 11120000 {
> +		gpio1: gpio at 11120000 {
>  			compatible = "rockchip,gpio-bank";
>  			reg = <0x11120000 0x100>;
>  			interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>;
> @@ -972,7 +972,7 @@
>  			#interrupt-cells = <2>;
>  		};
>  
> -		gpio2: gpio2 at 11130000 {
> +		gpio2: gpio at 11130000 {
>  			compatible = "rockchip,gpio-bank";
>  			reg = <0x11130000 0x100>;
>  			interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;
> @@ -985,7 +985,7 @@
>  			#interrupt-cells = <2>;
>  		};
>  
> -		gpio3: gpio3 at 11140000 {
> +		gpio3: gpio at 11140000 {
>  			compatible = "rockchip,gpio-bank";
>  			reg = <0x11140000 0x100>;
>  			interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
> diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
> index 4dcdcf17c..096f5bb22 100644
> --- a/arch/arm/boot/dts/rk3288.dtsi
> +++ b/arch/arm/boot/dts/rk3288.dtsi
> @@ -1422,7 +1422,7 @@
>  		#size-cells = <2>;
>  		ranges;
>  
> -		gpio0: gpio0 at ff750000 {
> +		gpio0: gpio at ff750000 {
>  			compatible = "rockchip,gpio-bank";
>  			reg = <0x0 0xff750000 0x0 0x100>;
>  			interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
> @@ -1435,7 +1435,7 @@
>  			#interrupt-cells = <2>;
>  		};
>  
> -		gpio1: gpio1 at ff780000 {
> +		gpio1: gpio at ff780000 {
>  			compatible = "rockchip,gpio-bank";
>  			reg = <0x0 0xff780000 0x0 0x100>;
>  			interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
> @@ -1448,7 +1448,7 @@
>  			#interrupt-cells = <2>;
>  		};
>  
> -		gpio2: gpio2 at ff790000 {
> +		gpio2: gpio at ff790000 {
>  			compatible = "rockchip,gpio-bank";
>  			reg = <0x0 0xff790000 0x0 0x100>;
>  			interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
> @@ -1461,7 +1461,7 @@
>  			#interrupt-cells = <2>;
>  		};
>  
> -		gpio3: gpio3 at ff7a0000 {
> +		gpio3: gpio at ff7a0000 {
>  			compatible = "rockchip,gpio-bank";
>  			reg = <0x0 0xff7a0000 0x0 0x100>;
>  			interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
> @@ -1474,7 +1474,7 @@
>  			#interrupt-cells = <2>;
>  		};
>  
> -		gpio4: gpio4 at ff7b0000 {
> +		gpio4: gpio at ff7b0000 {
>  			compatible = "rockchip,gpio-bank";
>  			reg = <0x0 0xff7b0000 0x0 0x100>;
>  			interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
> @@ -1487,7 +1487,7 @@
>  			#interrupt-cells = <2>;
>  		};
>  
> -		gpio5: gpio5 at ff7c0000 {
> +		gpio5: gpio at ff7c0000 {
>  			compatible = "rockchip,gpio-bank";
>  			reg = <0x0 0xff7c0000 0x0 0x100>;
>  			interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
> @@ -1500,7 +1500,7 @@
>  			#interrupt-cells = <2>;
>  		};
>  
> -		gpio6: gpio6 at ff7d0000 {
> +		gpio6: gpio at ff7d0000 {
>  			compatible = "rockchip,gpio-bank";
>  			reg = <0x0 0xff7d0000 0x0 0x100>;
>  			interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>;
> @@ -1513,7 +1513,7 @@
>  			#interrupt-cells = <2>;
>  		};
>  
> -		gpio7: gpio7 at ff7e0000 {
> +		gpio7: gpio at ff7e0000 {
>  			compatible = "rockchip,gpio-bank";
>  			reg = <0x0 0xff7e0000 0x0 0x100>;
>  			interrupts = <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>;
> @@ -1526,7 +1526,7 @@
>  			#interrupt-cells = <2>;
>  		};
>  
> -		gpio8: gpio8 at ff7f0000 {
> +		gpio8: gpio at ff7f0000 {
>  			compatible = "rockchip,gpio-bank";
>  			reg = <0x0 0xff7f0000 0x0 0x100>;
>  			interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;
> diff --git a/arch/arm/boot/dts/rv1108.dtsi b/arch/arm/boot/dts/rv1108.dtsi
> index 24d56849a..db7166ed8 100644
> --- a/arch/arm/boot/dts/rv1108.dtsi
> +++ b/arch/arm/boot/dts/rv1108.dtsi
> @@ -600,7 +600,7 @@
>  		#size-cells = <1>;
>  		ranges;
>  
> -		gpio0: gpio0 at 20030000 {
> +		gpio0: gpio at 20030000 {
>  			compatible = "rockchip,gpio-bank";
>  			reg = <0x20030000 0x100>;
>  			interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
> @@ -613,7 +613,7 @@
>  			#interrupt-cells = <2>;
>  		};
>  
> -		gpio1: gpio1 at 10310000 {
> +		gpio1: gpio at 10310000 {
>  			compatible = "rockchip,gpio-bank";
>  			reg = <0x10310000 0x100>;
>  			interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
> @@ -626,7 +626,7 @@
>  			#interrupt-cells = <2>;
>  		};
>  
> -		gpio2: gpio2 at 10320000 {
> +		gpio2: gpio at 10320000 {
>  			compatible = "rockchip,gpio-bank";
>  			reg = <0x10320000 0x100>;
>  			interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;
> @@ -639,7 +639,7 @@
>  			#interrupt-cells = <2>;
>  		};
>  
> -		gpio3: gpio3 at 10330000 {
> +		gpio3: gpio at 10330000 {
>  			compatible = "rockchip,gpio-bank";
>  			reg = <0x10330000 0x100>;
>  			interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
> 







More information about the linux-arm-kernel mailing list