summaryrefslogtreecommitdiffstats
path: root/drivers/net/smc911x.c
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2012-09-01 10:52:40 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-09-03 09:49:06 +0200
commit75880ac0ad974e9b2a2f2c77d00463bf7f354bc2 (patch)
tree741d542f5fdb29a955a7fea692f86566488ab1a1 /drivers/net/smc911x.c
parent187c55fddec95a9472fdab897ce8130bf73fa643 (diff)
downloadbarebox-75880ac0ad974e9b2a2f2c77d00463bf7f354bc2.tar.gz
barebox-75880ac0ad974e9b2a2f2c77d00463bf7f354bc2.tar.xz
smc911x: add 16bit bus width support
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/net/smc911x.c')
-rw-r--r--drivers/net/smc911x.c34
1 files changed, 29 insertions, 5 deletions
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 2583235372..917f99453e 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -76,7 +76,13 @@ static inline u32 smc911x_reg_read(struct smc911x_priv *priv, u32 reg)
return priv->reg_read(priv, reg);
}
-static inline u32 __smc911x_reg_read(struct smc911x_priv *priv, u32 reg)
+static inline u32 __smc911x_reg_readw(struct smc911x_priv *priv, u32 reg)
+{
+ return ((readw(priv->base + reg) & 0xFFFF) |
+ ((readw(priv->base + reg + 2) & 0xFFFF) << 16));
+}
+
+static inline u32 __smc911x_reg_readl(struct smc911x_priv *priv, u32 reg)
{
return readl(priv->base + reg);
}
@@ -87,7 +93,14 @@ static inline void smc911x_reg_write(struct smc911x_priv *priv, u32 reg,
priv->reg_write(priv, reg, val);
}
-static inline void __smc911x_reg_write(struct smc911x_priv *priv, u32 reg,
+static inline void __smc911x_reg_writew(struct smc911x_priv *priv, u32 reg,
+ u32 val)
+{
+ writew(val & 0xFFFF, priv->base + reg);
+ writew((val >> 16) & 0xFFFF, priv->base + reg + 2);
+}
+
+static inline void __smc911x_reg_writel(struct smc911x_priv *priv, u32 reg,
u32 val)
{
writel(val, priv->base + reg);
@@ -390,12 +403,23 @@ static int smc911x_probe(struct device_d *dev)
struct eth_device *edev;
struct smc911x_priv *priv;
uint32_t val;
- int i;
+ int i, is_32bit;
priv = xzalloc(sizeof(*priv));
+ is_32bit = dev->resource[0].flags & IORESOURCE_MEM_TYPE_MASK;
+ if (!is_32bit)
+ is_32bit = 1;
+ else
+ is_32bit = is_32bit == IORESOURCE_MEM_32BIT;
priv->base = dev_request_mem_region(dev, 0);
- priv->reg_read = __smc911x_reg_read;
- priv->reg_write = __smc911x_reg_write;
+
+ if (is_32bit) {
+ priv->reg_read = __smc911x_reg_readl;
+ priv->reg_write = __smc911x_reg_writel;
+ } else {
+ priv->reg_read = __smc911x_reg_readw;
+ priv->reg_write = __smc911x_reg_writew;
+ }
val = smc911x_reg_read(priv, BYTE_TEST);
if(val != 0x87654321) {