diff options
author | Peter Denison <openwrt@marshadder.org> | 2009-01-08 22:13:48 +0000 |
---|---|---|
committer | Peter Denison <openwrt@marshadder.org> | 2009-01-08 22:13:48 +0000 |
commit | 2057dcba0553436f2e321029e0e6f0f66232b82b (patch) | |
tree | e3aac3ae9028a17d8251fd7234febcabfc449f70 /target/linux/ixp4xx/patches-2.6.27 | |
parent | 54d7bf85aeced4c04798c2ed45d532c01b7e72e3 (diff) | |
download | master-187ad058-2057dcba0553436f2e321029e0e6f0f66232b82b.tar.gz master-187ad058-2057dcba0553436f2e321029e0e6f0f66232b82b.tar.bz2 master-187ad058-2057dcba0553436f2e321029e0e6f0f66232b82b.zip |
USR8200 changes
The attached patch adds LED support and enables all the PHYs on the switch.
Signed-off-by: Jose Vasconcellos <jvasco@verizon.net>
Also adds preliminary support for enabling the RTC, and some cache reporting
tweaks.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13942 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.27')
-rw-r--r-- | target/linux/ixp4xx/patches-2.6.27/500-usr8200_support.patch | 76 | ||||
-rw-r--r-- | target/linux/ixp4xx/patches-2.6.27/501-cachetypes.patch | 20 |
2 files changed, 70 insertions, 26 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.27/500-usr8200_support.patch b/target/linux/ixp4xx/patches-2.6.27/500-usr8200_support.patch index 413fcae818..ef818c7ca0 100644 --- a/target/linux/ixp4xx/patches-2.6.27/500-usr8200_support.patch +++ b/target/linux/ixp4xx/patches-2.6.27/500-usr8200_support.patch @@ -116,7 +116,7 @@ +subsys_initcall(usr8200_pci_init); --- /dev/null +++ b/arch/arm/mach-ixp4xx/usr8200-setup.c -@@ -0,0 +1,187 @@ +@@ -0,0 +1,211 @@ +/* + * arch/arm/mach-ixp4xx/usr8200-setup.c + * @@ -215,29 +215,35 @@ + .resource = usr8200_uart_resources, +}; + -+/* -+static struct i2c_gpio_platform_data usr8200_i2c_gpio_data = { -+ .sda_pin = 9, -+ .scl_pin = 10, -+}; -+ -+static struct platform_device usr8200_i2c_gpio = { -+ .name = "i2c-gpio", -+ .id = 0, -+ .dev = { -+ .platform_data = &usr8200_i2c_gpio_data, -+ }, -+}; -+ +static struct gpio_led usr8200_led_pin[] = { + { -+ .name = "usr8200:green:status", -+ .gpio = 7, ++ .name = "usr8200:usb1", ++ .gpio = 0, ++ .active_low = 1, ++ }, ++ { ++ .name = "usr8200:usb2", ++ .gpio = 1, ++ .active_low = 1, ++ }, ++ { ++ .name = "usr8200:ieee1394", ++ .gpio = 2, ++ .active_low = 1, ++ }, ++ { ++ .name = "usr8200:internal", ++ .gpio = 3, ++ .active_low = 1, ++ }, ++ { ++ .name = "usr8200:power", ++ .gpio = 14, + } +}; + +static struct gpio_led_platform_data usr8200_led_data = { -+ .num_leds = 1, ++ .num_leds = ARRAY_SIZE(usr8200_led_pin), + .leds = usr8200_led_pin, +}; + @@ -246,14 +252,14 @@ + .id = -1, + .dev.platform_data = &usr8200_led_data, +}; -+*/ + +static struct eth_plat_info usr8200_plat_eth[] = { -+ { -+ .phy = 16, ++ { /* NPEC - LAN with Marvell 88E6060 switch */ ++ .phy = IXP4XX_ETH_PHY_MAX_ADDR, ++ .phy_mask = 0x0F0000, + .rxq = 4, + .txreadyq = 21, -+ }, { ++ }, { /* NPEB - WAN */ + .phy = 9, + .rxq = 3, + .txreadyq = 20, @@ -272,13 +278,23 @@ + } +}; + ++static struct resource usr8200_rtc_resources = { ++ .flags = IORESOURCE_MEM ++}; ++ ++static struct platform_device usr8200_rtc = { ++ .name = "rtc7301", ++ .id = 0, ++ .resource = &usr8200_rtc_resources, ++}; ++ +static struct platform_device *usr8200_devices[] __initdata = { + &usr8200_flash, + &usr8200_uart, -+/* &usr8200_led, -+ &usr8200_i2c_gpio, */ ++ &usr8200_led, + &usr8200_eth[0], + &usr8200_eth[1], ++ &usr8200_rtc, +}; + +static void __init usr8200_init(void) @@ -286,10 +302,18 @@ + ixp4xx_sys_init(); + + usr8200_flash_resource.start = IXP4XX_EXP_BUS_BASE(0); -+ usr8200_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_64M - 1; ++ usr8200_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_16M - 1; ++ ++ usr8200_rtc_resources.start = IXP4XX_EXP_BUS_BASE(2); ++ usr8200_rtc_resources.end = IXP4XX_EXP_BUS_BASE(2) + 0x01ff; + + *IXP4XX_EXP_CS0 |= IXP4XX_FLASH_WRITABLE; -+ *IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0; ++ *IXP4XX_EXP_CS2 = IXP4XX_EXP_BUS_SIZE(0) | IXP4XX_EXP_BUS_WR_EN | ++ IXP4XX_EXP_BUS_CS_EN | IXP4XX_EXP_BUS_BYTE_EN; ++ *IXP4XX_GPIO_GPCLKR = 0x01100000; ++ ++ /* configure button as input */ ++ gpio_line_config(12, IXP4XX_GPIO_IN); + + platform_add_devices(usr8200_devices, ARRAY_SIZE(usr8200_devices)); +} diff --git a/target/linux/ixp4xx/patches-2.6.27/501-cachetypes.patch b/target/linux/ixp4xx/patches-2.6.27/501-cachetypes.patch new file mode 100644 index 0000000000..cc9c89e3e1 --- /dev/null +++ b/target/linux/ixp4xx/patches-2.6.27/501-cachetypes.patch @@ -0,0 +1,20 @@ +--- a/arch/arm/kernel/setup.c ++++ b/arch/arm/kernel/setup.c +@@ -184,7 +184,7 @@ static const char *cache_types[16] = { + "write-back", + "undefined 3", + "undefined 4", +- "undefined 5", ++ "write-back", + "write-back", + "write-back", + "undefined 8", +@@ -203,7 +203,7 @@ static const char *cache_clean[16] = { + "cp15 c7 ops", + "undefined 3", + "undefined 4", +- "undefined 5", ++ "cp15 c7 ops", + "cp15 c7 ops", + "cp15 c7 ops", + "undefined 8", |