History

Merge tag 'omap-for-v4.14/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc

Pull "soc changes for omaps for v4.14" from Tony Lindgren: SoC updates for omaps for v4.14. Most of the chages are to add support for new dra762 SoC. The other changes are are for legacy DMA code removal, and MMC quirk and iodelay config for dra7. * tag 'omap-for-v4.14/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP: dra7: powerdomain data: Register SoC specific powerdomains ARM: dra762: Enable SMP for dra762 ARM: dra7: hwmod: Register dra76x specific hwmod ARM: dra762: Add support for device identification ARM: OMAP2+: board-generic: add support for dra762 family ARM: OMAP2+: Select PINCTRL_TI_IODELAY for SOC_DRA7XX ARM: OMAP2+: Add pdata-quirks for MMC/SD on DRA74x EVM ARM: OMAP2+: Remove unused legacy code for DMA

Arnd Bergmann committed 9 years ago

Commit a968bc52 parents 6a1aa09 3af6ccc11 files · +101 −148Browse files

Showing the changes to include/linux/platform_data (1 of 11 files). Show all

Unified · Split

include/linux/platform_data/hsmmc-omap.h+3−0
@@ -67,6 +67,9 @@ struct omap_hsmmc_platform_data { · 66 unmodified lines
67#define HSMMC_HAS_HSPE_SUPPORT (1 << 2)67#define HSMMC_HAS_HSPE_SUPPORT (1 << 2)
68 unsigned features;68 unsigned features;
69 69
70 /* string specifying a particular variant of hardware */
71 char *version;
72
70 int gpio_cd; /* gpio (card detect) */73 int gpio_cd; /* gpio (card detect) */
71 int gpio_cod; /* gpio (cover detect) */74 int gpio_cod; /* gpio (cover detect) */
72 int gpio_wp; /* gpio (write protect) */75 int gpio_wp; /* gpio (write protect) */