diff options
author | Felix Fietkau <nbd@nbd.name> | 2017-04-18 09:59:54 +0200 |
---|---|---|
committer | Felix Fietkau <nbd@nbd.name> | 2017-04-26 10:29:45 +0200 |
commit | 837285b83221963739cda81911d8004f30f9afb0 (patch) | |
tree | d32bf44f10674643120214d4edc2355c897fe524 /target/linux/ar71xx/patches-4.4/525-MIPS-ath79-enable-qca-usb-quirks.patch | |
parent | ad0c1d3a310554af94659d82f75ecb5e9013baeb (diff) | |
download | mtk-20170518-837285b83221963739cda81911d8004f30f9afb0.zip mtk-20170518-837285b83221963739cda81911d8004f30f9afb0.tar.gz mtk-20170518-837285b83221963739cda81911d8004f30f9afb0.tar.bz2 |
ar71xx: fold 641-MIPS-ath79-fix-AR934x-OTP-offsets.patch into the patch that it fixes
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux/ar71xx/patches-4.4/525-MIPS-ath79-enable-qca-usb-quirks.patch')
-rw-r--r-- | target/linux/ar71xx/patches-4.4/525-MIPS-ath79-enable-qca-usb-quirks.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ar71xx/patches-4.4/525-MIPS-ath79-enable-qca-usb-quirks.patch b/target/linux/ar71xx/patches-4.4/525-MIPS-ath79-enable-qca-usb-quirks.patch index 0e33674..61b6b4e 100644 --- a/target/linux/ar71xx/patches-4.4/525-MIPS-ath79-enable-qca-usb-quirks.patch +++ b/target/linux/ar71xx/patches-4.4/525-MIPS-ath79-enable-qca-usb-quirks.patch @@ -29,7 +29,9 @@ - u32 bootstrap; + void __iomem *phy_reg; + u32 t; -+ + +- bootstrap = ath79_reset_rr(AR934X_RESET_REG_BOOTSTRAP); +- if (bootstrap & AR934X_BOOTSTRAP_USB_MODE_DEVICE) + phy_reg = ioremap(base, 4); + if (!phy_reg) + return; @@ -41,9 +43,7 @@ + + iounmap(phy_reg); +} - -- bootstrap = ath79_reset_rr(AR934X_RESET_REG_BOOTSTRAP); -- if (bootstrap & AR934X_BOOTSTRAP_USB_MODE_DEVICE) ++ +static void ar934x_usb_reset_notifier(struct platform_device *pdev) +{ + if (pdev->id != -1) |