bcm4908: backport first 5.18 DTS changes
authorRafał Miłecki <rafal@milecki.pl>
Tue, 1 Feb 2022 09:45:38 +0000 (10:45 +0100)
committerRafał Miłecki <rafal@milecki.pl>
Wed, 16 Feb 2022 08:15:52 +0000 (09:15 +0100)
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit da8b720b0ecbb6d58f28a31b082b0c53be149a5a)

target/linux/bcm4908/patches-5.4/036-v5.18-0001-arm64-dts-broadcom-bcm4908-use-proper-TWD-binding.patch [new file with mode: 0644]
target/linux/bcm4908/patches-5.4/036-v5.18-0002-arm64-dts-broadcom-bcm4908-add-pinctrl-binding.patch [new file with mode: 0644]
target/linux/bcm4908/patches-5.4/301-arm64-dts-broadcom-bcm4908-add-TWD-block.patch

diff --git a/target/linux/bcm4908/patches-5.4/036-v5.18-0001-arm64-dts-broadcom-bcm4908-use-proper-TWD-binding.patch b/target/linux/bcm4908/patches-5.4/036-v5.18-0001-arm64-dts-broadcom-bcm4908-use-proper-TWD-binding.patch
new file mode 100644 (file)
index 0000000..420f790
--- /dev/null
@@ -0,0 +1,47 @@
+From 33826e9c6ba76b265d4e26cb95493fa27ed78974 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Wed, 29 Dec 2021 11:23:14 +0100
+Subject: [PATCH] arm64: dts: broadcom: bcm4908: use proper TWD binding
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Block at <ff800400 0x4c> is a TWD that contains timers, watchdog and
+reset. Actual timers happen to be at block beginning but they only span
+across the first 0x28 registers. It means the old block description was
+incorrect (size 0x3c).
+
+Drop timers binding for now and use documented TWD binding. Timers
+should be properly documented and defined as TWD subnode.
+
+Fixes: 2961f69f151c ("arm64: dts: broadcom: add BCM4908 and Asus GT-AC5300 early DTS files")
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
+---
+ arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi
++++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi
+@@ -273,9 +273,9 @@
+               #size-cells = <1>;
+               ranges = <0x00 0x00 0xff800000 0x3000>;
+-              timer: timer@400 {
+-                      compatible = "brcm,bcm6328-timer", "syscon";
+-                      reg = <0x400 0x3c>;
++              twd: timer-mfd@400 {
++                      compatible = "brcm,bcm4908-twd", "simple-mfd", "syscon";
++                      reg = <0x400 0x4c>;
+               };
+               gpio0: gpio-controller@500 {
+@@ -330,7 +330,7 @@
+       reboot {
+               compatible = "syscon-reboot";
+-              regmap = <&timer>;
++              regmap = <&twd>;
+               offset = <0x34>;
+               mask = <1>;
+       };
diff --git a/target/linux/bcm4908/patches-5.4/036-v5.18-0002-arm64-dts-broadcom-bcm4908-add-pinctrl-binding.patch b/target/linux/bcm4908/patches-5.4/036-v5.18-0002-arm64-dts-broadcom-bcm4908-add-pinctrl-binding.patch
new file mode 100644 (file)
index 0000000..2f4baf8
--- /dev/null
@@ -0,0 +1,160 @@
+From 72b1c5da796ec5266f2012c36470e226cb4f09c9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Thu, 30 Dec 2021 12:05:35 +0100
+Subject: [PATCH] arm64: dts: broadcom: bcm4908: add pinctrl binding
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Describe pinmux block with its maps.
+
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
+---
+ .../boot/dts/broadcom/bcm4908/bcm4908.dtsi    | 135 ++++++++++++++++++
+ 1 file changed, 135 insertions(+)
+
+--- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi
++++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi
+@@ -287,6 +287,141 @@
+                       gpio-controller;
+               };
++              pinctrl@560 {
++                      compatible = "brcm,bcm4908-pinctrl";
++                      reg = <0x560 0x10>;
++
++                      pins_led_0_a: led_0-a-pins {
++                              function = "led_0";
++                              groups = "led_0_grp_a";
++                      };
++
++                      pins_led_1_a: led_1-a-pins {
++                              function = "led_1";
++                              groups = "led_1_grp_a";
++                      };
++
++                      pins_led_2_a: led_2-a-pins {
++                              function = "led_2";
++                              groups = "led_2_grp_a";
++                      };
++
++                      pins_led_3_a: led_3-a-pins {
++                              function = "led_3";
++                              groups = "led_3_grp_a";
++                      };
++
++                      pins_led_4_a: led_4-a-pins {
++                              function = "led_4";
++                              groups = "led_4_grp_a";
++                      };
++
++                      pins_led_5_a: led_5-a-pins {
++                              function = "led_5";
++                              groups = "led_5_grp_a";
++                      };
++
++                      pins_led_6_a: led_6-a-pins {
++                              function = "led_6";
++                              groups = "led_6_grp_a";
++                      };
++
++                      pins_led_7_a: led_7-a-pins {
++                              function = "led_7";
++                              groups = "led_7_grp_a";
++                      };
++
++                      pins_led_8_a: led_8-a-pins {
++                              function = "led_8";
++                              groups = "led_8_grp_a";
++                      };
++
++                      pins_led_9_a: led_9-a-pins {
++                              function = "led_9";
++                              groups = "led_9_grp_a";
++                      };
++
++                      pins_led_21_a: led_21-a-pins {
++                              function = "led_21";
++                              groups = "led_21_grp_a";
++                      };
++
++                      pins_led_22_a: led_22-a-pins {
++                              function = "led_22";
++                              groups = "led_22_grp_a";
++                      };
++
++                      pins_led_26_a: led_26-a-pins {
++                              function = "led_26";
++                              groups = "led_26_grp_a";
++                      };
++
++                      pins_led_27_a: led_27-a-pins {
++                              function = "led_27";
++                              groups = "led_27_grp_a";
++                      };
++
++                      pins_led_28_a: led_28-a-pins {
++                              function = "led_28";
++                              groups = "led_28_grp_a";
++                      };
++
++                      pins_led_29_a: led_29-a-pins {
++                              function = "led_29";
++                              groups = "led_29_grp_a";
++                      };
++
++                      pins_led_30_a: led_30-a-pins {
++                              function = "led_30";
++                              groups = "led_30_grp_a";
++                      };
++
++                      pins_hs_uart: hs_uart-pins {
++                              function = "hs_uart";
++                              groups = "hs_uart_grp";
++                      };
++
++                      pins_i2c_a: i2c-a-pins {
++                              function = "i2c";
++                              groups = "i2c_grp_a";
++                      };
++
++                      pins_i2c_b: i2c-b-pins {
++                              function = "i2c";
++                              groups = "i2c_grp_b";
++                      };
++
++                      pins_i2s: i2s-pins {
++                              function = "i2s";
++                              groups = "i2s_grp";
++                      };
++
++                      pins_nand_ctrl: nand_ctrl-pins {
++                              function = "nand_ctrl";
++                              groups = "nand_ctrl_grp";
++                      };
++
++                      pins_nand_data: nand_data-pins {
++                              function = "nand_data";
++                              groups = "nand_data_grp";
++                      };
++
++                      pins_emmc_ctrl: emmc_ctrl-pins {
++                              function = "emmc_ctrl";
++                              groups = "emmc_ctrl_grp";
++                      };
++
++                      pins_usb0_pwr: usb0_pwr-pins {
++                              function = "usb0_pwr";
++                              groups = "usb0_pwr_grp";
++                      };
++
++                      pins_usb1_pwr: usb1_pwr-pins {
++                              function = "usb1_pwr";
++                              groups = "usb1_pwr_grp";
++                      };
++              };
++
+               uart0: serial@640 {
+                       compatible = "brcm,bcm6345-uart";
+                       reg = <0x640 0x18>;
index 41d731d8dbd9c03b5e1f770103bdda377ca1b6f7..c505a46d46e2e3b11f72bc1b3f482d505077a08c 100644 (file)
@@ -17,16 +17,10 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
 
 --- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi
 +++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi
-@@ -273,9 +273,18 @@
-               #size-cells = <1>;
-               ranges = <0x00 0x00 0xff800000 0x3000>;
--              timer: timer@400 {
--                      compatible = "brcm,bcm6328-timer", "syscon";
--                      reg = <0x400 0x3c>;
-+              twd: timer-mfd@400 {
-+                      compatible = "brcm,bcm4908-twd", "brcm,twd", "simple-mfd", "syscon";
-+                      reg = <0x400 0x4c>;
+@@ -276,6 +276,15 @@
+               twd: timer-mfd@400 {
+                       compatible = "brcm,bcm4908-twd", "simple-mfd", "syscon";
+                       reg = <0x400 0x4c>;
 +                      ranges = <0x0 0x400 0x4c>;
 +
 +                      #address-cells = <1>;
@@ -39,12 +33,3 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
                };
  
                gpio0: gpio-controller@500 {
-@@ -330,7 +339,7 @@
-       reboot {
-               compatible = "syscon-reboot";
--              regmap = <&timer>;
-+              regmap = <&twd>;
-               offset = <0x34>;
-               mask = <1>;
-       };