From: Mathias Kresin <dev@kresin.me>
Date: Mon, 6 Aug 2018 06:17:24 +0000 (+0200)
Subject: ath79: fix node names
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=bf078fcab6f4683d2e8599dce107afee5e3742c3;p=openwrt%2Fstaging%2Faparcar.git

ath79: fix node names

Use the standardized node names from the devicetree specification.

Signed-off-by: Mathias Kresin <dev@kresin.me>
---

diff --git a/target/linux/ath79/dts/ar7241_ubnt_unifi.dts b/target/linux/ath79/dts/ar7241_ubnt_unifi.dts
index 368c05bf24..ed6142ef43 100644
--- a/target/linux/ath79/dts/ar7241_ubnt_unifi.dts
+++ b/target/linux/ath79/dts/ar7241_ubnt_unifi.dts
@@ -111,7 +111,7 @@
 &pcie {
 	status = "okay";
 
-	ath9k@0 {
+	wifi@0 {
 		reg = <0x0000 0 0 0 0>;
 		qca,no-eeprom;
 	};
diff --git a/target/linux/ath79/dts/ar7241_ubnt_xm.dtsi b/target/linux/ath79/dts/ar7241_ubnt_xm.dtsi
index 71dd8edd6c..615e230f92 100644
--- a/target/linux/ath79/dts/ar7241_ubnt_xm.dtsi
+++ b/target/linux/ath79/dts/ar7241_ubnt_xm.dtsi
@@ -116,7 +116,7 @@
 &pcie {
 	status = "okay";
 
-	ath9k@0 {
+	wifi@0 {
 		reg = <0x0000 0 0 0 0>;
 		qca,no-eeprom;
 	};
diff --git a/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g450h.dts b/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g450h.dts
index 10c26cd7dc..27933d5701 100644
--- a/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g450h.dts
+++ b/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g450h.dts
@@ -110,7 +110,7 @@
 &pcie {
 	status = "okay";
 
-	ath9k@0 {
+	wifi@0 {
 		reg = <0x0000 0 0 0 0>;
 		qca,no-eeprom;
 	};
diff --git a/target/linux/ath79/dts/ar9330_glinet_ar150.dts b/target/linux/ath79/dts/ar9330_glinet_ar150.dts
index 5e3552a30b..dfaa1b97ef 100644
--- a/target/linux/ath79/dts/ar9330_glinet_ar150.dts
+++ b/target/linux/ath79/dts/ar9330_glinet_ar150.dts
@@ -86,7 +86,7 @@
 	num-chipselects = <1>;
 	status = "okay";
 
-	spiflash@0 {
+	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
diff --git a/target/linux/ath79/dts/ar9331_dptechnics_dpt-module.dts b/target/linux/ath79/dts/ar9331_dptechnics_dpt-module.dts
index fb01ce43c6..02c15fec17 100644
--- a/target/linux/ath79/dts/ar9331_dptechnics_dpt-module.dts
+++ b/target/linux/ath79/dts/ar9331_dptechnics_dpt-module.dts
@@ -64,7 +64,7 @@
 	status = "okay";
 
 	/* Winbond 25Q128FVSG SPI flash */
-	spiflash: w25q128@0 {
+	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "winbond,w25q128", "jedec,spi-nor";
diff --git a/target/linux/ath79/dts/ar9331_dragino_ms14.dts b/target/linux/ath79/dts/ar9331_dragino_ms14.dts
index 23ecb1353a..e266a6cb4f 100644
--- a/target/linux/ath79/dts/ar9331_dragino_ms14.dts
+++ b/target/linux/ath79/dts/ar9331_dragino_ms14.dts
@@ -88,7 +88,7 @@
 	status = "okay";
 
 	/* Winbond 25Q128BVFG SPI flash */
-	spiflash: w25q128@0 {
+	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "winbond,w25q128", "jedec,spi-nor";
diff --git a/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts b/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts
index 1ce8851a11..a623f0ebb2 100644
--- a/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts
+++ b/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts
@@ -66,7 +66,7 @@
 	num-chipselects = <1>;
 	status = "okay";
 
-	spiflash {
+	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
diff --git a/target/linux/ath79/dts/ar9331_onion_omega.dts b/target/linux/ath79/dts/ar9331_onion_omega.dts
index cc47f56e84..834f065fd6 100644
--- a/target/linux/ath79/dts/ar9331_onion_omega.dts
+++ b/target/linux/ath79/dts/ar9331_onion_omega.dts
@@ -64,7 +64,7 @@
 	status = "okay";
 
 	/* Winbond 25Q128FVSG SPI flash */
-	spiflash: w25q128@0 {
+	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "winbond,w25q128", "jedec,spi-nor";
diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts b/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts
index 74db416ba6..684f092b3d 100644
--- a/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts
+++ b/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts
@@ -117,7 +117,7 @@
 	status = "okay";
 
 	/* Spansion S25FL032PIF SPI flash */
-	spiflash: s25sl032p@0 {
+	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";