summaryrefslogtreecommitdiff
path: root/target/linux/ar7/patches-2.6.37/972-cpmac_fixup.patch
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-02-26 15:18:02 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-02-26 15:18:02 +0000
commit79e11738c897e34b9c6c2bd961b1464d9a057776 (patch)
treea471c44a80d33ed2779f6024ba4e68e7528aa90d /target/linux/ar7/patches-2.6.37/972-cpmac_fixup.patch
parenta754c302a8a3533f692258c831dec7e48105aa01 (diff)
[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
Diffstat (limited to 'target/linux/ar7/patches-2.6.37/972-cpmac_fixup.patch')
-rw-r--r--target/linux/ar7/patches-2.6.37/972-cpmac_fixup.patch24
1 files changed, 13 insertions, 11 deletions
diff --git a/target/linux/ar7/patches-2.6.37/972-cpmac_fixup.patch b/target/linux/ar7/patches-2.6.37/972-cpmac_fixup.patch
index 2f56615343..d21ceb93f7 100644
--- a/target/linux/ar7/patches-2.6.37/972-cpmac_fixup.patch
+++ b/target/linux/ar7/patches-2.6.37/972-cpmac_fixup.patch
@@ -190,7 +190,7 @@
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);
}
@@ -199,17 +199,19 @@
if (mask & (mask - 1)) {
- external_switch = 1;
- mask = 0;
-+ if (ar7_is_titan()) {
-+ ar7_device_disable(AR7_RESET_BIT_EPHY);
-+ ar7_device_disable(TITAN_RESET_BIT_EPHY1);
-+ } else
-+ ar7_device_disable(AR7_RESET_BIT_EPHY);
++ if (!ar7_has_high_cpmac()) {
++ if (ar7_is_titan()) {
++ ar7_device_disable(AR7_RESET_BIT_EPHY);
++ ar7_device_disable(TITAN_RESET_BIT_EPHY1);
++ } else
++ ar7_device_disable(AR7_RESET_BIT_EPHY);
+
-+ //Titan remap might be different
-+ mii_reg = ioremap(AR7_REGS_MII, 4);
-+ if (mii_reg) {
-+ writel(readl(mii_reg) | 1, mii_reg);
-+ iounmap(mii_reg);
++ //Titan remap might be different
++ mii_reg = ioremap(AR7_REGS_MII, 4);
++ if (mii_reg) {
++ writel(readl(mii_reg) | 1, mii_reg);
++ iounmap(mii_reg);
++ }
+ }
}