diff options
| author | Rod Whitby <rod@whitby.id.au> | 2008-01-11 07:23:58 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2008-01-11 07:23:58 +0000 |
| commit | 45af6f04d110f2ac9bb548a5664d254ccb80c1ba (patch) | |
| tree | 9e5992e8d0c349a24173d1daa313a02dab801a7c | |
| parent | f002f44eb13ee6522555c00cd961a174ed8e4dff (diff) | |
| download | upstream-45af6f04d110f2ac9bb548a5664d254ccb80c1ba.tar.gz upstream-45af6f04d110f2ac9bb548a5664d254ccb80c1ba.tar.bz2 upstream-45af6f04d110f2ac9bb548a5664d254ccb80c1ba.zip | |
Combined the nas100d net driver patches, based on new nslu2-linux patch
SVN-Revision: 10166
| -rw-r--r-- | target/linux/ixp4xx/patches-2.6.23/032-ixp4xx-net-drivers-nas100d.patch (renamed from target/linux/ixp4xx/patches-2.6.23/067-nas100d_fetch_mac.patch) | 41 | ||||
| -rw-r--r-- | target/linux/ixp4xx/patches-2.6.23/052-nas100d_mac_plat_info.patch | 35 |
2 files changed, 36 insertions, 40 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.23/067-nas100d_fetch_mac.patch b/target/linux/ixp4xx/patches-2.6.23/032-ixp4xx-net-drivers-nas100d.patch index fdaaffdd41..143473378e 100644 --- a/target/linux/ixp4xx/patches-2.6.23/067-nas100d_fetch_mac.patch +++ b/target/linux/ixp4xx/patches-2.6.23/032-ixp4xx-net-drivers-nas100d.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.23.11-armeb/arch/arm/mach-ixp4xx/nas100d-setup.c +Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/nas100d-setup.c =================================================================== ---- linux-2.6.23.11-armeb.orig/arch/arm/mach-ixp4xx/nas100d-setup.c 2007-12-29 23:19:07.000000000 +1030 -+++ linux-2.6.23.11-armeb/arch/arm/mach-ixp4xx/nas100d-setup.c 2007-12-29 23:24:06.000000000 +1030 +--- linux-2.6.23.12-armeb.orig/arch/arm/mach-ixp4xx/nas100d-setup.c 2008-01-08 15:22:07.000000000 +1030 ++++ linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/nas100d-setup.c 2008-01-08 15:32:32.000000000 +1030 @@ -21,6 +21,7 @@ #include <asm/mach-types.h> #include <asm/mach/arch.h> @@ -10,7 +10,38 @@ Index: linux-2.6.23.11-armeb/arch/arm/mach-ixp4xx/nas100d-setup.c static struct flash_platform_data nas100d_flash_data = { .map_name = "cfi_probe", -@@ -164,6 +165,9 @@ +@@ -125,12 +126,30 @@ + .resource = nas100d_uart_resources, + }; + ++/* Built-in 10/100 Ethernet MAC interfaces */ ++static struct eth_plat_info nas100d_plat_eth[] = { ++ { ++ .phy = 0, ++ .rxq = 3, ++ .txreadyq = 20, ++ } ++}; ++ ++static struct platform_device nas100d_eth[] = { ++ { ++ .name = "ixp4xx_eth", ++ .id = IXP4XX_ETH_NPEB, ++ .dev.platform_data = nas100d_plat_eth, ++ } ++}; ++ + static struct platform_device *nas100d_devices[] __initdata = { + &nas100d_i2c_gpio, + &nas100d_flash, + #ifdef CONFIG_LEDS_IXP4XX + &nas100d_leds, + #endif ++ &nas100d_eth[0], + }; + + static void nas100d_power_off(void) +@@ -146,6 +165,9 @@ static void __init nas100d_init(void) { @@ -20,7 +51,7 @@ Index: linux-2.6.23.11-armeb/arch/arm/mach-ixp4xx/nas100d-setup.c ixp4xx_sys_init(); /* gpio 14 and 15 are _not_ clocks */ -@@ -183,6 +187,33 @@ +@@ -165,6 +187,33 @@ (void)platform_device_register(&nas100d_uart); platform_add_devices(nas100d_devices, ARRAY_SIZE(nas100d_devices)); diff --git a/target/linux/ixp4xx/patches-2.6.23/052-nas100d_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.23/052-nas100d_mac_plat_info.patch deleted file mode 100644 index 3196e0368c..0000000000 --- a/target/linux/ixp4xx/patches-2.6.23/052-nas100d_mac_plat_info.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/arch/arm/mach-ixp4xx/nas100d-setup.c b/arch/arm/mach-ixp4xx/nas100d-setup.c -index 54d884f..d4d8540 100644 ---- a/arch/arm/mach-ixp4xx/nas100d-setup.c -+++ b/arch/arm/mach-ixp4xx/nas100d-setup.c -@@ -125,12 +125,30 @@ static struct platform_device nas100d_uart = { - .resource = nas100d_uart_resources, - }; - -+/* Built-in 10/100 Ethernet MAC interfaces */ -+static struct eth_plat_info nas100d_plat_eth[] = { -+ { -+ .phy = 0, -+ .rxq = 3, -+ .txreadyq = 20, -+ } -+}; -+ -+static struct platform_device nas100d_eth[] = { -+ { -+ .name = "ixp4xx_eth", -+ .id = IXP4XX_ETH_NPEB, -+ .dev.platform_data = nas100d_plat_eth, -+ } -+}; -+ - static struct platform_device *nas100d_devices[] __initdata = { - &nas100d_i2c_gpio, - &nas100d_flash, - #ifdef CONFIG_LEDS_IXP4XX - &nas100d_leds, - #endif -+ &nas100d_eth[0], - }; - - static void nas100d_power_off(void) |