[openwrt/openwrt] ipq40xx: DTS style updates for OpenMesh devices
LEDE Commits
lede-commits at lists.infradead.org
Mon Nov 23 09:56:47 EST 2020
adrian pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/8231994d3f027725224651532210af36ae5c59ab
commit 8231994d3f027725224651532210af36ae5c59ab
Author: Sven Eckelmann <sven at narfation.org>
AuthorDate: Sun Nov 22 20:09:27 2020 +0100
ipq40xx: DTS style updates for OpenMesh devices
The OpenMesh related files were not updated since a while and the new
coding style requirements weren't integrated. This can cause problems
for new devices when an author uses these files as starting point.
* use SPDX-License-Identifiers instead of full license texts
* drop linux,default-trigger with value default-off for LEDs
* led nodes with label "abc:xyz" should have name "xyz_abc"
* led DT labels for "xyz_abc" should be "led_xyz_abc"
* "m25p80 at 0" flash node should be renamed to "flash at 0"
* drop unnecessary empty lines
Signed-off-by: Sven Eckelmann <sven at narfation.org>
[minor commit title and message adjustments]
Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
---
.../files/arch/arm/boot/dts/qcom-ipq4018-a42.dts | 32 ++++++----------------
.../files/arch/arm/boot/dts/qcom-ipq4019-a62.dts | 32 ++++++----------------
target/linux/ipq40xx/image/Makefile | 1 -
3 files changed, 18 insertions(+), 47 deletions(-)
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-a42.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-a42.dts
index d866f8dd1a..f571da510e 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-a42.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-a42.dts
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: ISC
/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
* Copyright (c) 2017, Sven Eckelmann <sven.eckelmann at openmesh.com>
- *
- * 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.
- *
*/
#include "qcom-ipq4019.dtsi"
@@ -95,30 +83,28 @@
};
aliases {
- led-boot = &power;
- led-failsafe = &power;
- led-running = &power;
- led-upgrade = &power;
+ led-boot = &led_status_green;
+ led-failsafe = &led_status_green;
+ led-running = &led_status_green;
+ led-upgrade = &led_status_green;
};
leds {
compatible = "gpio-leds";
- red {
+ status_red {
label = "red:status";
gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>;
- linux,default-trigger = "default-off";
};
- power: green {
+ led_status_green: status_green {
label = "green:status";
gpios = <&tlmm 1 GPIO_ACTIVE_HIGH>;
};
- blue {
+ status_blue {
label = "blue:status";
gpios = <&tlmm 2 GPIO_ACTIVE_HIGH>;
- linux,default-trigger = "default-off";
};
};
@@ -168,7 +154,7 @@
status = "okay";
cs-gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>;
- m25p80 at 0 {
+ flash at 0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "jedec,spi-nor";
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-a62.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-a62.dts
index 4c14f41b34..279050fa15 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-a62.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-a62.dts
@@ -1,18 +1,6 @@
+// SPDX-License-Identifier: ISC
/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
* Copyright (c) 2017-2018, Sven Eckelmann <sven.eckelmann at openmesh.com>
- *
- * 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.
- *
*/
#include "qcom-ipq4019.dtsi"
@@ -98,30 +86,28 @@
};
aliases {
- led-boot = &power;
- led-failsafe = &power;
- led-running = &power;
- led-upgrade = &power;
+ led-boot = &led_status_green;
+ led-failsafe = &led_status_green;
+ led-running = &led_status_green;
+ led-upgrade = &led_status_green;
};
leds {
compatible = "gpio-leds";
- red {
+ status_red {
label = "red:status";
gpios = <&tlmm 43 GPIO_ACTIVE_HIGH>;
- linux,default-trigger = "default-off";
};
- power: green {
+ led_status_green: status_green {
label = "green:status";
gpios = <&tlmm 45 GPIO_ACTIVE_HIGH>;
};
- blue {
+ status_blue {
label = "blue:status";
gpios = <&tlmm 46 GPIO_ACTIVE_HIGH>;
- linux,default-trigger = "default-off";
};
};
@@ -178,7 +164,7 @@
status = "okay";
cs-gpios = <&tlmm 12 GPIO_ACTIVE_HIGH>;
- m25p80 at 0 {
+ flash at 0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "jedec,spi-nor";
diff --git a/target/linux/ipq40xx/image/Makefile b/target/linux/ipq40xx/image/Makefile
index 142896bde8..d4188f5282 100644
--- a/target/linux/ipq40xx/image/Makefile
+++ b/target/linux/ipq40xx/image/Makefile
@@ -647,7 +647,6 @@ define Device/openmesh_a62
IMAGE/sysupgrade.bin/squashfs := append-rootfs | pad-rootfs | sysupgrade-tar rootfs=$$$$@ | append-metadata
DEVICE_PACKAGES := ath10k-firmware-qca9888-ct uboot-envtools
endef
-
TARGET_DEVICES += openmesh_a62
define Device/qcom_ap-dk01.1-c1
More information about the lede-commits
mailing list