From 70cfed2c9081a392a14a8cf387ed3b5e149cfc83 Mon Sep 17 00:00:00 2001 From: Marcin Wojtas Date: Fri, 14 Nov 2014 16:57:28 +0100 Subject: ARM: mvebu: re-enable SDHCI driver for Armada 38x SoC in v7 defconfig In the recent update of mvebu_v7_defconfig a config that enables sdhci-pxav3 driver, that supports SDHCI interface of Armada 38x SoC, disappeared. This commit enables CONFIG_MMC_SDHCI_PXAV3 back. Signed-off-by: Marcin Wojtas Reviewed-by: Gregory CLEMENT Acked-by: Thomas Petazzoni Acked-by: Andrew Lunn Fixes fc9fa8714a75 ("ARM: mvebu: update v7 defconfig with useful options") Link: https://lkml.kernel.org/r/1415980652-7429-2-git-send-email-mw@semihalf.com Signed-off-by: Jason Cooper --- arch/arm/configs/mvebu_v7_defconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/arm') diff --git a/arch/arm/configs/mvebu_v7_defconfig b/arch/arm/configs/mvebu_v7_defconfig index 9ca7e7822288..e4ce6575459c 100644 --- a/arch/arm/configs/mvebu_v7_defconfig +++ b/arch/arm/configs/mvebu_v7_defconfig @@ -100,6 +100,7 @@ CONFIG_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SDHCI_DOVE=y +CONFIG_MMC_SDHCI_PXAV3=y CONFIG_MMC_MVSDIO=y CONFIG_LEDS_GPIO=y CONFIG_LEDS_CLASS=y -- cgit v1.2.2 From b0abecb7c1d15c23808a31b3ab96788358719767 Mon Sep 17 00:00:00 2001 From: Marcin Wojtas Date: Fri, 14 Nov 2014 16:57:32 +0100 Subject: ARM: mvebu: enable i2c device in mvebu_v7_defconfig This commit enables user-space access to I2C bus using char device. Signed-off-by: Marcin Wojtas Reviewed-by: Gregory CLEMENT Acked-by: Thomas Petazzoni Acked-by: Andrew Lunn Link: https://lkml.kernel.org/r/1415980652-7429-6-git-send-email-mw@semihalf.com Signed-off-by: Jason Cooper --- arch/arm/configs/mvebu_v7_defconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/arm') diff --git a/arch/arm/configs/mvebu_v7_defconfig b/arch/arm/configs/mvebu_v7_defconfig index e4ce6575459c..10501938d255 100644 --- a/arch/arm/configs/mvebu_v7_defconfig +++ b/arch/arm/configs/mvebu_v7_defconfig @@ -74,6 +74,7 @@ CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_DW=y CONFIG_SERIAL_OF_PLATFORM=y CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y CONFIG_I2C_MV64XXX=y CONFIG_SPI=y CONFIG_SPI_ORION=y -- cgit v1.2.2 From 7dd0502d69fabb35f1538aef241a7dc4b627eaba Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 13 Nov 2014 11:11:29 +0100 Subject: ARM: mvebu: add MTD_BLOCK to mvebu_v7_defconfig Since many (most?) mvebu platforms have NAND or SPI flashes, it makes sense to have CONFIG_MTD_BLOCK=y in mvebu_v7_defconfig. The vast majority of the other ARM defconfigs have it enabled, including mvebu_v5_defconfig. Signed-off-by: Thomas Petazzoni Acked-by: Andrew Lunn Link: https://lkml.kernel.org/r/1415873489-22446-1-git-send-email-thomas.petazzoni@free-electrons.com Signed-off-by: Jason Cooper --- arch/arm/configs/mvebu_v7_defconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/arm') diff --git a/arch/arm/configs/mvebu_v7_defconfig b/arch/arm/configs/mvebu_v7_defconfig index 10501938d255..627accea72fb 100644 --- a/arch/arm/configs/mvebu_v7_defconfig +++ b/arch/arm/configs/mvebu_v7_defconfig @@ -45,6 +45,7 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_MTD=y +CONFIG_MTD_BLOCK=y CONFIG_MTD_CFI=y CONFIG_MTD_CFI_INTELEXT=y CONFIG_MTD_CFI_AMDSTD=y -- cgit v1.2.2