aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar7/patches-2.6.32/940-cpmac-titan.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/ar7/patches-2.6.32/940-cpmac-titan.patch')
-rw-r--r--target/linux/ar7/patches-2.6.32/940-cpmac-titan.patch110
1 files changed, 0 insertions, 110 deletions
diff --git a/target/linux/ar7/patches-2.6.32/940-cpmac-titan.patch b/target/linux/ar7/patches-2.6.32/940-cpmac-titan.patch
deleted file mode 100644
index 84bba9b1c3..0000000000
--- a/target/linux/ar7/patches-2.6.32/940-cpmac-titan.patch
+++ /dev/null
@@ -1,110 +0,0 @@
---- a/arch/mips/ar7/platform.c
-+++ b/arch/mips/ar7/platform.c
-@@ -716,23 +716,35 @@ static int __init ar7_register_devices(v
- }
-
- if (ar7_has_high_cpmac()) {
-- res = fixed_phy_add(PHY_POLL, cpmac_high.id, &fixed_phy_status);
-+ res = fixed_phy_add(PHY_POLL, ar7_is_titan() ? cpmac_high_titan.id : cpmac_high.id,
-+ &fixed_phy_status);
- if (res && res != -ENODEV)
- return res;
-- cpmac_get_mac(1, cpmac_high_data.dev_addr);
-- res = platform_device_register(&cpmac_high);
-+
-+ cpmac_get_mac(1, ar7_is_titan() ? cpmac_high_data_titan.dev_addr :
-+ cpmac_high_data.dev_addr);
-+ res = platform_device_register(ar7_is_titan() ? &cpmac_high_titan :
-+ &cpmac_high);
-+
- if (res)
- return res;
- } else {
-- cpmac_low_data.phy_mask = 0xffffffff;
-+ if (ar7_is_titan())
-+ cpmac_low_data_titan.phy_mask = 0xffffffff;
-+ else
-+ cpmac_low_data.phy_mask = 0xffffffff;
-+
- }
-
-- res = fixed_phy_add(PHY_POLL, cpmac_low.id, &fixed_phy_status);
-+ res = fixed_phy_add(PHY_POLL, ar7_is_titan() ? cpmac_low_titan.id :
-+ cpmac_low.id, &fixed_phy_status);
- if (res && res != -ENODEV)
- return res;
-
-- cpmac_get_mac(0, cpmac_low_data.dev_addr);
-- res = platform_device_register(&cpmac_low);
-+ cpmac_get_mac(0, ar7_is_titan() ? cpmac_low_data_titan.dev_addr :
-+ cpmac_low_data.dev_addr);
-+ res = platform_device_register(ar7_is_titan() ? &cpmac_low_titan :
-+ &cpmac_low);
- if (res)
- return res;
-
---- a/drivers/net/cpmac.c
-+++ b/drivers/net/cpmac.c
-@@ -1153,6 +1153,8 @@ static int __devinit cpmac_probe(struct
- goto fail;
- }
-
-+ ar7_device_reset(pdata->reset_bit);
-+
- dev->irq = platform_get_irq_byname(pdev, "irq");
-
- dev->netdev_ops = &cpmac_netdev_ops;
-@@ -1229,7 +1231,7 @@ int __devinit cpmac_init(void)
- cpmac_mii->reset = cpmac_mdio_reset;
- cpmac_mii->irq = mii_irqs;
-
-- cpmac_mii->priv = ioremap(AR7_REGS_MDIO, 256);
-+ cpmac_mii->priv = ioremap(ar7_is_titan() ? TITAN_REGS_MDIO : AR7_REGS_MDIO, 256);
-
- if (!cpmac_mii->priv) {
- printk(KERN_ERR "Can't ioremap mdio registers\n");
-@@ -1240,10 +1242,17 @@ int __devinit cpmac_init(void)
- #warning FIXME: unhardcode gpio&reset bits
- ar7_gpio_disable(26);
- ar7_gpio_disable(27);
-- ar7_device_reset(AR7_RESET_BIT_CPMAC_LO);
-- ar7_device_reset(AR7_RESET_BIT_CPMAC_HI);
-+
-+ if (!ar7_is_titan()) {
-+ ar7_device_reset(AR7_RESET_BIT_CPMAC_LO);
-+ ar7_device_reset(AR7_RESET_BIT_CPMAC_HI);
-+ }
- ar7_device_reset(AR7_RESET_BIT_EPHY);
-
-+ if (ar7_is_titan()) {
-+ ar7_device_reset(TITAN_RESET_BIT_EPHY1);
-+ }
-+
- cpmac_mii->reset(cpmac_mii);
-
- for (i = 0; i < 300; i++)
-@@ -1258,7 +1267,8 @@ int __devinit cpmac_init(void)
- mask = 0;
- }
-
-- cpmac_mii->phy_mask = ~(mask | 0x80000000);
-+ cpmac_mii->phy_mask = ar7_is_titan()? ~(mask | 0x80000000 | 0x40000000):
-+ ~(mask | 0x80000000);
- snprintf(cpmac_mii->id, MII_BUS_ID_SIZE, "1");
-
- res = mdiobus_register(cpmac_mii);
---- a/arch/mips/include/asm/mach-ar7/ar7.h
-+++ b/arch/mips/include/asm/mach-ar7/ar7.h
-@@ -50,8 +50,10 @@
- #define UR8_REGS_WDT (AR7_REGS_BASE + 0x0b00)
- #define UR8_REGS_UART1 (AR7_REGS_BASE + 0x0f00)
-
--#define TITAN_REGS_MAC0 (0x08640000)
--#define TITAN_REGS_MAC1 (TITAN_REGS_MAC0 + 0x0800)
-+#define TITAN_REGS_ESWITCH_BASE (0x08640000)
-+#define TITAN_REGS_MAC0 (TITAN_REGS_ESWITCH_BASE + 0)
-+#define TITAN_REGS_MAC1 (TITAN_REGS_ESWITCH_BASE + 0x0800)
-+#define TITAN_REGS_MDIO (TITAN_REGS_ESWITCH_BASE + 0x02000)
- #define TITAN_REGS_VLYNQ0 (AR7_REGS_BASE + 0x1c00)
- #define TITAN_REGS_VLYNQ1 (AR7_REGS_BASE + 0x1300)
-