ath79: DTS style improvement for Ubiquiti XM and BZ devices

This applies minor style improvements and removes commented pll
clock adjustments from ubnt_xm DTSI. The latter were introduced
(already commented out) when adding ath79 target and have never
been touched since then. For Unifi (BZ board), similar clock
adjustments are employed and used.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

diff --git a/target/linux/ath79/dts/ar7241_ubnt_airrouter.dts b/target/linux/ath79/dts/ar7241_ubnt_airrouter.dts
index 03306de5d942263d184e97a3df16752cb6689d7e..ad2762e20cfda46ac440fc3abb20b2497c3cfbea 100644 (file)
--- a/target/linux/ath79/dts/ar7241_ubnt_airrouter.dts
+++ b/target/linux/ath79/dts/ar7241_ubnt_airrouter.dts
@@ -15,7 +15,7 @@
                label-mac-device = &wifi;
        };
 
-       airrouter-leds {
+       leds {
                compatible = "gpio-leds";
 
                led_globe: globe {

diff --git a/target/linux/ath79/dts/ar7241_ubnt_unifi.dts b/target/linux/ath79/dts/ar7241_ubnt_unifi.dts
index 3e73eba9ed1b6788bca2bb5fecfb2a95fdced686..5f12fd581b767b67841e04dfa3669044c70a7155 100644 (file)
--- a/target/linux/ath79/dts/ar7241_ubnt_unifi.dts
+++ b/target/linux/ath79/dts/ar7241_ubnt_unifi.dts
@@ -78,30 +78,30 @@
                                read-only;
                        };
 
-                       partition@1 {
+                       partition@40000 {
                                label = "u-boot-env";
                                reg = <0x040000 0x010000>;
                        };
 
-                       partition@2 {
+                       partition@50000 {
                                compatible = "denx,uimage";
                                label = "firmware";
                                reg = <0x050000 0x750000>;
                        };
 
-                       partition@3 {
+                       partition@7a0000 {
                                label = "board_config";
                                reg = <0x7a0000 0x010000>;
                                read-only;
                        };
 
-                       partition@4 {
+                       partition@7b0000 {
                                label = "cfg";
                                reg = <0x7b0000 0x040000>;
                                read-only;
                        };
 
-                       art: partition@5 {
+                       art: partition@7f0000 {
                                label = "art";
                                reg = <0x7f0000 0x010000>;
                                read-only;

diff --git a/target/linux/ath79/dts/ar7241_ubnt_xm.dtsi b/target/linux/ath79/dts/ar7241_ubnt_xm.dtsi
index 687aef1112b6afbe2f384a971f9310d7507dc851..e2b653b3a7d8c13e721d246a1e04f72ca72423e8 100644 (file)
--- a/target/linux/ath79/dts/ar7241_ubnt_xm.dtsi
+++ b/target/linux/ath79/dts/ar7241_ubnt_xm.dtsi
@@ -9,12 +9,6 @@
        compatible = "ubnt,xm", "qca,ar7241";
        model = "Ubiquiti Networks XM (rev 1.0) board";
 
-/*     extosc: ref {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <40000000>;
-       };
-*/
        keys {
                compatible = "gpio-keys";
 
@@ -30,12 +24,9 @@
        status = "okay";
 };
 
-/*&pll {
-       clocks = <&extosc>;
-};*/
-
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
@@ -54,30 +45,30 @@
                                read-only;
                        };
 
-                       partition@1 {
+                       partition@40000 {
                                label = "u-boot-env";
                                reg = <0x040000 0x010000>;
                        };
 
-                       partition@2 {
+                       partition@50000 {
                                compatible = "denx,uimage";
                                label = "firmware";
                                reg = <0x050000 0x750000>;
                        };
 
-                       partition@3 {
+                       partition@7a0000 {
                                label = "board_config";
                                reg = <0x7a0000 0x010000>;
                                read-only;
                        };
 
-                       partition@4 {
+                       partition@7b0000 {
                                label = "cfg";
                                reg = <0x7b0000 0x040000>;
                                read-only;
                        };
 
-                       art: partition@5 {
+                       art: partition@7f0000 {
                                label = "art";
                                reg = <0x7f0000 0x010000>;
                                read-only;

diff --git a/target/linux/ath79/dts/ar7241_ubnt_xm_outdoor.dtsi b/target/linux/ath79/dts/ar7241_ubnt_xm_outdoor.dtsi
index 337da5b4b77eb46760c38d00e1cceac5e94d19c8..75116edc519c561458fa89d720a82a4d0f12d0cd 100644 (file)
--- a/target/linux/ath79/dts/ar7241_ubnt_xm_outdoor.dtsi
+++ b/target/linux/ath79/dts/ar7241_ubnt_xm_outdoor.dtsi
@@ -11,6 +11,7 @@
 
        leds {
                compatible = "gpio-leds";
+
                link1 {
                        label = "ubnt:red:link1";
                        gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;