Commit f1f8c6cb authored by Marc Kleine-Budde's avatar Marc Kleine-Budde

can: mcp251x: Don't use pdata->model for chip selection anymore

Since commit e446630c, i.e. v2.6.35-rc1,
the mcp251x chip model can be selected via the modalias member in the
struct spi_board_info. The driver stores the actual model in the
struct mcp251x_platform_data.

From the driver point of view the platform_data should be read only.
Since all in-tree users of the mcp251x have already been converted to
the modalias method, this patch moves the "model" member from the
struct mcp251x_platform_data to the driver's private data structure.
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Cc: Christian Pellegrin <chripell@fsfe.org>
Cc: Marc Zyngier <maz@misterjones.org>
parent d3cd1565
...@@ -38,14 +38,14 @@ ...@@ -38,14 +38,14 @@
* static struct mcp251x_platform_data mcp251x_info = { * static struct mcp251x_platform_data mcp251x_info = {
* .oscillator_frequency = 8000000, * .oscillator_frequency = 8000000,
* .board_specific_setup = &mcp251x_setup, * .board_specific_setup = &mcp251x_setup,
* .model = CAN_MCP251X_MCP2510,
* .power_enable = mcp251x_power_enable, * .power_enable = mcp251x_power_enable,
* .transceiver_enable = NULL, * .transceiver_enable = NULL,
* }; * };
* *
* static struct spi_board_info spi_board_info[] = { * static struct spi_board_info spi_board_info[] = {
* { * {
* .modalias = "mcp251x", * .modalias = "mcp2510",
* // or "mcp2515" depending on your controller
* .platform_data = &mcp251x_info, * .platform_data = &mcp251x_info,
* .irq = IRQ_EINT13, * .irq = IRQ_EINT13,
* .max_speed_hz = 2*1000*1000, * .max_speed_hz = 2*1000*1000,
...@@ -224,10 +224,16 @@ static struct can_bittiming_const mcp251x_bittiming_const = { ...@@ -224,10 +224,16 @@ static struct can_bittiming_const mcp251x_bittiming_const = {
.brp_inc = 1, .brp_inc = 1,
}; };
enum mcp251x_model {
CAN_MCP251X_MCP2510 = 0x2510,
CAN_MCP251X_MCP2515 = 0x2515,
};
struct mcp251x_priv { struct mcp251x_priv {
struct can_priv can; struct can_priv can;
struct net_device *net; struct net_device *net;
struct spi_device *spi; struct spi_device *spi;
enum mcp251x_model model;
struct mutex mcp_lock; /* SPI device lock */ struct mutex mcp_lock; /* SPI device lock */
...@@ -362,10 +368,9 @@ static void mcp251x_write_bits(struct spi_device *spi, u8 reg, ...@@ -362,10 +368,9 @@ static void mcp251x_write_bits(struct spi_device *spi, u8 reg,
static void mcp251x_hw_tx_frame(struct spi_device *spi, u8 *buf, static void mcp251x_hw_tx_frame(struct spi_device *spi, u8 *buf,
int len, int tx_buf_idx) int len, int tx_buf_idx)
{ {
struct mcp251x_platform_data *pdata = spi->dev.platform_data;
struct mcp251x_priv *priv = dev_get_drvdata(&spi->dev); struct mcp251x_priv *priv = dev_get_drvdata(&spi->dev);
if (pdata->model == CAN_MCP251X_MCP2510) { if (priv->model == CAN_MCP251X_MCP2510) {
int i; int i;
for (i = 1; i < TXBDAT_OFF + len; i++) for (i = 1; i < TXBDAT_OFF + len; i++)
...@@ -408,9 +413,8 @@ static void mcp251x_hw_rx_frame(struct spi_device *spi, u8 *buf, ...@@ -408,9 +413,8 @@ static void mcp251x_hw_rx_frame(struct spi_device *spi, u8 *buf,
int buf_idx) int buf_idx)
{ {
struct mcp251x_priv *priv = dev_get_drvdata(&spi->dev); struct mcp251x_priv *priv = dev_get_drvdata(&spi->dev);
struct mcp251x_platform_data *pdata = spi->dev.platform_data;
if (pdata->model == CAN_MCP251X_MCP2510) { if (priv->model == CAN_MCP251X_MCP2510) {
int i, len; int i, len;
for (i = 1; i < RXBDAT_OFF; i++) for (i = 1; i < RXBDAT_OFF; i++)
...@@ -951,16 +955,12 @@ static int __devinit mcp251x_can_probe(struct spi_device *spi) ...@@ -951,16 +955,12 @@ static int __devinit mcp251x_can_probe(struct spi_device *spi)
struct net_device *net; struct net_device *net;
struct mcp251x_priv *priv; struct mcp251x_priv *priv;
struct mcp251x_platform_data *pdata = spi->dev.platform_data; struct mcp251x_platform_data *pdata = spi->dev.platform_data;
int model = spi_get_device_id(spi)->driver_data;
int ret = -ENODEV; int ret = -ENODEV;
if (!pdata) if (!pdata)
/* Platform data is required for osc freq */ /* Platform data is required for osc freq */
goto error_out; goto error_out;
if (model)
pdata->model = model;
/* Allocate can/net device */ /* Allocate can/net device */
net = alloc_candev(sizeof(struct mcp251x_priv), TX_ECHO_SKB_MAX); net = alloc_candev(sizeof(struct mcp251x_priv), TX_ECHO_SKB_MAX);
if (!net) { if (!net) {
...@@ -977,6 +977,7 @@ static int __devinit mcp251x_can_probe(struct spi_device *spi) ...@@ -977,6 +977,7 @@ static int __devinit mcp251x_can_probe(struct spi_device *spi)
priv->can.clock.freq = pdata->oscillator_frequency / 2; priv->can.clock.freq = pdata->oscillator_frequency / 2;
priv->can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES | priv->can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES |
CAN_CTRLMODE_LOOPBACK | CAN_CTRLMODE_LISTENONLY; CAN_CTRLMODE_LOOPBACK | CAN_CTRLMODE_LISTENONLY;
priv->model = spi_get_device_id(spi)->driver_data;
priv->net = net; priv->net = net;
dev_set_drvdata(&spi->dev, priv); dev_set_drvdata(&spi->dev, priv);
...@@ -1150,8 +1151,7 @@ static int mcp251x_can_resume(struct spi_device *spi) ...@@ -1150,8 +1151,7 @@ static int mcp251x_can_resume(struct spi_device *spi)
#define mcp251x_can_resume NULL #define mcp251x_can_resume NULL
#endif #endif
static struct spi_device_id mcp251x_id_table[] = { static const struct spi_device_id mcp251x_id_table[] = {
{ "mcp251x", 0 /* Use pdata.model */ },
{ "mcp2510", CAN_MCP251X_MCP2510 }, { "mcp2510", CAN_MCP251X_MCP2510 },
{ "mcp2515", CAN_MCP251X_MCP2515 }, { "mcp2515", CAN_MCP251X_MCP2515 },
{ }, { },
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
/** /**
* struct mcp251x_platform_data - MCP251X SPI CAN controller platform data * struct mcp251x_platform_data - MCP251X SPI CAN controller platform data
* @oscillator_frequency: - oscillator frequency in Hz * @oscillator_frequency: - oscillator frequency in Hz
* @model: - actual type of chip
* @board_specific_setup: - called before probing the chip (power,reset) * @board_specific_setup: - called before probing the chip (power,reset)
* @transceiver_enable: - called to power on/off the transceiver * @transceiver_enable: - called to power on/off the transceiver
* @power_enable: - called to power on/off the mcp *and* the * @power_enable: - called to power on/off the mcp *and* the
...@@ -25,9 +24,6 @@ ...@@ -25,9 +24,6 @@
struct mcp251x_platform_data { struct mcp251x_platform_data {
unsigned long oscillator_frequency; unsigned long oscillator_frequency;
int model;
#define CAN_MCP251X_MCP2510 0x2510
#define CAN_MCP251X_MCP2515 0x2515
int (*board_specific_setup)(struct spi_device *spi); int (*board_specific_setup)(struct spi_device *spi);
int (*transceiver_enable)(int enable); int (*transceiver_enable)(int enable);
int (*power_enable) (int enable); int (*power_enable) (int enable);
......
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