mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
can: janz-ican3: fix support for older hardware revisions
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. Cc: stable <stable@vger.kernel.org> Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
This commit is contained in:
parent
c0d680e577
commit
e21093ef6f
1 changed files with 1 additions and 3 deletions
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue