ar71xx: use ath79_setup_qca955x_eth_cfg helper for QCA955x based boards

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41627 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c7.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c7.c
index dc50341..01719eb 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c7.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c7.c
@@ -182,23 +182,6 @@ static struct mdio_board_info archer_c7_mdio0_info[] = {
        },
 };
 
-static void __init archer_c7_gmac_setup(void)
-{
-       void __iomem *base;
-       u32 t;
-
-       base = ioremap(QCA955X_GMAC_BASE, QCA955X_GMAC_SIZE);
-
-       t = __raw_readl(base + QCA955X_GMAC_REG_ETH_CFG);
-
-       t &= ~(QCA955X_ETH_CFG_RGMII_EN | QCA955X_ETH_CFG_GE0_SGMII);
-       t |= QCA955X_ETH_CFG_RGMII_EN;
-
-       __raw_writel(t, base + QCA955X_GMAC_REG_ETH_CFG);
-
-       iounmap(base);
-}
-
 static void __init common_setup(bool pcie_slot)
 {
        u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
@@ -227,7 +210,7 @@ static void __init common_setup(bool pcie_slot)
                                    ARRAY_SIZE(archer_c7_mdio0_info));
        ath79_register_mdio(0, 0x0);
 
-       archer_c7_gmac_setup();
+       ath79_setup_qca955x_eth_cfg(QCA955X_ETH_CFG_RGMII_EN);
 
        /* GMAC0 is connected to the RMGII interface */
        ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-nbg6716.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-nbg6716.c
index 5b8c3d0..e102f2c 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-nbg6716.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-nbg6716.c
@@ -187,23 +187,6 @@ static void nbg6716_get_mac(const char *name, char *mac)
                pr_err("no MAC address found for %s\n", name);
 }
 
-static void __init nbg6716_gmac_setup(void)
-{
-       void __iomem *base;
-       u32 t;
-
-       base = ioremap(QCA955X_GMAC_BASE, QCA955X_GMAC_SIZE);
-
-       t = __raw_readl(base + QCA955X_GMAC_REG_ETH_CFG);
-
-       t &= ~(QCA955X_ETH_CFG_RGMII_EN | QCA955X_ETH_CFG_GE0_SGMII);
-       t |= QCA955X_ETH_CFG_RGMII_EN;
-
-       __raw_writel(t, base + QCA955X_GMAC_REG_ETH_CFG);
-
-       iounmap(base);
-}
-
 static void __init nbg6716_common_setup(void)
 {
        u8 *art = (u8 *) KSEG1ADDR(0x1f050000);
@@ -228,7 +211,7 @@ static void __init nbg6716_common_setup(void)
 
        ath79_register_wmac(art + NBG6716_WMAC_CALDATA_OFFSET, tmpmac);
 
-       nbg6716_gmac_setup();
+       ath79_setup_qca955x_eth_cfg(QCA955X_ETH_CFG_RGMII_EN);
 
        ath79_register_mdio(0, 0x0);
 

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v2.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v2.c
index b70c586..4f873e2 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v2.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v2.c
@@ -164,23 +164,6 @@ static struct mdio_board_info wr1043nd_v2_mdio0_info[] = {
        },
 };
 
-static void __init wr1043nd_v2_gmac_setup(void)
-{
-       void __iomem *base;
-       u32 t;
-
-       base = ioremap(QCA955X_GMAC_BASE, QCA955X_GMAC_SIZE);
-
-       t = __raw_readl(base + QCA955X_GMAC_REG_ETH_CFG);
-
-       t &= ~(QCA955X_ETH_CFG_RGMII_EN | QCA955X_ETH_CFG_GE0_SGMII);
-       t |= QCA955X_ETH_CFG_RGMII_EN;
-
-       __raw_writel(t, base + QCA955X_GMAC_REG_ETH_CFG);
-
-       iounmap(base);
-}
-
 static void __init tl_wr1043nd_v2_setup(void)
 {
        u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
@@ -202,7 +185,7 @@ static void __init tl_wr1043nd_v2_setup(void)
                                    ARRAY_SIZE(wr1043nd_v2_mdio0_info));
        ath79_register_mdio(0, 0x0);
 
-       wr1043nd_v2_gmac_setup();
+       ath79_setup_qca955x_eth_cfg(QCA955X_ETH_CFG_RGMII_EN);
 
        /* GMAC0 is connected to the RMGII interface */
        ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-wlr8100.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-wlr8100.c
index 8eecc0e..88022e7 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-wlr8100.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wlr8100.c
@@ -136,23 +136,6 @@ static struct mdio_board_info wlr8100_mdio0_info[] = {
        },
 };
 
