X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/f0cb3995a72f37dff3084c56fcc7fcfba071cfa8..95246c4c7045ce5db5760571c7551260fcf26a99:/target/linux/ixp4xx/patches-2.6.27/500-usr8200_support.patch?ds=sidebyside 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 629f537d5..6c23e6b3a 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 @@ -1,7 +1,5 @@ -Index: linux-2.6.27.3/arch/arm/mach-ixp4xx/Kconfig -=================================================================== ---- linux-2.6.27.3.orig/arch/arm/mach-ixp4xx/Kconfig 2008-11-05 19:31:20.000000000 +0000 -+++ linux-2.6.27.3/arch/arm/mach-ixp4xx/Kconfig 2008-11-05 20:10:26.000000000 +0000 +--- a/arch/arm/mach-ixp4xx/Kconfig ++++ b/arch/arm/mach-ixp4xx/Kconfig @@ -97,6 +97,14 @@ config MACH_SIDEWINDER Engineering Sidewinder board. For more information on this platform, see http://www.adiengineering.com @@ -17,11 +15,9 @@ Index: linux-2.6.27.3/arch/arm/mach-ixp4xx/Kconfig config MACH_COMPEX bool "Compex WP18 / NP18A" select PCI -Index: linux-2.6.27.3/arch/arm/mach-ixp4xx/Makefile -=================================================================== ---- linux-2.6.27.3.orig/arch/arm/mach-ixp4xx/Makefile 2008-11-05 19:31:20.000000000 +0000 -+++ linux-2.6.27.3/arch/arm/mach-ixp4xx/Makefile 2008-11-05 20:10:26.000000000 +0000 -@@ -24,6 +24,7 @@ obj-pci-$(CONFIG_MACH_COMPEX) += ixdp42 +--- a/arch/arm/mach-ixp4xx/Makefile ++++ b/arch/arm/mach-ixp4xx/Makefile +@@ -25,6 +25,7 @@ obj-pci-$(CONFIG_MACH_WRT300NV2) += wrt obj-pci-$(CONFIG_MACH_AP1000) += ixdp425-pci.o obj-pci-$(CONFIG_MACH_TW5334) += tw5334-pci.o obj-pci-$(CONFIG_MACH_MI424WR) += mi424wr-pci.o @@ -29,7 +25,7 @@ Index: linux-2.6.27.3/arch/arm/mach-ixp4xx/Makefile obj-y += common.o -@@ -46,6 +47,7 @@ obj-$(CONFIG_MACH_COMPEX) += compex-setu +@@ -48,6 +49,7 @@ obj-$(CONFIG_MACH_WRT300NV2) += wrt300nv obj-$(CONFIG_MACH_AP1000) += ap1000-setup.o obj-$(CONFIG_MACH_TW5334) += tw5334-setup.o obj-$(CONFIG_MACH_MI424WR) += mi424wr-setup.o @@ -37,10 +33,8 @@ Index: linux-2.6.27.3/arch/arm/mach-ixp4xx/Makefile obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o -Index: linux-2.6.27.3/arch/arm/mach-ixp4xx/usr8200-pci.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.27.3/arch/arm/mach-ixp4xx/usr8200-pci.c 2008-11-05 22:51:20.000000000 +0000 +--- /dev/null ++++ b/arch/arm/mach-ixp4xx/usr8200-pci.c @@ -0,0 +1,78 @@ +/* + * arch/arch/mach-ixp4xx/usr8200-pci.c @@ -120,11 +114,9 @@ Index: linux-2.6.27.3/arch/arm/mach-ixp4xx/usr8200-pci.c +} + +subsys_initcall(usr8200_pci_init); -Index: linux-2.6.27.3/arch/arm/mach-ixp4xx/usr8200-setup.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.27.3/arch/arm/mach-ixp4xx/usr8200-setup.c 2008-11-05 20:23:32.000000000 +0000 -@@ -0,0 +1,187 @@ +--- /dev/null ++++ b/arch/arm/mach-ixp4xx/usr8200-setup.c +@@ -0,0 +1,212 @@ +/* + * arch/arm/mach-ixp4xx/usr8200-setup.c + * @@ -223,29 +215,35 @@ Index: linux-2.6.27.3/arch/arm/mach-ixp4xx/usr8200-setup.c + .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, +}; + @@ -254,14 +252,14 @@ Index: linux-2.6.27.3/arch/arm/mach-ixp4xx/usr8200-setup.c + .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, @@ -280,13 +278,24 @@ Index: linux-2.6.27.3/arch/arm/mach-ixp4xx/usr8200-setup.c + } +}; + ++static struct resource usr8200_rtc_resources = { ++ .flags = IORESOURCE_MEM ++}; ++ ++static struct platform_device usr8200_rtc = { ++ .name = "rtc7301", ++ .id = 0, ++ .num_resources = 1, ++ .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) @@ -294,10 +303,18 @@ Index: linux-2.6.27.3/arch/arm/mach-ixp4xx/usr8200-setup.c + 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)); +} @@ -312,10 +329,8 @@ Index: linux-2.6.27.3/arch/arm/mach-ixp4xx/usr8200-setup.c + .boot_params = 0x0100, + .init_machine = usr8200_init, +MACHINE_END -Index: linux-2.6.27.3/arch/arm/mach-ixp4xx/include/mach/uncompress.h -=================================================================== ---- linux-2.6.27.3.orig/arch/arm/mach-ixp4xx/include/mach/uncompress.h 2008-11-05 20:11:38.000000000 +0000 -+++ linux-2.6.27.3/arch/arm/mach-ixp4xx/include/mach/uncompress.h 2008-11-05 20:12:11.000000000 +0000 +--- a/arch/arm/mach-ixp4xx/include/mach/uncompress.h ++++ b/arch/arm/mach-ixp4xx/include/mach/uncompress.h @@ -43,7 +43,7 @@ static __inline__ void __arch_decomp_set if (machine_is_adi_coyote() || machine_is_gtwx5715() || machine_is_gateway7001() || machine_is_wg302v2() ||