diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-06-22 18:12:33 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-06-22 18:12:33 +0200 |
| commit | f5b858a98c948100f2aab0233c6464dfdc8334ae (patch) | |
| tree | 04d73847906db5064bbdbee5f3041eb7c3c2cf1d | |
| parent | 18cbacd7889a592fd62dd6b30917322f3982e964 (diff) | |
tegra: colibri_t20: spidev support
Migrate spidev support.
| -rw-r--r-- | arch/arm/configs/colibri_t20_defconfig | 3 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-colibri_t20.c | 8 |
2 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/configs/colibri_t20_defconfig b/arch/arm/configs/colibri_t20_defconfig index b3e1b93f43e0..39a3d2b547b9 100644 --- a/arch/arm/configs/colibri_t20_defconfig +++ b/arch/arm/configs/colibri_t20_defconfig @@ -285,6 +285,9 @@ CONFIG_I2C_CHARDEV=y CONFIG_I2C_MUX=y CONFIG_I2C_MUX_PCA954x=y CONFIG_I2C_TEGRA=y +CONFIG_SPI=y +CONFIG_SPI_TEGRA=y +CONFIG_SPI_SPIDEV=y CONFIG_DEBUG_GPIO=y CONFIG_GPIO_SYSFS=y CONFIG_POWER_SUPPLY=y diff --git a/arch/arm/mach-tegra/board-colibri_t20.c b/arch/arm/mach-tegra/board-colibri_t20.c index 2caafbbad76e..1786d57f7b72 100644 --- a/arch/arm/mach-tegra/board-colibri_t20.c +++ b/arch/arm/mach-tegra/board-colibri_t20.c @@ -126,6 +126,10 @@ static __initdata struct tegra_clk_init_table colibri_t20_clk_init_table[] = { // {"cdev1", "pll_a_out0", 24576000, true}, // {"pll_a_out0", "pll_a", 24576000, true}, +//[ 2.284308] kernel BUG at drivers/spi/spi-tegra.c:254! +//[ 2.289454] Unable to handle kernel NULL pointer dereference at virtual address 00000000 + {"sbc4", "pll_p", 12000000, false}, + {NULL, NULL, 0, 0}, #else {"2d", "pll_c", 300000000, true}, @@ -616,6 +620,7 @@ static struct platform_device tegra_rtc_device = { /* SPI */ +#if defined(CONFIG_SPI_TEGRA) && defined(CONFIG_SPI_SPIDEV) static struct spi_board_info tegra_spi_devices[] __initdata = { { .bus_num = 3, @@ -633,6 +638,9 @@ static void __init colibri_t20_register_spidev(void) spi_register_board_info(tegra_spi_devices, ARRAY_SIZE(tegra_spi_devices)); } +#else /* CONFIG_SPI_TEGRA && CONFIG_SPI_SPIDEV */ +#define colibri_t20_register_spidev() do {} while (0) +#endif /* CONFIG_SPI_TEGRA && CONFIG_SPI_SPIDEV */ /* UART */ |