summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/board-colibri_t20.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-tegra/board-colibri_t20.c')
-rw-r--r--arch/arm/mach-tegra/board-colibri_t20.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/board-colibri_t20.c b/arch/arm/mach-tegra/board-colibri_t20.c
index 35e483e79653..05bcc5cbe883 100644
--- a/arch/arm/mach-tegra/board-colibri_t20.c
+++ b/arch/arm/mach-tegra/board-colibri_t20.c
@@ -293,7 +293,13 @@ static int __init colibri_t20_mcp2515_setup(struct spi_device *spi)
return 0;
}
-static struct tegra_spi_device_controller_data spi_controller_data;
+#ifndef MECS_TELLURIUM_XPOD2
+static struct tegra_spi_device_controller_data mcp251x_controller_data = {
+ .cs_hold_clk_count = 1, /* at least 50 ns */
+ .cs_setup_clk_count = 1, /* at least 50 ns */
+ .is_hw_based_cs = 1,
+};
+#endif /* MECS_TELLURIUM_XPOD2 */
static struct mcp251x_platform_data mcp251x_pdata = {
.board_specific_setup = colibri_t20_mcp2515_setup,
@@ -313,7 +319,7 @@ static struct spi_board_info mcp251x_board_info[] = {
#ifdef MECS_TELLURIUM_XPOD2
.controller_data = (void *) CAN_CS_GPIO,
#else
- .controller_data = &spi_controller_data,
+ .controller_data = &mcp251x_controller_data,
#endif
.max_speed_hz = 10000000,
.modalias = "mcp2515",
@@ -955,7 +961,7 @@ static struct platform_device xpod2_spi_device = {
#endif /* CONFIG_SPI_GPIO | CONFIG_SPI_GPIO_MODULE */
#if defined(CONFIG_SPI_TEGRA) && defined(CONFIG_SPI_SPIDEV)
-static struct tegra_spi_device_controller_data spi_controller_data = {
+static struct tegra_spi_device_controller_data spidev_controller_data = {
.cs_hold_clk_count = 1,
.cs_setup_clk_count = 1,
.is_hw_based_cs = 1,
@@ -969,7 +975,7 @@ static struct spi_board_info tegra_spi_devices[] __initdata = {
#else /* !CONFIG_CAN_MCP251X & !CONFIG_CAN_MCP251X_MODULE */
.chip_select = 1,
#endif /* !CONFIG_CAN_MCP251X & !CONFIG_CAN_MCP251X_MODULE */
- .controller_data = &spi_controller_data,
+ .controller_data = &spidev_controller_data,
.irq = 0,
.max_speed_hz = 50000000,
.modalias = "spidev",