From 420c62205b3ff27b9733bf252762d1eefe9fcd27 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Mon, 7 Oct 2013 15:02:31 +0000 Subject: [PATCH] ralink: DIR610A1 Fix remaining issues This patch fixes: - Ethernet and Wireless LEDs - Wireless MAC Address - Remove whitespaces from dts file Signed-off-by: Flavio Silveira SVN-Revision: 38321 --- .../etc/hotplug.d/firmware/10-rt2x00-eeprom | 2 +- .../ramips/base-files/lib/upgrade/platform.sh | 1 + target/linux/ramips/dts/DIR-610-A1.dts | 24 +++++++++++-------- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom index b0b071774a..40e17968cd 100644 --- a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom +++ b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom @@ -34,6 +34,7 @@ case "$FIRMWARE" in dir-300-b1 | \ dir-600-b1 | \ dir-600-b2 | \ + dir-610-a1 | \ dir-615-d) rt2x00_eeprom_extract "devdata" 16384 512 ;; @@ -71,7 +72,6 @@ case "$FIRMWARE" in dcs-930 | \ dir-300-b7 | \ dir-320-b1 | \ - dir-610-a1 | \ dir-615-h1 | \ dir-620-a1 | \ dir-620-d1 | \ diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh index e7087cc673..6836e16d96 100755 --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh @@ -90,6 +90,7 @@ platform_check_image() { } return 0 ;; + dir-610-a1 |\ dir-645) [ "$magic" != "5ea3a417" ] && { echo "Invalid image type." diff --git a/target/linux/ramips/dts/DIR-610-A1.dts b/target/linux/ramips/dts/DIR-610-A1.dts index 26caf5f67f..67c92b469d 100644 --- a/target/linux/ramips/dts/DIR-610-A1.dts +++ b/target/linux/ramips/dts/DIR-610-A1.dts @@ -5,7 +5,7 @@ / { compatible = "DIR-610-A1", "ralink,rt5350-soc"; model = "D-Link DIR-610 A1"; - + palmbus@10000000 { spi@b00 { status = "okay"; @@ -23,10 +23,10 @@ read-only; }; - partition@30000 { + devdata: partition@30000 { label = "devdata"; reg = <0x30000 0x10000>; - read-only; + read-only; }; factory: partition@40000 { @@ -53,11 +53,15 @@ }; esw@10110000 { - ralink,portmap = <0x1f>; - ralink,led-polarity = <0>; + status = "okay"; + ralink,portmap = <0x2f>; + ralink,led_polarity = <0x17>; + }; - pinctrl-names = "default"; - pinctrl-0 = <&phy_led_pins>; + wmac@10180000 { + status = "okay"; + ralink,led-polarity = <1>; + ralink,mtd-eeprom = <&devdata 16384>; }; gpio-leds { @@ -66,13 +70,13 @@ label = "d-link:green:status"; gpios = <&gpio0 9 1>; }; - wps { + wps { label = "d-link:green:wps"; gpios = <&gpio0 13 1>; }; - }; + }; - gpio-keys-polled { + gpio-keys-polled { gpio-keys-polled { compatible = "gpio-keys-polled"; #address-cells = <1>; -- 2.30.2