projects / oweals / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
ar71xx: build ALFA AP96 images with default profile as well
[oweals/openwrt.git] / target / linux / ar71xx / files / arch / mips / ar71xx / devices.c
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/devices.c b/target/linux/ar71xx/files/arch/mips/ar71xx/devices.c
index 2d73dd04421a03f5028bdecc659010ea3ad3771a..75b24b0043a5688639074bef96f1965245c55976 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/devices.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/devices.c
@@ -206,6 +206,36 @@ static void __init ar71xx_mii_ctrl_set_if(unsigned int reg,
        iounmap(base);
 }
 
+static void ar71xx_mii_ctrl_set_speed(unsigned int reg, unsigned int speed)
+{
+       void __iomem *base;
+       unsigned int mii_speed;
+       u32 t;
+
+       switch (speed) {
+       case SPEED_10:
+               mii_speed =  MII_CTRL_SPEED_10;
+               break;
+       case SPEED_100:
+               mii_speed =  MII_CTRL_SPEED_100;
+               break;
+       case SPEED_1000:
+               mii_speed =  MII_CTRL_SPEED_1000;
+               break;
+       default:
+               BUG();
+       }
+
+       base = ioremap(AR71XX_MII_BASE, AR71XX_MII_SIZE);
+
+       t = __raw_readl(base + reg);
+       t &= ~(MII_CTRL_SPEED_MASK << MII_CTRL_SPEED_SHIFT);
+       t |= mii_speed  << MII_CTRL_SPEED_SHIFT;
+       __raw_writel(t, base + reg);
+
+       iounmap(base);
+}
+
 void __init ar71xx_add_device_mdio(unsigned int id, u32 phy_mask)
 {
        struct platform_device *mdio_dev;
@@ -315,33 +345,35 @@ static u32 ar71xx_get_eth_pll(unsigned int mac, int speed)
        return pll_val;
 }
 
-static void ar71xx_set_pll_ge0(int speed)
+static void ar71xx_set_speed_ge0(int speed)
 {
        u32 val = ar71xx_get_eth_pll(0, speed);
 
        ar71xx_set_pll(AR71XX_PLL_REG_SEC_CONFIG, AR71XX_PLL_REG_ETH0_INT_CLOCK,
                        val, AR71XX_ETH0_PLL_SHIFT);
+       ar71xx_mii_ctrl_set_speed(MII_REG_MII0_CTRL, speed);
 }
 
-static void ar71xx_set_pll_ge1(int speed)
+static void ar71xx_set_speed_ge1(int speed)
 {
        u32 val = ar71xx_get_eth_pll(1, speed);
 
        ar71xx_set_pll(AR71XX_PLL_REG_SEC_CONFIG, AR71XX_PLL_REG_ETH1_INT_CLOCK,
                         val, AR71XX_ETH1_PLL_SHIFT);
+       ar71xx_mii_ctrl_set_speed(MII_REG_MII1_CTRL, speed);
 }
 
-static void ar724x_set_pll_ge0(int speed)
+static void ar724x_set_speed_ge0(int speed)
 {
        /* TODO */
 }
 
-static void ar724x_set_pll_ge1(int speed)
+static void ar724x_set_speed_ge1(int speed)
 {
        /* TODO */
 }
 
-static void ar7242_set_pll_ge0(int speed)
+static void ar7242_set_speed_ge0(int speed)
 {
        u32 val = ar71xx_get_eth_pll(0, speed);
        void __iomem *base;
@@ -351,38 +383,40 @@ static void ar7242_set_pll_ge0(int speed)
        iounmap(base);
 }
 
-static void ar91xx_set_pll_ge0(int speed)
+static void ar91xx_set_speed_ge0(int speed)
 {
        u32 val = ar71xx_get_eth_pll(0, speed);
 
        ar71xx_set_pll(AR91XX_PLL_REG_ETH_CONFIG, AR91XX_PLL_REG_ETH0_INT_CLOCK,
                         val, AR91XX_ETH0_PLL_SHIFT);
+       ar71xx_mii_ctrl_set_speed(MII_REG_MII0_CTRL, speed);
 }
 