-static void __init wlr8100_gmac_setup(void)
-{
-       void __iomem *base;
-       u32 t;
-
-       base = ioremap(QCA955X_GMAC_BASE, QCA955X_GMAC_SIZE);
-
-       t = __raw_readl(base + QCA955X_GMAC_REG_ETH_CFG);
-
-       t &= ~(QCA955X_ETH_CFG_RGMII_EN | QCA955X_ETH_CFG_GE0_SGMII);
-       t |= QCA955X_ETH_CFG_RGMII_EN;
-
-       __raw_writel(t, base + QCA955X_GMAC_REG_ETH_CFG);
-
-       iounmap(base);
-}
-
 static void __init wlr8100_common_setup(void)
 {
        u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
@@ -169,7 +152,7 @@ static void __init wlr8100_common_setup(void)
 
        ath79_register_wmac(art + WLR8100_WMAC_CALDATA_OFFSET, NULL);
 
-       wlr8100_gmac_setup();
+       ath79_setup_qca955x_eth_cfg(QCA955X_ETH_CFG_RGMII_EN);
 
        ath79_register_mdio(0, 0x0);
 

diff --git a/target/linux/ar71xx/patches-3.10/609-MIPS-ath79-ap136-fixes.patch b/target/linux/ar71xx/patches-3.10/609-MIPS-ath79-ap136-fixes.patch
index 4b530a7..4309712 100644 (file)
--- a/target/linux/ar71xx/patches-3.10/609-MIPS-ath79-ap136-fixes.patch
+++ b/target/linux/ar71xx/patches-3.10/609-MIPS-ath79-ap136-fixes.patch
@@ -86,7 +86,7 @@
                .gpio           = AP136_GPIO_LED_USB,
                .active_low     = 1,
        }
-@@ -98,65 +106,169 @@ static struct gpio_keys_button ap136_gpi
+@@ -98,65 +106,152 @@ static struct gpio_keys_button ap136_gpi
        },
  };
  
@@ -134,66 +134,30 @@
 -      .bus_num        = 0,
 -      .num_chipselect = 1,
 -};
