mmc: do not overwrite cfg->f_max if "max-frequency" if missing

[u-boot] / arch / arm / mach-uniphier / Kconfig

diff --git a/arch/arm/mach-uniphier/Kconfig b/arch/arm/mach-uniphier/Kconfig
index ee2211241235210573341bf3366d5093d6501f1d..cc759b3e01dc0cc41bddcd19f7bc063caa9aeb3d 100644 (file)
--- a/arch/arm/mach-uniphier/Kconfig
+++ b/arch/arm/mach-uniphier/Kconfig
@@ -12,18 +12,14 @@ config ARCH_UNIPHIER_32BIT
 
 choice
         prompt "UniPhier SoC select"
-        default ARCH_UNIPHIER_PRO4
+        default ARCH_UNIPHIER_V7_MULTI
 
 config ARCH_UNIPHIER_LD4_SLD8
        bool "UniPhier LD4/sLD8 SoCs"
        select ARCH_UNIPHIER_32BIT
 
-config ARCH_UNIPHIER_PRO4
-       bool "UniPhier Pro4 SoC"
-       select ARCH_UNIPHIER_32BIT
-
-config ARCH_UNIPHIER_PRO5_PXS2_LD6B
-       bool "UniPhier Pro5/PXs2/LD6b SoCs"
+config ARCH_UNIPHIER_V7_MULTI
+       bool "UniPhier Pro4/Pro5/PXs2/LD6b SoCs"
        select ARCH_UNIPHIER_32BIT
 
 config ARCH_UNIPHIER_V8_MULTI
@@ -44,19 +40,24 @@ config ARCH_UNIPHIER_SLD8
        depends on ARCH_UNIPHIER_LD4_SLD8
        default y
 
+config ARCH_UNIPHIER_PRO4
+       bool "Enable UniPhier Pro4 SoC support"
+       depends on ARCH_UNIPHIER_V7_MULTI
+       default y
+
 config ARCH_UNIPHIER_PRO5
        bool "Enable UniPhier Pro5 SoC support"
-       depends on ARCH_UNIPHIER_PRO5_PXS2_LD6B
+       depends on ARCH_UNIPHIER_V7_MULTI
        default y
 
 config ARCH_UNIPHIER_PXS2
        bool "Enable UniPhier Pxs2 SoC support"
-       depends on ARCH_UNIPHIER_PRO5_PXS2_LD6B
+       depends on ARCH_UNIPHIER_V7_MULTI
        default y
 
 config ARCH_UNIPHIER_LD6B
        bool "Enable UniPhier LD6b SoC support"
-       depends on ARCH_UNIPHIER_PRO5_PXS2_LD6B
+       depends on ARCH_UNIPHIER_V7_MULTI
        default y
 
 config ARCH_UNIPHIER_LD11
@@ -116,4 +117,6 @@ config CMD_DDRMPHY_DUMP
          The command "ddrmphy" shows the resulting parameters of DDR Multi PHY
          training; it is useful for the evaluation of DDR Multi PHY training.
 
+config SYS_SOC
+       default "uniphier-v7" if ARCH_UNIPHIER_LD4_SLD8 || ARCH_UNIPHIER_V7_MULTI
 endif