Add 'clock-names' property for gpio dt nodes, which is used by the gpio driver to identified as the index for the gpio controller. Signed-off-by: Jianqun Xu <jay.xu@xxxxxxxxxxxxxx> --- arch/arm64/boot/dts/rockchip/rk3308.dtsi | 5 +++++ arch/arm64/boot/dts/rockchip/rk3328.dtsi | 4 ++++ arch/arm64/boot/dts/rockchip/rk3368.dtsi | 4 ++++ arch/arm64/boot/dts/rockchip/rk3399.dtsi | 5 +++++ arch/arm64/boot/dts/rockchip/rk356x.dtsi | 5 +++++ 5 files changed, 23 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/arch/arm64/boot/dts/rockchip/rk3308.dtsi index fa189701cdc9..778b0e37d2e2 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi @@ -800,6 +800,7 @@ gpio0: gpio@ff220000 { compatible = "rockchip,gpio-bank"; reg = <0x0 0xff220000 0x0 0x100>; interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>; + clock-names = "bus"; clocks = <&cru PCLK_GPIO0>; gpio-controller; #gpio-cells = <2>; @@ -811,6 +812,7 @@ gpio1: gpio@ff230000 { compatible = "rockchip,gpio-bank"; reg = <0x0 0xff230000 0x0 0x100>; interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>; + clock-names = "bus"; clocks = <&cru PCLK_GPIO1>; gpio-controller; #gpio-cells = <2>; @@ -822,6 +824,7 @@ gpio2: gpio@ff240000 { compatible = "rockchip,gpio-bank"; reg = <0x0 0xff240000 0x0 0x100>; interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>; + clock-names = "bus"; clocks = <&cru PCLK_GPIO2>; gpio-controller; #gpio-cells = <2>; @@ -833,6 +836,7 @@ gpio3: gpio@ff250000 { compatible = "rockchip,gpio-bank"; reg = <0x0 0xff250000 0x0 0x100>; interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>; + clock-names = "bus"; clocks = <&cru PCLK_GPIO3>; gpio-controller; #gpio-cells = <2>; @@ -844,6 +848,7 @@ gpio4: gpio@ff260000 { compatible = "rockchip,gpio-bank"; reg = <0x0 0xff260000 0x0 0x100>; interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>; + clock-names = "bus"; clocks = <&cru PCLK_GPIO4>; gpio-controller; #gpio-cells = <2>; diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi index 22c2857bcdcf..765409f642c0 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi @@ -1040,6 +1040,7 @@ gpio0: gpio@ff210000 { compatible = "rockchip,gpio-bank"; reg = <0x0 0xff210000 0x0 0x100>; interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>; + clock-names = "bus"; clocks = <&cru PCLK_GPIO0>; gpio-controller; @@ -1053,6 +1054,7 @@ gpio1: gpio@ff220000 { compatible = "rockchip,gpio-bank"; reg = <0x0 0xff220000 0x0 0x100>; interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>; + clock-names = "bus"; clocks = <&cru PCLK_GPIO1>; gpio-controller; @@ -1066,6 +1068,7 @@ gpio2: gpio@ff230000 { compatible = "rockchip,gpio-bank"; reg = <0x0 0xff230000 0x0 0x100>; interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>; + clock-names = "bus"; clocks = <&cru PCLK_GPIO2>; gpio-controller; @@ -1079,6 +1082,7 @@ gpio3: gpio@ff240000 { compatible = "rockchip,gpio-bank"; reg = <0x0 0xff240000 0x0 0x100>; interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>; + clock-names = "bus"; clocks = <&cru PCLK_GPIO3>; gpio-controller; diff --git a/arch/arm64/boot/dts/rockchip/rk3368.dtsi b/arch/arm64/boot/dts/rockchip/rk3368.dtsi index fc7e3f2bc786..45f32de84fae 100644 --- a/arch/arm64/boot/dts/rockchip/rk3368.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3368.dtsi @@ -984,6 +984,7 @@ pinctrl: pinctrl { gpio0: gpio@ff750000 { compatible = "rockchip,gpio-bank"; reg = <0x0 0xff750000 0x0 0x100>; + clock-names = "bus"; clocks = <&cru PCLK_GPIO0>; interrupts = <GIC_SPI 0x51 IRQ_TYPE_LEVEL_HIGH>; @@ -997,6 +998,7 @@ gpio0: gpio@ff750000 { gpio1: gpio@ff780000 { compatible = "rockchip,gpio-bank"; reg = <0x0 0xff780000 0x0 0x100>; + clock-names = "bus"; clocks = <&cru PCLK_GPIO1>; interrupts = <GIC_SPI 0x52 IRQ_TYPE_LEVEL_HIGH>; @@ -1010,6 +1012,7 @@ gpio1: gpio@ff780000 { gpio2: gpio@ff790000 { compatible = "rockchip,gpio-bank"; reg = <0x0 0xff790000 0x0 0x100>; + clock-names = "bus"; clocks = <&cru PCLK_GPIO2>; interrupts = <GIC_SPI 0x53 IRQ_TYPE_LEVEL_HIGH>; @@ -1023,6 +1026,7 @@ gpio2: gpio@ff790000 { gpio3: gpio@ff7a0000 { compatible = "rockchip,gpio-bank"; reg = <0x0 0xff7a0000 0x0 0x100>; + clock-names = "bus"; clocks = <&cru PCLK_GPIO3>; interrupts = <GIC_SPI 0x54 IRQ_TYPE_LEVEL_HIGH>; diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi index caffcaee2d6c..0b8b96fe0cf0 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -2071,6 +2071,7 @@ pinctrl: pinctrl { gpio0: gpio@ff720000 { compatible = "rockchip,gpio-bank"; reg = <0x0 0xff720000 0x0 0x100>; + clock-names = "bus"; clocks = <&pmucru PCLK_GPIO0_PMU>; interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH 0>; @@ -2084,6 +2085,7 @@ gpio0: gpio@ff720000 { gpio1: gpio@ff730000 { compatible = "rockchip,gpio-bank"; reg = <0x0 0xff730000 0x0 0x100>; + clock-names = "bus"; clocks = <&pmucru PCLK_GPIO1_PMU>; interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH 0>; @@ -2097,6 +2099,7 @@ gpio1: gpio@ff730000 { gpio2: gpio@ff780000 { compatible = "rockchip,gpio-bank"; reg = <0x0 0xff780000 0x0 0x100>; + clock-names = "bus"; clocks = <&cru PCLK_GPIO2>; interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH 0>; @@ -2110,6 +2113,7 @@ gpio2: gpio@ff780000 { gpio3: gpio@ff788000 { compatible = "rockchip,gpio-bank"; reg = <0x0 0xff788000 0x0 0x100>; + clock-names = "bus"; clocks = <&cru PCLK_GPIO3>; interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH 0>; @@ -2123,6 +2127,7 @@ gpio3: gpio@ff788000 { gpio4: gpio@ff790000 { compatible = "rockchip,gpio-bank"; reg = <0x0 0xff790000 0x0 0x100>; + clock-names = "bus"; clocks = <&cru PCLK_GPIO4>; interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH 0>; diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi index 319981c3e9f7..66d038720e65 100644 --- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi @@ -1650,6 +1650,7 @@ gpio0: gpio@fdd60000 { compatible = "rockchip,gpio-bank"; reg = <0x0 0xfdd60000 0x0 0x100>; interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>; + clock-names = "bus", "db"; clocks = <&pmucru PCLK_GPIO0>, <&pmucru DBCLK_GPIO0>; gpio-controller; #gpio-cells = <2>; @@ -1661,6 +1662,7 @@ gpio1: gpio@fe740000 { compatible = "rockchip,gpio-bank"; reg = <0x0 0xfe740000 0x0 0x100>; interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>; + clock-names = "bus", "db"; clocks = <&cru PCLK_GPIO1>, <&cru DBCLK_GPIO1>; gpio-controller; #gpio-cells = <2>; @@ -1672,6 +1674,7 @@ gpio2: gpio@fe750000 { compatible = "rockchip,gpio-bank"; reg = <0x0 0xfe750000 0x0 0x100>; interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>; + clock-names = "bus", "db"; clocks = <&cru PCLK_GPIO2>, <&cru DBCLK_GPIO2>; gpio-controller; #gpio-cells = <2>; @@ -1683,6 +1686,7 @@ gpio3: gpio@fe760000 { compatible = "rockchip,gpio-bank"; reg = <0x0 0xfe760000 0x0 0x100>; interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>; + clock-names = "bus", "db"; clocks = <&cru PCLK_GPIO3>, <&cru DBCLK_GPIO3>; gpio-controller; #gpio-cells = <2>; @@ -1694,6 +1698,7 @@ gpio4: gpio@fe770000 { compatible = "rockchip,gpio-bank"; reg = <0x0 0xfe770000 0x0 0x100>; interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>; + clock-names = "bus", "db"; clocks = <&cru PCLK_GPIO4>, <&cru DBCLK_GPIO4>; gpio-controller; #gpio-cells = <2>; -- 2.25.1