igmpproxy: remove some bashism

[oweals/openwrt.git] / target / linux / ipq40xx / files-4.19 / arch / arm / boot / dts / qcom-ipq4018-rt-ac58u.dts

diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts
index 8c32b9eb36ee997cbe2699c188c646580824787e..a0030f77ce60bb550274c21bf6b4b20a68b21234 100644 (file)
--- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts
+++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts
@@ -7,7 +7,7 @@
 
 / {
        model = "ASUS RT-AC58U";
-       compatible = "asus,rt-ac58u", "qcom,ipq4019";
+       compatible = "asus,rt-ac58u";
 
        memory {
                device_type = "memory";
@@ -15,10 +15,10 @@
        };
 
        aliases {
-               led-boot = &power;
-               led-failsafe = &power;
-               led-running = &power;
-               led-upgrade = &power;
+               led-boot = &led_power;
+               led-failsafe = &led_power;
+               led-running = &led_power;
+               led-upgrade = &led_power;
        };
 
        chosen {
@@ -26,6 +26,10 @@
        };
 
        soc {
+               rng@22000 {
+                       status = "okay";
+               };
+
                mdio@90000 {
                        status = "okay";
                };
@@ -58,26 +62,27 @@
                        qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
                };
 
-               usb2@60f8800 {
-                       status = "okay";
-               };
-
                usb3@8af8800 {
                        status = "okay";
-               };
 
-               crypto@8e3a000 {
-                       status = "okay";
-               };
+                       dwc3@8a00000 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
 
-               wifi@a000000 {
-                       status = "okay";
-                       qcom,ath10k-calibration-variant = "RT-AC58U";
+                               usb3_port1: port@1 {
+                                       reg = <1>;
+                                       #trigger-source-cells = <0>;
+                               };
+
+                               usb3_port2: port@2 {
+                                       reg = <2>;
+                                       #trigger-source-cells = <0>;
+                               };
+                       };
                };
 
-               wifi@a800000 {
+               crypto@8e3a000 {
                        status = "okay";
-                       qcom,ath10k-calibration-variant = "RT-AC58U";
                };
 
                watchdog@b017000 {
@@ -93,7 +98,7 @@
                };
        };
 
-       gpio-keys {
+       keys {
                compatible = "gpio-keys";
 
                reset {
@@ -109,10 +114,10 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
-               power: status {
+               led_power: status {
                        label = "rt-ac58u:blue:status";
                        gpios = <&tlmm 3 GPIO_ACTIVE_HIGH>;
                };
@@ -125,16 +130,20 @@
                wlan2G {
                        label = "rt-ac58u:blue:wlan2G";
                        gpios = <&tlmm 58 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "phy0tpt";
                };
 
-               wan5G {
+               wlan5G {
                        label = "rt-ac58u:blue:wlan5G";
                        gpios = <&tlmm 5 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "phy1tpt";
                };
 
                usb {
                        label = "rt-ac58u:blue:usb";
                        gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>;
+                       trigger-sources = <&usb3_port1>, <&usb3_port2>;
+                       linux,default-trigger = "usbport";
                };
 
                lan {
@@ -195,49 +204,49 @@
                compatible = "jedec,spi-nor";
                reg = <0>;
                linux,modalias = "m25p80", "mx25l1606e", "n25q128a11";
-               spi-max-frequency = <24000000>;
+               spi-max-frequency = <30000000>;
 
                partitions {
                        compatible = "fixed-partitions";
                        #address-cells = <1>;
                        #size-cells = <1>;
 
-                       partition0@0 {
+                       partition@0 {
                                label = "SBL1";
                                reg = <0x00000000 0x00040000>;
                                read-only;
                        };
-                       partition1@40000 {
+                       partition@40000 {
                                label = "MIBIB";
                                reg = <0x00040000 0x00020000>;
                                read-only;
                        };
-                       partition2@60000 {
+                       partition@60000 {
                                label = "QSEE";
                                reg = <0x00060000 0x00060000>;
                                read-only;
                        };
-                       partition3@c0000 {
+                       partition@c0000 {
                                label = "CDT";
                                reg = <0x000c0000 0x00010000>;
                                read-only;
                        };
-                       partition4@d0000 {
+                       partition@d0000 {
                                label = "DDRPARAMS";
                                reg = <0x000d0000 0x00010000>;
                                read-only;
                        };
-                       partition5@e0000 {
+                       partition@e0000 {
                                label = "APPSBLENV"; /* uboot env*/
                                reg = <0x000e0000 0x00010000>;
                                read-only;
                        };
-                       partition5@f0000 {
+                       partition@f0000 {
                                label = "APPSBL"; /* uboot */
                                reg = <0x000f0000 0x00080000>;
                                read-only;
                        };
-                       partition5@170000 {
+                       partition@170000 {
                                label = "ART";
                                reg = <0x00170000 0x00010000>;
                                read-only;
@@ -249,7 +258,7 @@
        spi-nand@1 {
                compatible = "spi-nand";
                reg = <1>;
-               spi-max-frequency = <24000000>;
+               spi-max-frequency = <30000000>;
 
                /*
                 * U-boot looks for "spinand,mt29f" node,
@@ -263,7 +272,12 @@
                        #size-cells = <1>;
 
                        partition@0 {
-                               label = "ubi";
+                               /*
+                                * TODO: change to label = "ubi" once we drop 4.14.
+                                *       also drop the bootargs-append and all the
+                                *       userspace CI_UBIPART="UBI_DEV" remains.
+                                */
+                               label = "UBI_DEV";
                                reg = <0x00000000 0x08000000>;
                        };
                };
@@ -284,6 +298,12 @@
        status = "okay";
 };
 
-&usb2_hs_phy {
+&wifi0 {
+       status = "okay";
+       qcom,ath10k-calibration-variant = "RT-AC58U";
+};
+
+&wifi1 {
        status = "okay";
+       qcom,ath10k-calibration-variant = "RT-AC58U";
 };