bcm4908: use backported switch & PMB DTS patches

Final versions differ slightly from what was used initially.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>

diff --git a/target/linux/bcm4908/patches-5.4/130-arm64-dts-broadcom-bcm4908-describe-internal-switch.patch b/target/linux/bcm4908/patches-5.4/031-v5.12-0005-arm64-dts-broadcom-bcm4908-describe-internal-switch.patch
similarity index 94%
rename from target/linux/bcm4908/patches-5.4/130-arm64-dts-broadcom-bcm4908-describe-internal-switch.patch
rename to target/linux/bcm4908/patches-5.4/031-v5.12-0005-arm64-dts-broadcom-bcm4908-describe-internal-switch.patch
index d039e041725b59988f88f89685b84b1297b977d2..c0e27a4e927f0dd208a9ea3d12b5869729db0a3a 100644 (file)
--- a/target/linux/bcm4908/patches-5.4/130-arm64-dts-broadcom-bcm4908-describe-internal-switch.patch
+++ b/target/linux/bcm4908/patches-5.4/031-v5.12-0005-arm64-dts-broadcom-bcm4908-describe-internal-switch.patch
@@ -1,6 +1,6 @@
-From 12cda92893ea57cdd84a8ccfcc05946d7f3a1cd7 Mon Sep 17 00:00:00 2001
+From 961c38974fa5b34d6232d7485120e4392d279ab4 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Tue, 12 Jan 2021 12:56:58 +0100
+Date: Wed, 13 Jan 2021 12:14:06 +0100
 Subject: [PATCH] arm64: dts: broadcom: bcm4908: describe internal switch
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -15,6 +15,7 @@ internal MDIO.
 CPU port and Ethernet interface remain to be documented.
 
 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
 ---
  .../bcm4908/bcm4908-asus-gt-ac5300.dts        | 51 +++++++++++
  .../boot/dts/broadcom/bcm4908/bcm4908.dtsi    | 85 ++++++++++++++++++-
@@ -97,7 +98,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
                };
 +
 +              switch@80000 {
-+                      compatible = "simple-mfd";
++                      compatible = "simple-bus";
 +                      #size-cells = <1>;
 +                      #address-cells = <1>;
 +                      ranges = <0 0x80000 0x50000>;

diff --git a/target/linux/bcm4908/patches-5.4/131-arm64-dts-broadcom-bcm4908-describe-PMB-block.patch b/target/linux/bcm4908/patches-5.4/031-v5.12-0006-arm64-dts-broadcom-bcm4908-describe-PMB-block.patch
similarity index 81%
rename from target/linux/bcm4908/patches-5.4/131-arm64-dts-broadcom-bcm4908-describe-PMB-block.patch
rename to target/linux/bcm4908/patches-5.4/031-v5.12-0006-arm64-dts-broadcom-bcm4908-describe-PMB-block.patch
index 5b0ae7af1cc9fbd1606ef608144a597521293391..c1a9c35837bc4da30a77f8f4b8e62d0abff25c8c 100644 (file)
--- a/target/linux/bcm4908/patches-5.4/131-arm64-dts-broadcom-bcm4908-describe-PMB-block.patch
+++ b/target/linux/bcm4908/patches-5.4/031-v5.12-0006-arm64-dts-broadcom-bcm4908-describe-PMB-block.patch
@@ -1,6 +1,6 @@
-From 11a7fb140af5cfa706a8d9c0a309247f020a8d0c Mon Sep 17 00:00:00 2001
+From edcf90801c8e58bd6306d85a4e714a6f09f452df Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Mon, 11 Jan 2021 08:15:35 +0100
+Date: Wed, 13 Jan 2021 12:15:47 +0100
 Subject: [PATCH] arm64: dts: broadcom: bcm4908: describe PMB block
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -10,10 +10,7 @@ PMB (Power Management Bus) controls powering connected devices (e.g.
 PCIe, USB, SATA). In BCM4908 it's a part of the PROCMON block.
 
 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
----
-Florian: this patch is based on top of the
-[PATCH] arm64: dts: broadcom: bcm4908: describe internal switch
-one. Both modify "ranges".
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
 ---
  .../boot/dts/broadcom/bcm4908/bcm4908.dtsi      | 17 ++++++++++++++++-
  1 file changed, 16 insertions(+), 1 deletion(-)
@@ -35,7 +32,7 @@ one. Both modify "ranges".
                };
 +
 +              procmon: syscon@280000 {
-+                      compatible = "simple-mfd";
++                      compatible = "simple-bus";
 +                      reg = <0x280000 0x1000>;
 +                      ranges;
 +