Skip to content
Permalink
Browse files

ipq40xx: device-tree overhaul

 - replace licence texts with SPDX-License-Identifier where
   applicable.

 - make node-names more generic to fit with Device-Tree Release v0.2
   Section 2.2.2 Generic Names Recommendation.

 - utilize wifi0/1, blsp1_uart1 labels

Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
  • Loading branch information...
chunkeey committed Dec 16, 2018
1 parent 97ba141 commit 2630aae36fc2628647c349fc680c7b595fd73e4f
@@ -63,12 +63,6 @@
status = "okay";
};

serial@78af000 {
pinctrl-0 = <&serial_pins>;
pinctrl-names = "default";
status = "okay";
};

crypto@8e3a000 {
status = "okay";
};
@@ -180,6 +174,12 @@
};
};

&blsp1_uart1 {
pinctrl-0 = <&serial_pins>;
pinctrl-names = "default";
status = "okay";
};

&cryptobam {
status = "okay";
};
@@ -36,12 +36,6 @@
qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
};

serial@78af000 {
pinctrl-0 = <&serial_pins>;
pinctrl-names = "default";
status = "okay";
};

crypto@8e3a000 {
status = "okay";
};
@@ -208,6 +202,12 @@
};
};

&blsp1_uart1 {
pinctrl-0 = <&serial_pins>;
pinctrl-names = "default";
status = "okay";
};

&cryptobam {
status = "okay";
};
@@ -51,12 +51,6 @@
qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
};

serial@78af000 {
pinctrl-0 = <&serial_pins>;
pinctrl-names = "default";
status = "okay";
};

crypto@8e3a000 {
status = "okay";
};
@@ -290,6 +284,12 @@
};
};

&blsp1_uart1 {
pinctrl-0 = <&serial_pins>;
pinctrl-names = "default";
status = "okay";
};

&blsp_dma {
status = "okay";
};
@@ -1,18 +1,4 @@
/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT

#include "qcom-ipq4019.dtsi"
#include <dt-bindings/gpio/gpio.h>
@@ -67,12 +53,6 @@
status = "okay";
};

serial@78af000 {
pinctrl-0 = <&serial_pins>;
pinctrl-names = "default";
status = "okay";
};

usb3@8af8800 {
status = "okay";
};
@@ -81,16 +61,6 @@
status = "okay";
};

wifi@a000000 {
status = "okay";
qcom,ath10k-calibration-variant = "AVM-FRITZBox-4040";
};

wifi@a800000 {
status = "okay";
qcom,ath10k-calibration-variant = "AVM-FRITZBox-4040";
};

watchdog@b017000 {
status = "okay";
};
@@ -114,7 +84,7 @@
};
};

gpio-keys {
keys {
compatible = "gpio-keys";

wlan {
@@ -130,7 +100,7 @@
};
};

gpio-leds {
switch-leds {
compatible = "gpio-leds";

wlan {
@@ -207,7 +177,7 @@
status = "okay";
cs-gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>;

mx25l25635f@0 {
flash@0 {
compatible = "jedec,spi-nor";
#address-cells = <1>;
#size-cells = <0>;
@@ -290,6 +260,12 @@
};
};

&blsp1_uart1 {
pinctrl-0 = <&serial_pins>;
pinctrl-names = "default";
status = "okay";
};

&usb3_ss_phy {
status = "okay";
};
@@ -301,3 +277,13 @@
&usb2_hs_phy {
status = "okay";
};

&wifi0 {
status = "okay";
qcom,ath10k-calibration-variant = "AVM-FRITZBox-4040";
};

&wifi1 {
status = "okay";
qcom,ath10k-calibration-variant = "AVM-FRITZBox-4040";
};
@@ -70,12 +70,6 @@
status = "okay";
};

serial@78af000 {
pinctrl-0 = <&serial_pins>;
pinctrl-names = "default";
status = "okay";
};

usb3: usb3@8af8800 {
status = "okay";
};
@@ -225,6 +219,12 @@
};
};

&blsp1_uart1 {
pinctrl-0 = <&serial_pins>;
pinctrl-names = "default";
status = "okay";
};

&cryptobam {
status = "okay";
};
@@ -1,18 +1,4 @@
/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT

#include "qcom-ipq4019.dtsi"
#include <dt-bindings/gpio/gpio.h>
@@ -77,12 +63,6 @@
status = "okay";
};

serial@78af000 {
pinctrl-0 = <&serial_pins>;
pinctrl-names = "default";
status = "okay";
};

usb3@8af8800 {
status = "okay";
};
@@ -104,7 +84,7 @@
};
};

gpio-keys {
keys {
compatible = "gpio-keys";

wlan {
@@ -127,7 +107,7 @@
};
};

gpio-leds {
leds {
compatible = "gpio-leds";
pinctrl-0 = <&led_pins>;
pinctrl-names = "default";
@@ -291,6 +271,12 @@
};
};

&blsp1_uart1 {
pinctrl-0 = <&serial_pins>;
pinctrl-names = "default";
status = "okay";
};

&cryptobam {
status = "okay";
};
@@ -1,18 +1,4 @@
/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT

#include "qcom-ipq4019.dtsi"
#include <dt-bindings/gpio/gpio.h>
@@ -76,12 +62,6 @@
status = "okay";
};

serial@78af000 {
pinctrl-0 = <&serial_pins>;
pinctrl-names = "default";
status = "okay";
};

usb3@8af8800 {
status = "okay";
};
@@ -206,7 +186,7 @@
cs-gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>,
<&tlmm 59 GPIO_ACTIVE_HIGH>;

m25p80@0 {
flash@0 {
#address-cells = <1>;
#size-cells = <0>;
/*
@@ -268,26 +248,38 @@
};
};

mt29f@1 {
flash@1 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "spinand,mt29f";
reg = <1>;
spi-max-frequency = <24000000>;

/*
* U-boot looks for "spinand,mt29f" node,
* if we don't have it, it will spit out the following warning:
* "ipq: fdt fixup unable to find compatible node".
*/

partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;

partition0@0 {
partition@0 {
label = "ubi";
reg = <0x00000000 0x08000000>;
};
};
};
};

&blsp1_uart1 {
pinctrl-0 = <&serial_pins>;
pinctrl-names = "default";
status = "okay";
};

&usb3_ss_phy {
status = "okay";
};
@@ -62,12 +62,6 @@
qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
};

serial@78af000 {
pinctrl-0 = <&serial_pins>;
pinctrl-names = "default";
status = "okay";
};

crypto@8e3a000 {
status = "okay";
};
@@ -157,6 +151,10 @@
};
};

&blsp_dma {
status = "okay";
};

&blsp1_spi1 {
pinctrl-0 = <&spi_0_pins>;
pinctrl-names = "default";
@@ -242,7 +240,9 @@
};
};

&blsp_dma {
&blsp1_uart1 {
pinctrl-0 = <&serial_pins>;
pinctrl-names = "default";
status = "okay";
};

0 comments on commit 2630aae

Please sign in to comment.
You can’t perform that action at this time.