diff options
| author | Ira W. Snyder <iws@ovro.caltech.edu> | 2012-09-11 15:58:15 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-02 09:47:37 -0700 |
| commit | cf90cf86548beeebe5217548de6922c025372ec1 (patch) | |
| tree | 2c0f41b6d997c07e861ba384d50a4c14ecf1573b /drivers/net/can | |
| parent | 2704f7f5dc86a8c8c3a5bdd22942f839ff556642 (diff) | |
| download | kernel_samsung_smdk4412-cf90cf86548beeebe5217548de6922c025372ec1.zip kernel_samsung_smdk4412-cf90cf86548beeebe5217548de6922c025372ec1.tar.gz kernel_samsung_smdk4412-cf90cf86548beeebe5217548de6922c025372ec1.tar.bz2 | |
can: janz-ican3: fix support for older hardware revisions
commit e21093ef6fb4cbecdf926102286dbe280ae965db upstream.
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>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/can')
| -rw-r--r-- | 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 f1942ca..b4159a6 100644 --- a/drivers/net/can/janz-ican3.c +++ b/drivers/net/can/janz-ican3.c @@ -1249,7 +1249,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; @@ -1263,8 +1262,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; |