netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Marc Kleine-Budde <mkl@pengutronix.de>
To: linux-can@vger.kernel.org
Cc: netdev@vger.kernel.org,
	Florian Vaussard <florian.vaussard@epfl.ch>,
	Marc Kleine-Budde <mkl@pengutronix.de>
Subject: [PATCH v4 5/5] can: sja1000: of: add reg-io-width property for 8, 16 and 32-bit register access
Date: Thu,  6 Feb 2014 12:09:56 +0100	[thread overview]
Message-ID: <1391684996-612-6-git-send-email-mkl@pengutronix.de> (raw)
In-Reply-To: <1391684996-612-1-git-send-email-mkl@pengutronix.de>

From: Florian Vaussard <florian.vaussard@epfl.ch>

Add the 'reg-io-width' property for 8, 16 and 32-bit access, like
what is currently done with IORESOURCE_MEM_{8,16,32}BIT for non-OF
boot.

Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
Tested-by: Andreas Larsson <andreas@gaisler.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 drivers/net/can/sja1000/sja1000_platform.c | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/drivers/net/can/sja1000/sja1000_platform.c b/drivers/net/can/sja1000/sja1000_platform.c
index b7fbe4f..95a844a 100644
--- a/drivers/net/can/sja1000/sja1000_platform.c
+++ b/drivers/net/can/sja1000/sja1000_platform.c
@@ -101,8 +101,24 @@ static void sp_populate_of(struct sja1000_priv *priv, struct device_node *of)
 	int err;
 	u32 prop;
 
-	priv->read_reg = sp_read_reg8;
-	priv->write_reg = sp_write_reg8;
+	err = of_property_read_u32(of, "reg-io-width", &prop);
+	if (err)
+		prop = 1; /* 8 bit is default */
+
+	switch (prop) {
+	case 4:
+		priv->read_reg = sp_read_reg32;
+		priv->write_reg = sp_write_reg32;
+		break;
+	case 2:
+		priv->read_reg = sp_read_reg16;
+		priv->write_reg = sp_write_reg16;
+		break;
+	case 1:	/* fallthrough */
+	default:
+		priv->read_reg = sp_read_reg8;
+		priv->write_reg = sp_write_reg8;
+	}
 
 	err = of_property_read_u32(of, "nxp,external-clock-frequency", &prop);
 	if (!err)
-- 
1.8.5.3


      parent reply	other threads:[~2014-02-06 11:09 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-06 11:09 PATCH v4 1/5] can: sja1000: cleanups and new OF property Marc Kleine-Budde
2014-02-06 11:09 ` [PATCH v4 1/5] can: sja1000: convert printk to use netdev API Marc Kleine-Budde
2014-02-06 11:09 ` [PATCH v4 2/5] can: sja1000: platform: use devm_* APIs Marc Kleine-Budde
2014-02-06 11:09 ` [PATCH v4 3/5] can: sja1000: fuse of_platform into platform Marc Kleine-Budde
2014-02-06 11:09 ` [PATCH v4 4/5] Documentation: devicetree: sja1000: add reg-io-width binding Marc Kleine-Budde
2014-02-06 11:09 ` Marc Kleine-Budde [this message]

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=1391684996-612-6-git-send-email-mkl@pengutronix.de \
    --to=mkl@pengutronix.de \
    --cc=florian.vaussard@epfl.ch \
    --cc=linux-can@vger.kernel.org \
    --cc=netdev@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).