X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=arch%2Farm%2Fmach-uniphier%2Fsoc_info.c;h=046104bd78d66a6426cdb279984dbe15b6c0fd32;hb=9f375f655fa54f88fdbe35d3f0c3bd6c1a91671b;hp=3e8e7f4ef33bdf838cb0dd6d45fdf14e40341efc;hpb=323d1f9d5bebfe55e97e23c8094055685665afef;p=u-boot

diff --git a/arch/arm/mach-uniphier/soc_info.c b/arch/arm/mach-uniphier/soc_info.c
index 3e8e7f4ef3..046104bd78 100644
--- 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)
@@ -16,39 +17,49 @@ enum uniphier_soc_id uniphier_get_soc_type(void)
 	enum uniphier_soc_id ret;
 
 	switch ((revision & SG_REVISION_TYPE_MASK) >> SG_REVISION_TYPE_SHIFT) {
-#ifdef CONFIG_ARCH_UNIPHIER_PH1_SLD3
+#ifdef CONFIG_ARCH_UNIPHIER_SLD3
 	case 0x25:
-		ret = SOC_UNIPHIER_PH1_SLD3;
+		ret = SOC_UNIPHIER_SLD3;
 		break;
 #endif
-#ifdef CONFIG_ARCH_UNIPHIER_PH1_LD4
+#ifdef CONFIG_ARCH_UNIPHIER_LD4
 	case 0x26:
-		ret = SOC_UNIPHIER_PH1_LD4;
+		ret = SOC_UNIPHIER_LD4;
 		break;
 #endif
-#ifdef CONFIG_ARCH_UNIPHIER_PH1_PRO4
+#ifdef CONFIG_ARCH_UNIPHIER_PRO4
 	case 0x28:
-		ret = SOC_UNIPHIER_PH1_PRO4;
+		ret = SOC_UNIPHIER_PRO4;
 		break;
 #endif
-#ifdef CONFIG_ARCH_UNIPHIER_PH1_SLD8
+#ifdef CONFIG_ARCH_UNIPHIER_SLD8
 	case 0x29:
-		ret = SOC_UNIPHIER_PH1_SLD8;
+		ret = SOC_UNIPHIER_SLD8;
 		break;
 #endif
-#ifdef CONFIG_ARCH_UNIPHIER_PH1_PRO5
+#ifdef CONFIG_ARCH_UNIPHIER_PRO5
 	case 0x2A:
-		ret = SOC_UNIPHIER_PH1_PRO5;
+		ret = SOC_UNIPHIER_PRO5;
 		break;
 #endif
-#ifdef CONFIG_ARCH_UNIPHIER_PROXSTREAM2
+#ifdef CONFIG_ARCH_UNIPHIER_PXS2
 	case 0x2E:
-		ret = SOC_UNIPHIER_PROXSTREAM2;
+		ret = SOC_UNIPHIER_PXS2;
 		break;
 #endif
-#ifdef CONFIG_ARCH_UNIPHIER_PH1_LD6B
+#ifdef CONFIG_ARCH_UNIPHIER_LD6B
 	case 0x2F:
-		ret = SOC_UNIPHIER_PH1_LD6B;
+		ret = SOC_UNIPHIER_LD6B;
+		break;
+#endif
+#ifdef CONFIG_ARCH_UNIPHIER_LD11
+	case 0x31:
+		ret = SOC_UNIPHIER_LD11;
+		break;
+#endif
+#ifdef CONFIG_ARCH_UNIPHIER_LD20
+	case 0x32:
+		ret = SOC_UNIPHIER_LD20;
 		break;
 #endif
 	default:
@@ -59,3 +70,15 @@ enum uniphier_soc_id uniphier_get_soc_type(void)
 	return ret;
 }
 #endif
+
+int uniphier_get_soc_model(void)
+{
+	return (readl(SG_REVISION) & SG_REVISION_MODEL_MASK) >>
+						SG_REVISION_MODEL_SHIFT;
+}
+
+int uniphier_get_soc_revision(void)
+{
+	return (readl(SG_REVISION) & SG_REVISION_REV_MASK) >>
+						SG_REVISION_REV_SHIFT;
+}