Commit ee967fff authored by Alexander Shiyan's avatar Alexander Shiyan Committed by Marc Kleine-Budde

can: mcp251x: Improve mcp251x_hw_probe()

This patch adds check for mcp251x_hw_reset() result on startup and
removes unnecessary checking for CANSTAT register since this value
is being checked in mcp251x_hw_reset().
Signed-off-by: default avatarAlexander Shiyan <shc_work@mail.ru>
Tested-by: default avatarAlexander Shiyan <shc_work@mail.ru>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent ff06d611
...@@ -649,23 +649,22 @@ static int mcp251x_hw_reset(struct spi_device *spi) ...@@ -649,23 +649,22 @@ static int mcp251x_hw_reset(struct spi_device *spi)
static int mcp251x_hw_probe(struct spi_device *spi) static int mcp251x_hw_probe(struct spi_device *spi)
{ {
int st1, st2; u8 ctrl;
int ret;
mcp251x_hw_reset(spi); ret = mcp251x_hw_reset(spi);
if (ret)
return ret;
/* ctrl = mcp251x_read_reg(spi, CANCTRL);
* Please note that these are "magic values" based on after
* reset defaults taken from data sheet which allows us to see
* if we really have a chip on the bus (we avoid common all
* zeroes or all ones situations)
*/
st1 = mcp251x_read_reg(spi, CANSTAT) & 0xEE;
st2 = mcp251x_read_reg(spi, CANCTRL) & 0x17;
dev_dbg(&spi->dev, "CANSTAT 0x%02x CANCTRL 0x%02x\n", st1, st2); dev_dbg(&spi->dev, "CANCTRL 0x%02x\n", ctrl);
/* Check for power up default values */ /* Check for power up default value */
return (st1 == 0x80 && st2 == 0x07) ? 1 : 0; if ((ctrl & 0x17) != 0x07)
return -ENODEV;
return 0;
} }
static int mcp251x_power_enable(struct regulator *reg, int enable) static int mcp251x_power_enable(struct regulator *reg, int enable)
...@@ -1142,10 +1141,10 @@ static int mcp251x_can_probe(struct spi_device *spi) ...@@ -1142,10 +1141,10 @@ static int mcp251x_can_probe(struct spi_device *spi)
SET_NETDEV_DEV(net, &spi->dev); SET_NETDEV_DEV(net, &spi->dev);
/* Here is OK to not lock the MCP, no one knows about it yet */ /* Here is OK to not lock the MCP, no one knows about it yet */
if (!mcp251x_hw_probe(spi)) { ret = mcp251x_hw_probe(spi);
ret = -ENODEV; if (ret)
goto error_probe; goto error_probe;
}
mcp251x_hw_sleep(spi); mcp251x_hw_sleep(spi);
ret = register_candev(net); ret = register_candev(net);
...@@ -1154,7 +1153,7 @@ static int mcp251x_can_probe(struct spi_device *spi) ...@@ -1154,7 +1153,7 @@ static int mcp251x_can_probe(struct spi_device *spi)
devm_can_led_init(net); devm_can_led_init(net);
return ret; return 0;
error_probe: error_probe:
if (mcp251x_enable_dma) if (mcp251x_enable_dma)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment