-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 <file:Documentation/arm/IXP4xx>.
config MACH_LOFT
bool "Loft"
depends on MACH_AVILA
-@@ -200,7 +208,7 @@ config CPU_IXP46X
+@@ -200,7 +208,7 @@
config CPU_IXP43X
bool
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
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
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
+}
+
+subsys_initcall(cambria_pci_init);
-diff -ruN /usr/src/openwrt/clean/linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-setup.c linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-setup.c
---- /usr/src/openwrt/clean/linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-setup.c 1969-12-31 16:00:00.000000000 -0800
-+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-setup.c 2008-05-20 16:02:43.000000000 -0700
-@@ -0,0 +1,445 @@
+--- /dev/null
++++ b/arch/arm/mach-ixp4xx/cambria-setup.c
+@@ -0,0 +1,444 @@
+/*
+ * arch/arm/mach-ixp4xx/cambria-setup.c
+ *
+# include <linux/eeprom.h>
+#endif
+
-+#include <linux/leds.h>
++#include <linux/leds.h>
+#include <linux/i2c-gpio.h>
+#include <asm/types.h>
+#include <asm/setup.h>
+#include <asm/mach/flash.h>
+
+struct cambria_board_info {
-+ unsigned char *model;
-+ void (* setup)(void);
++ unsigned char *model;
++ void (* setup)(void);
+};
+
+static struct cambria_board_info *cambria_info __initdata;
+static struct platform_device cambria_i2c_gpio = {
+ .name = "i2c-gpio",
+ .id = 0,
-+ .dev = {
++ .dev = {
+ .platform_data = &cambria_i2c_gpio_data,
+ },
+};
+static struct platform_device cambria_uart = {
+ .name = "serial8250",
+ .id = PLAT8250_DEV_PLATFORM,
-+ .dev = {
++ .dev = {
+ .platform_data = cambria_uart_data,
+ },
+ .num_resources = 1,
+};
+
+static struct eth_plat_info cambria_npec_data = {
-+ .phy = 2,
-+ .rxq = 4,
++ .phy = 1,
++ .rxq = 4,
+ .txreadyq = 21,
+};
+
+static struct eth_plat_info cambria_npea_data = {
-+ .phy = 1,
-+ .rxq = 2,
++ .phy = 2,
++ .rxq = 2,
+ .txreadyq = 19,
+};
+
+static struct platform_device cambria_npec_device = {
-+ .name = "ixp4xx_eth",
++ .name = "ixp4xx_eth",
+ .id = IXP4XX_ETH_NPEC,
+ .dev.platform_data = &cambria_npec_data,
+};
+
+static struct platform_device cambria_npea_device = {
-+ .name = "ixp4xx_eth",
++ .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,
-+ }
++ {
++ .name = "user", /* green led */
++ .gpio = 5,
++ .active_low = 1,
++ }
+};
+
+static struct gpio_led_platform_data cambria_gpio_leds_data = {
-+ .num_leds = 1,
-+ .leds = cambria_gpio_leds,
++ .num_leds = 1,
++ .leds = cambria_gpio_leds,
+};
+
+static struct platform_device cambria_gpio_leds_device = {
-+ .name = "leds-gpio",
-+ .id = -1,
-+ .dev.platform_data = &cambria_gpio_leds_data,
++ .name = "leds-gpio",
++ .id = -1,
++ .dev.platform_data = &cambria_gpio_leds_data,
+};
+
+
+static struct latch_led cambria_latch_leds[] = {
+ {
-+ .name = "ledA", /* green led */
-+ .bit = 0,
++ .name = "ledA", /* green led */
++ .bit = 0,
+ },
+ {
-+ .name = "ledB", /* green led */
-+ .bit = 1,
++ .name = "ledB", /* green led */
++ .bit = 1,
+ },
+ {
-+ .name = "ledC", /* green led */
-+ .bit = 2,
++ .name = "ledC", /* green led */
++ .bit = 2,
+ },
+ {
-+ .name = "ledD", /* green led */
-+ .bit = 3,
++ .name = "ledD", /* green led */
++ .bit = 3,
+ },
+ {
-+ .name = "ledE", /* green led */
-+ .bit = 4,
++ .name = "ledE", /* green led */
++ .bit = 4,
+ },
+ {
-+ .name = "ledF", /* green led */
-+ .bit = 5,
++ .name = "ledF", /* green led */
++ .bit = 5,
+ },
+ {
-+ .name = "ledG", /* green led */
-+ .bit = 6,
++ .name = "ledG", /* green led */
++ .bit = 6,
+ },
+ {
-+ .name = "ledH", /* green led */
-+ .bit = 7,
++ .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,
++ .num_leds = 8,
++ .leds = cambria_latch_leds,
++ .mem = 0x53F40000,
+};
+
+static struct platform_device cambria_latch_leds_device = {
-+ .name = "leds-latch",
-+ .id = -1,
-+ .dev.platform_data = &cambria_latch_leds_data,
++ .name = "leds-latch",
++ .id = -1,
++ .dev.platform_data = &cambria_latch_leds_data,
+};
+
+static struct resource cambria_usb0_resources[] = {
+ {
-+ .start = 0xCD000000,
-+ .end = 0xCD000300,
-+ .flags = IORESOURCE_MEM,
++ .start = 0xCD000000,
++ .end = 0xCD000300,
++ .flags = IORESOURCE_MEM,
+ },
+ {
-+ .start = 32,
-+ .flags = IORESOURCE_IRQ,
++ .start = 32,
++ .flags = IORESOURCE_IRQ,
+ },
+};
+
+static struct resource cambria_usb1_resources[] = {
+ {
-+ .start = 0xCE000000,
-+ .end = 0xCE000300,
-+ .flags = IORESOURCE_MEM,
++ .start = 0xCE000000,
++ .end = 0xCE000300,
++ .flags = IORESOURCE_MEM,
+ },
+ {
-+ .start = 33,
-+ .flags = IORESOURCE_IRQ,
++ .start = 33,
++ .flags = IORESOURCE_IRQ,
+ },
+};
+
+static u64 ehci_dma_mask = ~(u32)0;
+
+static struct platform_device cambria_usb0_device = {
-+ .name = "ixp4xx-ehci",
-+ .id = 0,
++ .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,
++ .dma_mask = &ehci_dma_mask,
++ .coherent_dma_mask = 0xffffffff,
+ },
-+ .resource = cambria_usb0_resources,
-+ .num_resources = 2,
+};
+
-+static struct platform_device cambria_usb1_device = {
-+ .name = "ixp4xx-ehci",
-+ .id = 1,
++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,
++ .dma_mask = &ehci_dma_mask,
++ .coherent_dma_mask = 0xffffffff,
+ },
-+ .resource = cambria_usb1_resources,
-+ .num_resources = 2,
+};
+
-+
+static struct platform_device *cambria_devices[] __initdata = {
+ &cambria_i2c_gpio,
+ &cambria_flash,
+
+static void __init cambria_gw23xx_setup(void)
+{
-+ platform_device_register(&cambria_npec_device);
-+ platform_device_register(&cambria_npea_device);
++ platform_device_register(&cambria_npec_device);
++ platform_device_register(&cambria_npea_device);
+}
+
+#ifdef CONFIG_SENSORS_EEPROM
+static void __init cambria_gw2350_setup(void)
+{
-+ platform_device_register(&cambria_npec_device);
-+ platform_device_register(&cambria_npea_device);
++ platform_device_register(&cambria_npec_device);
++ platform_device_register(&cambria_npea_device);
+
+ platform_device_register(&cambria_usb0_device);
+ platform_device_register(&cambria_usb1_device);
+
+static void __init cambria_gw2358_setup(void)
+{
-+ platform_device_register(&cambria_npec_device);
-+ platform_device_register(&cambria_npea_device);
++ 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,
-+ }
++ {
++ .model = "GW2350",
++ .setup = cambria_gw2350_setup,
++ }, {
++ .model = "GW2358",
++ .setup = cambria_gw2358_setup,
++ }
+};
+
+static struct cambria_board_info * __init cambria_find_board_info(char *model)
+{
-+ int i;
++ 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;
-+ }
++ 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 NULL;
++ return NULL;
+}
+
+struct cambria_eeprom_header {
+static int __init cambria_eeprom_notify(struct notifier_block *self,
+ unsigned long event, void *t)
+{
-+ struct eeprom_data *ee = t;
-+ struct cambria_eeprom_header hdr;
++ struct eeprom_data *ee = t;
++ struct cambria_eeprom_header hdr;
+
-+ if (cambria_info)
-+ return NOTIFY_DONE;
++ if (cambria_info)
++ return NOTIFY_DONE;
+
-+ /* The eeprom is at address 0x51 */
-+ if (event != EEPROM_REGISTER || ee->client.addr != 0x51)
-+ 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));
++ 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;
++ 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);
++ 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);
++ cambria_info = cambria_find_board_info(hdr.model);
+
-+ return NOTIFY_OK;
++ return NOTIFY_OK;
+}
+
+static struct notifier_block cambria_eeprom_notifier __initdata = {
+
+static void __init cambria_register_eeprom_notifier(void)
+{
-+ register_eeprom_notifier(&cambria_eeprom_notifier);
++ register_eeprom_notifier(&cambria_eeprom_notifier);
+}
+
+static void __init cambria_unregister_eeprom_notifier(void)
+{
-+ unregister_eeprom_notifier(&cambria_eeprom_notifier);
++ unregister_eeprom_notifier(&cambria_eeprom_notifier);
+}
+#else /* CONFIG_SENSORS_EEPROM */
+static inline void cambria_register_eeprom_notifier(void) {};
+
+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;
++ 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);
+
+ .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__
projects / openwrt.git / blobdiff