ARM: keystone2: use SPD info to configure K2HK and K2E DDR3

[u-boot] / arch / arm / mach-uniphier / soc_info.c

diff --git a/arch/arm/mach-uniphier/soc_info.c b/arch/arm/mach-uniphier/soc_info.c
index 6cdeae65784754f60a2e693624820096e3a3b8d4..3cfc183723b041e9ec9fb55267ca7468492833b8 100644 (file)
--- a/arch/arm/mach-uniphier/soc_info.c
+++ b/arch/arm/mach-uniphier/soc_info.c
@@ -6,8 +6,9 @@
 
 #include <linux/io.h>
 #include <linux/types.h>
-#include <mach/sg-regs.h>
-#include <mach/soc_info.h>
+
+#include "sg-regs.h"
+#include "soc-info.h"
 
 #if UNIPHIER_MULTI_SOC
 enum uniphier_soc_id uniphier_get_soc_type(void)
@@ -51,14 +52,14 @@ enum uniphier_soc_id uniphier_get_soc_type(void)
                ret = SOC_UNIPHIER_PH1_LD6B;
                break;
 #endif
-#ifdef CONFIG_ARCH_UNIPHIER_PH1_SLD11
+#ifdef CONFIG_ARCH_UNIPHIER_PH1_LD11
        case 0x31:
-               ret = SOC_UNIPHIER_PH1_SLD11;
+               ret = SOC_UNIPHIER_PH1_LD11;
                break;
 #endif
-#ifdef CONFIG_ARCH_UNIPHIER_PH1_LD10
+#ifdef CONFIG_ARCH_UNIPHIER_PH1_LD20
        case 0x32:
-               ret = SOC_UNIPHIER_PH1_LD10;
+               ret = SOC_UNIPHIER_PH1_LD20;
                break;
 #endif
        default: