From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
To: barebox@lists.infradead.org
Subject: [PATCH 3/7] smc911x: add 16bit bus width support
Date: Tue, 14 Aug 2012 19:32:16 +0200 [thread overview]
Message-ID: <1344965540-31534-3-git-send-email-plagnioj@jcrosoft.com> (raw)
In-Reply-To: <1344965540-31534-1-git-send-email-plagnioj@jcrosoft.com>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
drivers/net/smc911x.c | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 2583235..c74ed52 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -47,6 +47,8 @@ struct smc911x_priv {
struct mii_device miidev;
void __iomem *base;
+ u32 width;
+
u32 (*reg_read)(struct smc911x_priv *priv, u32 reg);
void (*reg_write)(struct smc911x_priv *priv, u32 reg, u32 val);
};
@@ -78,7 +80,11 @@ static inline u32 smc911x_reg_read(struct smc911x_priv *priv, u32 reg)
static inline u32 __smc911x_reg_read(struct smc911x_priv *priv, u32 reg)
{
- return readl(priv->base + reg);
+ if (priv->width)
+ return readl(priv->base + reg);
+ else
+ return ((readw(priv->base + reg) & 0xFFFF) |
+ ((readw(priv->base + reg + 2) & 0xFFFF) << 16));
}
static inline void smc911x_reg_write(struct smc911x_priv *priv, u32 reg,
@@ -90,7 +96,12 @@ static inline void smc911x_reg_write(struct smc911x_priv *priv, u32 reg,
static inline void __smc911x_reg_write(struct smc911x_priv *priv, u32 reg,
u32 val)
{
- writel(val, priv->base + reg);
+ if (priv->width) {
+ writel(val, priv->base + reg);
+ } else {
+ writew(val & 0xFFFF, priv->base + reg);
+ writew((val >> 16) & 0xFFFF, priv->base + reg + 2);
+ }
}
static int smc911x_mac_wait_busy(struct smc911x_priv *priv)
@@ -393,6 +404,11 @@ static int smc911x_probe(struct device_d *dev)
int i;
priv = xzalloc(sizeof(*priv));
+ priv->width = dev->resource[0].flags & IORESOURCE_MEM_TYPE_MASK;
+ if (!priv->width)
+ priv->width = 1;
+ else
+ priv->width = priv->width == IORESOURCE_MEM_32BIT;
priv->base = dev_request_mem_region(dev, 0);
priv->reg_read = __smc911x_reg_read;
priv->reg_write = __smc911x_reg_write;
--
1.7.10.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2012-08-14 17:32 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-14 17:25 [PATCH 0/7] smsc911x: runtime configuration improvement Jean-Christophe PLAGNIOL-VILLARD
2012-08-14 17:32 ` [PATCH 1/7] smc911x: move register define to smc911x.h Jean-Christophe PLAGNIOL-VILLARD
2012-08-14 17:32 ` [PATCH 2/7] smc911x: introduce read/write ops Jean-Christophe PLAGNIOL-VILLARD
2012-08-14 17:32 ` Jean-Christophe PLAGNIOL-VILLARD [this message]
2012-08-14 20:21 ` [PATCH 3/7] smc911x: add 16bit bus width support Sascha Hauer
2012-08-15 4:30 ` Jean-Christophe PLAGNIOL-VILLARD
2012-08-27 14:20 ` Sascha Hauer
2012-08-14 17:32 ` [PATCH 4/7] smc911x: add support to pass the shift via platform data Jean-Christophe PLAGNIOL-VILLARD
2012-08-14 17:32 ` [PATCH 5/7] smc911x: improve detection handle Jean-Christophe PLAGNIOL-VILLARD
2012-08-14 17:32 ` [PATCH 6/7] smc911x: update chip detection Jean-Christophe PLAGNIOL-VILLARD
2012-08-14 17:32 ` [PATCH 7/7] smm911x: check if the device is ready before using it Jean-Christophe PLAGNIOL-VILLARD
2012-08-14 20:19 ` [PATCH 1/7] smc911x: move register define to smc911x.h Sascha Hauer
2012-08-15 4:34 ` Jean-Christophe PLAGNIOL-VILLARD
2012-08-29 4:27 [PATCH 0/7 2] smsc911x: runtime configuration improvement Jean-Christophe PLAGNIOL-VILLARD
2012-08-29 5:06 ` [PATCH 1/7] smc911x: move register define to smc911x.h Jean-Christophe PLAGNIOL-VILLARD
2012-08-29 5:06 ` [PATCH 3/7] smc911x: add 16bit bus width support Jean-Christophe PLAGNIOL-VILLARD
2012-09-01 8:47 [PATCH 0/7 v3] smsc911x: runtime configuration improvement Jean-Christophe PLAGNIOL-VILLARD
2012-09-01 8:52 ` [PATCH 1/7] smc911x: move register define to smc911x.h Jean-Christophe PLAGNIOL-VILLARD
2012-09-01 8:52 ` [PATCH 3/7] smc911x: add 16bit bus width support Jean-Christophe PLAGNIOL-VILLARD
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1344965540-31534-3-git-send-email-plagnioj@jcrosoft.com \
--to=plagnioj@jcrosoft.com \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox