From: INAGAKI Hiroshi <musashino.open@gmail.com>
Date: Fri, 3 Jan 2025 08:37:29 +0000 (+0900)
Subject: ath79: update dtsi/dts for NEC Aterm devices based on QCA9558
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76e0338247ff538247c83ff00b68eed4a65fba57;p=thirdparty%2Fopenwrt.git

ath79: update dtsi/dts for NEC Aterm devices based on QCA9558

Add more DT labels and move a USB hub node to dts files of Aterm devices
as a preparation for adding support of Aterm WG2200HP.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/17584
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---

diff --git a/target/linux/ath79/dts/qca9558_nec_aterm.dtsi b/target/linux/ath79/dts/qca9558_nec_aterm.dtsi
index 441d906f449..d650927195e 100644
--- a/target/linux/ath79/dts/qca9558_nec_aterm.dtsi
+++ b/target/linux/ath79/dts/qca9558_nec_aterm.dtsi
@@ -26,7 +26,7 @@
 		label-mac-device = &eth0;
 	};
 
-	i2c {
+	i2c: i2c {
 		compatible = "i2c-gpio";
 
 		pinctrl-names = "default";
@@ -51,7 +51,7 @@
 		};
 	};
 
-	keys {
+	keys: keys {
 		compatible = "gpio-keys";
 		pinctrl-names = "default";
 		pinctrl-0 = <&jtag_disable_pins>;
@@ -240,7 +240,7 @@
 				reg = <0x030000 0x010000>;
 				read-only;
 
-				nvmem-layout {
+				nvmem_art: nvmem-layout {
 					compatible = "fixed-layout";
 					#address-cells = <1>;
 					#size-cells = <1>;
@@ -327,7 +327,7 @@
 &pcie0 {
 	status = "okay";
 
-	wifi@0,0 {
+	wifi: wifi@0,0 {
 		compatible = "pci168c,003c";
 		reg = <0x0000 0 0 0 0>;
 		nvmem-cells = <&cal_art_5000>, <&macaddr_config_12>;
@@ -349,16 +349,6 @@
 
 &usb0 {
 	status = "okay";
-	#address-cells = <1>;
-	#size-cells = <0>;
-
-	/delete-node/ port@1;
-
-	/* NEC uPD720114 */
-	hub@1 {
-		compatible = "usb0409,005a";
-		reg = <1>;
-	};
 };
 
 &wmac {
diff --git a/target/linux/ath79/dts/qca9558_nec_wg1400hp.dts b/target/linux/ath79/dts/qca9558_nec_wg1400hp.dts
index bfcac09d55b..bfa6bf9eeab 100644
--- a/target/linux/ath79/dts/qca9558_nec_wg1400hp.dts
+++ b/target/linux/ath79/dts/qca9558_nec_wg1400hp.dts
@@ -10,3 +10,13 @@
 &eth0 {
 	pll-data = <0x5a000000 0x00000101 0x00001616>;
 };
+
+&usb0 {
+	/delete-node/ port@1;
+
+	/* NEC uPD720114 */
+	hub@1 {
+		compatible = "usb0409,005a";
+		reg = <1>;
+	};
+};
diff --git a/target/linux/ath79/dts/qca9558_nec_wg1800hp.dts b/target/linux/ath79/dts/qca9558_nec_wg1800hp.dts
index 47679c58699..ffcabaee3cb 100644
--- a/target/linux/ath79/dts/qca9558_nec_wg1800hp.dts
+++ b/target/linux/ath79/dts/qca9558_nec_wg1800hp.dts
@@ -10,3 +10,13 @@
 &eth0 {
 	pll-data = <0x5a000000 0x00000101 0x00001616>;
 };
+
+&usb0 {
+	/delete-node/ port@1;
+
+	/* NEC uPD720114 */
+	hub@1 {
+		compatible = "usb0409,005a";
+		reg = <1>;
+	};
+};
diff --git a/target/linux/ath79/dts/qca9558_nec_wg1800hp2.dts b/target/linux/ath79/dts/qca9558_nec_wg1800hp2.dts
index 39dec5b2c4f..8e7654cb147 100644
--- a/target/linux/ath79/dts/qca9558_nec_wg1800hp2.dts
+++ b/target/linux/ath79/dts/qca9558_nec_wg1800hp2.dts
@@ -10,3 +10,13 @@
 &eth0 {
 	pll-data = <0x96000000 0x00000101 0x00001616>;
 };
+
+&usb0 {
+	/delete-node/ port@1;
+
+	/* NEC uPD720114 */
+	hub@1 {
+		compatible = "usb0409,005a";
+		reg = <1>;
+	};
+};