ipq40xx: rt-ac58u: replace ubi auto load hack

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

diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts
index 7e5d12345a6b2315dd859b0f0267ffc1251952fb..4d546bf40fbb7cc55ea3129806b52ab0a8d39071 100644 (file)
--- a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts
+++ b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts
@@ -15,7 +15,6 @@
  */
 
 #include "qcom-ipq4019.dtsi"
-#include "qcom-ipq4019-bus.dtsi"
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/soc/qcom,tcsr.h>
@@ -36,20 +35,8 @@
                led-upgrade = &power;
        };
 
-       reserved-memory {
-               #address-cells = <0x1>;
-               #size-cells = <0x1>;
-               ranges;
-
-               smem@87e00000 {
-                       reg = <0x87e00000 0x080000>;
-                       no-map;
-               };
-
-               tz@87e80000 {
-                       reg = <0x87e80000 0x180000>;
-                       no-map;
-               };
+       chosen {
+               bootargs-append = " ubi.mtd=UBI_DEV";
        };
 
        soc {
@@ -86,35 +73,35 @@
                };
 
                usb2@60f8800 {
-                       status = "ok";
+                       status = "okay";
                };
 
                serial@78af000 {
                        pinctrl-0 = <&serial_pins>;
                        pinctrl-names = "default";
-                       status = "ok";
+                       status = "okay";
                };
 
                usb3@8af8800 {
-                       status = "ok";
+                       status = "okay";
                };
 
                crypto@8e3a000 {
-                       status = "ok";
+                       status = "okay";
                };
 
                wifi@a000000 {
                        status = "okay";
-                       qcom,ath10k-calibration-variant = "ASUS-RT-AC58U";
+                       qcom,ath10k-calibration-variant = "RT-AC58U";
                };
 
                wifi@a800000 {
                        status = "okay";
-                       qcom,ath10k-calibration-variant = "ASUS-RT-AC58U";
+                       qcom,ath10k-calibration-variant = "RT-AC58U";
                };
 
                watchdog@b017000 {
-                       status = "ok";
+                       status = "okay";
                };
 
                ess-switch@c000000 {
@@ -178,11 +165,11 @@
 };
 
 &cryptobam {
-       status = "ok";
+       status = "okay";
 };
 
 &blsp_dma {
-       status = "ok";
+       status = "okay";
 };
 
 &tlmm {
@@ -212,12 +199,12 @@
        };
 };
 
-&spi_0 { /* BLSP1 QUP1 */
+&blsp1_spi1 { /* BLSP1 QUP1 */
        pinctrl-0 = <&spi_0_pins>;
        pinctrl-names = "default";
-       status = "ok";
-       cs-gpios = <&tlmm 54 0>,
-                  <&tlmm 59 0>;
+       status = "okay";
+       cs-gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>,
+                  <&tlmm 59 GPIO_ACTIVE_HIGH>;
 
        m25p80@0 {
                #address-cells = <1>;
@@ -302,13 +289,13 @@
 };
 
 &usb3_ss_phy {
-       status = "ok";
+       status = "okay";
 };
 
 &usb3_hs_phy {
-       status = "ok";
+       status = "okay";
 };
 
 &usb2_hs_phy {
-       status = "ok";
+       status = "okay";
 };