X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=target%2Flinux%2Far71xx%2Ffiles%2Farch%2Fmips%2Far71xx%2Fmach-wndr3700.c;h=52ddae5a1e33c5f87fcdb42282689c15432750d5;hp=1599dce05ff01e6952357b04e189ea97de3a7181;hb=20ba2bd69f025fefa9faa0a1548c9eb1f3deb99c;hpb=03a2d1af092be23a01b0bfe5ad918390e53e3f04 diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c index 1599dce05f..52ddae5a1e 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c @@ -2,7 +2,7 @@ * Netgear WNDR3700 board support * * Copyright (C) 2009 Marco Porsch - * Copyright (C) 2009 Gabor Juhos + * Copyright (C) 2009-2010 Gabor Juhos * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published @@ -12,27 +12,42 @@ #include #include #include -#include -#include -#include +#include +#include -#include #include -#include +#include "machtype.h" #include "devices.h" +#include "dev-m25p80.h" +#include "dev-ap94-pci.h" +#include "dev-gpio-buttons.h" +#include "dev-leds-gpio.h" +#include "dev-usb.h" #define WNDR3700_GPIO_LED_WPS_ORANGE 0 #define WNDR3700_GPIO_LED_POWER_ORANGE 1 #define WNDR3700_GPIO_LED_POWER_GREEN 2 #define WNDR3700_GPIO_LED_WPS_GREEN 4 +#define WNDR3700_GPIO_LED_WAN_GREEN 6 #define WNDR3700_GPIO_BTN_WPS 3 #define WNDR3700_GPIO_BTN_RESET 8 #define WNDR3700_GPIO_BTN_WIFI 11 +#define WNDR3700_GPIO_RTL8366_SDA 5 +#define WNDR3700_GPIO_RTL8366_SCK 7 + #define WNDR3700_BUTTONS_POLL_INTERVAL 20 +#define WNDR3700_ETH0_MAC_OFFSET 0 +#define WNDR3700_ETH1_MAC_OFFSET 0x6 + +#define WNDR3700_WMAC0_MAC_OFFSET 0 +#define WNDR3700_WMAC1_MAC_OFFSET 0xc +#define WNDR3700_CALDATA0_OFFSET 0x1000 +#define WNDR3700_CALDATA1_OFFSET 0x5000 + #ifdef CONFIG_MTD_PARTITIONS static struct mtd_partition wndr3700_partitions[] = { { @@ -90,28 +105,6 @@ static struct flash_platform_data wndr3700_flash_data = { #endif }; -static struct ar71xx_pci_irq wndr3700_pci_irqs[] __initdata = { - { - .slot = 0, - .pin = 1, - .irq = AR71XX_PCI_IRQ_DEV0, - }, { - .slot = 1, - .pin = 1, - .irq = AR71XX_PCI_IRQ_DEV1, - } -}; - -static struct spi_board_info wndr3700_spi_info[] = { - { - .bus_num = 0, - .chip_select = 0, - .max_speed_hz = 25000000, - .modalias = "m25p80", - .platform_data = &wndr3700_flash_data, - } -}; - static struct gpio_led wndr3700_leds_gpio[] __initdata = { { .name = "wndr3700:green:power", @@ -129,6 +122,10 @@ static struct gpio_led wndr3700_leds_gpio[] __initdata = { .name = "wndr3700:orange:wps", .gpio = WNDR3700_GPIO_LED_WPS_ORANGE, .active_low = 1, + }, { + .name = "wndr3700:green:wan", + .gpio = WNDR3700_GPIO_LED_WAN_GREEN, + .active_low = 1, } }; @@ -136,36 +133,56 @@ static struct gpio_button wndr3700_gpio_buttons[] __initdata = { { .desc = "reset", .type = EV_KEY, - .code = BTN_0, - .threshold = 5, + .code = KEY_RESTART, + .threshold = 3, .gpio = WNDR3700_GPIO_BTN_RESET, + .active_low = 1, }, { .desc = "wps", .type = EV_KEY, - .code = BTN_1, - .threshold = 5, + .code = KEY_WPS_BUTTON, + .threshold = 3, .gpio = WNDR3700_GPIO_BTN_WPS, + .active_low = 1, } , { .desc = "wifi", .type = EV_KEY, .code = BTN_2, - .threshold = 5, + .threshold = 3, .gpio = WNDR3700_GPIO_BTN_WIFI, + .active_low = 1, + } +}; + +static struct rtl8366s_platform_data wndr3700_rtl8366s_data = { + .gpio_sda = WNDR3700_GPIO_RTL8366_SDA, + .gpio_sck = WNDR3700_GPIO_RTL8366_SCK, +}; + +static struct platform_device wndr3700_rtl8366s_device = { + .name = RTL8366S_DRIVER_NAME, + .id = -1, + .dev = { + .platform_data = &wndr3700_rtl8366s_data, } }; static void __init wndr3700_setup(void) { - u8 *mac = (u8 *) KSEG1ADDR(0x1fff0000); - - ar71xx_set_mac_base(mac); - ar71xx_add_device_mdio(0x0); + u8 *art = (u8 *) KSEG1ADDR(0x1fff0000); + ar71xx_init_mac(ar71xx_eth0_data.mac_addr, + art + WNDR3700_ETH0_MAC_OFFSET, 0); + ar71xx_eth0_pll_data.pll_1000 = 0x11110000; + ar71xx_eth0_data.mii_bus_dev = &wndr3700_rtl8366s_device.dev; ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII; - ar71xx_eth0_data.phy_mask = 0xf; ar71xx_eth0_data.speed = SPEED_1000; ar71xx_eth0_data.duplex = DUPLEX_FULL; + ar71xx_init_mac(ar71xx_eth1_data.mac_addr, + art + WNDR3700_ETH1_MAC_OFFSET, 0); + ar71xx_eth1_pll_data.pll_1000 = 0x11110000; + ar71xx_eth1_data.mii_bus_dev = &wndr3700_rtl8366s_device.dev; ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII; ar71xx_eth1_data.phy_mask = 0x10; @@ -174,10 +191,7 @@ static void __init wndr3700_setup(void) ar71xx_add_device_usb(); - ar71xx_pci_init(ARRAY_SIZE(wndr3700_pci_irqs), wndr3700_pci_irqs); - - ar71xx_add_device_spi(NULL, wndr3700_spi_info, - ARRAY_SIZE(wndr3700_spi_info)); + ar71xx_add_device_m25p80(&wndr3700_flash_data); ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(wndr3700_leds_gpio), wndr3700_leds_gpio); @@ -185,6 +199,16 @@ static void __init wndr3700_setup(void) ar71xx_add_device_gpio_buttons(-1, WNDR3700_BUTTONS_POLL_INTERVAL, ARRAY_SIZE(wndr3700_gpio_buttons), wndr3700_gpio_buttons); + + platform_device_register(&wndr3700_rtl8366s_device); + platform_device_register_simple("wndr3700-led-usb", -1, NULL, 0); + + ap94_pci_enable_quirk_wndr3700(); + ap94_pci_init(art + WNDR3700_CALDATA0_OFFSET, + art + WNDR3700_WMAC0_MAC_OFFSET, + art + WNDR3700_CALDATA1_OFFSET, + art + WNDR3700_WMAC1_MAC_OFFSET); } -MIPS_MACHINE(AR71XX_MACH_WNDR3700, "NETGEAR WNDR3700", wndr3700_setup); +MIPS_MACHINE(AR71XX_MACH_WNDR3700, "WNDR3700", "NETGEAR WNDR3700", + wndr3700_setup);