aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/octeon/files/arch
diff options
context:
space:
mode:
authorCarsten Spieß <mail@carsten-spiess.de>2023-07-12 10:24:11 +0200
committerChristian Lamparter <chunkeey@gmail.com>2023-07-15 22:24:50 +0200
commit345bce75a14328bd3503e2d3ee86db7245e12417 (patch)
tree97bb83bea1cac04c871d6c49a70db9498e27bdd7 /target/linux/octeon/files/arch
parentabe659efba3e28b5657143ef604c5bc42d1edb91 (diff)
downloadupstream-345bce75a14328bd3503e2d3ee86db7245e12417.tar.gz
upstream-345bce75a14328bd3503e2d3ee86db7245e12417.tar.bz2
upstream-345bce75a14328bd3503e2d3ee86db7245e12417.zip
octeon: ubnt-edgerouter-4/6p: devicetree cleanup
removed redundant eeprom partition nodes from cn7130_ubnt_edgerouter-4.dts and cn7130_ubnt_edgerouter-6p.dts as they are identically defined in cn7130_ubnt_edgerouter-e300.dtsi. Signed-off-by: Carsten Spieß <mail@carsten-spiess.de> (integrated eeprom referenced node in the .dtsi) Signed-off-by: Christian Lamparter <chunkeey@gmail.com> (cherry picked from commit 700f11aaadb7baa38285ed8f928e976a29a72eed)
Diffstat (limited to 'target/linux/octeon/files/arch')
-rw-r--r--target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-4.dts10
-rw-r--r--target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-6p.dts9
-rw-r--r--target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-e300.dtsi21
3 files changed, 10 insertions, 30 deletions
diff --git a/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-4.dts b/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-4.dts
index 75e2c794b9..f8d511b599 100644
--- a/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-4.dts
+++ b/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-4.dts
@@ -19,13 +19,3 @@
};
};
};
-
-&eeprom {
- compatible = "nvmem-cells";
- #address-cells = <1>;
- #size-cells = <1>;
-
- macaddr_eeprom_0: macaddr@0 {
- reg = <0x0 0x6>;
- };
-};
diff --git a/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-6p.dts b/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-6p.dts
index c1a41cbf70..f354d08199 100644
--- a/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-6p.dts
+++ b/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-6p.dts
@@ -62,12 +62,3 @@
};
};
-&eeprom {
- compatible = "nvmem-cells";
- #address-cells = <1>;
- #size-cells = <1>;
-
- macaddr_eeprom_0: macaddr@0 {
- reg = <0x0 0x6>;
- };
-};
diff --git a/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-e300.dtsi b/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-e300.dtsi
index 855736b209..9be52f9175 100644
--- a/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-e300.dtsi
+++ b/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-e300.dtsi
@@ -116,10 +116,18 @@
reg = <0x300000 0x100000>;
};
- eeprom: partition@400000 {
+ partition@400000 {
+ compatible = "nvmem-cells";
+ reg = <0x400000 0x10000>;
label = "eeprom";
read-only;
- reg = <0x400000 0x10000>;
+
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ macaddr_eeprom_0: macaddr@0 {
+ reg = <0x0 0x6>;
+ };
};
};
};
@@ -213,12 +221,3 @@
};
};
-&eeprom {
- compatible = "nvmem-cells";
- #address-cells = <1>;
- #size-cells = <1>;
-
- macaddr_eeprom_0: macaddr@0 {
- reg = <0x0 0x6>;
- };
-};