From bb3362b0ca0771a511d4a622d591b4dea5cb15e4 Mon Sep 17 00:00:00 2001 From: Jagan Teki <jagan@amarulasolutions.com> Date: Fri, 12 Apr 2019 16:48:25 +0530 Subject: [PATCH] arm: sunxi: Enable DM_MMC and DM_SCSI MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit - Enable DM_MMC if MMC defined - Enable DM_SCSI if SCSI defined globally through Allwinner platform, the effected SoC families and boards will make use of MMC and SCSI subsystems in driver-model. Tested DM_MMC in one board from A64, H6, H5, H3, R40, A83T, A20, A10 SoCs. Tested-by: Pablo Sebastián Greco <pgreco@centosproject.org> # BPI-M2-Ultra Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- arch/arm/Kconfig | 2 ++ arch/arm/mach-sunxi/Kconfig | 13 ------------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 4640f3b3bd..f58f8fb235 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -857,6 +857,8 @@ config ARCH_SUNXI select DM_ETH select DM_GPIO select DM_KEYBOARD + select DM_MMC if MMC + select DM_SCSI if SCSI select DM_SERIAL select DM_USB if DISTRO_DEFAULTS select OF_BOARD_SETUP diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig index 8110f23ff6..1669e62a6d 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig @@ -154,8 +154,6 @@ config MACH_SUN4I bool "sun4i (Allwinner A10)" select CPU_V7A select ARM_CORTEX_CPU_IS_UP - select DM_MMC if MMC - select DM_SCSI if SCSI select PHY_SUN4I_USB select DRAM_SUN4I select SUNXI_GEN_SUN4I @@ -165,7 +163,6 @@ config MACH_SUN5I bool "sun5i (Allwinner A13)" select CPU_V7A select ARM_CORTEX_CPU_IS_UP - select DM_MMC if MMC select DRAM_SUN4I select PHY_SUN4I_USB select SUNXI_GEN_SUN4I @@ -178,7 +175,6 @@ config MACH_SUN6I select CPU_V7_HAS_NONSEC select CPU_V7_HAS_VIRT select ARCH_SUPPORT_PSCI - select DM_MMC if MMC select DRAM_SUN6I select PHY_SUN4I_USB select SUN6I_P2WI @@ -205,7 +201,6 @@ config MACH_SUN8I_A23 select CPU_V7_HAS_NONSEC select CPU_V7_HAS_VIRT select ARCH_SUPPORT_PSCI - select DM_MMC if MMC select DRAM_SUN8I_A23 select PHY_SUN4I_USB select SUNXI_GEN_SUN6I @@ -219,7 +214,6 @@ config MACH_SUN8I_A33 select CPU_V7_HAS_NONSEC select CPU_V7_HAS_VIRT select ARCH_SUPPORT_PSCI - select DM_MMC if MMC select DRAM_SUN8I_A33 select PHY_SUN4I_USB select SUNXI_GEN_SUN6I @@ -230,7 +224,6 @@ config MACH_SUN8I_A33 config MACH_SUN8I_A83T bool "sun8i (Allwinner A83T)" select CPU_V7A - select DM_MMC if MMC select DRAM_SUN8I_A83T select PHY_SUN4I_USB select SUNXI_GEN_SUN6I @@ -246,7 +239,6 @@ config MACH_SUN8I_H3 select ARCH_SUPPORT_PSCI select MACH_SUNXI_H3_H5 select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT - select DM_MMC if MMC config MACH_SUN8I_R40 bool "sun8i (Allwinner R40)" @@ -265,7 +257,6 @@ config MACH_SUN8I_V3S select CPU_V7_HAS_NONSEC select CPU_V7_HAS_VIRT select ARCH_SUPPORT_PSCI - select DM_MMC if MMC select SUNXI_GEN_SUN6I select SUNXI_DRAM_DW select SUNXI_DRAM_DW_16BIT @@ -280,13 +271,11 @@ config MACH_SUN9I select SUNXI_GEN_SUN6I select SUN8I_RSB select SUPPORT_SPL - select DM_MMC if MMC config MACH_SUN50I bool "sun50i (Allwinner A64)" select ARM64 select DM_I2C - select DM_MMC if MMC select PHY_SUN4I_USB select SUN6I_PRCM select SUNXI_DE2 @@ -303,7 +292,6 @@ config MACH_SUN50I_H5 bool "sun50i (Allwinner H5)" select ARM64 select MACH_SUNXI_H3_H5 - select DM_MMC if MMC select FIT select SPL_LOAD_FIT @@ -311,7 +299,6 @@ config MACH_SUN50I_H6 bool "sun50i (Allwinner H6)" select ARM64 select SUPPORT_SPL - select DM_MMC if MMC select FIT select SPL_LOAD_FIT select DRAM_SUN50I_H6 -- 2.39.5