summaryrefslogtreecommitdiffstats
path: root/target/linux/ixp4xx/patches-2.6.23/054-fsg3_mac_plat_info.patch
diff options
context:
space:
mode:
authorrwhitby <rwhitby@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-01-05 04:11:46 +0000
committerrwhitby <rwhitby@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-01-05 04:11:46 +0000
commite5ab7e8a449f5f7c23a9e410ae9e21983fe39b1e (patch)
tree09a17ee37c2a3434973bb7ce4d5b8dd2ac580ca2 /target/linux/ixp4xx/patches-2.6.23/054-fsg3_mac_plat_info.patch
parent71435f63a50a5740d6971e06c79f12caa4556e1e (diff)
ixp4xx/fsg3: Added LEDs support, and refreshed patches for 2.6.23.12
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10119 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.23/054-fsg3_mac_plat_info.patch')
-rw-r--r--target/linux/ixp4xx/patches-2.6.23/054-fsg3_mac_plat_info.patch71
1 files changed, 36 insertions, 35 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.23/054-fsg3_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.23/054-fsg3_mac_plat_info.patch
index 3a9f62607..9a8d3f30f 100644
--- a/target/linux/ixp4xx/patches-2.6.23/054-fsg3_mac_plat_info.patch
+++ b/target/linux/ixp4xx/patches-2.6.23/054-fsg3_mac_plat_info.patch
@@ -1,44 +1,45 @@
-diff --git a/arch/arm/mach-ixp4xx/fsg-setup.c b/arch/arm/mach-ixp4xx/fsg-setup.c
-index 11336e6..ec3d517 100644
---- a/arch/arm/mach-ixp4xx/fsg-setup.c
-+++ b/arch/arm/mach-ixp4xx/fsg-setup.c
-@@ -142,12 +142,39 @@ static struct platform_device fsg_uart = {
+Index: linux-2.6.23.12/arch/arm/mach-ixp4xx/fsg-setup.c
+===================================================================
+--- linux-2.6.23.12.orig/arch/arm/mach-ixp4xx/fsg-setup.c 2008-01-05 13:53:26.000000000 +1030
++++ linux-2.6.23.12/arch/arm/mach-ixp4xx/fsg-setup.c 2008-01-05 13:56:28.000000000 +1030
+@@ -94,6 +94,31 @@
.resource = fsg_uart_resources,
};
-+/* Built-in 10/100 Ethernet MAC interfaces */
-+static struct eth_plat_info fsg_plat_eth[] = {
-+ {
-+ .phy = 5,
-+ .rxq = 3,
-+ .txreadyq = 20,
-+ }, {
-+ .phy = 4,
-+ .rxq = 4,
-+ .txreadyq = 21,
-+ }
-+};
-+
-+static struct platform_device fsg_eth[] = {
-+ {
-+ .name = "ixp4xx_eth",
-+ .id = IXP4XX_ETH_NPEB,
-+ .dev.platform_data = fsg_plat_eth,
-+ }, {
-+ .name = "ixp4xx_eth",
-+ .id = IXP4XX_ETH_NPEC,
-+ .dev.platform_data = fsg_plat_eth + 1,
-+ }
-+};
-+
++ /* Built-in 10/100 Ethernet MAC interfaces */
++ static struct eth_plat_info fsg_plat_eth[] = {
++ {
++ .phy = 5,
++ .rxq = 3,
++ .txreadyq = 20,
++ }, {
++ .phy = 4,
++ .rxq = 4,
++ .txreadyq = 21,
++ }
++ };
++
++ static struct platform_device fsg_eth[] = {
++ {
++ .name = "ixp4xx_eth",
++ .id = IXP4XX_ETH_NPEB,
++ .dev.platform_data = fsg_plat_eth,
++ }, {
++ .name = "ixp4xx_eth",
++ .id = IXP4XX_ETH_NPEC,
++ .dev.platform_data = fsg_plat_eth + 1,
++ }
++ };
++
+ static struct platform_device fsg_leds = {
+ .name = "fsg-led",
+ .id = -1,
+@@ -102,6 +127,8 @@
static struct platform_device *fsg_devices[] __initdata = {
- &fsg_i2c_gpio,
+ &fsg_i2c_controller,
&fsg_flash,
- #ifdef CONFIG_LEDS_IXP4XX
- &fsg_leds,
- #endif
+ &fsg_eth[0],
+ &fsg_eth[1],
+ &fsg_leds,
};
- static void __init fsg_init(void)