ar71xx: fix sections mismatch warnings in the nand drivers

[openwrt.git] / target / linux / ar71xx / files / drivers / spi / spi_vsc7385.c

diff --git a/target/linux/ar71xx/files/drivers/spi/spi_vsc7385.c b/target/linux/ar71xx/files/drivers/spi/spi_vsc7385.c
index 14952c6..9340df2 100644 (file)
--- a/target/linux/ar71xx/files/drivers/spi/spi_vsc7385.c
+++ b/target/linux/ar71xx/files/drivers/spi/spi_vsc7385.c
@@ -56,17 +56,18 @@
 #define VSC73XX_MAC_CFG_WEXC_DIS       (1 << 31)
 #define VSC73XX_MAC_CFG_PORT_RST       (1 << 29)
 #define VSC73XX_MAC_CFG_TX_EN          (1 << 28)
-#define VSC73XX_MAC_CFG_SEED_LOAD              (1 << 27)
-#define VSC73XX_MAC_CFG_FDX            (1 << 18)
+#define VSC73XX_MAC_CFG_SEED_LOAD      (1 << 27)
+#define VSC73XX_MAC_CFG_FDX            (1 << 18)
 #define VSC73XX_MAC_CFG_GIGE           (1 << 17)
 #define VSC73XX_MAC_CFG_RX_EN          (1 << 16)
 #define VSC73XX_MAC_CFG_VLAN_DBLAWR    (1 << 15)
 #define VSC73XX_MAC_CFG_VLAN_AWR       (1 << 14)
 #define VSC73XX_MAC_CFG_100_BASE_T     (1 << 13)
-#define VSC73XX_MAC_CFG_TX_IPG(x)      ((x & 0x1f) << 6)
+#define VSC73XX_MAC_CFG_TX_IPG(x)      (((x) & 0x1f) << 6)
 #define VSC73XX_MAC_CFG_MAC_RX_RST     (1 << 5)
 #define VSC73XX_MAC_CFG_MAC_TX_RST     (1 << 4)
-#define VSC73XX_MAC_CFG_CLK_SEL(x)     ((x & 0x3) << 0)
+#define VSC73XX_MAC_CFG_BIT2           (1 << 2)
+#define VSC73XX_MAC_CFG_CLK_SEL(x)     ((x) & 0x3)
 
 /* ADVPORTM register bits */
 #define VSC73XX_ADVPORTM_IFG_PPM       (1 << 7)
@@ -145,12 +146,10 @@
                                 VSC73XX_MAC_CFG_MAC_RX_RST | \
                                 VSC73XX_MAC_CFG_MAC_TX_RST)
 
-#define VSC7385_MAC_CFG_INIT   (VSC73XX_MAC_CFG_TX_EN | \
+#define VSC73XX_MAC_CFG_INIT   (VSC73XX_MAC_CFG_TX_EN | \
                                 VSC73XX_MAC_CFG_FDX | \
                                 VSC73XX_MAC_CFG_GIGE | \
-                                VSC73XX_MAC_CFG_RX_EN | \
-                                VSC73XX_MAC_CFG_TX_IPG(6) | \
-                                4)
+                                VSC73XX_MAC_CFG_RX_EN)
 
 #define VSC73XX_RESET_DELAY    100
 
@@ -399,7 +398,8 @@ static int vsc7385_upload_ucode(struct vsc7385 *vsc)
                rc = vsc7385_read(vsc, VSC73XX_BLOCK_SYSTEM, 0,
                                  VSC73XX_ICPU_SRAM, &curVal);
                if (rc) {
-                       dev_err(&spi->dev, "could not read microcode %d\n",rc);
+                       dev_err(&spi->dev, "could not read microcode %d\n",
+                               rc);
                        goto out;
                }
 
@@ -431,13 +431,15 @@ static int vsc7385_upload_ucode(struct vsc7385 *vsc)
 
        rc = vsc7385_icpu_start(vsc);
 
- out:
+out:
        release_firmware(firmware);
        return rc;
 }
 
 static int vsc7385_setup(struct vsc7385 *vsc)
 {
+       struct vsc7385_platform_data *pdata = vsc->pdata;
+       u32 t;
        int err;
 
        err = vsc7385_write_verify(vsc, VSC73XX_BLOCK_SYSTEM, 0,
@@ -461,14 +463,20 @@ static int vsc7385_setup(struct vsc7385 *vsc)
        if (err)
                goto err;
 
+       t = VSC73XX_MAC_CFG_INIT;
+       t |= VSC73XX_MAC_CFG_TX_IPG(pdata->mac_cfg.tx_ipg);
+       t |= VSC73XX_MAC_CFG_CLK_SEL(pdata->mac_cfg.clk_sel);
+       if (pdata->mac_cfg.bit2)
+               t |= VSC73XX_MAC_CFG_BIT2;
+
        err = vsc7385_write(vsc, VSC73XX_BLOCK_MAC, VSC73XX_SUBBLOCK_PORT_MAC,
-                           VSC73XX_MAC_CFG, VSC7385_MAC_CFG_INIT);
+                           VSC73XX_MAC_CFG, t);
        if (err)
                goto err;
 
        return 0;
 
- err:
+err:
        return err;
 }
 
@@ -513,7 +521,7 @@ static int vsc7385_detect(struct vsc7385 *vsc)
 
        rev = (t >> VSC73XX_ICPU_CHIPID_REV_SHIFT) &
              VSC73XX_ICPU_CHIPID_REV_MASK;
-       dev_info(&spi->dev, "VSC%04X (rev. %d) switch found \n", id, rev);
+       dev_info(&spi->dev, "VSC%04X (rev. %d) switch found\n", id, rev);
 
        return 0;
 }
@@ -529,13 +537,13 @@ static int __devinit vsc7385_probe(struct spi_device *spi)
        pdata = spi->dev.platform_data;
        if (!pdata) {
                dev_err(&spi->dev, "no platform data specified\n");
-               return-ENODEV;
+               return -ENODEV;
        }
 
        vsc = kzalloc(sizeof(*vsc), GFP_KERNEL);
        if (!vsc) {
                dev_err(&spi->dev, "no memory for private data\n");
-               return-ENOMEM;
+               return -ENOMEM;
        }
 
        mutex_init(&vsc->lock);
@@ -547,13 +555,13 @@ static int __devinit vsc7385_probe(struct spi_device *spi)
        spi->bits_per_word = 8;
        err = spi_setup(spi);
        if (err) {
-               dev_err(&spi->dev, "spi_setup failed, err=%d \n", err);
+               dev_err(&spi->dev, "spi_setup failed, err=%d\n", err);
                goto err_drvdata;
        }
 
        err = vsc7385_detect(vsc);
        if (err) {
-               dev_err(&spi->dev, "no chip found, err=%d \n", err);
+               dev_err(&spi->dev, "no chip found, err=%d\n", err);
                goto err_drvdata;
        }
 
@@ -567,7 +575,7 @@ static int __devinit vsc7385_probe(struct spi_device *spi)
 
        return 0;
 
- err_drvdata:
+err_drvdata:
        dev_set_drvdata(&spi->dev, NULL);
        kfree(vsc);
        return err;