aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/files/drivers
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2009-07-11 14:59:31 +0000
committerGabor Juhos <juhosg@openwrt.org>2009-07-11 14:59:31 +0000
commit218298becfb97225c0f10949b0730d4858a1fea2 (patch)
tree230a7f57d87ac2ebe3a1e8216736c27a10200083 /target/linux/ar71xx/files/drivers
parent292775eb34a0deaf84d0b9345d2f0125c8c5b36b (diff)
downloadupstream-218298becfb97225c0f10949b0730d4858a1fea2.tar.gz
upstream-218298becfb97225c0f10949b0730d4858a1fea2.tar.bz2
upstream-218298becfb97225c0f10949b0730d4858a1fea2.zip
use platform data to setup the MAC_CFG register in the spi_vsc7385 driver
SVN-Revision: 16780
Diffstat (limited to 'target/linux/ar71xx/files/drivers')
-rw-r--r--target/linux/ar71xx/files/drivers/spi/spi_vsc7385.c21
1 files changed, 14 insertions, 7 deletions
diff --git a/target/linux/ar71xx/files/drivers/spi/spi_vsc7385.c b/target/linux/ar71xx/files/drivers/spi/spi_vsc7385.c
index 14952c663b..c16707ed8c 100644
--- a/target/linux/ar71xx/files/drivers/spi/spi_vsc7385.c
+++ b/target/linux/ar71xx/files/drivers/spi/spi_vsc7385.c
@@ -63,10 +63,11 @@
#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
@@ -438,6 +437,8 @@ static int vsc7385_upload_ucode(struct vsc7385 *vsc)
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,8 +462,14 @@ 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;