-static void ar91xx_set_pll_ge1(int speed)
+static void ar91xx_set_speed_ge1(int speed)
 {
        u32 val = ar71xx_get_eth_pll(1, speed);
 
        ar71xx_set_pll(AR91XX_PLL_REG_ETH_CONFIG, AR91XX_PLL_REG_ETH1_INT_CLOCK,
                         val, AR91XX_ETH1_PLL_SHIFT);
+       ar71xx_mii_ctrl_set_speed(MII_REG_MII1_CTRL, speed);
 }
 
-static void ar933x_set_pll_ge0(int speed)
+static void ar933x_set_speed_ge0(int speed)
 {
        /* TODO */
 }
 
-static void ar933x_set_pll_ge1(int speed)
+static void ar933x_set_speed_ge1(int speed)
 {
        /* TODO */
 }
 
-static void ar934x_set_pll_ge0(int speed)
+static void ar934x_set_speed_ge0(int speed)
 {
        /* TODO */
 }
 
-static void ar934x_set_pll_ge1(int speed)
+static void ar934x_set_speed_ge1(int speed)
 {
        /* TODO */
 }
@@ -443,11 +477,6 @@ static struct resource ar71xx_eth0_resources[] = {
                .flags  = IORESOURCE_MEM,
                .start  = AR71XX_GE0_BASE,
                .end    = AR71XX_GE0_BASE + 0x200 - 1,
-       }, {
-               .name   = "mii_ctrl",
-               .flags  = IORESOURCE_MEM,
-               .start  = AR71XX_MII_BASE + MII_REG_MII0_CTRL,
-               .end    = AR71XX_MII_BASE + MII_REG_MII0_CTRL + 3,
        }, {
                .name   = "mac_irq",
                .flags  = IORESOURCE_IRQ,
@@ -476,11 +505,6 @@ static struct resource ar71xx_eth1_resources[] = {
                .flags  = IORESOURCE_MEM,
                .start  = AR71XX_GE1_BASE,
                .end    = AR71XX_GE1_BASE + 0x200 - 1,
-       }, {
-               .name   = "mii_ctrl",
-               .flags  = IORESOURCE_MEM,
-               .start  = AR71XX_MII_BASE + MII_REG_MII1_CTRL,
-               .end    = AR71XX_MII_BASE + MII_REG_MII1_CTRL + 3,
        }, {
                .name   = "mac_irq",
                .flags  = IORESOURCE_IRQ,
@@ -503,6 +527,8 @@ struct platform_device ar71xx_eth1_device = {
        },
 };
 
+struct ag71xx_switch_platform_data ar71xx_switch_data;
+
 #define AR71XX_PLL_VAL_1000    0x00110000
 #define AR71XX_PLL_VAL_100     0x00001099
 #define AR71XX_PLL_VAL_10      0x00991099
@@ -742,30 +768,39 @@ void __init ar71xx_add_device_eth(unsigned int id)
 
        switch (ar71xx_soc) {
        case AR71XX_SOC_AR7130:
-               pdata->ddr_flush = id ? ar71xx_ddr_flush_ge1
-                                     : ar71xx_ddr_flush_ge0;
-               pdata->set_pll =  id ? ar71xx_set_pll_ge1
-                                    : ar71xx_set_pll_ge0;
+               if (id == 0) {
+                       pdata->ddr_flush = ar71xx_ddr_flush_ge0;
+                       pdata->set_speed = ar71xx_set_speed_ge0;
+               } else {
+                       pdata->ddr_flush = ar71xx_ddr_flush_ge1;
+                       pdata->set_speed = ar71xx_set_speed_ge1;
+               }
                break;
 
        case AR71XX_SOC_AR7141:
        case AR71XX_SOC_AR7161:
-               pdata->ddr_flush = id ? ar71xx_ddr_flush_ge1
-                                     : ar71xx_ddr_flush_ge0;
-               pdata->set_pll =  id ? ar71xx_set_pll_ge1
-                                    : ar71xx_set_pll_ge0;
+               if (id == 0) {
+                       pdata->ddr_flush = ar71xx_ddr_flush_ge0;
+                       pdata->set_speed = ar71xx_set_speed_ge0;
+               } else {
+                       pdata->ddr_flush = ar71xx_ddr_flush_ge1;
+                       pdata->set_speed = ar71xx_set_speed_ge1;
+               }
                pdata->has_gbit = 1;
                break;
 
        case AR71XX_SOC_AR7242:
-               ar71xx_eth0_data.reset_bit |= AR724X_RESET_GE0_MDIO |
-                                             RESET_MODULE_GE0_PHY;
-               ar71xx_eth1_data.reset_bit |= AR724X_RESET_GE1_MDIO |
-                                             RESET_MODULE_GE1_PHY;
-               pdata->ddr_flush = id ? ar724x_ddr_flush_ge1
-                                     : ar724x_ddr_flush_ge0;
-               pdata->set_pll =  id ? ar724x_set_pll_ge1
-                                    : ar7242_set_pll_ge0;
+               if (id == 0) {
+                       pdata->reset_bit |= AR724X_RESET_GE0_MDIO |
+                                           RESET_MODULE_GE0_PHY;
+                       pdata->ddr_flush = ar724x_ddr_flush_ge0;
+                       pdata->set_speed = ar7242_set_speed_ge0;
+               } else {
+                       pdata->reset_bit |= AR724X_RESET_GE1_MDIO |
+                                           RESET_MODULE_GE1_PHY;
+                       pdata->ddr_flush = ar724x_ddr_flush_ge1;
+                       pdata->set_speed = ar724x_set_speed_ge1;
+               }
                pdata->has_gbit = 1;
                pdata->is_ar724x = 1;
 
@@ -778,16 +813,28 @@ void __init ar71xx_add_device_eth(unsigned int id)
                break;
 
        case AR71XX_SOC_AR7241:
-               ar71xx_eth0_data.reset_bit |= AR724X_RESET_GE0_MDIO;
-               ar71xx_eth1_data.reset_bit |= AR724X_RESET_GE1_MDIO;
+               if (id == 0)
+                       pdata->reset_bit |= AR724X_RESET_GE0_MDIO;
+               else
+                       pdata->reset_bit |= AR724X_RESET_GE1_MDIO;
                /* fall through */
        case AR71XX_SOC_AR7240:
-               ar71xx_eth0_data.reset_bit |= RESET_MODULE_GE0_PHY;
-               ar71xx_eth1_data.reset_bit |= RESET_MODULE_GE1_PHY;
-               pdata->ddr_flush = id ? ar724x_ddr_flush_ge1
-                                     : ar724x_ddr_flush_ge0;
-               pdata->set_pll =  id ? ar724x_set_pll_ge1
-                                    : ar724x_set_pll_ge0;
+               if (id == 0) {
+                       pdata->reset_bit |= RESET_MODULE_GE0_PHY;
+                       pdata->ddr_flush = ar724x_ddr_flush_ge0;
+                       pdata->set_speed = ar724x_set_speed_ge0;
+
+                       pdata->phy_mask = BIT(4);
+               } else {
+                       pdata->reset_bit |= RESET_MODULE_GE1_PHY;
+                       pdata->ddr_flush = ar724x_ddr_flush_ge1;
+                       pdata->set_speed = ar724x_set_speed_ge1;
+
+                       pdata->speed = SPEED_1000;
+                       pdata->duplex = DUPLEX_FULL;
+                       pdata->switch_data = &ar71xx_switch_data;
+               }
+               pdata->has_gbit = 1;
                pdata->is_ar724x = 1;
                if (ar71xx_soc == AR71XX_SOC_AR7240)
                        pdata->is_ar7240 = 1;
@@ -801,32 +848,48 @@ void __init ar71xx_add_device_eth(unsigned int id)
                break;
 
        case AR71XX_SOC_AR9130:
-               pdata->ddr_flush = id ? ar91xx_ddr_flush_ge1
-                                     : ar91xx_ddr_flush_ge0;
-               pdata->set_pll =  id ? ar91xx_set_pll_ge1
-                                    : ar91xx_set_pll_ge0;
+               if (id == 0) {
+                       pdata->ddr_flush = ar91xx_ddr_flush_ge0;
+                       pdata->set_speed = ar91xx_set_speed_ge0;
+               } else {
+                       pdata->ddr_flush = ar91xx_ddr_flush_ge1;
+                       pdata->set_speed = ar91xx_set_speed_ge1;
+               }
                pdata->is_ar91xx = 1;
                break;
 
        case AR71XX_SOC_AR9132:
-               pdata->ddr_flush = id ? ar91xx_ddr_flush_ge1
-                                     : ar91xx_ddr_flush_ge0;
-               pdata->set_pll =  id ? ar91xx_set_pll_ge1
-                                     : ar91xx_set_pll_ge0;
+               if (id == 0) {
+                       pdata->ddr_flush = ar91xx_ddr_flush_ge0;
+                       pdata->set_speed = ar91xx_set_speed_ge0;
+               } else {
+                       pdata->ddr_flush = ar91xx_ddr_flush_ge1;
+                       pdata->set_speed = ar91xx_set_speed_ge1;
+               }
                pdata->is_ar91xx = 1;
                pdata->has_gbit = 1;
                break;
 
        case AR71XX_SOC_AR9330:
        case AR71XX_SOC_AR9331:
-               ar71xx_eth0_data.reset_bit = AR933X_RESET_GE0_MAC |
-                                            AR933X_RESET_GE0_MDIO;
-               ar71xx_eth1_data.reset_bit = AR933X_RESET_GE1_MAC |
-                                            AR933X_RESET_GE1_MDIO;
-               pdata->ddr_flush = id ? ar933x_ddr_flush_ge1
-                                     : ar933x_ddr_flush_ge0;
-               pdata->set_pll =  id ? ar933x_set_pll_ge1
-                                    : ar933x_set_pll_ge0;
+               if (id == 0) {
+                       pdata->reset_bit = AR933X_RESET_GE0_MAC |
+                                          AR933X_RESET_GE0_MDIO;
+                       pdata->ddr_flush = ar933x_ddr_flush_ge0;
+                       pdata->set_speed = ar933x_set_speed_ge0;
+
+                       pdata->phy_mask = BIT(4);
+               } else {
+                       pdata->reset_bit = AR933X_RESET_GE1_MAC |
+                                          AR933X_RESET_GE1_MDIO;
+                       pdata->ddr_flush = ar933x_ddr_flush_ge1;
+                       pdata->set_speed = ar933x_set_speed_ge1;
+
+                       pdata->speed = SPEED_1000;
+                       pdata->duplex = DUPLEX_FULL;
+                       pdata->switch_data = &ar71xx_switch_data;
+               }
+
                pdata->has_gbit = 1;
                pdata->is_ar724x = 1;
 
@@ -841,14 +904,20 @@ void __init ar71xx_add_device_eth(unsigned int id)
        case AR71XX_SOC_AR9341:
        case AR71XX_SOC_AR9342:
        case AR71XX_SOC_AR9344:
-               ar71xx_eth0_data.reset_bit = AR934X_RESET_GE0_MAC |
-                                            AR934X_RESET_GE0_MDIO;
-               ar71xx_eth1_data.reset_bit = AR934X_RESET_GE1_MAC |
-                                            AR934X_RESET_GE1_MDIO;
-               pdata->ddr_flush = id ? ar934x_ddr_flush_ge1
-                                     : ar934x_ddr_flush_ge0;
-               pdata->set_pll =  id ? ar934x_set_pll_ge1
-                                    : ar934x_set_pll_ge0;
+               if (id == 0) {
+                       pdata->reset_bit = AR934X_RESET_GE0_MAC |
+                                          AR934X_RESET_GE0_MDIO;
+                       pdata->ddr_flush =ar934x_ddr_flush_ge0;
+                       pdata->set_speed = ar934x_set_speed_ge0;
+               } else {
+                       pdata->reset_bit = AR934X_RESET_GE1_MAC |
+                                          AR934X_RESET_GE1_MDIO;
+                       pdata->ddr_flush = ar934x_ddr_flush_ge1;
+                       pdata->set_speed = ar934x_set_speed_ge1;
+
+                       pdata->switch_data = &ar71xx_switch_data;
+               }
+
                pdata->has_gbit = 1;
                pdata->is_ar724x = 1;
 
@@ -986,9 +1055,9 @@ static int __init ar71xx_kmac_setup(char *str)
 __setup("kmac=", ar71xx_kmac_setup);
 
 void __init ar71xx_init_mac(unsigned char *dst, const unsigned char *src,
-                           unsigned offset)
+                           int offset)
 {
-       u32 t;
+       int t;
 
        if (!is_valid_ether_addr(src)) {
                memset(dst, '\0', ETH_ALEN);
Unnamed repository; edit this file 'description' to name the repository.