Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/arch/arm/mach-bcm2708/bcm2708.c b/arch/arm/mach-bcm2708/bcm2708.c
- index 6349cbe..9b2409b 100644
- --- a/arch/arm/mach-bcm2708/bcm2708.c
- +++ b/arch/arm/mach-bcm2708/bcm2708.c
- @@ -34,6 +34,11 @@
- #include <linux/spi/spi.h>
- #include <linux/w1-gpio.h>
- #include <linux/pps-gpio.h>
- +/* added begin */
- +/* #include <linux/spi/spi_bitbang.h> */
- +/* #include <linux/spi/spi_gpio.h> */
- +/* #include <linux/gpio.h> */
- +/* added end */
- #include <linux/version.h>
- #include <linux/clkdev.h>
- @@ -150,6 +155,37 @@ static struct map_desc bcm2708_io_desc[] __initdata = {
- .type = MT_DEVICE}
- };
- +/* added begin */
- +
- +/* static struct spi_gpio_platform_data spi_gpio_data = { */
- +/* .sck = 11, */
- +/* .mosi = 10, */
- +/* .miso = 9, */
- +
- +/* .num_chipselect = 2, */
- +/* }; */
- +
- +/* static struct platform_device bcm2708_spi_gpio = { */
- +/* .name = "spi_gpio", */
- +/* .id = 0, */
- +/* .dev = { */
- +/* .platform_data = &spi_gpio_data, */
- +/* }, */
- +
- +/* }; */
- +
- +/* static struct spi_board_info gpio_spi_devices[] = { */
- +/* { */
- +/* .modalias = "mmc_spi", */
- +/* .max_speed_hz = 100000, */
- +/* .chip_select = 0, */
- +/* .controller_data = (void *) 8, */
- +/* // .mode = SPI_CS_HIGH */
- +/* }, */
- +/* }; */
- +
- +/* added end */
- +
- void __init bcm2708_map_io(void)
- {
- iotable_init(bcm2708_io_desc, ARRAY_SIZE(bcm2708_io_desc));
- @@ -582,6 +618,7 @@ static struct resource bcm2708_spi_resources[] = {
- };
- +
- static u64 bcm2708_spi_dmamask = DMA_BIT_MASK(DMA_MASK_BITS_COMMON);
- static struct platform_device bcm2708_spi_device = {
- .name = "bcm2708_spi",
- @@ -596,13 +633,14 @@ static struct platform_device bcm2708_spi_device = {
- #ifdef CONFIG_BCM2708_SPIDEV
- static struct spi_board_info bcm2708_spi_devices[] = {
- #ifdef CONFIG_SPI_SPIDEV
- - {
- - .modalias = "spidev",
- - .max_speed_hz = 500000,
- - .bus_num = 0,
- - .chip_select = 0,
- - .mode = SPI_MODE_0,
- - }, {
- + /* { */
- + /* .modalias = "spidev", */
- + /* .max_speed_hz = 500000, */
- + /* .bus_num = 0, */
- + /* .chip_select = 0, */
- + /* .mode = SPI_MODE_0, */
- + /* }, */
- + {
- .modalias = "spidev",
- .max_speed_hz = 500000,
- .bus_num = 0,
- @@ -613,6 +651,17 @@ static struct spi_board_info bcm2708_spi_devices[] = {
- };
- #endif
- +static struct spi_board_info rw_spi_devices[] = {
- + {
- + .modalias = "mmc_spi",
- + .max_speed_hz = 500000,
- + .bus_num = 0,
- + .chip_select = 0,
- + // .controller_data = (void *) 8,
- + // .mode = SPI_CS_HIGH
- + },
- +};
- +
- static struct resource bcm2708_bsc0_resources[] = {
- {
- .start = BSC0_BASE,
- @@ -892,6 +941,11 @@ void __init bcm2708_init(void)
- if (bcm2835_mmc)
- bcm_register_device(&bcm2835_emmc_device);
- #endif
- +/* added begin */
- + /* bcm_register_device(&bcm2708_spi_gpio); */
- + /* spi_register_board_info(gpio_spi_devices, */
- + /* ARRAY_SIZE(gpio_spi_devices)); */
- +/* added end */
- bcm2708_init_led();
- for (i = 0; i < ARRAY_SIZE(bcm2708_alsa_devices); i++)
- bcm_register_device(&bcm2708_alsa_devices[i]);
- @@ -957,6 +1011,9 @@ void __init bcm2708_init(void)
- spi_register_board_info(bcm2708_spi_devices,
- ARRAY_SIZE(bcm2708_spi_devices));
- #endif
- + /* bcm_register_device(&bcm2708_spi_gpio); */
- + spi_register_board_info(rw_spi_devices,
- + ARRAY_SIZE(rw_spi_devices));
- }
- static void timer_set_mode(enum clock_event_mode mode,
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement