mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
[ar7] fix MII register ioremap on when high cpmac is available, patch from Wipster
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25730 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -190,7 +190,7 @@
|
|||||||
|
|
||||||
cpmac_mii->reset(cpmac_mii);
|
cpmac_mii->reset(cpmac_mii);
|
||||||
|
|
||||||
@@ -1269,10 +1256,20 @@ int __devinit cpmac_init(void)
|
@@ -1269,10 +1256,22 @@ int __devinit cpmac_init(void)
|
||||||
msleep(10);
|
msleep(10);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -199,17 +199,19 @@
|
|||||||
if (mask & (mask - 1)) {
|
if (mask & (mask - 1)) {
|
||||||
- external_switch = 1;
|
- external_switch = 1;
|
||||||
- mask = 0;
|
- mask = 0;
|
||||||
+ if (ar7_is_titan()) {
|
+ if (!ar7_has_high_cpmac()) {
|
||||||
+ ar7_device_disable(AR7_RESET_BIT_EPHY);
|
+ if (ar7_is_titan()) {
|
||||||
+ ar7_device_disable(TITAN_RESET_BIT_EPHY1);
|
+ ar7_device_disable(AR7_RESET_BIT_EPHY);
|
||||||
+ } else
|
+ ar7_device_disable(TITAN_RESET_BIT_EPHY1);
|
||||||
+ ar7_device_disable(AR7_RESET_BIT_EPHY);
|
+ } else
|
||||||
|
+ ar7_device_disable(AR7_RESET_BIT_EPHY);
|
||||||
+
|
+
|
||||||
+ //Titan remap might be different
|
+ //Titan remap might be different
|
||||||
+ mii_reg = ioremap(AR7_REGS_MII, 4);
|
+ mii_reg = ioremap(AR7_REGS_MII, 4);
|
||||||
+ if (mii_reg) {
|
+ if (mii_reg) {
|
||||||
+ writel(readl(mii_reg) | 1, mii_reg);
|
+ writel(readl(mii_reg) | 1, mii_reg);
|
||||||
+ iounmap(mii_reg);
|
+ iounmap(mii_reg);
|
||||||
|
+ }
|
||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user