[openwrt/openwrt] ramips: netgear_r6xxx: cleaning up nvmem-cells definitions

LEDE Commits lede-commits at lists.infradead.org
Sun Jun 16 12:25:12 PDT 2024


hauke pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/3ce71a1ead370c5621ee09582b2b5e10d5769c0d

commit 3ce71a1ead370c5621ee09582b2b5e10d5769c0d
Author: Mieczyslaw Nalewaj <namiltd at yahoo.com>
AuthorDate: Sun Jun 16 09:19:26 2024 +0200

    ramips: netgear_r6xxx: cleaning up nvmem-cells definitions
    
    Move nvmem-cells definitions to dts files to prevent overwriting
    
    Signed-off-by: Mieczyslaw Nalewaj <namiltd at yahoo.com>
---
 target/linux/ramips/dts/mt7628an_netgear_r6020.dts  | 5 +++++
 target/linux/ramips/dts/mt7628an_netgear_r6080.dts  | 5 +++++
 target/linux/ramips/dts/mt7628an_netgear_r6120.dts  | 4 ++--
 target/linux/ramips/dts/mt7628an_netgear_r6xxx.dtsi | 2 --
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/target/linux/ramips/dts/mt7628an_netgear_r6020.dts b/target/linux/ramips/dts/mt7628an_netgear_r6020.dts
index 6ae7474331..e6c8874532 100644
--- a/target/linux/ramips/dts/mt7628an_netgear_r6020.dts
+++ b/target/linux/ramips/dts/mt7628an_netgear_r6020.dts
@@ -60,3 +60,8 @@
 &ohci {
 	status = "disabled";
 };
+
+&wifi5 {
+	nvmem-cells = <&eeprom_factory_8000>;
+	nvmem-cell-names = "eeprom";
+};
diff --git a/target/linux/ramips/dts/mt7628an_netgear_r6080.dts b/target/linux/ramips/dts/mt7628an_netgear_r6080.dts
index 73cfc47a6c..bc665c7dd4 100644
--- a/target/linux/ramips/dts/mt7628an_netgear_r6080.dts
+++ b/target/linux/ramips/dts/mt7628an_netgear_r6080.dts
@@ -40,3 +40,8 @@
 &ohci {
 	status = "disabled";
 };
+
+&wifi5 {
+	nvmem-cells = <&eeprom_factory_8000>;
+	nvmem-cell-names = "eeprom";
+};
diff --git a/target/linux/ramips/dts/mt7628an_netgear_r6120.dts b/target/linux/ramips/dts/mt7628an_netgear_r6120.dts
index e3ee55873e..8a27f0d1ef 100644
--- a/target/linux/ramips/dts/mt7628an_netgear_r6120.dts
+++ b/target/linux/ramips/dts/mt7628an_netgear_r6120.dts
@@ -44,6 +44,6 @@
 };
 
 &wifi5 {
-	nvmem-cells = <&macaddr_factory_4 2>;
-	nvmem-cell-names = "mac-address";
+	nvmem-cells = <&eeprom_factory_8000>, <&macaddr_factory_4 2>;
+	nvmem-cell-names = "eeprom", "mac-address";
 };
diff --git a/target/linux/ramips/dts/mt7628an_netgear_r6xxx.dtsi b/target/linux/ramips/dts/mt7628an_netgear_r6xxx.dtsi
index 7e75950acb..41e5fb7e4b 100644
--- a/target/linux/ramips/dts/mt7628an_netgear_r6xxx.dtsi
+++ b/target/linux/ramips/dts/mt7628an_netgear_r6xxx.dtsi
@@ -138,8 +138,6 @@
 &pcie0 {
 	wifi5: wifi at 0,0 {
 		reg = <0x0000 0 0 0 0>;
-		nvmem-cells = <&eeprom_factory_8000>;
-		nvmem-cell-names = "eeprom";
 		ieee80211-freq-limit = <5000000 6000000>;
 	};
 };




More information about the lede-commits mailing list