From: "Ira W. Snyder" <iws@ovro.caltech.edu>
To: linux-kernel@vger.kernel.org
Cc: linux-can@vger.kernel.org, sameo@linux.intel.com,
"Ira W. Snyder" <iws@ovro.caltech.edu>
Subject: [PATCH 2/2] can: janz-ican3: fix support for older hardware revisions
Date: Tue, 11 Sep 2012 15:58:15 -0700 [thread overview]
Message-ID: <1347404295-7985-3-git-send-email-iws@ovro.caltech.edu> (raw)
In-Reply-To: <1347404295-7985-1-git-send-email-iws@ovro.caltech.edu>
From: "Ira W. Snyder" <iws@ovro.caltech.edu>
The Revision 1.0 Janz CMOD-IO Carrier Board does not have support for
the reset registers. To support older hardware, the code is changed to
use the hardware reset register on the Janz VMOD-ICAN3 hardware itself.
Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
---
drivers/net/can/janz-ican3.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/drivers/net/can/janz-ican3.c b/drivers/net/can/janz-ican3.c
index 98ee438..7edadee 100644
--- a/drivers/net/can/janz-ican3.c
+++ b/drivers/net/can/janz-ican3.c
@@ -1391,7 +1391,6 @@ static irqreturn_t ican3_irq(int irq, void *dev_id)
*/
static int ican3_reset_module(struct ican3_dev *mod)
{
- u8 val = 1 << mod->num;
unsigned long start;
u8 runold, runnew;
@@ -1405,8 +1404,7 @@ static int ican3_reset_module(struct ican3_dev *mod)
runold = ioread8(mod->dpm + TARGET_RUNNING);
/* reset the module */
- iowrite8(val, &mod->ctrl->reset_assert);
- iowrite8(val, &mod->ctrl->reset_deassert);
+ iowrite8(0x00, &mod->dpmctrl->hwreset);
/* wait until the module has finished resetting and is running */
start = jiffies;
--
1.7.8.6
next prev parent reply other threads:[~2012-09-11 22:58 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-11 22:58 [PATCH 0/2] janz: fix support for Janz CMOD-IO revision 1.0 hardware Ira W. Snyder
2012-09-11 22:58 ` [PATCH 1/2] mfd/janz-cmodio: fix MODULBus number sysfs entry Ira W. Snyder
2012-09-13 11:56 ` Marc Kleine-Budde
2012-09-13 12:52 ` Samuel Ortiz
2012-09-13 12:57 ` Marc Kleine-Budde
2012-09-11 22:58 ` Ira W. Snyder [this message]
2012-09-13 11:57 ` [PATCH 2/2] can: janz-ican3: fix support for older hardware revisions Marc Kleine-Budde
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=1347404295-7985-3-git-send-email-iws@ovro.caltech.edu \
--to=iws@ovro.caltech.edu \
--cc=linux-can@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sameo@linux.intel.com \
/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
all inboxes | Powered by JetHome®