On 13/02/21 4:30 pm, Dario Binacchi wrote:
Move gpio controller nodes from am33xx.dtsi to am33xx-l4.dtsi. Now both files are more similar to those found in Linux 5.9-rc7. To be fully operational as before it was also necessary to fix the am33xx-clock.dtsi file. It too is now almost the same as the Linux kernel.
Signed-off-by: Dario Binacchi dariobin@libero.it
Applied PATCH 1/3 to u-boot-ti/for-rc branch.
Thanks and regards, Lokesh
arch/arm/dts/am33xx-clocks.dtsi | 2 +- arch/arm/dts/am33xx-l4.dtsi | 64 +++++++++++++++++++++++++++++++++ arch/arm/dts/am33xx.dtsi | 44 ----------------------- 3 files changed, 65 insertions(+), 45 deletions(-)
diff --git a/arch/arm/dts/am33xx-clocks.dtsi b/arch/arm/dts/am33xx-clocks.dtsi index 87c4410ee2..5640ce40c4 100644 --- a/arch/arm/dts/am33xx-clocks.dtsi +++ b/arch/arm/dts/am33xx-clocks.dtsi @@ -604,7 +604,7 @@
l4_wkup_clkctrl: l4-wkup-clkctrl@0 { compatible = "ti,clkctrl";
reg = <0x4 0x10>, <0xb4 0x24>;
reg = <0x0 0x10>, <0xb4 0x24>; #clock-cells = <2>;diff --git a/arch/arm/dts/am33xx-l4.dtsi b/arch/arm/dts/am33xx-l4.dtsi index 257991e2ad..e678673317 100644 --- a/arch/arm/dts/am33xx-l4.dtsi +++ b/arch/arm/dts/am33xx-l4.dtsi @@ -148,6 +148,28 @@ #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0x7000 0x1000>;
gpio0: gpio@0 {compatible = "ti,omap4-gpio";gpio-ranges = <&am33xx_pinmux 0 82 8>,<&am33xx_pinmux 8 52 4>,<&am33xx_pinmux 12 94 4>,<&am33xx_pinmux 16 71 2>,<&am33xx_pinmux 18 135 1>,<&am33xx_pinmux 19 108 2>,<&am33xx_pinmux 21 73 1>,<&am33xx_pinmux 22 8 2>,<&am33xx_pinmux 26 10 2>,<&am33xx_pinmux 28 74 1>,<&am33xx_pinmux 29 81 1>,<&am33xx_pinmux 30 28 2>;gpio-controller;#gpio-cells = <2>;interrupt-controller;#interrupt-cells = <2>;reg = <0x0 0x1000>;interrupts = <96>;};};
target-module@9000 { /* 0x44e09000, ap 16 04.0 */
@@ -1200,6 +1222,20 @@ #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0x4c000 0x1000>;
gpio1: gpio@0 {compatible = "ti,omap4-gpio";gpio-ranges = <&am33xx_pinmux 0 0 8>,<&am33xx_pinmux 8 90 4>,<&am33xx_pinmux 12 12 16>,<&am33xx_pinmux 28 30 4>;gpio-controller;#gpio-cells = <2>;interrupt-controller;#interrupt-cells = <2>;reg = <0x0 0x1000>;interrupts = <98>;};};
target-module@50000 { /* 0x48050000, ap 34 2c.0 */
@@ -1570,6 +1606,19 @@ #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0xac000 0x1000>;
gpio2: gpio@0 {compatible = "ti,omap4-gpio";gpio-ranges = <&am33xx_pinmux 0 34 18>,<&am33xx_pinmux 18 77 4>,<&am33xx_pinmux 22 56 10>;gpio-controller;#gpio-cells = <2>;interrupt-controller;#interrupt-cells = <2>;reg = <0x0 0x1000>;interrupts = <32>;};};
target-module@ae000 { /* 0x481ae000, ap 56 3a.0 */
@@ -1593,6 +1642,21 @@ #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0xae000 0x1000>;
gpio3: gpio@0 {compatible = "ti,omap4-gpio";gpio-ranges = <&am33xx_pinmux 0 66 5>,<&am33xx_pinmux 5 98 2>,<&am33xx_pinmux 7 75 2>,<&am33xx_pinmux 13 141 1>,<&am33xx_pinmux 14 100 8>;gpio-controller;#gpio-cells = <2>;interrupt-controller;#interrupt-cells = <2>;reg = <0x0 0x1000>;interrupts = <62>;};};
target-module@b0000 { /* 0x481b0000, ap 58 50.0 */
diff --git a/arch/arm/dts/am33xx.dtsi b/arch/arm/dts/am33xx.dtsi index 3e5ed00aae..ce07cec846 100644 --- a/arch/arm/dts/am33xx.dtsi +++ b/arch/arm/dts/am33xx.dtsi @@ -301,50 +301,6 @@ }; };
gpio0: gpio@44e07000 {compatible = "ti,omap4-gpio";ti,hwmods = "gpio1";gpio-controller;#gpio-cells = <2>;interrupt-controller;#interrupt-cells = <2>;reg = <0x44e07000 0x1000>;interrupts = <96>;};gpio1: gpio@4804c000 {compatible = "ti,omap4-gpio";ti,hwmods = "gpio2";gpio-controller;#gpio-cells = <2>;interrupt-controller;#interrupt-cells = <2>;reg = <0x4804c000 0x1000>;interrupts = <98>;};gpio2: gpio@481ac000 {compatible = "ti,omap4-gpio";ti,hwmods = "gpio3";gpio-controller;#gpio-cells = <2>;interrupt-controller;#interrupt-cells = <2>;reg = <0x481ac000 0x1000>;interrupts = <32>;};gpio3: gpio@481ae000 {compatible = "ti,omap4-gpio";ti,hwmods = "gpio4";gpio-controller;#gpio-cells = <2>;interrupt-controller;#interrupt-cells = <2>;reg = <0x481ae000 0x1000>;interrupts = <62>;};- i2c0: i2c@44e0b000 { compatible = "ti,omap4-i2c"; #address-cells = <1>;