ipq40xx: dts: Unify naming of gpio-keys nodes

[openwrt/staging/dedeckeh.git] / target / linux / ipq40xx / files-4.14 / arch / arm / boot / dts / qcom-ipq4029-gl-b1300.dts

diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts
index f3db47fb75bf84999d3850bf515934dcaaad4102..092534fdc60eea9accdb4248e7414183229db8c8 100644 (file)
--- a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts
+++ b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts
@@ -35,47 +35,6 @@
                reg = <0x80000000 0x10000000>;
        };
 
-       reserved-memory {
-               #address-cells = <0x1>;
-               #size-cells = <0x1>;
-               ranges;
-
-               apps_bl@87000000 {
-                       reg = <0x87000000 0x400000>;
-                       no-map;
-               };
-
-               sbl@87400000 {
-                       reg = <0x87400000 0x100000>;
-                       no-map;
-               };
-
-               cnss_debug@87500000 {
-                       reg = <0x87500000 0x600000>;
-                       no-map;
-               };
-
-               cpu_context_dump@87b00000 {
-                       reg = <0x87b00000 0x080000>;
-                       no-map;
-               };
-
-               tz_apps@87b80000 {
-                       reg = <0x87b80000 0x280000>;
-                       no-map;
-               };
-
-               smem@87e00000 {
-                       reg = <0x87e00000 0x080000>;
-                       no-map;
-               };
-
-               tz@87e80000 {
-                       reg = <0x87e80000 0x180000>;
-                       no-map;
-               };
-       };
-
        soc {
                mdio@90000 {
                        status = "okay";
@@ -115,12 +74,6 @@
                        status = "okay";
                };
 
-               serial@78af000 {
-                       pinctrl-0 = <&serial_pins>;
-                       pinctrl-names = "default";
-                       status = "okay";
-               };
-
                usb3@8af8800 {
                        status = "okay";
                };
@@ -144,7 +97,7 @@
                };
        };
 
-       gpio-keys {
+       keys {
                compatible = "gpio-keys";
 
                wps {
@@ -189,11 +142,11 @@
        status = "okay";
 };
 
-&spi_0 {
+&blsp1_spi1 {
        pinctrl-0 = <&spi_0_pins>;
        pinctrl-names = "default";
        status = "okay";
-       cs-gpios = <&tlmm 54 0>;
+       cs-gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>;
 
        mx25l25635f@0 {
                compatible = "jedec,spi-nor";
@@ -202,61 +155,74 @@
                reg = <0>;
                spi-max-frequency = <24000000>;
 
-               SBL1@0 {
-                       label = "SBL1";
-                       reg = <0x0 0x40000>;
-                       read-only;
-               };
-
-               MIBIB@40000 {
-                       label = "MIBIB";
-                       reg = <0x40000 0x20000>;
-                       read-only;
-               };
-
-               QSEE@60000 {
-                       label = "QSEE";
-                       reg = <0x60000 0x60000>;
-                       read-only;
-               };
-
-               CDT@c0000 {
-                       label = "CDT";
-                       reg = <0xc0000 0x10000>;
-                       read-only;
-               };
-
-               DDRPARAMS@d0000 {
-                       label = "DDRPARAMS";
-                       reg = <0xd0000 0x10000>;
-                       read-only;
-               };
-
-               APPSBLENV@e0000 {
-                       label = "APPSBLENV";
-                       reg = <0xe0000 0x10000>;
-                       read-only;
-               };
-
-               APPSBL@f0000 {
-                       label = "APPSBL";
-                       reg = <0xf0000 0x80000>;
-                       read-only;
-               };
-
-               ART@170000 {
-                       label = "ART";
-                       reg = <0x170000 0x10000>;
-                       read-only;
-               };
-
-               firmware@180000 {
-                       label = "firmware";
-                       reg = <0x180000 0x1e80000>;
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       SBL1@0 {
+                               label = "SBL1";
+                               reg = <0x0 0x40000>;
+                               read-only;
+                       };
+
+                       MIBIB@40000 {
+                               label = "MIBIB";
+                               reg = <0x40000 0x20000>;
+                               read-only;
+                       };
+
+                       QSEE@60000 {
+                               label = "QSEE";
+                               reg = <0x60000 0x60000>;
+                               read-only;
+                       };
+
+                       CDT@c0000 {
+                               label = "CDT";
+                               reg = <0xc0000 0x10000>;
+                               read-only;
+                       };
+
+                       DDRPARAMS@d0000 {
+                               label = "DDRPARAMS";
+                               reg = <0xd0000 0x10000>;
+                               read-only;
+                       };
+
+                       APPSBLENV@e0000 {
+                               label = "APPSBLENV";
+                               reg = <0xe0000 0x10000>;
+                               read-only;
+                       };
+
+                       APPSBL@f0000 {
+                               label = "APPSBL";
+                               reg = <0xf0000 0x80000>;
+                               read-only;
+                       };
+
+                       ART@170000 {
+                               label = "ART";
+                               reg = <0x170000 0x10000>;
+                               read-only;
+                       };
+
+                       firmware@180000 {
+                               compatible = "denx,fit";
+                               label = "firmware";
+                               reg = <0x180000 0x1e80000>;
+                       };
                };
        };
 };
 
+&blsp1_uart1 {
+       pinctrl-0 = <&serial_pins>;
+       pinctrl-names = "default";
+       status = "okay";
+};
+
 &tlmm {
        serial_pins: serial_pinmux {
                mux {
@@ -303,8 +269,10 @@
 
 &wifi0 {
        status = "okay";
+       qcom,ath10k-calibration-variant = "GL-B1300";
 };
 
 &wifi1 {
        status = "okay";
+       qcom,ath10k-calibration-variant = "GL-B1300";
 };