lantiq: use new ADSL nvmem support

Can now set through DTS.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/19910
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9.dtsi
index a96783f1f8a26baca938d3733dc5536935a126b5..25329745cf7a67b2f164e03fb6208ebd645cb7b6 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9.dtsi
@@ -391,7 +391,7 @@
                        lantiq,rx-burst-length = <8>;
                };
 
-               ppe@e234000 {
+               ppe: ppe@e234000 {
                        compatible = "lantiq,ppe-arx100";
                        reg = <0xe234000 0x3ffd>;
                        interrupt-parent = <&icu0>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7312.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7312.dts
index ba6c48704893bd92aa24b9a8f03a66e607eafd34..13158f0fab8151d71e5832370eb88a93915909f7 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7312.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7312.dts
@@ -115,6 +115,11 @@
        };
 };
 
+&ppe {
+       nvmem-cells = <&macaddr_ath9k_cal_a91 1>;
+       nvmem-cell-names = "mac-address";
+};
+
 &localbus {
        flash@0 {
                compatible = "lantiq,nor";

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts
index c09d3879b4209b8995a952e9776b4f21c25b3656..f3cc8ccb221a8cb1fc1cfed6b82f912d57b2585c 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts
@@ -116,6 +116,11 @@
        };
 };
 
+&ppe {
+       nvmem-cells = <&macaddr_ath9k_cal_a91 1>;
+       nvmem-cell-names = "mac-address";
+};
+
 &gpio {
        pinctrl-names = "default";
        pinctrl-0 = <&state_default>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube.dtsi
index ff67a2e2feec21b73ada82de03b384a65f93808a..aa25a611c7cf35c873482796e3ce844f2d67bd00 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube.dtsi
@@ -303,7 +303,7 @@
                        lantiq,rx-burst-length = <4>;
                };
 
