+++ /dev/null
-From 5cbee5828219c4f7b33e96b5d8ce5e467b2857c8 Mon Sep 17 00:00:00 2001
-Date: Fri, 1 Sep 2023 12:55:49 +0200
-Subject: [PATCH] ARM: dts: BCM5301X: Set MACs for D-Link DIR-885L
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Specify NVRAM access and use its "et2macaddr" NVMEM cell.
-
----
- .../dts/broadcom/bcm47094-dlink-dir-885l.dts | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
---- a/arch/arm/boot/dts/broadcom/bcm47094-dlink-dir-885l.dts
-+++ b/arch/arm/boot/dts/broadcom/bcm47094-dlink-dir-885l.dts
-@@ -25,6 +25,15 @@
- <0x88000000 0x08000000>;
- };
-
-+ nvram@1e3f0000 {
-+ compatible = "brcm,nvram";
-+ reg = <0x1e3f0000 0x10000>;
-+
-+ et2macaddr: et2macaddr {
-+ #nvmem-cell-cells = <1>;
-+ };
-+ };
-+
- nand_controller: nand-controller@18028000 {
- nand@0 {
- partitions {
-@@ -112,6 +121,11 @@
- vcc-gpio = <&chipcommon 18 GPIO_ACTIVE_HIGH>;
- };
-
-+&gmac0 {
-+ nvmem-cells = <&et2macaddr 0>;
-+ nvmem-cell-names = "mac-address";
-+};
-+
- &spi_nor {
- status = "okay";
- };
-@@ -142,6 +156,8 @@
-
- port@4 {
- label = "wan";
-+ nvmem-cells = <&et2macaddr 3>;
-+ nvmem-cell-names = "mac-address";
- };
-
- port@5 {
+++ /dev/null
-From a9e79863b62aaaefcdf469fc331bf482ae00db0d Mon Sep 17 00:00:00 2001
-Date: Fri, 1 Sep 2023 14:43:11 +0200
-Subject: [PATCH] ARM: dts: BCM5301X: Set MAC address for Asus RT-AC87U
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Specify NVRAM access and use its "et1macaddr" NVMEM cell.
-
----
- arch/arm/boot/dts/broadcom/bcm4709-asus-rt-ac87u.dts | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
---- a/arch/arm/boot/dts/broadcom/bcm4709-asus-rt-ac87u.dts
-+++ b/arch/arm/boot/dts/broadcom/bcm4709-asus-rt-ac87u.dts
-@@ -25,6 +25,12 @@
- <0x88000000 0x08000000>;
- };
-
-+ nvram@1c080000 {
-+ et1macaddr: et1macaddr {
-+ #nvmem-cell-cells = <1>;
-+ };
-+ };
-+
- leds {
- compatible = "gpio-leds";
-
-@@ -62,6 +68,11 @@
- };
- };
-
-+&gmac0 {
-+ nvmem-cells = <&et1macaddr 0>;
-+ nvmem-cell-names = "mac-address";
-+};
-+
- &usb3_phy {
- status = "okay";
- };
+++ /dev/null
-From 81ea360a16978a4df61df9db56b171909bd659c0 Mon Sep 17 00:00:00 2001
-Date: Sat, 16 Sep 2023 10:30:57 +0200
-Subject: [PATCH] ARM: dts: BCM5301X: Relicense Felix's code to the GPL 2.0+ /
- MIT
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Move code added by Felix to the bcm-ns.dtsi which uses dual licensing.
-That syncs more Northstar code to be based on the same licensing schema.
-
-This code was added in the commit 1ff80363524c ("ARM: BCM5301X: Add
-profiling support").
-
----
- arch/arm/boot/dts/broadcom/bcm-ns.dtsi | 7 +++++++
- arch/arm/boot/dts/broadcom/bcm5301x.dtsi | 7 -------
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
---- a/arch/arm/boot/dts/broadcom/bcm-ns.dtsi
-+++ b/arch/arm/boot/dts/broadcom/bcm-ns.dtsi
-@@ -14,6 +14,13 @@
- #address-cells = <1>;
- #size-cells = <1>;
-
-+ pmu {
-+ compatible = "arm,cortex-a9-pmu";
-+ interrupts =
-+ <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
-+ <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
-+ };
-+
- chipcommon-a-bus@18000000 {
- compatible = "simple-bus";
- ranges = <0x00000000 0x18000000 0x00001000>;
---- a/arch/arm/boot/dts/broadcom/bcm5301x.dtsi
-+++ b/arch/arm/boot/dts/broadcom/bcm5301x.dtsi
-@@ -26,13 +26,6 @@
- };
- };
-
-- pmu {
-- compatible = "arm,cortex-a9-pmu";
-- interrupts =
-- <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
-- <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
-- };
--
- clocks {
- #address-cells = <1>;
- #size-cells = <1>;
+++ /dev/null
-From b8d4f7c1be04d66c37c119c501c87bccc4197694 Mon Sep 17 00:00:00 2001
-Date: Sat, 16 Sep 2023 10:58:55 +0200
-Subject: [PATCH] ARM: dts: BCM5301X: Relicense Vivek's code to the GPL 2.0+ /
- MIT
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Move code added by Vivek to the bcm-ns.dtsi which uses dual licensing.
-That syncs more Northstar code to be based on the same licensing schema.
-
-This code was added in the commit 37f6130ec39f ("ARM: dts: BCM5301X:
-Make USB 3.0 PHY use MDIO PHY driver").
-
----
- arch/arm/boot/dts/broadcom/bcm-ns.dtsi | 27 ++++++++++++++++++++++++
- arch/arm/boot/dts/broadcom/bcm5301x.dtsi | 27 ------------------------
- 2 files changed, 27 insertions(+), 27 deletions(-)
-
---- a/arch/arm/boot/dts/broadcom/bcm-ns.dtsi
-+++ b/arch/arm/boot/dts/broadcom/bcm-ns.dtsi
-@@ -327,6 +327,29 @@
- #address-cells = <1>;
- };
-
-+ mdio-mux@18003000 {
-+ compatible = "mdio-mux-mmioreg", "mdio-mux";
-+ mdio-parent-bus = <&mdio>;
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+ reg = <0x18003000 0x4>;
-+ mux-mask = <0x200>;
-+
-+ mdio@0 {
-+ reg = <0x0>;
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ usb3_phy: usb3-phy@10 {
-+ compatible = "brcm,ns-ax-usb3-phy";
-+ reg = <0x10>;
-+ usb3-dmp-syscon = <&usb3_dmp>;
-+ #phy-cells = <0>;
-+ status = "disabled";
-+ };
-+ };
-+ };
-+
- rng: rng@18004000 {
- compatible = "brcm,bcm5301x-rng";
- reg = <0x18004000 0x14>;
-@@ -467,6 +490,10 @@
- brcm,nand-has-wp;
- };
-
-+ usb3_dmp: syscon@18105000 {
-+ reg = <0x18105000 0x1000>;
-+ };
-+
- thermal-zones {
- cpu_thermal: cpu-thermal {
- polling-delay-passive = <0>;
---- a/arch/arm/boot/dts/broadcom/bcm5301x.dtsi
-+++ b/arch/arm/boot/dts/broadcom/bcm5301x.dtsi
-@@ -62,33 +62,6 @@
- };
- };
-
-- mdio-mux@18003000 {
-- compatible = "mdio-mux-mmioreg", "mdio-mux";
-- mdio-parent-bus = <&mdio>;
-- #address-cells = <1>;
-- #size-cells = <0>;
-- reg = <0x18003000 0x4>;
-- mux-mask = <0x200>;
--
-- mdio@0 {
-- reg = <0x0>;
-- #address-cells = <1>;
-- #size-cells = <0>;
--
-- usb3_phy: usb3-phy@10 {
-- compatible = "brcm,ns-ax-usb3-phy";
-- reg = <0x10>;
-- usb3-dmp-syscon = <&usb3_dmp>;
-- #phy-cells = <0>;
-- status = "disabled";
-- };
-- };
-- };
--
-- usb3_dmp: syscon@18105000 {
-- reg = <0x18105000 0x1000>;
-- };
--
- i2c0: i2c@18009000 {
- compatible = "brcm,iproc-i2c";
- reg = <0x18009000 0x50>;
+++ /dev/null
-From 473baeab929444295b0530f8766e4becb6a08973 Mon Sep 17 00:00:00 2001
-Date: Fri, 13 Oct 2023 12:33:13 +0200
-Subject: [PATCH] ARM: dts: BCM5301X: Explicitly disable unused switch CPU
- ports
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When redescribing ports I assumed that missing "label" (like "cpu")
-means switch port isn't used. That was incorrect and I realized my
-change made Linux always use the first (5) CPU port (there are 3 of
-them).
-
-While above should technically be possible it often isn't correct:
-1. Non-default switch ports are often connected to Ethernet interfaces
- not fully covered by vendor setup (they may miss MACs)
-2. On some devices non-default ports require specifying fixed link
-
-This fixes network connectivity for some devices. It was reported &
-tested for Netgear R8000. It also affects Linksys EA9200 with its
-downstream DTS.
-
-Fixes: ba4aebce23b2 ("ARM: dts: BCM5301X: Describe switch ports in the main DTS")
----
- .../dts/broadcom/bcm4708-buffalo-wzr-1166dhp-common.dtsi | 8 ++++++++
- arch/arm/boot/dts/broadcom/bcm4708-luxul-xap-1510.dts | 8 ++++++++
- arch/arm/boot/dts/broadcom/bcm4708-luxul-xwc-1000.dts | 8 ++++++++
- arch/arm/boot/dts/broadcom/bcm4708-netgear-r6250.dts | 8 ++++++++
- arch/arm/boot/dts/broadcom/bcm4708-smartrg-sr400ac.dts | 8 ++++++++
- .../boot/dts/broadcom/bcm47081-buffalo-wzr-600dhp2.dts | 8 ++++++++
- arch/arm/boot/dts/broadcom/bcm47081-luxul-xap-1410.dts | 8 ++++++++
- arch/arm/boot/dts/broadcom/bcm47081-luxul-xwr-1200.dts | 8 ++++++++
- arch/arm/boot/dts/broadcom/bcm4709-netgear-r8000.dts | 8 ++++++++
- arch/arm/boot/dts/broadcom/bcm47094-dlink-dir-885l.dts | 8 ++++++++
- arch/arm/boot/dts/broadcom/bcm47094-dlink-dir-890l.dts | 8 ++++++++
- arch/arm/boot/dts/broadcom/bcm47094-luxul-abr-4500.dts | 8 ++++++++
- arch/arm/boot/dts/broadcom/bcm47094-luxul-xap-1610.dts | 8 ++++++++
- arch/arm/boot/dts/broadcom/bcm47094-luxul-xbr-4500.dts | 8 ++++++++
- arch/arm/boot/dts/broadcom/bcm47094-luxul-xwc-2000.dts | 8 ++++++++
- arch/arm/boot/dts/broadcom/bcm47094-luxul-xwr-3100.dts | 8 ++++++++
- arch/arm/boot/dts/broadcom/bcm47094-luxul-xwr-3150-v1.dts | 8 ++++++++
- arch/arm/boot/dts/broadcom/bcm53015-meraki-mr26.dts | 8 ++++++++
- arch/arm/boot/dts/broadcom/bcm53016-meraki-mr32.dts | 8 ++++++++
- arch/arm/boot/dts/broadcom/bcm953012er.dts | 8 ++++++++
- 20 files changed, 160 insertions(+)
-
---- a/arch/arm/boot/dts/broadcom/bcm4708-buffalo-wzr-1166dhp-common.dtsi
-+++ b/arch/arm/boot/dts/broadcom/bcm4708-buffalo-wzr-1166dhp-common.dtsi
-@@ -189,5 +189,13 @@
- port@8 {
- status = "disabled";
- };
-+
-+ port@7 {
-+ status = "disabled";
-+ };
-+
-+ port@8 {
-+ status = "disabled";
-+ };
- };
- };
---- a/arch/arm/boot/dts/broadcom/bcm4708-luxul-xap-1510.dts
-+++ b/arch/arm/boot/dts/broadcom/bcm4708-luxul-xap-1510.dts
-@@ -93,5 +93,13 @@
- port@8 {
- status = "disabled";
- };
-+
-+ port@7 {
-+ status = "disabled";
-+ };
-+
-+ port@8 {
-+ status = "disabled";
-+ };
- };
- };
---- a/arch/arm/boot/dts/broadcom/bcm4708-luxul-xwc-1000.dts
-+++ b/arch/arm/boot/dts/broadcom/bcm4708-luxul-xwc-1000.dts
-@@ -96,5 +96,13 @@
- port@8 {
- status = "disabled";
- };
-+
-+ port@7 {
-+ status = "disabled";
-+ };
-+
-+ port@8 {
-+ status = "disabled";
-+ };
- };
- };
---- a/arch/arm/boot/dts/broadcom/bcm4708-netgear-r6250.dts
-+++ b/arch/arm/boot/dts/broadcom/bcm4708-netgear-r6250.dts
-@@ -130,5 +130,13 @@
- port@8 {
- status = "disabled";
- };
-+
-+ port@7 {
-+ status = "disabled";
-+ };
-+
-+ port@8 {
-+ status = "disabled";
-+ };
- };
- };
---- a/arch/arm/boot/dts/broadcom/bcm4708-smartrg-sr400ac.dts
-+++ b/arch/arm/boot/dts/broadcom/bcm4708-smartrg-sr400ac.dts
-@@ -153,6 +153,14 @@
- port@8 {
- status = "disabled";
- };
-+
-+ port@7 {
-+ status = "disabled";
-+ };
-+
-+ port@8 {
-+ status = "disabled";
-+ };
- };
- };
-
---- a/arch/arm/boot/dts/broadcom/bcm47081-buffalo-wzr-600dhp2.dts
-+++ b/arch/arm/boot/dts/broadcom/bcm47081-buffalo-wzr-600dhp2.dts
-@@ -153,5 +153,13 @@
- port@8 {
- status = "disabled";
- };
-+
-+ port@7 {
-+ status = "disabled";
-+ };
-+
-+ port@8 {
-+ status = "disabled";
-+ };
- };
- };
---- a/arch/arm/boot/dts/broadcom/bcm47081-luxul-xap-1410.dts
-+++ b/arch/arm/boot/dts/broadcom/bcm47081-luxul-xap-1410.dts
-@@ -89,5 +89,13 @@
- port@8 {
- status = "disabled";
- };
-+
-+ port@7 {
-+ status = "disabled";
-+ };
-+
-+ port@8 {
-+ status = "disabled";
-+ };
- };
- };
---- a/arch/arm/boot/dts/broadcom/bcm47081-luxul-xwr-1200.dts
-+++ b/arch/arm/boot/dts/broadcom/bcm47081-luxul-xwr-1200.dts
-@@ -156,5 +156,13 @@
- port@8 {
- status = "disabled";
- };
-+
-+ port@7 {
-+ status = "disabled";
-+ };
-+
-+ port@8 {
-+ status = "disabled";
-+ };
- };
- };
---- a/arch/arm/boot/dts/broadcom/bcm4709-netgear-r8000.dts
-+++ b/arch/arm/boot/dts/broadcom/bcm4709-netgear-r8000.dts
-@@ -235,6 +235,14 @@
- status = "disabled";
- };
-
-+ port@5 {
-+ status = "disabled";
-+ };
-+
-+ port@7 {
-+ status = "disabled";
-+ };
-+
- port@8 {
- label = "cpu";
- };
---- a/arch/arm/boot/dts/broadcom/bcm47094-dlink-dir-885l.dts
-+++ b/arch/arm/boot/dts/broadcom/bcm47094-dlink-dir-885l.dts
-@@ -168,6 +168,14 @@
- status = "disabled";
- };
-
-+ port@5 {
-+ status = "disabled";
-+ };
-+
-+ port@7 {
-+ status = "disabled";
-+ };
-+
- port@8 {
- label = "cpu";
- };
---- a/arch/arm/boot/dts/broadcom/bcm47094-dlink-dir-890l.dts
-+++ b/arch/arm/boot/dts/broadcom/bcm47094-dlink-dir-890l.dts
-@@ -200,6 +200,14 @@
- status = "disabled";
- };
-
-+ port@5 {
-+ status = "disabled";
-+ };
-+
-+ port@7 {
-+ status = "disabled";
-+ };
-+
- port@8 {
- label = "cpu";
- phy-mode = "rgmii";
---- a/arch/arm/boot/dts/broadcom/bcm47094-luxul-abr-4500.dts
-+++ b/arch/arm/boot/dts/broadcom/bcm47094-luxul-abr-4500.dts
-@@ -115,5 +115,13 @@
- port@8 {
- status = "disabled";
- };
-+
-+ port@7 {
-+ status = "disabled";
-+ };
-+
-+ port@8 {
-+ status = "disabled";
-+ };
- };
- };
---- a/arch/arm/boot/dts/broadcom/bcm47094-luxul-xap-1610.dts
-+++ b/arch/arm/boot/dts/broadcom/bcm47094-luxul-xap-1610.dts
-@@ -128,5 +128,13 @@
- port@8 {
- status = "disabled";
- };
-+
-+ port@7 {
-+ status = "disabled";
-+ };
-+
-+ port@8 {
-+ status = "disabled";
-+ };
- };
- };
---- a/arch/arm/boot/dts/broadcom/bcm47094-luxul-xbr-4500.dts
-+++ b/arch/arm/boot/dts/broadcom/bcm47094-luxul-xbr-4500.dts
-@@ -115,5 +115,13 @@
- port@8 {
- status = "disabled";
- };
-+
-+ port@7 {
-+ status = "disabled";
-+ };
-+
-+ port@8 {
-+ status = "disabled";
-+ };
- };
- };
---- a/arch/arm/boot/dts/broadcom/bcm47094-luxul-xwc-2000.dts
-+++ b/arch/arm/boot/dts/broadcom/bcm47094-luxul-xwc-2000.dts
-@@ -83,5 +83,13 @@
- port@8 {
- status = "disabled";
- };
-+
-+ port@7 {
-+ status = "disabled";
-+ };
-+
-+ port@8 {
-+ status = "disabled";
-+ };
- };
- };
---- a/arch/arm/boot/dts/broadcom/bcm47094-luxul-xwr-3100.dts
-+++ b/arch/arm/boot/dts/broadcom/bcm47094-luxul-xwr-3100.dts
-@@ -155,5 +155,13 @@
- port@8 {
- status = "disabled";
- };
-+
-+ port@7 {
-+ status = "disabled";
-+ };
-+
-+ port@8 {
-+ status = "disabled";
-+ };
- };
- };
---- a/arch/arm/boot/dts/broadcom/bcm47094-luxul-xwr-3150-v1.dts
-+++ b/arch/arm/boot/dts/broadcom/bcm47094-luxul-xwr-3150-v1.dts
-@@ -166,5 +166,13 @@
- port@8 {
- status = "disabled";
- };
-+
-+ port@7 {
-+ status = "disabled";
-+ };
-+
-+ port@8 {
-+ status = "disabled";
-+ };
- };
- };
---- a/arch/arm/boot/dts/broadcom/bcm53015-meraki-mr26.dts
-+++ b/arch/arm/boot/dts/broadcom/bcm53015-meraki-mr26.dts
-@@ -132,6 +132,14 @@
- port@8 {
- status = "disabled";
- };
-+
-+ port@7 {
-+ status = "disabled";
-+ };
-+
-+ port@8 {
-+ status = "disabled";
-+ };
- };
- };
-
---- a/arch/arm/boot/dts/broadcom/bcm53016-meraki-mr32.dts
-+++ b/arch/arm/boot/dts/broadcom/bcm53016-meraki-mr32.dts
-@@ -193,6 +193,14 @@
- port@8 {
- status = "disabled";
- };
-+
-+ port@7 {
-+ status = "disabled";
-+ };
-+
-+ port@8 {
-+ status = "disabled";
-+ };
- };
- };
-
---- a/arch/arm/boot/dts/broadcom/bcm953012er.dts
-+++ b/arch/arm/boot/dts/broadcom/bcm953012er.dts
-@@ -92,6 +92,14 @@
- port@8 {
- status = "disabled";
- };
-+
-+ port@7 {
-+ status = "disabled";
-+ };
-+
-+ port@8 {
-+ status = "disabled";
-+ };
- };
- };
-
+++ /dev/null
-From d313b0e9070a7100ca55e64fe3b081d176d8806d Mon Sep 17 00:00:00 2001
-Date: Fri, 13 Oct 2023 12:33:14 +0200
-Subject: [PATCH] ARM: dts: BCM5301X: Set fixed-link for extra Netgear R8000
- CPU ports
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Ports 5 and 7 are disabled by default because the standard use case is
-for port 8 to manage all CPU directed traffic. For experimentation
-purposes however it is desirable to provide adequate properties such
-that people can experiment with using different ports without having to
-figure out their configuration. Some of the use cases include but are
-not limited to doubling or tripling the bandwidth by leveraging the
-additional ports/Ethernet MAC combinations.
-
----
- arch/arm/boot/dts/broadcom/bcm4709-netgear-r8000.dts | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
---- a/arch/arm/boot/dts/broadcom/bcm4709-netgear-r8000.dts
-+++ b/arch/arm/boot/dts/broadcom/bcm4709-netgear-r8000.dts
-@@ -237,10 +237,20 @@
-
- port@5 {
- status = "disabled";
-+
-+ fixed-link {
-+ speed = <1000>;
-+ full-duplex;
-+ };
- };
-
- port@7 {
- status = "disabled";
-+
-+ fixed-link {
-+ speed = <1000>;
-+ full-duplex;
-+ };
- };
-
- port@8 {
+++ /dev/null
-From 253358f373492608348136e569366d73cb969f6a Mon Sep 17 00:00:00 2001
-Date: Tue, 24 Oct 2023 09:26:05 +0200
-Subject: [PATCH] ARM: dts: BCM5301X: Set switch ports for Linksys EA9200
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This patch was developed as OpenWrt downstream change and was recently
-confirmed to work as expected.
-
----
- .../dts/broadcom/bcm4709-linksys-ea9200.dts | 38 +++++++++++++++++++
- 1 file changed, 38 insertions(+)
-
---- a/arch/arm/boot/dts/broadcom/bcm4709-linksys-ea9200.dts
-+++ b/arch/arm/boot/dts/broadcom/bcm4709-linksys-ea9200.dts
-@@ -47,3 +47,41 @@
- &usb3_phy {
- status = "okay";
- };
-+
-+&srab {
-+ status = "okay";
-+
-+ ports {
-+ port@0 {
-+ label = "lan1";
-+ };
-+
-+ port@1 {
-+ label = "lan2";
-+ };
-+
-+ port@2 {
-+ label = "lan3";
-+ };
-+
-+ port@3 {
-+ label = "lan4";
-+ };
-+
-+ port@4 {
-+ label = "wan";
-+ };
-+
-+ port@5 {
-+ status = "disabled";
-+ };
-+
-+ port@7 {
-+ status = "disabled";
-+ };
-+
-+ port@8 {
-+ label = "cpu";
-+ };
-+ };
-+};
+++ /dev/null
-From ed0d78c75ca93c9f1d7f0d08ac5abe0de71fe312 Mon Sep 17 00:00:00 2001
-Date: Thu, 16 May 2024 10:47:37 +0200
-Subject: [PATCH] ARM: dts: broadcom: convert NVMEM content to layout syntax
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Use cleaner (and non-deprecated) bindings syntax. See commit
-bd912c991d2e ("dt-bindings: nvmem: layouts: add fixed-layout") for
-details.
-
----
- arch/arm/boot/dts/broadcom/bcm53016-meraki-mr32.dts | 12 ++++++++----
- .../dts/broadcom/bcm958625-meraki-mx6x-common.dtsi | 12 ++++++++----
- 2 files changed, 16 insertions(+), 8 deletions(-)
-
---- a/arch/arm/boot/dts/broadcom/bcm53016-meraki-mr32.dts
-+++ b/arch/arm/boot/dts/broadcom/bcm53016-meraki-mr32.dts
-@@ -223,11 +223,15 @@
- reg = <0x50>;
- pagesize = <32>;
- read-only;
-- #address-cells = <1>;
-- #size-cells = <1>;
-
-- mac_address: mac-address@66 {
-- reg = <0x66 0x6>;
-+ nvmem-layout {
-+ compatible = "fixed-layout";
-+ #address-cells = <1>;
-+ #size-cells = <1>;
-+
-+ mac_address: mac-address@66 {
-+ reg = <0x66 0x6>;
-+ };
- };
- };
- };
---- a/arch/arm/boot/dts/broadcom/bcm958625-meraki-mx6x-common.dtsi
-+++ b/arch/arm/boot/dts/broadcom/bcm958625-meraki-mx6x-common.dtsi
-@@ -55,11 +55,15 @@
- reg = <0x50>;
- pagesize = <32>;
- read-only;
-- #address-cells = <1>;
-- #size-cells = <1>;
-
-- mac_address: mac-address@66 {
-- reg = <0x66 0x6>;
-+ nvmem-layout {
-+ compatible = "fixed-layout";
-+ #address-cells = <1>;
-+ #size-cells = <1>;
-+
-+ mac_address: mac-address@66 {
-+ reg = <0x66 0x6>;
-+ };
- };
- };
- };
if (xhci->quirks & XHCI_NEC_HOST)
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
-@@ -1660,6 +1660,7 @@ struct xhci_hcd {
+@@ -1630,6 +1630,7 @@ struct xhci_hcd {
#define XHCI_CDNS_SCTX_QUIRK BIT_ULL(48)
#define XHCI_ETRON_HOST BIT_ULL(49)
#define XHCI_LIMIT_ENDPOINT_INTERVAL_9 BIT_ULL(50)
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
-@@ -36,6 +36,11 @@ ifeq ($(CONFIG_ARCH_ACORN),y)
+@@ -30,6 +30,11 @@ ifeq ($(CONFIG_ARCH_ACORN),y)
OBJS += ll_char_wr.o font.o
endif
--- a/arch/arm/boot/dts/broadcom/Makefile
+++ b/arch/arm/boot/dts/broadcom/Makefile
-@@ -68,6 +68,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
+@@ -69,6 +69,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
bcm4709-buffalo-wxr-1900dhp.dtb \
bcm4709-linksys-ea9200.dtb \
bcm4709-netgear-r7000.dtb \
if ((int)mtd_div_by_eb(ubi->mtd->size, ubi->mtd) <= UBI_FM_MAX_START) {
--- a/drivers/mtd/ubi/io.c
+++ b/drivers/mtd/ubi/io.c
-@@ -717,6 +717,10 @@ int ubi_io_read_ec_hdr(struct ubi_device
+@@ -729,6 +729,10 @@ int ubi_io_read_ec_hdr(struct ubi_device
}
magic = be32_to_cpu(ec_hdr->magic);
return UBI_IO_BAD_HDR_EBADMSG;
--- a/drivers/mtd/ubi/ubi.h
+++ b/drivers/mtd/ubi/ubi.h
-@@ -822,6 +822,7 @@ extern struct mutex ubi_devices_mutex;
+@@ -820,6 +820,7 @@ extern struct mutex ubi_devices_mutex;
extern struct blocking_notifier_head ubi_notifiers;
/* attach.c */
--- a/include/linux/netdev_features.h
+++ b/include/linux/netdev_features.h
-@@ -243,10 +243,10 @@ static inline int find_next_netdev_featu
+@@ -235,10 +235,10 @@ static inline int find_next_netdev_featu
#define NETIF_F_UPPER_DISABLES NETIF_F_LRO
/* changeable features with no special hardware requirements */
#include <linux/clockchips.h>
#include <linux/clocksource.h>
#include <linux/clocksource_ids.h>
-@@ -1048,6 +1049,16 @@ static void __init arch_timer_of_configu
+@@ -1070,6 +1071,16 @@ static void __init arch_timer_of_configu
if (of_property_read_u32(np, "clock-frequency", &arch_timer_rate))
arch_timer_rate = rate;
projects / openwrt / staging / stintel.git / commitdiff