aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2015-02-09 12:15:45 +0000
committerJohn Crispin <john@openwrt.org>2015-02-09 12:15:45 +0000
commit4ce7053b2b811b1a0055fc0f9d51a04e63ee8092 (patch)
tree2f71d8b7ca8daf58fe0dc3862f263e6e856e6465
parent2c03605028bda686db7e17d9a1b5ea05933502b9 (diff)
downloadupstream-4ce7053b2b811b1a0055fc0f9d51a04e63ee8092.tar.gz
upstream-4ce7053b2b811b1a0055fc0f9d51a04e63ee8092.tar.bz2
upstream-4ce7053b2b811b1a0055fc0f9d51a04e63ee8092.zip
ramips: Kingston MLW221 and MLWG2 cleanup
MLW221 dts use tabs NOT spaces. MLWG2 dts typo and 1 tab not spaces 01_leds and diag.sh cleanup Signed-off-by: L. D. Pinney <ldpinney@gmail.com> SVN-Revision: 44356
-rwxr-xr-xtarget/linux/ramips/base-files/etc/board.d/01_leds5
-rw-r--r--target/linux/ramips/base-files/etc/diag.sh4
-rw-r--r--target/linux/ramips/dts/MLW221.dts226
-rw-r--r--target/linux/ramips/dts/MLWG2.dts4
4 files changed, 117 insertions, 122 deletions
diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds
index cfc782ed07..bfe1c0c7f2 100755
--- a/target/linux/ramips/base-files/etc/board.d/01_leds
+++ b/target/linux/ramips/base-files/etc/board.d/01_leds
@@ -127,10 +127,7 @@ case $board in
hw550-3g)
set_usb_led "hw550-3g:green:usb"
;;
- mlw221)
- set_wifi_led "kingston:blue:wifi"
- ucidef_set_led_default "system" "system" "kingston:blue:system" "1"
- ;;
+ mlw221|\
mlwg2)
set_wifi_led "kingston:blue:wifi"
ucidef_set_led_default "system" "system" "kingston:blue:system" "1"
diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh
index e9b39970ca..d31fbe4f98 100644
--- a/target/linux/ramips/base-files/etc/diag.sh
+++ b/target/linux/ramips/base-files/etc/diag.sh
@@ -88,9 +88,7 @@ get_status_led() {
m4)
status_led="m4:blue:status"
;;
- mlw221)
- status_led="kingston:blue:status"
- ;;
+ mlw221|\
mlwg2)
status_led="kingston:blue:system"
;;
diff --git a/target/linux/ramips/dts/MLW221.dts b/target/linux/ramips/dts/MLW221.dts
index f220e976f6..83467dcb58 100644
--- a/target/linux/ramips/dts/MLW221.dts
+++ b/target/linux/ramips/dts/MLW221.dts
@@ -3,117 +3,117 @@
/include/ "mt7620n.dtsi"
/ {
- compatible = "mlw221", "ralink,mt7620n-soc";
- model = "Kingston MLW221";
-
- palmbus@10000000 {
- gpio0: gpio@600 {
- status = "okay";
- };
-
- gpio2: gpio@660 {
- status = "okay";
- };
-
- gpio3: gpio@688 {
- status = "okay";
- };
-
- spi@b00 {
- status = "okay";
-
- m25p80@0 {
- #address-cells = <1>;
- #size-cells = <1>;
- compatible = "s25fl129p1";
- reg = <0 0>;
- linux,modalias = "m25p80", "s25fl129p1";
- spi-max-frequency = <10000000>;
-
- partition@0 {
- label = "u-boot";
- reg = <0x0 0x30000>;
- read-only;
- };
-
- partition@30000 {
- label = "u-boot-env";
- reg = <0x30000 0x10000>;
- read-only;
- };
-
- factory: partition@40000 {
- label = "factory";
- reg = <0x40000 0x10000>;
- read-only;
- };
-
- partition@50000 {
- label = "firmware";
- reg = <0x50000 0xf60000>;
- };
-
- partition@fb0000 {
- label = "user-config";
- reg = <0xfb0000 0x50000>;
-
- };
- };
- };
- };
-
- ehci@101c0000 {
- status = "okay";
- };
-
- ohci@101c1000 {
- status = "okay";
- };
-
- ethernet@10100000 {
- mtd-mac-address = <&factory 0x4>;
- ralink,port-map = "wllll";
- };
-
- wmac@10180000 {
- ralink,mtd-eeprom = <&factory 0>;
- };
-
- pinctrl {
- state_default: pinctrl0 {
- default {
- ralink,group = "i2c", "ephy", "wled";
- ralink,function = "gpio";
- };
- };
- };
-
- gpio-leds {
- compatible = "gpio-leds";
- system {
- label = "kingston:blue:system";
- gpios = <&gpio2 3 1>;
- };
- wifi {
- label = "kingston:blue:wifi";
- gpios = <&gpio3 0 1>;
- };
- };
-
- gpio-keys-polled {
- compatible = "gpio-keys-polled";
- #address-cells = <1>;
- #size-cells = <0>;
- poll-interval = <20>;
- reset {
- label = "reset";
- gpios = <&gpio0 1 1>;
- linux,code = <0x198>;
- };
- system {
- label = "system";
- gpios = <&gpio0 2 1>;
- linux,code = <0x211>;
- };
- };
+ compatible = "mlw221", "ralink,mt7620n-soc";
+ model = "Kingston MLW221";
+
+ palmbus@10000000 {
+ gpio0: gpio@600 {
+ status = "okay";
+ };
+
+ gpio2: gpio@660 {
+ status = "okay";
+ };
+
+ gpio3: gpio@688 {
+ status = "okay";
+ };
+
+ spi@b00 {
+ status = "okay";
+
+ m25p80@0 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "s25fl129p1";
+ reg = <0 0>;
+ linux,modalias = "m25p80", "s25fl129p1";
+ spi-max-frequency = <10000000>;
+
+ partition@0 {
+ label = "u-boot";
+ reg = <0x0 0x30000>;
+ read-only;
+ };
+
+ partition@30000 {
+ label = "u-boot-env";
+ reg = <0x30000 0x10000>;
+ read-only;
+ };
+
+ factory: partition@40000 {
+ label = "factory";
+ reg = <0x40000 0x10000>;
+ read-only;
+ };
+
+ partition@50000 {
+ label = "firmware";
+ reg = <0x50000 0xf60000>;
+ };
+
+ partition@fb0000 {
+ label = "user-config";
+ reg = <0xfb0000 0x50000>;
+
+ };
+ };
+ };
+ };
+
+ ehci@101c0000 {
+ status = "okay";
+ };
+
+ ohci@101c1000 {
+ status = "okay";
+ };
+
+ ethernet@10100000 {
+ mtd-mac-address = <&factory 0x4>;
+ ralink,port-map = "wllll";
+ };
+
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
+ pinctrl {
+ state_default: pinctrl0 {
+ default {
+ ralink,group = "i2c", "ephy", "wled";
+ ralink,function = "gpio";
+ };
+ };
+ };
+
+ gpio-leds {
+ compatible = "gpio-leds";
+ system {
+ label = "kingston:blue:system";
+ gpios = <&gpio2 3 1>;
+ };
+ wifi {
+ label = "kingston:blue:wifi";
+ gpios = <&gpio3 0 1>;
+ };
+ };
+
+ gpio-keys-polled {
+ compatible = "gpio-keys-polled";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ poll-interval = <20>;
+ reset {
+ label = "reset";
+ gpios = <&gpio0 1 1>;
+ linux,code = <0x198>;
+ };
+ system {
+ label = "system";
+ gpios = <&gpio0 2 1>;
+ linux,code = <0x211>;
+ };
+ };
};
diff --git a/target/linux/ramips/dts/MLWG2.dts b/target/linux/ramips/dts/MLWG2.dts
index c7ce14685d..a2b0033150 100644
--- a/target/linux/ramips/dts/MLWG2.dts
+++ b/target/linux/ramips/dts/MLWG2.dts
@@ -3,7 +3,7 @@
/include/ "mt7620n.dtsi"
/ {
- compatible = "mlwG2", "ralink,mt7620n-soc";
+ compatible = "mlwg2", "ralink,mt7620n-soc";
model = "Kingston MLWG2";
palmbus@10000000 {
@@ -12,7 +12,7 @@
};
gpio2: gpio@660 {
- status = "okay";
+ status = "okay";
};
gpio3: gpio@688 {