mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 09:12:39 +00:00
196f3d586f
5.4.102 backported a lot of stuff that our WireGuard backport already did, in addition to other patches we had, so those patches were removed from that part of the series. In the process other patches were refreshed or reworked to account for upstream changes. This commit involved `update_kernel.sh -v -u 5.4`. Cc: John Audia <graysky@archlinux.us> Cc: David Bauer <mail@david-bauer.net> Cc: Petr Štetiar <ynezz@true.cz> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
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
|
|
@@ -716,6 +716,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";
|
|
+};
|