ipq40xx: only include ath10k-board-qca4019 for the generic subtarget

[openwrt/staging/chunkeey.git] / target / linux / ath79 / dts / qca9558_tplink_rex5x.dtsi

diff --git a/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi b/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi
index 55f4edf19e857761a8d1f7933ed09c3ea2fe92ba..31089f339daa4d3ce1096aa78bad53eff723e6a9 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi
+++ b/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi
@@ -100,13 +100,8 @@
        status = "okay";
 };
 
-&uart {
-       status = "okay";
-};
-
 &spi {
        status = "okay";
-       num-cs = <1>;
 
        flash@0 {
                compatible = "jedec,spi-nor";
@@ -163,13 +158,25 @@
        phy-handle = <&phy4>;
        pll-data = <0xa6000000 0x00000101 0x00001616>;
 
-       mtd-mac-address = <&info 0x8>;
+       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&info 0x8>;
-       mtd-mac-address-increment = <(-1)>;
+       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cell-names = "mac-address";
+       mac-address-increment = <(-1)>;
+};
+
+&info {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_info_8: macaddr@8 {
+               reg = <0x8 0x6>;
+       };
 };