From: juhosg Date: Sat, 22 Dec 2012 12:12:46 +0000 (+0000) Subject: ar71xx: rename QCA9558 ETH_CFG bit defines X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=commitdiff_plain;h=6c2c55144e65688b46f642c879656f5009d85d37 ar71xx: rename QCA9558 ETH_CFG bit defines Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34852 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/target/linux/ar71xx/patches-3.6/601-MIPS-ath79-add-more-register-defines.patch b/target/linux/ar71xx/patches-3.6/601-MIPS-ath79-add-more-register-defines.patch index 006217f6f2..01852482ee 100644 --- a/target/linux/ar71xx/patches-3.6/601-MIPS-ath79-add-more-register-defines.patch +++ b/target/linux/ar71xx/patches-3.6/601-MIPS-ath79-add-more-register-defines.patch @@ -296,7 +296,7 @@ + +#define QCA955X_GMAC_REG_ETH_CFG 0x00 + -+#define QCA955X_ETH_CFG_RGMII_GMAC0 BIT(0) -+#define QCA955X_ETH_CFG_SGMII_GMAC0 BIT(6) ++#define QCA955X_ETH_CFG_RGMII_EN BIT(0) ++#define QCA955X_ETH_CFG_GE0_SGMII BIT(6) + #endif /* __ASM_MACH_AR71XX_REGS_H */ diff --git a/target/linux/ar71xx/patches-3.6/609-MIPS-ath79-ap136-fixes.patch b/target/linux/ar71xx/patches-3.6/609-MIPS-ath79-ap136-fixes.patch index 33d8073921..8325cdbb8f 100644 --- a/target/linux/ar71xx/patches-3.6/609-MIPS-ath79-ap136-fixes.patch +++ b/target/linux/ar71xx/patches-3.6/609-MIPS-ath79-ap136-fixes.patch @@ -130,8 +130,8 @@ - sizeof(ap136_ath9k_data.eeprom_data)); + t = __raw_readl(base + QCA955X_GMAC_REG_ETH_CFG); + -+ t &= ~(QCA955X_ETH_CFG_RGMII_GMAC0 | QCA955X_ETH_CFG_SGMII_GMAC0); -+ t |= QCA955X_ETH_CFG_RGMII_GMAC0; ++ t &= ~(QCA955X_ETH_CFG_RGMII_EN | QCA955X_ETH_CFG_GE0_SGMII); ++ t |= QCA955X_ETH_CFG_RGMII_EN; - ath79_pci_set_plat_dev_init(ap136_pci_plat_dev_init); - ath79_register_pci();