Advertisement
Guest User

Untitled

a guest
Dec 16th, 2014
779
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
C 3.62 KB | None | 0 0
  1. diff --git a/arch/arm/mach-bcm2708/bcm2708.c b/arch/arm/mach-bcm2708/bcm2708.c
  2. index 6349cbe..9b2409b 100644
  3. --- a/arch/arm/mach-bcm2708/bcm2708.c
  4. +++ b/arch/arm/mach-bcm2708/bcm2708.c
  5. @@ -34,6 +34,11 @@
  6.  #include <linux/spi/spi.h>
  7.  #include <linux/w1-gpio.h>
  8.  #include <linux/pps-gpio.h>
  9. +/* added begin */
  10. +/* #include <linux/spi/spi_bitbang.h> */
  11. +/* #include <linux/spi/spi_gpio.h> */
  12. +/* #include <linux/gpio.h> */
  13. +/* added end */
  14.  
  15.  #include <linux/version.h>
  16.  #include <linux/clkdev.h>
  17. @@ -150,6 +155,37 @@ static struct map_desc bcm2708_io_desc[] __initdata = {
  18.      .type = MT_DEVICE}
  19.  };
  20.  
  21. +/* added begin */
  22. +
  23. +/* static struct spi_gpio_platform_data spi_gpio_data = { */
  24. +/*        .sck = 11, */
  25. +/*        .mosi = 10, */
  26. +/*        .miso = 9, */
  27. +
  28. +/*        .num_chipselect = 2, */
  29. +/* }; */
  30. +
  31. +/* static struct platform_device bcm2708_spi_gpio = { */
  32. +/*        .name      = "spi_gpio", */
  33. +/*        .id      = 0, */
  34. +/*        .dev      = { */
  35. +/*                .platform_data   = &spi_gpio_data, */
  36. +/*        }, */
  37. +
  38. +/* }; */
  39. +
  40. +/* static struct spi_board_info gpio_spi_devices[] = { */
  41. +/*        { */
  42. +/*                .modalias = "mmc_spi", */
  43. +/*                .max_speed_hz = 100000, */
  44. +/*                .chip_select = 0, */
  45. +/*                .controller_data = (void *) 8, */
  46. +/*                // .mode = SPI_CS_HIGH */
  47. +/*        }, */
  48. +/* }; */
  49. +
  50. +/* added end */
  51. +
  52.  void __init bcm2708_map_io(void)
  53.  {
  54.     iotable_init(bcm2708_io_desc, ARRAY_SIZE(bcm2708_io_desc));
  55. @@ -582,6 +618,7 @@ static struct resource bcm2708_spi_resources[] = {
  56.  };
  57.  
  58.  
  59. +
  60.  static u64 bcm2708_spi_dmamask = DMA_BIT_MASK(DMA_MASK_BITS_COMMON);
  61.  static struct platform_device bcm2708_spi_device = {
  62.     .name = "bcm2708_spi",
  63. @@ -596,13 +633,14 @@ static struct platform_device bcm2708_spi_device = {
  64.  #ifdef CONFIG_BCM2708_SPIDEV
  65.  static struct spi_board_info bcm2708_spi_devices[] = {
  66.  #ifdef CONFIG_SPI_SPIDEV
  67. -   {
  68. -       .modalias = "spidev",
  69. -       .max_speed_hz = 500000,
  70. -       .bus_num = 0,
  71. -       .chip_select = 0,
  72. -       .mode = SPI_MODE_0,
  73. -   }, {
  74. +   /* { */
  75. +   /*  .modalias = "spidev", */
  76. +   /*  .max_speed_hz = 500000, */
  77. +   /*  .bus_num = 0, */
  78. +   /*  .chip_select = 0, */
  79. +   /*  .mode = SPI_MODE_0, */
  80. +   /* }, */
  81. +    {
  82.         .modalias = "spidev",
  83.         .max_speed_hz = 500000,
  84.         .bus_num = 0,
  85. @@ -613,6 +651,17 @@ static struct spi_board_info bcm2708_spi_devices[] = {
  86.  };
  87.  #endif
  88.  
  89. +static struct spi_board_info rw_spi_devices[] = {
  90. +       {
  91. +               .modalias = "mmc_spi",
  92. +               .max_speed_hz = 500000,
  93. +               .bus_num = 0,
  94. +               .chip_select = 0,
  95. +               // .controller_data = (void *) 8,
  96. +               // .mode = SPI_CS_HIGH
  97. +       },
  98. +};
  99. +
  100.  static struct resource bcm2708_bsc0_resources[] = {
  101.     {
  102.         .start = BSC0_BASE,
  103. @@ -892,6 +941,11 @@ void __init bcm2708_init(void)
  104.     if (bcm2835_mmc)
  105.         bcm_register_device(&bcm2835_emmc_device);
  106.  #endif
  107. +/* added begin */
  108. +    /* bcm_register_device(&bcm2708_spi_gpio); */
  109. +    /* spi_register_board_info(gpio_spi_devices, */
  110. +    /*                         ARRAY_SIZE(gpio_spi_devices)); */
  111. +/* added end */
  112.     bcm2708_init_led();
  113.     for (i = 0; i < ARRAY_SIZE(bcm2708_alsa_devices); i++)
  114.         bcm_register_device(&bcm2708_alsa_devices[i]);
  115. @@ -957,6 +1011,9 @@ void __init bcm2708_init(void)
  116.     spi_register_board_info(bcm2708_spi_devices,
  117.             ARRAY_SIZE(bcm2708_spi_devices));
  118.  #endif
  119. +    /* bcm_register_device(&bcm2708_spi_gpio); */
  120. +    spi_register_board_info(rw_spi_devices,
  121. +                            ARRAY_SIZE(rw_spi_devices));
  122.  }
  123.  
  124.  static void timer_set_mode(enum clock_event_mode mode,
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement