x86: Add kmod-dwmac-intel

[openwrt/staging/hauke.git] / target / linux / mpc85xx / files / arch / powerpc / boot / dts / hiveap-330.dts

diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/hiveap-330.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/hiveap-330.dts
index bb2f2d0827838e7202ea779c8ad1228bfd571b8d..f74aca58c0d17fbba5d846dfb8eb7a3a9bbeee66 100644 (file)
--- a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/hiveap-330.dts
+++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/hiveap-330.dts
@@ -24,6 +24,7 @@
                led-running = &led_power_green;
                led-upgrade = &led_fault_red;
                label-mac-device = &enet0;
+               spi0 = &spi0;
        };
 
        memory {
@@ -75,12 +76,16 @@
                                        label = "hw-info";
                                        read-only;
 
-                                       compatible = "nvmem-cells";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
+                                       nvmem-layout {
+                                               compatible = "fixed-layout";
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
 
-                                       macaddr_hwinfo_0: macaddr@0 {
-                                               reg = <0x0 0x6>;
+                                               macaddr_hwinfo_0: macaddr@0 {
+                                                       compatible = "mac-base";
+                                                       reg = <0x0 0x6>;
+                                                       #nvmem-cell-cells = <1>;
+                                               };
                                        };
                                };
 
@@ -113,6 +118,14 @@
        board_soc: soc: soc@ffe00000 {
                ranges = <0x0 0x0 0xffe00000 0x100000>;
 
+               spi0: spi@7000 {
+                       temperature-sensor@1 {
+                               compatible = "ti,tmp125";
+                               reg = <1>;
+                               spi-max-frequency = <5000000>;
+                       };
+               };
+
                i2c@3100 {
                        tpm@29 {
                                compatible = "atmel,at97sc3204t";
@@ -198,12 +211,12 @@
 
                mdio@24000 {
                        phy0: ethernet-phy@0 {
-                               interrupts = <3 1 0 0>;
+                               /* interrupts = <3 1 0 0>; */
                                reg = <0x1>;
                        };
 
                        phy1: ethernet-phy@1 {
-                               interrupts = <2 1 0 0>;
+                               /* interrupts = <2 1 0 0>; */
                                reg = <0x2>;
                        };
                };
@@ -220,7 +233,7 @@
                        status = "okay";
                        phy-handle = <&phy0>;
                        phy-connection-type = "rgmii-id";
-                       nvmem-cells = <&macaddr_hwinfo_0>;
+                       nvmem-cells = <&macaddr_hwinfo_0 0>;
                        nvmem-cell-names = "mac-address";
                };
 
@@ -232,9 +245,8 @@
                        status = "okay";
                        phy-handle = <&phy1>;
                        phy-connection-type = "rgmii-id";
-                       nvmem-cells = <&macaddr_hwinfo_0>;
+                       nvmem-cells = <&macaddr_hwinfo_0 1>;
                        nvmem-cell-names = "mac-address";
-                       mac-address-increment = <1>;
                };
 
                gpio0: gpio-controller@fc00 {
@@ -291,3 +303,16 @@
        };
 };
 /include/ "fsl/p1020si-post.dtsi"
+
+/*
+ * For the OpenWrt 22.03 release, since Linux 5.10.138 now uses
+ * aliases to determine PCI domain numbers, drop aliases so as not to
+ * change the sysfs path of our wireless netdevs.
+ */
+
+/ {
+       aliases {
+               /delete-property/ pci0;
+               /delete-property/ pci1;
+       };
+};