diff options
| author | Marc Zyngier <maz@misterjones.org> | 2010-03-29 08:57:56 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-30 23:51:09 -0700 |
| commit | e446630c960946b5c1762e4eadb618becef599e7 (patch) | |
| tree | 7dc73fc57fd1d38f309b208b6dadfddf248cb05f /include/linux/can | |
| parent | 598ed9367a36ee1fd4ae3271a54a3547a33975a5 (diff) | |
| download | blackbird-obmc-linux-e446630c960946b5c1762e4eadb618becef599e7.tar.gz blackbird-obmc-linux-e446630c960946b5c1762e4eadb618becef599e7.zip | |
Add hotplug support to mcp251x driver
Chip model can now be selected directly by matching the modalias name
(instead of filling the .model field in platform_data), and allows the
module to be auto-loaded. Previous behaviour is of course still supported.
Convert the two in-tree users to this feature (icontrol & zeus).
Tested on an Zeus platform (mcp2515).
Signed-off-by: Marc Zyngier <maz@misterjones.org>
Acked-by: Christian Pellegrin <chripell@fsfe.org>
Cc: Edwin Peer <epeer@tmtservices.co.za>
Acked-by: Wolfgang Grandegger <wg@grandegger.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/can')
| -rw-r--r-- | include/linux/can/platform/mcp251x.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/can/platform/mcp251x.h b/include/linux/can/platform/mcp251x.h index 1448177d86d5..dba28268e651 100644 --- a/include/linux/can/platform/mcp251x.h +++ b/include/linux/can/platform/mcp251x.h @@ -26,8 +26,8 @@ struct mcp251x_platform_data { unsigned long oscillator_frequency; int model; -#define CAN_MCP251X_MCP2510 0 -#define CAN_MCP251X_MCP2515 1 +#define CAN_MCP251X_MCP2510 0x2510 +#define CAN_MCP251X_MCP2515 0x2515 int (*board_specific_setup)(struct spi_device *spi); int (*transceiver_enable)(int enable); int (*power_enable) (int enable); |