-+static void __init ap136_gmac_setup(void)
-+{
-+      void __iomem *base;
-+      u32 t;
- 
--#ifdef CONFIG_PCI
--static struct ath9k_platform_data ap136_ath9k_data;
-+      base = ioremap(QCA955X_GMAC_BASE, QCA955X_GMAC_SIZE);
- 
--static int ap136_pci_plat_dev_init(struct pci_dev *dev)
--{
--      if (dev->bus->number == 1 && (PCI_SLOT(dev->devfn)) == 0)
--              dev->dev.platform_data = &ap136_ath9k_data;
-+      t = __raw_readl(base + QCA955X_GMAC_REG_ETH_CFG);
- 
--      return 0;
--}
-+      t &= ~(QCA955X_ETH_CFG_RGMII_EN | QCA955X_ETH_CFG_GE0_SGMII);
-+      t |= QCA955X_ETH_CFG_RGMII_EN;
- 
--static void __init ap136_pci_init(u8 *eeprom)
--{
--      memcpy(ap136_ath9k_data.eeprom_data, eeprom,
--             sizeof(ap136_ath9k_data.eeprom_data));
-+      __raw_writel(t, base + QCA955X_GMAC_REG_ETH_CFG);
- 
--      ath79_pci_set_plat_dev_init(ap136_pci_plat_dev_init);
--      ath79_register_pci();
-+      iounmap(base);
- }
--#else
--static inline void ap136_pci_init(void) {}
--#endif /* CONFIG_PCI */
- 
--static void __init ap136_setup(void)
 +static void __init ap136_common_setup(void)
- {
-       u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
- 
++{
++      u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
++
 +      ath79_register_m25p80(NULL);
 +
-       ath79_register_leds_gpio(-1, ARRAY_SIZE(ap136_leds_gpio),
-                                ap136_leds_gpio);
-       ath79_register_gpio_keys_polled(-1, AP136_KEYS_POLL_INTERVAL,
-                                       ARRAY_SIZE(ap136_gpio_keys),
-                                       ap136_gpio_keys);
--      ath79_register_spi(&ap136_spi_data, ap136_spi_info,
--                         ARRAY_SIZE(ap136_spi_info));
++      ath79_register_leds_gpio(-1, ARRAY_SIZE(ap136_leds_gpio),
++                               ap136_leds_gpio);
++      ath79_register_gpio_keys_polled(-1, AP136_KEYS_POLL_INTERVAL,
++                                      ARRAY_SIZE(ap136_gpio_keys),
++                                      ap136_gpio_keys);
 +
-       ath79_register_usb();
--      ath79_register_wmac(art + AP136_WMAC_CALDATA_OFFSET);
--      ap136_pci_init(art + AP136_PCIE_CALDATA_OFFSET);
++      ath79_register_usb();
 +      ath79_register_nfc();
 +
 +      ath79_register_wmac(art + AP136_WMAC_CALDATA_OFFSET, NULL);
 +
-+      ap136_gmac_setup();
-+
++      ath79_setup_qca955x_eth_cfg(QCA955X_ETH_CFG_RGMII_EN);
+ 
+-#ifdef CONFIG_PCI
+-static struct ath9k_platform_data ap136_ath9k_data;
 +      ath79_register_mdio(0, 0x0);
-+
+ 
+-static int ap136_pci_plat_dev_init(struct pci_dev *dev)
 +      ath79_init_mac(ath79_eth0_data.mac_addr, art + AP136_MAC0_OFFSET, 0);
 +
 +      mdiobus_register_board_info(ap136_mdio0_info,
@@ -215,9 +179,12 @@
 +}
 +
 +static void __init ap136_010_setup(void)
-+{
+ {
+-      if (dev->bus->number == 1 && (PCI_SLOT(dev->devfn)) == 0)
+-              dev->dev.platform_data = &ap136_ath9k_data;
 +      u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
-+
+ 
+-      return 0;
 +      /* GMAC0 of the AR8327 switch is connected to GMAC0 via RGMII */
 +      ap136_ar8327_pad0_cfg.mode = AR8327_PAD_MAC_RGMII;
 +      ap136_ar8327_pad0_cfg.txclk_delay_en = true;
@@ -237,13 +204,15 @@
 +      ap91_pci_init(art + AP136_PCIE_CALDATA_OFFSET, NULL);
  }
  
- MIPS_MACHINE(ATH79_MACH_AP136_010, "AP136-010",
-            "Atheros AP136-010 reference board",
--           ap136_setup);
+-static void __init ap136_pci_init(u8 *eeprom)
++MIPS_MACHINE(ATH79_MACH_AP136_010, "AP136-010",
++           "Atheros AP136-010 reference board",
 +           ap136_010_setup);
 +
 +static void __init ap136_020_common_setup(void)
-+{
+ {
+-      memcpy(ap136_ath9k_data.eeprom_data, eeprom,
+-             sizeof(ap136_ath9k_data.eeprom_data));
 +      /* GMAC0 of the AR8327 switch is connected to GMAC1 via SGMII */
 +      ap136_ar8327_pad0_cfg.mode = AR8327_PAD_MAC_SGMII;
 +      ap136_ar8327_pad0_cfg.sgmii_delay_en = true;
@@ -254,21 +223,40 @@
 +      ap136_ar8327_pad6_cfg.rxclk_delay_en = true;
 +      ap136_ar8327_pad6_cfg.txclk_delay_sel = AR8327_CLK_DELAY_SEL1;
 +      ap136_ar8327_pad6_cfg.rxclk_delay_sel = AR8327_CLK_DELAY_SEL2;
-+
+ 
+-      ath79_pci_set_plat_dev_init(ap136_pci_plat_dev_init);
+-      ath79_register_pci();
 +      ath79_eth0_pll_data.pll_1000 = 0x56000000;
 +      ath79_eth1_pll_data.pll_1000 = 0x03000101;
 +
 +      ap136_common_setup();
-+}
-+
+ }
+-#else
+-static inline void ap136_pci_init(void) {}
+-#endif /* CONFIG_PCI */
+ 
+-static void __init ap136_setup(void)
 +static void __init ap136_020_setup(void)
-+{
-+      u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
-+
+ {
+       u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
+ 
+-      ath79_register_leds_gpio(-1, ARRAY_SIZE(ap136_leds_gpio),
+-                               ap136_leds_gpio);
+-      ath79_register_gpio_keys_polled(-1, AP136_KEYS_POLL_INTERVAL,
+-                                      ARRAY_SIZE(ap136_gpio_keys),
+-                                      ap136_gpio_keys);
+-      ath79_register_spi(&ap136_spi_data, ap136_spi_info,
+-                         ARRAY_SIZE(ap136_spi_info));
+-      ath79_register_usb();
+-      ath79_register_wmac(art + AP136_WMAC_CALDATA_OFFSET);
+-      ap136_pci_init(art + AP136_PCIE_CALDATA_OFFSET);
 +      ap136_020_common_setup();
 +      ap91_pci_init(art + AP136_PCIE_CALDATA_OFFSET, NULL);
-+}
-+
+ }
+ 
+-MIPS_MACHINE(ATH79_MACH_AP136_010, "AP136-010",
+-           "Atheros AP136-010 reference board",
+-           ap136_setup);
 +MIPS_MACHINE(ATH79_MACH_AP136_020, "AP136-020",
 +           "Atheros AP136-020 reference board",
 +           ap136_020_setup);