0097-bcm2709-Port-pps-gpio-and-i2c-patches.patch 3.1 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091
  1. From aca6741a1d26736f6000d18b3c60a18a313be6ea Mon Sep 17 00:00:00 2001
  2. From: Phil Elwell <phil@raspberrypi.org>
  3. Date: Mon, 26 Jan 2015 17:40:22 +0000
  4. Subject: [PATCH 097/114] bcm2709: Port pps-gpio and i2c patches
  5. ---
  6. arch/arm/mach-bcm2709/bcm2709.c | 41 +++++++++++++++++++++++++++++++++++++++--
  7. 1 file changed, 39 insertions(+), 2 deletions(-)
  8. --- a/arch/arm/mach-bcm2709/bcm2709.c
  9. +++ b/arch/arm/mach-bcm2709/bcm2709.c
  10. @@ -37,6 +37,7 @@
  11. #include <linux/spi/spi.h>
  12. #include <linux/gpio/machine.h>
  13. #include <linux/w1-gpio.h>
  14. +#include <linux/pps-gpio.h>
  15. #include <linux/version.h>
  16. #include <linux/clkdev.h>
  17. @@ -95,6 +96,8 @@ static unsigned disk_led_active_low = 1;
  18. static unsigned reboot_part = 0;
  19. static unsigned w1_gpio_pin = W1_GPIO;
  20. static unsigned w1_gpio_pullup = W1_PULLUP;
  21. +static int pps_gpio_pin = -1;
  22. +static bool vc_i2c_override = false;
  23. static unsigned use_dt = 0;
  24. @@ -283,6 +286,19 @@ static struct platform_device w1_device
  25. };
  26. #endif
  27. +static struct pps_gpio_platform_data pps_gpio_info = {
  28. + .assert_falling_edge = false,
  29. + .capture_clear = false,
  30. + .gpio_pin = -1,
  31. + .gpio_label = "PPS",
  32. +};
  33. +
  34. +static struct platform_device pps_gpio_device = {
  35. + .name = "pps-gpio",
  36. + .id = PLATFORM_DEVID_NONE,
  37. + .dev.platform_data = &pps_gpio_info,
  38. +};
  39. +
  40. static u64 fb_dmamask = DMA_BIT_MASK(DMA_MASK_BITS_COMMON);
  41. static struct platform_device bcm2708_fb_device = {
  42. @@ -860,6 +876,16 @@ void __init bcm2709_init(void)
  43. #ifdef CONFIG_BCM2708_GPIO
  44. bcm_register_device_dt(&bcm2708_gpio_device);
  45. #endif
  46. +
  47. +#if defined(CONFIG_PPS_CLIENT_GPIO) || defined(CONFIG_PPS_CLIENT_GPIO_MODULE)
  48. + if (!use_dt && (pps_gpio_pin >= 0)) {
  49. + pr_info("bcm2709: GPIO %d setup as pps-gpio device\n", pps_gpio_pin);
  50. + pps_gpio_info.gpio_pin = pps_gpio_pin;
  51. + pps_gpio_device.id = pps_gpio_pin;
  52. + bcm_register_device(&pps_gpio_device);
  53. + }
  54. +#endif
  55. +
  56. #if defined(CONFIG_W1_MASTER_GPIO) || defined(CONFIG_W1_MASTER_GPIO_MODULE)
  57. w1_gpio_pdata.pin = w1_gpio_pin;
  58. w1_gpio_pdata.ext_pullup_enable_pin = w1_gpio_pullup;
  59. @@ -884,8 +910,15 @@ void __init bcm2709_init(void)
  60. bcm_register_device(&bcm2835_thermal_device);
  61. bcm_register_device_dt(&bcm2708_spi_device);
  62. - bcm_register_device_dt(&bcm2708_bsc0_device);
  63. - bcm_register_device_dt(&bcm2708_bsc1_device);
  64. +
  65. + if (vc_i2c_override) {
  66. + bcm_register_device_dt(&bcm2708_bsc0_device);
  67. + bcm_register_device_dt(&bcm2708_bsc1_device);
  68. + } else if ((boardrev & 0xffffff) == 0x2 || (boardrev & 0xffffff) == 0x3) {
  69. + bcm_register_device_dt(&bcm2708_bsc0_device);
  70. + } else {
  71. + bcm_register_device_dt(&bcm2708_bsc1_device);
  72. + }
  73. #if defined(CONFIG_SND_BCM2708_SOC_I2S) || defined(CONFIG_SND_BCM2708_SOC_I2S_MODULE)
  74. bcm_register_device_dt(&bcm2708_i2s_device);
  75. @@ -1245,3 +1278,7 @@ module_param(disk_led_active_low, uint,
  76. module_param(reboot_part, uint, 0644);
  77. module_param(w1_gpio_pin, uint, 0644);
  78. module_param(w1_gpio_pullup, uint, 0644);
  79. +module_param(pps_gpio_pin, int, 0644);
  80. +MODULE_PARM_DESC(pps_gpio_pin, "Set GPIO pin to reserve for PPS");
  81. +module_param(vc_i2c_override, bool, 0644);
  82. +MODULE_PARM_DESC(vc_i2c_override, "Allow the use of VC's I2C peripheral.");