diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-03-07 16:05:56 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-03-07 16:05:56 +0100 |
| commit | 0517a0934e45d083adb31fd79ae48a49cadfa1d4 (patch) | |
| tree | 891e04b16e177f5b2a22f88776ca82f3ee97bb13 /arch/arm/configs | |
| parent | ea99a3546a0fbf926e3994d91604d69ddfcbab9b (diff) | |
| parent | 18aa0f4bca701cb078a6d58a3ed804aa6a4690c7 (diff) | |
Merge tag 'omap-for-v4.17/dt-sdhci-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
Pull "Device tree changes for dra7 sdhci for v4.17" from Tony Lindgren:
This series from Sekhar Nori and Kishon Vijay Abraham I adds
sdhci related nodes for dra7. To support higher transfer speeds,
the iodelay pinmux controller needs to be also configured.
Note that as these changes need SDHCI_OMAP to be enabled to avoid
breaking booting for various systems, these changes are based on
two defconfig changes to enable SDHCI_OMAP in the defconfig files.
* tag 'omap-for-v4.17/dt-sdhci-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: dts: am57xx-idk: Select pull down for mmc1_clk line in default mode
ARM: dts: dra71-evm: Select pull down for mmc1_clk line in default mode
ARM: dts: dra71-evm: Correct evm_sd regulator max voltage
ARM: dts: dra76-evm: Add "vqmmc-supply" property for mmc2
ARM: dts: am57xx-idk: Add "vqmmc-supply" property for mmc2
ARM: dts: dra7-evm: Add "vqmmc-supply" property for mmc2
ARM: dts: dra7-evm: Remove mmc specific pinmux
ARM: dts: am57xx-beagle-x15: Add "vqmmc-supply" property for mmc2
ARM: dts: dra76-evm: Add pinctrl data for higher speed MMC/SD modes
ARM: dts: dra76-evm: Shift to using common IOdelay data
ARM: dts: dra76x: Create a common file with MMC/SD IOdelay data
ARM: omap2plus_defconfig: Enable CONFIG_MMC_SDHCI_OMAP
ARM: multi_v7_defconfig: Enable CONFIG_MMC_SDHCI_OMAP
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/omap2plus_defconfig | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index da7387689b88..28f1d714e5b9 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -751,6 +751,7 @@ CONFIG_MMC_DW_ROCKCHIP=y CONFIG_MMC_SH_MMCIF=y CONFIG_MMC_SUNXI=y CONFIG_MMC_BCM2835=y +CONFIG_MMC_SDHCI_OMAP=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_CLASS_FLASH=m diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig index 92674f247a12..bce7e5abcc05 100644 --- a/arch/arm/configs/omap2plus_defconfig +++ b/arch/arm/configs/omap2plus_defconfig @@ -431,8 +431,11 @@ CONFIG_USB_ZERO=m CONFIG_USB_G_NOKIA=m CONFIG_MMC=y CONFIG_SDIO_UART=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_OMAP=y CONFIG_MMC_OMAP_HS=y +CONFIG_MMC_SDHCI_OMAP=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=m CONFIG_LEDS_CPCAP=m |