mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-23 20:30:37 +02:00
ar71xx: dynamically set AR8327's PAD configuration on AP136
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34882 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
a735287d68
commit
e495dc2e71
@ -56,40 +56,16 @@
|
|||||||
|
|
||||||
static struct gpio_led ap136_leds_gpio[] __initdata = {
|
static struct gpio_led ap136_leds_gpio[] __initdata = {
|
||||||
{
|
{
|
||||||
@@ -98,63 +104,106 @@ static struct gpio_keys_button ap136_gpi
|
@@ -98,63 +104,103 @@ static struct gpio_keys_button ap136_gpi
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
-static struct ath79_spi_controller_data ap136_spi0_data = {
|
-static struct ath79_spi_controller_data ap136_spi0_data = {
|
||||||
- .cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
|
- .cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
|
||||||
- .cs_line = 0,
|
- .cs_line = 0,
|
||||||
+static struct ar8327_pad_cfg ap136_ar8327_pad0_cfg = {
|
+static struct ar8327_pad_cfg ap136_ar8327_pad0_cfg;
|
||||||
+ .mode = AR8327_PAD_MAC_RGMII,
|
+static struct ar8327_pad_cfg ap136_ar8327_pad6_cfg;
|
||||||
+ .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 = {
|
+static struct ar8327_platform_data ap136_ar8327_data = {
|
||||||
+ .pad0_cfg = &ap136_ar8327_pad0_cfg,
|
+ .pad0_cfg = &ap136_ar8327_pad0_cfg,
|
||||||
+ .pad6_cfg = &ap136_ar8327_pad6_cfg,
|
+ .pad6_cfg = &ap136_ar8327_pad6_cfg,
|
||||||
@ -109,37 +85,49 @@
|
|||||||
+ },
|
+ },
|
||||||
};
|
};
|
||||||
|
|
||||||
-#ifdef CONFIG_PCI
|
-static struct spi_board_info ap136_spi_info[] = {
|
||||||
-static struct ath9k_platform_data ap136_ath9k_data;
|
|
||||||
+static struct mdio_board_info ap136_mdio0_info[] = {
|
+static struct mdio_board_info ap136_mdio0_info[] = {
|
||||||
+ {
|
{
|
||||||
|
- .bus_num = 0,
|
||||||
|
- .chip_select = 0,
|
||||||
|
- .max_speed_hz = 25000000,
|
||||||
|
- .modalias = "mx25l6405d",
|
||||||
|
- .controller_data = &ap136_spi0_data,
|
||||||
|
- }
|
||||||
+ .bus_id = "ag71xx-mdio.0",
|
+ .bus_id = "ag71xx-mdio.0",
|
||||||
+ .phy_addr = 0,
|
+ .phy_addr = 0,
|
||||||
+ .platform_data = &ap136_ar8327_data,
|
+ .platform_data = &ap136_ar8327_data,
|
||||||
+ },
|
+ },
|
||||||
+};
|
};
|
||||||
|
|
||||||
-static int ap136_pci_plat_dev_init(struct pci_dev *dev)
|
-static struct ath79_spi_platform_data ap136_spi_data = {
|
||||||
|
- .bus_num = 0,
|
||||||
|
- .num_chipselect = 1,
|
||||||
|
-};
|
||||||
+static void __init ap136_gmac_setup(void)
|
+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;
|
+ void __iomem *base;
|
||||||
+ u32 t;
|
+ 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;
|
- return 0;
|
||||||
-}
|
-}
|
||||||
+ base = ioremap(QCA955X_GMAC_BASE, QCA955X_GMAC_SIZE);
|
+ 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)
|
-static void __init ap136_pci_init(u8 *eeprom)
|
||||||
-{
|
-{
|
||||||
- memcpy(ap136_ath9k_data.eeprom_data, eeprom,
|
- memcpy(ap136_ath9k_data.eeprom_data, eeprom,
|
||||||
- sizeof(ap136_ath9k_data.eeprom_data));
|
- sizeof(ap136_ath9k_data.eeprom_data));
|
||||||
+ 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);
|
+ __raw_writel(t, base + QCA955X_GMAC_REG_ETH_CFG);
|
||||||
|
|
||||||
- ath79_pci_set_plat_dev_init(ap136_pci_plat_dev_init);
|
- ath79_pci_set_plat_dev_init(ap136_pci_plat_dev_init);
|
||||||
@ -179,6 +167,16 @@
|
|||||||
+ mdiobus_register_board_info(ap136_mdio0_info,
|
+ mdiobus_register_board_info(ap136_mdio0_info,
|
||||||
+ ARRAY_SIZE(ap136_mdio0_info));
|
+ ARRAY_SIZE(ap136_mdio0_info));
|
||||||
+
|
+
|
||||||
|
+ ap136_ar8327_pad0_cfg.mode = AR8327_PAD_MAC_RGMII;
|
||||||
|
+ ap136_ar8327_pad0_cfg.txclk_delay_en = true;
|
||||||
|
+ ap136_ar8327_pad0_cfg.rxclk_delay_en = true;
|
||||||
|
+ ap136_ar8327_pad0_cfg.txclk_delay_sel = AR8327_CLK_DELAY_SEL1;
|
||||||
|
+ ap136_ar8327_pad0_cfg.rxclk_delay_sel = AR8327_CLK_DELAY_SEL2;
|
||||||
|
+
|
||||||
|
+ ap136_ar8327_pad6_cfg.mode = AR8327_PAD_MAC_SGMII;
|
||||||
|
+ ap136_ar8327_pad6_cfg.rxclk_delay_en = true;
|
||||||
|
+ ap136_ar8327_pad6_cfg.rxclk_delay_sel = AR8327_CLK_DELAY_SEL0;
|
||||||
|
+
|
||||||
+ /* GMAC0 is connected to GMAC0 of the AR8327 switch via RGMII */
|
+ /* GMAC0 is connected to GMAC0 of the AR8327 switch via RGMII */
|
||||||
+ ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
|
+ ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
|
||||||
+ ath79_eth0_data.phy_mask = BIT(0);
|
+ ath79_eth0_data.phy_mask = BIT(0);
|
||||||
|
Loading…
Reference in New Issue
Block a user