From 2630aae36fc2628647c349fc680c7b595fd73e4f Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Sun, 16 Dec 2018 10:35:30 +0100 Subject: 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 --- .../arch/arm/boot/dts/qcom-ipq4018-fritz4040.dts | 54 ++++++++-------------- 1 file changed, 20 insertions(+), 34 deletions(-) (limited to 'target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-fritz4040.dts') diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-fritz4040.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-fritz4040.dts index 598e22c815..9576e14f25 100644 --- a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-fritz4040.dts +++ b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-fritz4040.dts @@ -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 @@ -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"; +}; -- cgit v1.2.3