From 0618ae4136933b66a4df070be842ba0ae2e27adc Mon Sep 17 00:00:00 2001 From: juhosg Date: Sun, 12 Aug 2012 12:48:24 +0000 Subject: [PATCH] ramips: add D-Link DIR-620 A1 support Full functionality runtime tested, installation via OEM web-interface requires a follow-up patch. Thanks go to Sergey Vasilyugin for his patch that pointed me at the missing bits (including the antiparallel wps led). Signed-off-by: Paul Fertser git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33142 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ramips/base-files/etc/diag.sh | 2 +- .../etc/hotplug.d/firmware/10-rt2x00-eeprom | 1 + .../linux/ramips/base-files/etc/uci-defaults/leds | 4 +- .../ramips/base-files/etc/uci-defaults/network | 8 +++- .../ramips/base-files/lib/preinit/06_set_iface_mac | 1 + target/linux/ramips/base-files/lib/ramips.sh | 3 ++ .../ramips/base-files/lib/upgrade/platform.sh | 1 + .../arch/mips/include/asm/mach-ralink/machine.h | 1 + .../arch/mips/ralink/rt305x/mach-dir-300-revb.c | 54 ++++++++++++++++++++-- target/linux/ramips/image/Makefile | 12 +++++ 10 files changed, 81 insertions(+), 6 deletions(-) diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh index c1f594989c..b426693422 100755 --- a/target/linux/ramips/base-files/etc/diag.sh +++ b/target/linux/ramips/base-files/etc/diag.sh @@ -36,7 +36,7 @@ get_status_led() { argus-atp52b) status_led="argus-atp52b:green:run" ;; - dir-300-b1 | dir-600-b1 | dir-600-b2) + dir-300-b1 | dir-600-b1 | dir-600-b2 | dir-620-a1) status_led="d-link:green:status" ;; dap-1350) 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 d29335799f..392a8e1da3 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 @@ -57,6 +57,7 @@ case "$FIRMWARE" in all5002 | \ argus-atp52b | \ bc2 | \ + dir-620-a1 | \ esr-9753 | \ fonera20n | \ freestation5 | \ diff --git a/target/linux/ramips/base-files/etc/uci-defaults/leds b/target/linux/ramips/base-files/etc/uci-defaults/leds index f8241d3062..21804c74a2 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/leds +++ b/target/linux/ramips/base-files/etc/uci-defaults/leds @@ -26,9 +26,11 @@ case $board in ;; dir-300-b1|\ dir-600-b1|\ - dir-600-b2) + dir-600-b2|\ + dir-620-a1) # ANDed with vlan switch port 4 led state ucidef_set_led_default "wan" "WAN LED (amber)" "d-link:amber:wan" "1" + set_wifi_led "rt2800pci-phy0::radio" ;; esr-9753) set_wifi_led "rt2800pci-phy0::radio" diff --git a/target/linux/ramips/base-files/etc/uci-defaults/network b/target/linux/ramips/base-files/etc/uci-defaults/network index d1493da534..cbb0b85ff4 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/network +++ b/target/linux/ramips/base-files/etc/uci-defaults/network @@ -94,7 +94,7 @@ ramips_setup_macs() ;; 3g-6200n | \ argus-atp52b | \ - b2c | \ + bc2 | \ f5d8235-v1 | \ nw718 | \ psr-680w | \ @@ -122,6 +122,12 @@ ramips_setup_macs() wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) ;; + dir-620-a1) + lan_mac=$(ramips_get_mac_binary factory 4) + lan_mac=$(maccalc or "$lan_mac" "02:00:00:00:00:00") + wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1) + ;; + esr-9753 | \ ur-336un) lan_mac=$(ramips_get_mac_binary devdata 16388) diff --git a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac index f701b7e075..a6c88ed961 100644 --- a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac +++ b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac @@ -13,6 +13,7 @@ preinit_set_mac_address() { ifconfig eth0 hw ether $mac 2>/dev/null ;; bc2 |\ + dir-620-a1 |\ esr-9753 |\ freestation5 |\ nw718 |\ diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index 0089e0ddcc..8dcda484a6 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -80,6 +80,9 @@ ramips_board_name() { *"DIR-600 B2") name="dir-600-b2" ;; + *"DIR-620 A1") + name="dir-620-a1" + ;; *"DAP-1350") name="dap-1350" ;; diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh index eb9a0d1206..2548e1d6da 100755 --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh @@ -21,6 +21,7 @@ platform_check_image() { dir-300-b1 | \ dir-600-b1 | \ dir-600-b2 | \ + dir-620-a1 | \ dap-1350 | \ esr-9753 | \ fonera20n | \ diff --git a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/machine.h b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/machine.h index 50f86889b7..2de19d799a 100644 --- a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/machine.h +++ b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/machine.h @@ -27,6 +27,7 @@ enum ramips_mach_type { RAMIPS_MACH_DIR_600_B1, /* D-Link DIR-600 B1 */ RAMIPS_MACH_DIR_600_B2, /* D-Link DIR-600 B2 */ RAMIPS_MACH_DIR_615_D, /* D-Link DIR-615 D */ + RAMIPS_MACH_DIR_620_A1, /* D-Link DIR-620 A1 */ RAMIPS_MACH_RT_G32_B1, /* Asus RT-G32 B1 */ RAMIPS_MACH_RT_N10_PLUS, /* Asus RT-N10+ */ RAMIPS_MACH_NW718, /* Netcore NW718 */ diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-dir-300-revb.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-dir-300-revb.c index e4c5c73da1..3ae1b7852c 100644 --- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-dir-300-revb.c +++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-dir-300-revb.c @@ -29,6 +29,12 @@ #define DIR_300B_GPIO_LED_WAN_GREEN 12 #define DIR_300B_GPIO_LED_WAN_AMBER 14 +/* + * NOTE: the WPS led in DIR-620 consists of two antiparallel leds, + * so they can't be lit simultaneously + */ +#define DIR_620_GPIO_LED_WPS_AMBER 11 + #define DIR_300B_GPIO_BUTTON_WPS 0 /* active low */ #define DIR_300B_GPIO_BUTTON_RESET 10 /* active low */ @@ -77,7 +83,33 @@ static struct gpio_keys_button dir_300b_gpio_buttons[] __initdata = { } }; -static void __init dir_300b_init(void) +static struct gpio_led dir_620_leds_gpio[] __initdata = { + { + .name = "d-link:amber:status", + .gpio = DIR_300B_GPIO_LED_STATUS_AMBER, + .active_low = 1, + }, { + .name = "d-link:green:status", + .gpio = DIR_300B_GPIO_LED_STATUS_GREEN, + .active_low = 1, + }, { + .name = "d-link:amber:wan", + .gpio = DIR_300B_GPIO_LED_WAN_AMBER, + .active_low = 1, + }, { + .name = "d-link:green:wan", + .gpio = DIR_300B_GPIO_LED_WAN_GREEN, + .active_low = 1, + }, { + .name = "d-link:blue:wps", + .gpio = DIR_300B_GPIO_LED_WPS, + }, { + .name = "d-link:amber:wps", + .gpio = DIR_620_GPIO_LED_WPS_AMBER, + } +}; + +static void __init dir_common_init(void) { rt305x_gpio_init(RT305X_GPIO_MODE_GPIO << RT305X_GPIO_MODE_UART0_SHIFT); @@ -85,8 +117,6 @@ static void __init dir_300b_init(void) rt305x_esw_data.vlan_config = RT305X_ESW_VLAN_CONFIG_LLLLW; rt305x_register_ethernet(); - ramips_register_gpio_leds(-1, ARRAY_SIZE(dir_300b_leds_gpio), - dir_300b_leds_gpio); ramips_register_gpio_buttons(-1, DIR_300B_KEYS_POLL_INTERVAL, ARRAY_SIZE(dir_300b_gpio_buttons), dir_300b_gpio_buttons); @@ -94,6 +124,21 @@ static void __init dir_300b_init(void) rt305x_register_wdt(); } +static void __init dir_300b_init(void) +{ + dir_common_init(); + ramips_register_gpio_leds(-1, ARRAY_SIZE(dir_300b_leds_gpio), + dir_300b_leds_gpio); +} + +static void __init dir_620a1_init(void) +{ + dir_common_init(); + ramips_register_gpio_leds(-1, ARRAY_SIZE(dir_620_leds_gpio), + dir_620_leds_gpio); + rt305x_register_usb(); +} + MIPS_MACHINE(RAMIPS_MACH_DIR_300_B1, "DIR-300-B1", "D-Link DIR-300 B1", dir_300b_init); @@ -105,3 +150,6 @@ MIPS_MACHINE(RAMIPS_MACH_DIR_600_B2, "DIR-600-B2", "D-Link DIR-600 B2", MIPS_MACHINE(RAMIPS_MACH_DIR_615_D, "DIR-615-D", "D-Link DIR-615 D", dir_300b_init); + +MIPS_MACHINE(RAMIPS_MACH_DIR_620_A1, "DIR-620-A1", "D-Link DIR-620 A1", + dir_620a1_init); diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile index 5675201bce..5f42fe8a75 100644 --- a/target/linux/ramips/image/Makefile +++ b/target/linux/ramips/image/Makefile @@ -196,6 +196,17 @@ define BuildFirmware/DAP1350/initramfs $(call BuildFirmware/Generic/initramfs,$(1),$(2),$(call mkcmdline,$(3),ttyS1,115200) $(call mkmtd/phys,$(mtdlayout_dap1350)),$(mtd_dap1350_kernel_part_size),$(mtd_dap1350_rootfs_part_size)) endef +mtdlayout_dir620a1=192k(u-boot)ro,64k(u-boot-env)ro,64k(factory)ro,896k(kernel),6976k(rootfs),7872k@0x50000(firmware) +kernel_size_dir620a1=917504 +rootfs_size_dir620a1=7143424 +define BuildFirmware/DIR620A1 + $(call BuildFirmware/Generic,$(1),$(2),$(call mkcmdline,$(3),ttyS1,57600) $(call mkmtd/phys,$(mtdlayout_dir620a1)),$(kernel_size_dir620a1),$(rootfs_size_dir620a1)) +endef + +define BuildFirmware/DIR620A1/initramfs + $(call BuildFirmware/Generic/initramfs,$(1),$(2),$(call mkcmdline,$(3),ttyS1,57600) $(call mkmtd/phys,$(mtdlayout_dir620a1)),$(kernel_size_dir620a1),$(rootfs_size_dir620a1)) +endef + define BuildFirmware/Edimax if [ -e "$(call sysupname,$(1),$(2))" ]; then \ mkedimaximg -i $(call sysupname,$(1),$(2)) \ @@ -365,6 +376,7 @@ define Image/Build/Profile/DIR300B1 $(call Image/Build/Template/$(fs_squash)/$(1),DIR300B1,dir-600-b1,DIR-600-B1,wrgn23_dlwbr_dir600b) $(call Image/Build/Template/$(fs_squash)/$(1),DIR300B1,dir-600-b2,DIR-600-B2,wrgn23_dlwbr_dir600b) $(call Image/Build/Template/$(fs_squash)/$(1),DIR300B1,dir-615-d,DIR-615-D,wrgn23_dlwbr_dir615d) + $(call Image/Build/Template/$(fs_squash)/$(1),DIR620A1,dir-620-a1,DIR-620-A1) endef define Image/Build/Profile/DAP1350 -- 2.11.0