667f6c7f49
Manually rebased patches: bcm27xx/patches-5.4/950-0135-spi-spi-bcm2835-Disable-forced-software-CS.patch generic-backport/744-v5.5-net-sfp-soft-status-and-control-support.patch layerscape/patches-5.4/819-uart-0005-tty-serial-fsl_lpuart-enable-dma-mode-for-imx8qxp.patch mvebu/patches-5.4/521-arm64-dts-marvell-espressobin-Add-ethernet-switch-al.patch Removed: layerscape/patches-5.4/819-uart-0012-tty-serial-lpuart-add-LS1028A-support.patch All modifications made by update_kernel.sh Build system: x86_64 Build-tested: ipq806x/R7800, ath79/generic, bcm27xx/bcm2711, lantiq/Easybox 904 xDSL, x86_64 Run-tested: ipq806x/R7800, lantiq/Easybox 904 xDSL, x86_64 No dmesg regressions, everything functional Signed-off-by: John Audia <graysky@archlinux.us> Co-developed-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
41 lines
950 B
Diff
41 lines
950 B
Diff
--- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi
|
|
+++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
|
|
@@ -714,6 +714,17 @@
|
|
status = "disabled";
|
|
};
|
|
|
|
+ wmac: wmac@18000000 {
|
|
+ compatible = "mediatek,mt7622-wmac";
|
|
+ reg = <0 0x18000000 0 0x100000>;
|
|
+ interrupts = <GIC_SPI 211 IRQ_TYPE_LEVEL_LOW>;
|
|
+
|
|
+ mediatek,infracfg = <&infracfg>;
|
|
+ status = "disabled";
|
|
+
|
|
+ power-domains = <&scpsys MT7622_POWER_DOMAIN_WB>;
|
|
+ };
|
|
+
|
|
ssusbsys: ssusbsys@1a000000 {
|
|
compatible = "mediatek,mt7622-ssusbsys",
|
|
"syscon";
|
|
--- a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
|
|
+++ b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
|
|
@@ -589,7 +589,7 @@
|
|
reg = <0x140000 0x0080000>;
|
|
};
|
|
|
|
- partition@1c0000 {
|
|
+ factory: partition@1c0000 {
|
|
label = "Factory";
|
|
reg = <0x1c0000 0x0040000>;
|
|
};
|
|
@@ -646,3 +646,8 @@
|
|
pinctrl-0 = <&watchdog_pins>;
|
|
status = "okay";
|
|
};
|
|
+
|
|
+&wmac {
|
|
+ mediatek,mtd-eeprom = <&factory 0x0000>;
|
|
+ status = "okay";
|
|
+};
|