sync patch naming schema with the other boards
authorImre Kaloz <kaloz@openwrt.org>
Mon, 2 Apr 2007 14:45:38 +0000 (14:45 +0000)
committerImre Kaloz <kaloz@openwrt.org>
Mon, 2 Apr 2007 14:45:38 +0000 (14:45 +0000)
SVN-Revision: 6833

target/linux/ixp4xx-2.6/patches/210-gateway_7001_mac_setup.patch [deleted file]
target/linux/ixp4xx-2.6/patches/210-gateway_7001_setup_mac.patch [new file with mode: 0644]

diff --git a/target/linux/ixp4xx-2.6/patches/210-gateway_7001_mac_setup.patch b/target/linux/ixp4xx-2.6/patches/210-gateway_7001_mac_setup.patch
deleted file mode 100644 (file)
index 8b3f4b9..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/gateway7001-setup.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/gateway7001-setup.c
---- linux-2.6.19.2/arch/arm/mach-ixp4xx/gateway7001-setup.c    2007-04-02 15:56:39.000000000 +0200
-+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/gateway7001-setup.c       2007-04-02 15:57:38.000000000 +0200
-@@ -76,9 +76,57 @@
-       .resource       = &gateway7001_uart_resource,
- };
-+static struct resource res_mac0 = {
-+      .start          = IXP4XX_EthB_BASE_PHYS,
-+      .end            = IXP4XX_EthB_BASE_PHYS + 0x1ff,
-+      .flags          = IORESOURCE_MEM,
-+};
-+
-+static struct resource res_mac1 = {
-+      .start          = IXP4XX_EthC_BASE_PHYS,
-+      .end            = IXP4XX_EthC_BASE_PHYS + 0x1ff,
-+      .flags          = IORESOURCE_MEM,
-+};
-+
-+static struct mac_plat_info plat_mac0 = {
-+      .npe_id         = 1,
-+      .phy_id         = 1,
-+      .eth_id         = 0,
-+      .rxq_id         = 27,
-+      .txq_id         = 24,
-+      .rxdoneq_id     = 4,
-+};
-+
-+static struct mac_plat_info plat_mac1 = {
-+      .npe_id         = 2,
-+      .phy_id         = 2,
-+      .eth_id         = 1,
-+      .rxq_id         = 28,
-+      .txq_id         = 25,
-+      .rxdoneq_id     = 5,
-+};
-+
-+static struct platform_device mac0 = {
-+      .name           = "ixp4xx_mac",
-+      .id             = 0,
-+      .dev.platform_data = &plat_mac0,
-+      .num_resources  = 1,
-+      .resource       = &res_mac0,
-+};
-+
-+static struct platform_device mac1 = {
-+      .name           = "ixp4xx_mac",
-+      .id             = 1,
-+      .dev.platform_data = &plat_mac1,
-+      .num_resources  = 1,
-+      .resource       = &res_mac1,
-+};
-+
- static struct platform_device *gateway7001_devices[] __initdata = {
-       &gateway7001_flash,
--      &gateway7001_uart
-+      &gateway7001_uart,
-+      &mac0,
-+      &mac1,
- };
- static void __init gateway7001_init(void)
diff --git a/target/linux/ixp4xx-2.6/patches/210-gateway_7001_setup_mac.patch b/target/linux/ixp4xx-2.6/patches/210-gateway_7001_setup_mac.patch
new file mode 100644 (file)
index 0000000..8b3f4b9
--- /dev/null
@@ -0,0 +1,62 @@
+diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/gateway7001-setup.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/gateway7001-setup.c
+--- linux-2.6.19.2/arch/arm/mach-ixp4xx/gateway7001-setup.c    2007-04-02 15:56:39.000000000 +0200
++++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/gateway7001-setup.c       2007-04-02 15:57:38.000000000 +0200
+@@ -76,9 +76,57 @@
+       .resource       = &gateway7001_uart_resource,
+ };
++static struct resource res_mac0 = {
++      .start          = IXP4XX_EthB_BASE_PHYS,
++      .end            = IXP4XX_EthB_BASE_PHYS + 0x1ff,
++      .flags          = IORESOURCE_MEM,
++};
++
++static struct resource res_mac1 = {
++      .start          = IXP4XX_EthC_BASE_PHYS,
++      .end            = IXP4XX_EthC_BASE_PHYS + 0x1ff,
++      .flags          = IORESOURCE_MEM,
++};
++
++static struct mac_plat_info plat_mac0 = {
++      .npe_id         = 1,
++      .phy_id         = 1,
++      .eth_id         = 0,
++      .rxq_id         = 27,
++      .txq_id         = 24,
++      .rxdoneq_id     = 4,
++};
++
++static struct mac_plat_info plat_mac1 = {
++      .npe_id         = 2,
++      .phy_id         = 2,
++      .eth_id         = 1,
++      .rxq_id         = 28,
++      .txq_id         = 25,
++      .rxdoneq_id     = 5,
++};
++
++static struct platform_device mac0 = {
++      .name           = "ixp4xx_mac",
++      .id             = 0,
++      .dev.platform_data = &plat_mac0,
++      .num_resources  = 1,
++      .resource       = &res_mac0,
++};
++
++static struct platform_device mac1 = {
++      .name           = "ixp4xx_mac",
++      .id             = 1,
++      .dev.platform_data = &plat_mac1,
++      .num_resources  = 1,
++      .resource       = &res_mac1,
++};
++
+ static struct platform_device *gateway7001_devices[] __initdata = {
+       &gateway7001_flash,
+-      &gateway7001_uart
++      &gateway7001_uart,
++      &mac0,
++      &mac1,
+ };
+ static void __init gateway7001_init(void)