aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2013-07-22 15:30:56 +0000
committerGabor Juhos <juhosg@openwrt.org>2013-07-22 15:30:56 +0000
commit6a5b4ec7dc2abeecd47345e2fb5aeb83ea50f322 (patch)
treec509094fab78eeabacde97824507826b776d48a7 /target/linux/lantiq
parent06a27059bd238abfc0310c50cb59e997ec208798 (diff)
downloadupstream-6a5b4ec7dc2abeecd47345e2fb5aeb83ea50f322.tar.gz
upstream-6a5b4ec7dc2abeecd47345e2fb5aeb83ea50f322.tar.bz2
upstream-6a5b4ec7dc2abeecd47345e2fb5aeb83ea50f322.zip
kernel: update 3.9 to 3.9.11
Also refresh 3.9 patches. Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 37501
Diffstat (limited to 'target/linux/lantiq')
-rw-r--r--target/linux/lantiq/patches-3.9/0010-NET-MIPS-lantiq-update-etop-driver-for-devicetree.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/lantiq/patches-3.9/0010-NET-MIPS-lantiq-update-etop-driver-for-devicetree.patch b/target/linux/lantiq/patches-3.9/0010-NET-MIPS-lantiq-update-etop-driver-for-devicetree.patch
index adf34c9b19..6d1b22259a 100644
--- a/target/linux/lantiq/patches-3.9/0010-NET-MIPS-lantiq-update-etop-driver-for-devicetree.patch
+++ b/target/linux/lantiq/patches-3.9/0010-NET-MIPS-lantiq-update-etop-driver-for-devicetree.patch
@@ -276,17 +276,17 @@ Subject: [PATCH 10/22] NET: MIPS: lantiq: update etop driver for devicetree
struct ltq_etop_priv *priv = netdev_priv(dev);
- int i;
+ int mii_mode = priv->mii_mode;
-+
-+ clk_enable(priv->clk_ppe);
- ltq_pmu_enable(PMU_PPE);
++ clk_enable(priv->clk_ppe);
+
+- switch (priv->pldata->mii_mode) {
+ if (of_machine_is_compatible("lantiq,ar9")) {
+ ltq_etop_gbit_init(dev);
+ /* force the etops link to the gbit to MII */
+ mii_mode = PHY_INTERFACE_MODE_MII;
+ }
-
-- switch (priv->pldata->mii_mode) {
++
+ switch (mii_mode) {
case PHY_INTERFACE_MODE_RMII:
ltq_etop_w32_mask(ETOP_MII_MASK,