d658de23ea
Backport of r34316. Also override the pll_1000 value. Without these settings ethernet suffers from packet loss. Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 34374
185 lines
5.0 KiB
Diff
185 lines
5.0 KiB
Diff
--- a/arch/mips/ath79/mach-ap136.c
|
|
+++ b/arch/mips/ath79/mach-ap136.c
|
|
@@ -1,5 +1,5 @@
|
|
/*
|
|
- * Qualcomm Atheros AP136 reference board support
|
|
+ * Atheros AP136 reference board support
|
|
*
|
|
* Copyright (c) 2012 Qualcomm Atheros
|
|
* Copyright (c) 2012 Gabor Juhos <juhosg@openwrt.org>
|
|
@@ -18,23 +18,27 @@
|
|
*
|
|
*/
|
|
|
|
-#include <linux/pci.h>
|
|
-#include <linux/ath9k_platform.h>
|
|
+#include <linux/platform_device.h>
|
|
+#include <linux/ar8216_platform.h>
|
|
|
|
-#include "machtypes.h"
|
|
+#include <asm/mach-ath79/ar71xx_regs.h>
|
|
+
|
|
+#include "common.h"
|
|
+#include "dev-ap9x-pci.h"
|
|
#include "dev-gpio-buttons.h"
|
|
+#include "dev-eth.h"
|
|
#include "dev-leds-gpio.h"
|
|
-#include "dev-spi.h"
|
|
+#include "dev-m25p80.h"
|
|
#include "dev-usb.h"
|
|
#include "dev-wmac.h"
|
|
-#include "pci.h"
|
|
+#include "machtypes.h"
|
|
|
|
-#define AP136_GPIO_LED_STATUS_RED 14
|
|
-#define AP136_GPIO_LED_STATUS_GREEN 19
|
|
#define AP136_GPIO_LED_USB 4
|
|
-#define AP136_GPIO_LED_WLAN_2G 13
|
|
#define AP136_GPIO_LED_WLAN_5G 12
|
|
+#define AP136_GPIO_LED_WLAN_2G 13
|
|
+#define AP136_GPIO_LED_STATUS_RED 14
|
|
#define AP136_GPIO_LED_WPS_RED 15
|
|
+#define AP136_GPIO_LED_STATUS_GREEN 19
|
|
#define AP136_GPIO_LED_WPS_GREEN 20
|
|
|
|
#define AP136_GPIO_BTN_WPS 16
|
|
@@ -43,8 +47,10 @@
|
|
#define AP136_KEYS_POLL_INTERVAL 20 /* msecs */
|
|
#define AP136_KEYS_DEBOUNCE_INTERVAL (3 * AP136_KEYS_POLL_INTERVAL)
|
|
|
|
-#define AP136_WMAC_CALDATA_OFFSET 0x1000
|
|
-#define AP136_PCIE_CALDATA_OFFSET 0x5000
|
|
+#define AP136_MAC0_OFFSET 0
|
|
+#define AP136_MAC1_OFFSET 6
|
|
+#define AP136_WMAC_CALDATA_OFFSET 0x1000
|
|
+#define AP136_PCIE_CALDATA_OFFSET 0x5000
|
|
|
|
static struct gpio_led ap136_leds_gpio[] __initdata = {
|
|
{
|
|
@@ -98,63 +104,91 @@ static struct gpio_keys_button ap136_gpi
|
|
},
|
|
};
|
|
|
|
-static struct ath79_spi_controller_data ap136_spi0_data = {
|
|
- .cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
|
|
- .cs_line = 0,
|
|
+static struct ar8327_pad_cfg ap136_ar8327_pad0_cfg = {
|
|
+ .mode = AR8327_PAD_MAC_RGMII,
|
|
+ .txclk_delay_en = true,
|
|
+ .rxclk_delay_en = true,
|
|
+ .txclk_delay_sel = AR8327_CLK_DELAY_SEL1,
|
|
+ .rxclk_delay_sel = AR8327_CLK_DELAY_SEL2,
|
|
};
|
|
|
|
-static struct spi_board_info ap136_spi_info[] = {
|
|
- {
|
|
- .bus_num = 0,
|
|
- .chip_select = 0,
|
|
- .max_speed_hz = 25000000,
|
|
- .modalias = "mx25l6405d",
|
|
- .controller_data = &ap136_spi0_data,
|
|
- }
|
|
+static struct ar8327_pad_cfg ap136_ar8327_pad6_cfg = {
|
|
+ .mode = AR8327_PAD_MAC_SGMII,
|
|
+ .txclk_delay_en = false,
|
|
+ .rxclk_delay_en = true,
|
|
+ .txclk_delay_sel = AR8327_CLK_DELAY_SEL0,
|
|
+ .rxclk_delay_sel = AR8327_CLK_DELAY_SEL0,
|
|
};
|
|
|
|
-static struct ath79_spi_platform_data ap136_spi_data = {
|
|
- .bus_num = 0,
|
|
- .num_chipselect = 1,
|
|
+static struct ar8327_platform_data ap136_ar8327_data = {
|
|
+ .pad0_cfg = &ap136_ar8327_pad0_cfg,
|
|
+ .pad6_cfg = &ap136_ar8327_pad6_cfg,
|
|
+ .cpuport_cfg = {
|
|
+ .force_link = 1,
|
|
+ .speed = AR8327_PORT_SPEED_1000,
|
|
+ .duplex = 1,
|
|
+ .txpause = 1,
|
|
+ .rxpause = 1,
|
|
+ }
|
|
};
|
|
|
|
-#ifdef CONFIG_PCI
|
|
-static struct ath9k_platform_data ap136_ath9k_data;
|
|
+static struct mdio_board_info ap136_mdio0_info[] = {
|
|
+ {
|
|
+ .bus_id = "ag71xx-mdio.0",
|
|
+ .phy_addr = 0,
|
|
+ .platform_data = &ap136_ar8327_data,
|
|
+ },
|
|
+};
|
|
|
|
-static int ap136_pci_plat_dev_init(struct pci_dev *dev)
|
|
+static void __init ap136_gmac_setup(void)
|
|
{
|
|
- if (dev->bus->number == 1 && (PCI_SLOT(dev->devfn)) == 0)
|
|
- dev->dev.platform_data = &ap136_ath9k_data;
|
|
+ void __iomem *base;
|
|
+ u32 t;
|
|
|
|
- return 0;
|
|
-}
|
|
+ base = ioremap(QCA955X_GMAC_BASE, QCA955X_GMAC_SIZE);
|
|
|
|
-static void __init ap136_pci_init(u8 *eeprom)
|
|
-{
|
|
- memcpy(ap136_ath9k_data.eeprom_data, eeprom,
|
|
- 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;
|
|
|
|
- ath79_pci_set_plat_dev_init(ap136_pci_plat_dev_init);
|
|
- ath79_register_pci();
|
|
+ __raw_writel(t, base + QCA955X_GMAC_REG_ETH_CFG);
|
|
+
|
|
+ iounmap(base);
|
|
}
|
|
-#else
|
|
-static inline void ap136_pci_init(void) {}
|
|
-#endif /* CONFIG_PCI */
|
|
|
|
static void __init ap136_setup(void)
|
|
{
|
|
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_usb();
|
|
- ath79_register_wmac(art + AP136_WMAC_CALDATA_OFFSET);
|
|
- ap136_pci_init(art + AP136_PCIE_CALDATA_OFFSET);
|
|
+ ath79_register_wmac(art + AP136_WMAC_CALDATA_OFFSET, NULL);
|
|
+ ap91_pci_init(art + AP136_PCIE_CALDATA_OFFSET, NULL);
|
|
+
|
|
+ ap136_gmac_setup();
|
|
+
|
|
+ ath79_register_mdio(0, 0x0);
|
|
+
|
|
+ ath79_init_mac(ath79_eth0_data.mac_addr, art + AP136_MAC0_OFFSET, 0);
|
|
+
|
|
+ mdiobus_register_board_info(ap136_mdio0_info,
|
|
+ ARRAY_SIZE(ap136_mdio0_info));
|
|
+
|
|
+ /* GMAC0 is connected to an AR8327 switch */
|
|
+ ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
|
|
+ ath79_eth0_data.phy_mask = BIT(0);
|
|
+ ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev;
|
|
+ ath79_eth0_pll_data.pll_1000 = 0xa6000000;
|
|
+
|
|
+ ath79_register_eth(0);
|
|
}
|
|
|
|
MIPS_MACHINE(ATH79_MACH_AP136, "AP136", "Atheros AP136 reference board",
|