-               ppe@e234000 {
+               ppe: ppe@e234000 {
                        compatible = "lantiq,ppe-danube";
                        reg = <0xe234000 0x40000>;
                        interrupt-parent = <&icu0>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts
index f4fd7397d3f0158057cc89cf9c60f5d48b4f14f1..4b0cba2bebb1175ca67de59a2f67f094594fa389 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts
@@ -108,6 +108,11 @@
        nvmem-cell-names = "mac-address";
 };
 
+&ppe {
+       nvmem-cells = <&macaddr_boardconfig_16 2>;
+       nvmem-cell-names = "mac-address";
+};
+
 &localbus {
        flash@0 {
                compatible = "lantiq,nor";

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7519pw.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7519pw.dts
index 130090d03ee3a9a51662be78be5718b32fa0166b..87046f9e0be1407c0449413c1aa799ef75fa0904 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7519pw.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7519pw.dts
@@ -143,7 +143,12 @@
 
 &gsw {
        phy-mode = "mii";
-       nvmem-cells = <&macaddr_boardconfig_16>;
+       nvmem-cells = <&macaddr_boardconfig_16 0>;
+       nvmem-cell-names = "mac-address";
+};
+
+&ppe {
+       nvmem-cells = <&macaddr_boardconfig_16 1>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -185,7 +190,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_boardconfig_16: macaddr@16 {
+                                               compatible = "mac-base";
                                                reg = <0x16 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts
index 000add09d8a3b987b58b0e8090387565474ff5a5..d9d1a908be9c3af099b94fadb683b89b4f141f19 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts
@@ -98,7 +98,12 @@
 };
 
 &eth0 {
-       nvmem-cells = <&macaddr_boardconfig_16>;
+       nvmem-cells = <&macaddr_boardconfig_16 0>;
+       nvmem-cell-names = "mac-address";
+};
+
+&ppe {
+       nvmem-cells = <&macaddr_boardconfig_16 1>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -218,7 +223,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_boardconfig_16: macaddr@16 {
+                                               compatible = "mac-base";
                                                reg = <0x16 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi
index 52501b4d2a92ffd60d8c37a44cb6a63ebb5c4654..536307f9bf236b40d61005ce9a6361bf43c1e8b7 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi
@@ -136,6 +136,11 @@
        nvmem-cell-names = "mac-address";
 };
 
+&ppe {
+       nvmem-cells = <&macaddr_boardconfig_16 0>;
+       nvmem-cell-names = "mac-address";
+};
+
 &gphy0 {
        lantiq,gphy-mode = <GPHY_MODE_GE>;
 };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vrv9510kwac23.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vrv9510kwac23.dts
index 60e14ba9c45ae9d957b058ec6cf1f0077cd6e1bc..b922e385e57be49768c83f28a37c753dc7679f09 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vrv9510kwac23.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vrv9510kwac23.dts
@@ -224,6 +224,11 @@
        nvmem-cell-names = "mac-address";
 };
 
+&ppe {
+       nvmem-cells = <&macaddr_boardconfig_16 0>;
+       nvmem-cell-names = "mac-address";
+};
+
 &gphy0 {
        lantiq,gphy-mode = <GPHY_MODE_GE>;
 };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360sl.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360sl.dts
index 9301b049cae9b682f40329df568fa0f476604154..58d6c91a4b5499f9564a89dfeae67e0de0587fbe 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360sl.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360sl.dts
@@ -86,6 +86,11 @@
        nvmem-cell-names = "mac-address";
 };
 
+&ppe {
+       nvmem-cells = <&macaddr_urlader_a91 1>;
+       nvmem-cell-names = "mac-address";
+};
+
 &phy0 {
        reset-gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
 };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts
index 994b50832337cd93811c4aa6b405e3b81f47af0e..6cf00824475a898faee2cfdb03f05468da396324 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts
@@ -156,6 +156,11 @@
        nvmem-cell-names = "mac-address";
 };
 
+&ppe {
+       nvmem-cells = <&macaddr_caldata_110c 4>;
+       nvmem-cell-names = "mac-address";
+};
+
 &gswip {
        pinctrl-0 = <&mdio_pins>;
        pinctrl-names = "default";

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_netgear_dm200.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_netgear_dm200.dts
index fb9e3b483c64eff885c534b4479328f63ab9a846..3ce679796484581347498a6ae682da9563aef554 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_netgear_dm200.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_netgear_dm200.dts
@@ -87,6 +87,16 @@
        };
 };
 
+&eth0 {
+       nvmem-cells = <&macaddr_art_0 0>;
+       nvmem-cell-names = "mac-address";
+};
+
+&ppe {
+       nvmem-cells = <&macaddr_art_0 1>;
+       nvmem-cell-names = "mac-address";
+};
+
 &gphy1 {
        lantiq,gphy-mode = <GPHY_MODE_FE>;
 };
@@ -156,6 +166,18 @@
                                reg = <0x7f2000 0x1000>;
                                label = "ART";
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               compatible = "mac-base";
+                                               reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
 
                        partition@7f3000 {

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_tdw89x0.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_tdw89x0.dtsi
index be9c8063b452d848daadbe81e00cae02e7161f15..104c905baadad53c3d91fdfe5b40304eeabb5d61 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_tdw89x0.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_tdw89x0.dtsi
@@ -117,6 +117,11 @@
        nvmem-cell-names = "mac-address";
 };
 
+&ppe {
+       nvmem-cells = <&macaddr_ath9k_cal_f100 1>;
+       nvmem-cell-names = "mac-address";
+};
+
 &gphy0 {
        lantiq,gphy-mode = <GPHY_MODE_GE>;
 };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dtsi
index 34b58cd0b419d8a92d103c240f38da0e140ff170..bb934b6448bac19eac620ee7912776199ec03a71 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dtsi
@@ -109,6 +109,11 @@
        nvmem-cell-names = "mac-address";
 };
 
+&ppe {
+       nvmem-cells = <&macaddr_romfile_f100 1>;
+       nvmem-cell-names = "mac-address";
+};
+
 &gphy0 {
        lantiq,gphy-mode = <GPHY_MODE_GE>;
 };