ar71xx: don't use mac_base2 in the ag71xx driver

[openwrt-10.03/.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 f76dad5a9f3dede7aad9241058fd3065a7d75e78..90869a88e6075b1a304c968a8c425c5655a22820 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/devices.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/devices.c
@@ -140,7 +140,6 @@ void __init ar71xx_add_device_usb(void)
        }
 }
 
-#ifndef CONFIG_AR71XX_EARLY_SERIAL
 static struct resource ar71xx_uart_resources[] = {
        {
                .start  = AR71XX_UART_BASE,
@@ -177,14 +176,13 @@ void __init ar71xx_add_device_uart(void)
        ar71xx_uart_data[0].uartclk = ar71xx_ahb_freq;
        platform_device_register(&ar71xx_uart_device);
 }
-#endif /* CONFIG_AR71XX_EARLY_SERIAL */
 
 static struct resource ar71xx_mdio_resources[] = {
        {
                .name   = "mdio_base",
                .flags  = IORESOURCE_MEM,
-               .start  = AR71XX_GE0_BASE + 0x20,
-               .end    = AR71XX_GE0_BASE + 0x38 - 1,
+               .start  = AR71XX_GE0_BASE,
+               .end    = AR71XX_GE0_BASE + 0x200 - 1,
        }
 };
 
@@ -289,6 +287,16 @@ static void ar71xx_set_pll_ge1(int speed)
                         val, AR71XX_ETH1_PLL_SHIFT);
 }
 
+static void ar724x_set_pll_ge0(int speed)
+{
+       /* TODO */
+}
+
+static void ar724x_set_pll_ge1(int speed)
+{
+       /* TODO */
+}
+
 static void ar91xx_set_pll_ge0(int speed)
 {
        u32 val = ar71xx_get_eth_pll(0, speed);
@@ -315,6 +323,16 @@ static void ar71xx_ddr_flush_ge1(void)
        ar71xx_ddr_flush(AR71XX_DDR_REG_FLUSH_GE1);
 }
 
+static void ar724x_ddr_flush_ge0(void)
+{
+       ar71xx_ddr_flush(AR724X_DDR_REG_FLUSH_GE0);
+}
+
+static void ar724x_ddr_flush_ge1(void)
+{
+       ar71xx_ddr_flush(AR724X_DDR_REG_FLUSH_GE1);
+}
+
 static void ar91xx_ddr_flush_ge0(void)
 {
        ar71xx_ddr_flush(AR91XX_DDR_REG_FLUSH_GE0);
@@ -330,11 +348,6 @@ static struct resource ar71xx_eth0_resources[] = {
                .name   = "mac_base",
                .flags  = IORESOURCE_MEM,
                .start  = AR71XX_GE0_BASE,
-               .end    = AR71XX_GE0_BASE + 0x20 - 1,
-       }, {
-               .name   = "mac_base2",
-               .flags  = IORESOURCE_MEM,
-               .start  = AR71XX_GE0_BASE + 0x38,
                .end    = AR71XX_GE0_BASE + 0x200 - 1,
        }, {
                .name   = "mii_ctrl",
@@ -368,11 +381,6 @@ static struct resource ar71xx_eth1_resources[] = {
                .name   = "mac_base",
                .flags  = IORESOURCE_MEM,
                .start  = AR71XX_GE1_BASE,
-               .end    = AR71XX_GE1_BASE + 0x20 - 1,
-       }, {
-               .name   = "mac_base2",
-               .flags  = IORESOURCE_MEM,
-               .start  = AR71XX_GE1_BASE + 0x38,
                .end    = AR71XX_GE1_BASE + 0x200 - 1,
        }, {
                .name   = "mii_ctrl",
@@ -405,6 +413,10 @@ static struct platform_device ar71xx_eth1_device = {
 #define AR71XX_PLL_VAL_100     0x00001099
 #define AR71XX_PLL_VAL_10      0x00991099
 
+#define AR724X_PLL_VAL_1000    0x00110000
+#define AR724X_PLL_VAL_100     0x00001099
+#define AR724X_PLL_VAL_10      0x00991099
+
 #define AR91XX_PLL_VAL_1000    0x1a000000
 #define AR91XX_PLL_VAL_100     0x13000a44
 #define AR91XX_PLL_VAL_10      0x00441099
@@ -433,6 +445,13 @@ static void __init ar71xx_init_eth_pll_data(unsigned int id)
                pll_100 = AR71XX_PLL_VAL_100;
                pll_1000 = AR71XX_PLL_VAL_1000;
                break;
+
+       case AR71XX_SOC_AR7240:
+               pll_10 = AR724X_PLL_VAL_10;
+               pll_100 = AR724X_PLL_VAL_100;
+               pll_1000 = AR724X_PLL_VAL_1000;
+               break;
+
        case AR71XX_SOC_AR9130:
        case AR71XX_SOC_AR9132:
                pll_10 = AR91XX_PLL_VAL_10;
@@ -522,6 +541,14 @@ void __init ar71xx_add_device_eth(unsigned int id)
                pdata->has_gbit = 1;
                break;
 
+       case AR71XX_SOC_AR7240:
+               pdata->ddr_flush = id ? ar724x_ddr_flush_ge1
+                                     : ar724x_ddr_flush_ge0;
+               pdata->set_pll =  id ? ar724x_set_pll_ge1
+                                    : ar724x_set_pll_ge0;
+               pdata->is_ar724x = 1;
+               break;
+
        case AR71XX_SOC_AR9130:
                pdata->ddr_flush = id ? ar91xx_ddr_flush_ge1
                                      : ar91xx_ddr_flush_ge0;