X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/0fc3447849ba0984e4892fe9cf0006852b65c12d..095085228384edbd706366fbbe61c07a75532483:/target/linux/ixp4xx/patches-2.6.25/190-cambria_support.patch?ds=sidebyside diff --git a/target/linux/ixp4xx/patches-2.6.25/190-cambria_support.patch b/target/linux/ixp4xx/patches-2.6.25/190-cambria_support.patch index ee207d101..5e682b097 100644 --- a/target/linux/ixp4xx/patches-2.6.25/190-cambria_support.patch +++ b/target/linux/ixp4xx/patches-2.6.25/190-cambria_support.patch @@ -1,8 +1,6 @@ -Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig -=================================================================== ---- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Kconfig -+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig -@@ -25,6 +25,14 @@ config MACH_AVILA +--- a/arch/arm/mach-ixp4xx/Kconfig ++++ b/arch/arm/mach-ixp4xx/Kconfig +@@ -25,6 +25,14 @@ Avila Network Platform. For more information on this platform, see . @@ -17,7 +15,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig config MACH_LOFT bool "Loft" depends on MACH_AVILA -@@ -200,7 +208,7 @@ config CPU_IXP46X +@@ -200,7 +208,7 @@ config CPU_IXP43X bool @@ -26,11 +24,9 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Kconfig default y config MACH_GTWX5715 -Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile -=================================================================== ---- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/Makefile -+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile -@@ -7,6 +7,7 @@ obj-pci-n := +--- a/arch/arm/mach-ixp4xx/Makefile ++++ b/arch/arm/mach-ixp4xx/Makefile +@@ -7,6 +7,7 @@ obj-pci-$(CONFIG_ARCH_IXDP4XX) += ixdp425-pci.o obj-pci-$(CONFIG_MACH_AVILA) += avila-pci.o @@ -38,7 +34,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile obj-pci-$(CONFIG_MACH_IXDPG425) += ixdpg425-pci.o obj-pci-$(CONFIG_ARCH_ADI_COYOTE) += coyote-pci.o obj-pci-$(CONFIG_MACH_GTWX5715) += gtwx5715-pci.o -@@ -28,6 +29,7 @@ obj-y += common.o +@@ -28,6 +29,7 @@ obj-$(CONFIG_ARCH_IXDP4XX) += ixdp425-setup.o obj-$(CONFIG_MACH_AVILA) += avila-setup.o @@ -46,10 +42,8 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/Makefile obj-$(CONFIG_MACH_IXDPG425) += coyote-setup.o obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote-setup.o obj-$(CONFIG_MACH_GTWX5715) += gtwx5715-setup.o -Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-pci.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-pci.c ++++ b/arch/arm/mach-ixp4xx/cambria-pci.c @@ -0,0 +1,74 @@ +/* + * arch/arch/mach-ixp4xx/cambria-pci.c @@ -125,11 +119,9 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-pci.c +} + +subsys_initcall(cambria_pci_init); -Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-setup.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-setup.c -@@ -0,0 +1,250 @@ ++++ b/arch/arm/mach-ixp4xx/cambria-setup.c +@@ -0,0 +1,444 @@ +/* + * arch/arm/mach-ixp4xx/cambria-setup.c + * @@ -157,7 +149,8 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-setup.c +# include +# include +#endif -+ ++ ++#include +#include +#include +#include @@ -168,6 +161,13 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-setup.c +#include +#include + ++struct cambria_board_info { ++ unsigned char *model; ++ void (* setup)(void); ++}; ++ ++static struct cambria_board_info *cambria_info __initdata; ++ +static struct flash_platform_data cambria_flash_data = { + .map_name = "cfi_probe", + .width = 2, @@ -195,7 +195,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-setup.c +static struct platform_device cambria_i2c_gpio = { + .name = "i2c-gpio", + .id = 0, -+ .dev = { ++ .dev = { + .platform_data = &cambria_i2c_gpio_data, + }, +}; @@ -222,7 +222,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-setup.c +static struct platform_device cambria_uart = { + .name = "serial8250", + .id = PLAT8250_DEV_PLATFORM, -+ .dev = { ++ .dev = { + .platform_data = cambria_uart_data, + }, + .num_resources = 1, @@ -257,96 +257,262 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-setup.c + .resource = cambria_pata_resources, +}; + -+static struct eth_plat_info cambria_plat_eth[] = { -+ { -+ .phy = 2, -+ .rxq = 4, -+ .txreadyq = 21, -+ }, { -+ .phy = 1, -+ .rxq = 2, -+ .txreadyq = 19, -+ } ++static struct eth_plat_info cambria_npec_data = { ++ .phy = 1, ++ .rxq = 4, ++ .txreadyq = 21, ++}; ++ ++static struct eth_plat_info cambria_npea_data = { ++ .phy = 2, ++ .rxq = 2, ++ .txreadyq = 19, +}; + -+static struct platform_device cambria_eth[] = { -+ { -+ .name = "ixp4xx_eth", -+ .id = IXP4XX_ETH_NPEC, -+ .dev.platform_data = cambria_plat_eth, -+ }, { -+ .name = "ixp4xx_eth", -+ .id = IXP4XX_ETH_NPEA, -+ .dev.platform_data = cambria_plat_eth + 1, ++static struct platform_device cambria_npec_device = { ++ .name = "ixp4xx_eth", ++ .id = IXP4XX_ETH_NPEC, ++ .dev.platform_data = &cambria_npec_data, ++}; ++ ++static struct platform_device cambria_npea_device = { ++ .name = "ixp4xx_eth", ++ .id = IXP4XX_ETH_NPEA, ++ .dev.platform_data = &cambria_npea_data, ++}; ++ ++static struct gpio_led cambria_gpio_leds[] = { ++ { ++ .name = "user", /* green led */ ++ .gpio = 5, ++ .active_low = 1, + } +}; + -+#ifdef CONFIG_LEDS_IXP4XX -+static struct platform_device cambria_leds_pld = { -+ .name = "IXP4XX-PLD-LED", ++static struct gpio_led_platform_data cambria_gpio_leds_data = { ++ .num_leds = 1, ++ .leds = cambria_gpio_leds, ++}; ++ ++static struct platform_device cambria_gpio_leds_device = { ++ .name = "leds-gpio", + .id = -1, -+ .num_resources = 0, ++ .dev.platform_data = &cambria_gpio_leds_data, +}; + -+static struct platform_device cambria_leds_mem = { -+ .name = "IXP4XX-MEM-LED", ++ ++static struct latch_led cambria_latch_leds[] = { ++ { ++ .name = "ledA", /* green led */ ++ .bit = 0, ++ }, ++ { ++ .name = "ledB", /* green led */ ++ .bit = 1, ++ }, ++ { ++ .name = "ledC", /* green led */ ++ .bit = 2, ++ }, ++ { ++ .name = "ledD", /* green led */ ++ .bit = 3, ++ }, ++ { ++ .name = "ledE", /* green led */ ++ .bit = 4, ++ }, ++ { ++ .name = "ledF", /* green led */ ++ .bit = 5, ++ }, ++ { ++ .name = "ledG", /* green led */ ++ .bit = 6, ++ }, ++ { ++ .name = "ledH", /* green led */ ++ .bit = 7, ++ } ++}; ++ ++static struct latch_led_platform_data cambria_latch_leds_data = { ++ .num_leds = 8, ++ .leds = cambria_latch_leds, ++ .mem = 0x53F40000, ++}; ++ ++static struct platform_device cambria_latch_leds_device = { ++ .name = "leds-latch", + .id = -1, -+ .num_resources = 0, ++ .dev.platform_data = &cambria_latch_leds_data, ++}; ++ ++static struct resource cambria_usb0_resources[] = { ++ { ++ .start = 0xCD000000, ++ .end = 0xCD000300, ++ .flags = IORESOURCE_MEM, ++ }, ++ { ++ .start = 32, ++ .flags = IORESOURCE_IRQ, ++ }, ++}; ++ ++static struct resource cambria_usb1_resources[] = { ++ { ++ .start = 0xCE000000, ++ .end = 0xCE000300, ++ .flags = IORESOURCE_MEM, ++ }, ++ { ++ .start = 33, ++ .flags = IORESOURCE_IRQ, ++ }, ++}; ++ ++static u64 ehci_dma_mask = ~(u32)0; ++ ++static struct platform_device cambria_usb0_device = { ++ .name = "ixp4xx-ehci", ++ .id = 0, ++ .resource = cambria_usb0_resources, ++ .num_resources = ARRAY_SIZE(cambria_usb0_resources), ++ .dev = { ++ .dma_mask = &ehci_dma_mask, ++ .coherent_dma_mask = 0xffffffff, ++ }, ++}; ++ ++static struct platform_device cambria_usb1_device = { ++ .name = "ixp4xx-ehci", ++ .id = 1, ++ .resource = cambria_usb1_resources, ++ .num_resources = ARRAY_SIZE(cambria_usb1_resources), ++ .dev = { ++ .dma_mask = &ehci_dma_mask, ++ .coherent_dma_mask = 0xffffffff, ++ }, +}; -+#endif + +static struct platform_device *cambria_devices[] __initdata = { + &cambria_i2c_gpio, + &cambria_flash, + &cambria_uart, -+#ifdef CONFIG_LEDS_IXP4XX -+ &cambria_leds_pld, -+ &cambria_leds_mem, -+#endif -+ &cambria_eth[0], -+ &cambria_eth[1], +}; + ++static void __init cambria_gw23xx_setup(void) ++{ ++ platform_device_register(&cambria_npec_device); ++ platform_device_register(&cambria_npea_device); ++} ++ +#ifdef CONFIG_SENSORS_EEPROM -+static int cambria_eeprom_do(struct notifier_block *self, unsigned long event, void *t) ++static void __init cambria_gw2350_setup(void) ++{ ++ platform_device_register(&cambria_npec_device); ++ platform_device_register(&cambria_npea_device); ++ ++ platform_device_register(&cambria_usb0_device); ++ platform_device_register(&cambria_usb1_device); ++ ++ platform_device_register(&cambria_gpio_leds_device); ++} ++ ++static void __init cambria_gw2358_setup(void) ++{ ++ platform_device_register(&cambria_npec_device); ++ platform_device_register(&cambria_npea_device); ++ ++ platform_device_register(&cambria_usb0_device); ++ platform_device_register(&cambria_usb1_device); ++ ++ platform_device_register(&cambria_pata); ++ ++ platform_device_register(&cambria_latch_leds_device); ++} ++ ++static struct cambria_board_info cambria_boards[] __initdata = { ++ { ++ .model = "GW2350", ++ .setup = cambria_gw2350_setup, ++ }, { ++ .model = "GW2358", ++ .setup = cambria_gw2358_setup, ++ } ++}; ++ ++static struct cambria_board_info * __init cambria_find_board_info(char *model) +{ -+ struct eeprom_data *data = t; -+ struct sockaddr address; -+ struct net_device * netdev; -+ -+ char macs[12]; -+ -+ /* The MACs are the first 12 bytes in the eeprom at address 0x51 */ -+ if (event == EEPROM_REGISTER && data->client.addr == 0x51) { -+ data->attr->read(&data->client.dev.kobj, data->attr, macs, 0, 12); -+ /* eth0 */ -+ memcpy(address.sa_data, macs, ETH_ALEN); -+ memcpy(&cambria_plat_eth[0].hwaddr, macs, ETH_ALEN); -+ if ( (netdev = dev_get_by_name(&init_net, "eth0")) ) -+ netdev->set_mac_address(netdev, &address); -+ -+ /* eth1 */ -+ memcpy(address.sa_data, macs + ETH_ALEN, ETH_ALEN); -+ memcpy(&cambria_plat_eth[1].hwaddr, macs + ETH_ALEN, ETH_ALEN); -+ if ( (netdev = dev_get_by_name(&init_net, "eth1")) ) -+ netdev->set_mac_address(netdev, &address); ++ int i; ++ ++ for (i = 0; i < ARRAY_SIZE(cambria_boards); i++) { ++ struct cambria_board_info *info = &cambria_boards[i]; ++ if (strncmp(info->model, model, strlen(info->model)) == 0) ++ return info; + } + -+ return NOTIFY_DONE; ++ return NULL; +} + -+static struct notifier_block cambria_eeprom_notifier = { -+ .notifier_call = cambria_eeprom_do ++struct cambria_eeprom_header { ++ unsigned char mac0[ETH_ALEN]; ++ unsigned char mac1[ETH_ALEN]; ++ unsigned char res0[4]; ++ unsigned char magic[2]; ++ unsigned char config[14]; ++ unsigned char model[16]; +}; -+#endif + -+static void __init cambria_init(void) ++static int __init cambria_eeprom_notify(struct notifier_block *self, ++ unsigned long event, void *t) +{ -+ ixp4xx_sys_init(); ++ struct eeprom_data *ee = t; ++ struct cambria_eeprom_header hdr; + -+#ifdef CONFIG_SENSORS_EEPROM ++ if (cambria_info) ++ return NOTIFY_DONE; ++ ++ /* The eeprom is at address 0x51 */ ++ if (event != EEPROM_REGISTER || ee->client.addr != 0x51) ++ return NOTIFY_DONE; ++ ++ ee->attr->read(&ee->client.dev.kobj, ee->attr, (char *)&hdr, ++ 0, sizeof(hdr)); ++ ++ if (hdr.magic[0] != 'G' || hdr.magic[1] != 'W') ++ return NOTIFY_DONE; ++ ++ memcpy(&cambria_npec_data.hwaddr, hdr.mac0, ETH_ALEN); ++ memcpy(&cambria_npea_data.hwaddr, hdr.mac1, ETH_ALEN); ++ ++ cambria_info = cambria_find_board_info(hdr.model); ++ ++ return NOTIFY_OK; ++} ++ ++static struct notifier_block cambria_eeprom_notifier __initdata = { ++ .notifier_call = cambria_eeprom_notify ++}; ++ ++static void __init cambria_register_eeprom_notifier(void) ++{ + register_eeprom_notifier(&cambria_eeprom_notifier); -+#endif ++} ++ ++static void __init cambria_unregister_eeprom_notifier(void) ++{ ++ unregister_eeprom_notifier(&cambria_eeprom_notifier); ++} ++#else /* CONFIG_SENSORS_EEPROM */ ++static inline void cambria_register_eeprom_notifier(void) {}; ++static inline void cambria_unregister_eeprom_notifier(void) {}; ++#endif /* CONFIG_SENSORS_EEPROM */ ++ ++static void __init cambria_init(void) ++{ ++ ixp4xx_sys_init(); + + cambria_flash_resource.start = IXP4XX_EXP_BUS_BASE(0); + cambria_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_32M - 1; @@ -365,8 +531,28 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-setup.c + cambria_pata_data.cs0_cfg = IXP4XX_EXP_CS3; + cambria_pata_data.cs1_cfg = IXP4XX_EXP_CS3; + -+ platform_device_register(&cambria_pata); ++ cambria_register_eeprom_notifier(); ++} ++ ++static int __init cambria_model_setup(void) ++{ ++ if (!machine_is_cambria()) ++ return 0; ++ ++ if (cambria_info) { ++ printk(KERN_DEBUG "Running on Gateworks Cambria %s\n", ++ cambria_info->model); ++ cambria_info->setup(); ++ } else { ++ printk(KERN_INFO "Unknown/missing Cambria model number" ++ " -- defaults will be used\n"); ++ cambria_gw23xx_setup(); ++ } ++ ++ cambria_unregister_eeprom_notifier(); ++ return 0; +} ++late_initcall(cambria_model_setup); + +#ifdef CONFIG_MACH_CAMBRIA +MACHINE_START(CAMBRIA, "Gateworks Cambria series") @@ -380,10 +566,8 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-setup.c + .init_machine = cambria_init, +MACHINE_END +#endif -Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/hardware.h -=================================================================== ---- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/hardware.h -+++ linux-2.6.25.4/include/asm-arm/arch-ixp4xx/hardware.h +--- a/include/asm-arm/arch-ixp4xx/hardware.h ++++ b/include/asm-arm/arch-ixp4xx/hardware.h @@ -18,7 +18,7 @@ #define __ASM_ARCH_HARDWARE_H__