diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-08-16 22:34:15 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-08-16 22:34:15 +0200 |
| commit | a968bc52fe8afb54ea07c5bae1d7ed236bd7733f (patch) | |
| tree | 76a4e1aa6938987b0991cb5f0835fd18e49f1257 /include/linux/platform_data | |
| parent | 6a1aa09b1576e92ce2b1fa00c0bedde15c74de37 (diff) | |
| parent | 3af6ccc3d1b167c14fd195341092073820361de1 (diff) | |
| download | op-kernel-dev-a968bc52fe8afb54ea07c5bae1d7ed236bd7733f.zip op-kernel-dev-a968bc52fe8afb54ea07c5bae1d7ed236bd7733f.tar.gz | |
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
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/hsmmc-omap.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/platform_data/hsmmc-omap.h b/include/linux/platform_data/hsmmc-omap.h index 0ff1e0d..73d9098 100644 --- a/include/linux/platform_data/hsmmc-omap.h +++ b/include/linux/platform_data/hsmmc-omap.h @@ -67,6 +67,9 @@ struct omap_hsmmc_platform_data { #define HSMMC_HAS_HSPE_SUPPORT (1 << 2) unsigned features; + /* string specifying a particular variant of hardware */ + char *version; + int gpio_cd; /* gpio (card detect) */ int gpio_cod; /* gpio (cover detect) */ int gpio_wp; /* gpio (write protect) */ |
