From: Chuanhong Guo Date: Sun, 13 Sep 2020 09:53:45 +0000 (+0800) Subject: 841 v8 8m comapt X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0769036e8d4233e8c9b81be0ab9869ab27772d88;p=openwrt%2Fstaging%2F981213.git 841 v8 8m comapt --- diff --git a/target/linux/ath79/dts/ar9341_tplink_tl-wr841-v8.dts b/target/linux/ath79/dts/ar9341_tplink_tl-wr841-v8.dts index 95a047c6d4..d2fd6834ff 100644 --- a/target/linux/ath79/dts/ar9341_tplink_tl-wr841-v8.dts +++ b/target/linux/ath79/dts/ar9341_tplink_tl-wr841-v8.dts @@ -51,12 +51,12 @@ partition@20000 { compatible = "tplink,firmware"; label = "firmware"; - reg = <0x020000 0x3d0000>; + reg = <0x020000 0x7d0000>; }; art: partition@3f0000 { label = "art"; - reg = <0x3f0000 0x010000>; + reg = <0x7f0000 0x010000>; read-only; }; }; diff --git a/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_mdio.c b/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_mdio.c index a58ee3346b..abbf466c61 100644 --- a/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_mdio.c +++ b/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_mdio.c @@ -47,6 +47,7 @@ static int ag71xx_mdio_mii_read(struct mii_bus *bus, int addr, int reg) int err; int ret; + lockdep_assert_held(&bus->mdio_lock); err = ag71xx_mdio_wait_busy(am); if (err) return 0xffff; @@ -73,6 +74,7 @@ static int ag71xx_mdio_mii_write(struct mii_bus *bus, int addr, int reg, u16 val { struct ag71xx_mdio *am = bus->priv; + lockdep_assert_held(&bus->mdio_lock); DBG("mii_write: addr=%04x, reg=%04x, value=%04x\n", addr, reg, val); regmap_write(am->mii_regmap, AG71XX_REG_MII_ADDR, diff --git a/target/linux/ath79/image/tiny-tp-link.mk b/target/linux/ath79/image/tiny-tp-link.mk index c918c6baa6..f134a7a326 100644 --- a/target/linux/ath79/image/tiny-tp-link.mk +++ b/target/linux/ath79/image/tiny-tp-link.mk @@ -348,7 +348,7 @@ endef TARGET_DEVICES += tplink_tl-wr841-v7 define Device/tplink_tl-wr841-v8 - $(Device/tplink-4mlzma) + $(Device/tplink-8mlzma) SOC := ar9341 DEVICE_MODEL := TL-WR841N/ND DEVICE_VARIANT := v8