mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-09 16:26:15 +02:00
109 lines
3.5 KiB
Diff
109 lines
3.5 KiB
Diff
|
--- a/arch/mips/ar7/platform.c
|
||
|
|
+++ b/arch/mips/ar7/platform.c
|
||
|
|
@@ -769,22 +769,31 @@ static int __init ar7_register_devices(v
|
||
|
|
}
|
||
|
|
|
||
|
|
if (ar7_has_high_cpmac()) {
|
||
|
|
- res = fixed_phy_add(PHY_POLL, cpmac_high.id, &fixed_phy_status);
|
||
|
|
+ fixed_phy_add(PHY_POLL, ar7_is_titan() ? cpmac_high_titan.id : cpmac_high.id,
|
||
|
|
+ &fixed_phy_status);
|
||
|
|
if (!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)
|
||
|
|
pr_warning("unable to register cpmac-high: %d\n", res);
|
||
|
|
} else
|
||
|
|
pr_warning("unable to add cpmac-high phy: %d\n", res);
|
||
|
|
- } else
|
||
|
|
- cpmac_low_data.phy_mask = 0xffffffff;
|
||
|
|
+ } else {
|
||
|
|
+ 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) {
|
||
|
|
- 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)
|
||
|
|
pr_warning("unable to register cpmac-low: %d\n", res);
|
||
|
|
} else
|
||
|
|
--- a/drivers/net/cpmac.c
|
||
|
|
+++ b/drivers/net/cpmac.c
|
||
|
|
@@ -1158,6 +1158,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;
|
||
|
|
@@ -1234,7 +1236,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");
|
||
|
|
@@ -1245,10 +1247,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++)
|
||
|
|
@@ -1263,7 +1272,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)
|
||
|
|
|