1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-10-04 12:17:37 +03:00

[ixp4xx] clean up Avila/Cambria patches

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11254 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
juhosg 2008-05-24 11:25:35 +00:00
parent 5b8653e189
commit c1b0377035
3 changed files with 141 additions and 142 deletions

View File

@ -129,7 +129,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-setup.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-setup.c +++ linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-setup.c
@@ -0,0 +1,445 @@ @@ -0,0 +1,444 @@
+/* +/*
+ * arch/arm/mach-ixp4xx/cambria-setup.c + * arch/arm/mach-ixp4xx/cambria-setup.c
+ * + *
@ -385,26 +385,25 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-setup.c
+static struct platform_device cambria_usb0_device = { +static struct platform_device cambria_usb0_device = {
+ .name = "ixp4xx-ehci", + .name = "ixp4xx-ehci",
+ .id = 0, + .id = 0,
+ .resource = cambria_usb0_resources,
+ .num_resources = ARRAY_SIZE(cambria_usb0_resources),
+ .dev = { + .dev = {
+ .dma_mask = &ehci_dma_mask, + .dma_mask = &ehci_dma_mask,
+ .coherent_dma_mask = 0xffffffff, + .coherent_dma_mask = 0xffffffff,
+ }, + },
+ .resource = cambria_usb0_resources,
+ .num_resources = 2,
+}; +};
+ +
+static struct platform_device cambria_usb1_device = { +static struct platform_device cambria_usb1_device = {
+ .name = "ixp4xx-ehci", + .name = "ixp4xx-ehci",
+ .id = 1, + .id = 1,
+ .resource = cambria_usb1_resources,
+ .num_resources = ARRAY_SIZE(cambria_usb1_resources),
+ .dev = { + .dev = {
+ .dma_mask = &ehci_dma_mask, + .dma_mask = &ehci_dma_mask,
+ .coherent_dma_mask = 0xffffffff, + .coherent_dma_mask = 0xffffffff,
+ }, + },
+ .resource = cambria_usb1_resources,
+ .num_resources = 2,
+}; +};
+ +
+
+static struct platform_device *cambria_devices[] __initdata = { +static struct platform_device *cambria_devices[] __initdata = {
+ &cambria_i2c_gpio, + &cambria_i2c_gpio,
+ &cambria_flash, + &cambria_flash,