ARM: uniphier: add functions to get SoC model/revision

We sometimes have to implement different code depending on the SoC
revision.  This commit adds functions to get the model/revision
number.

Note:
  Model number: incremented on major changes of the SoC
  Revision number: incremented on minor changes of the SoC

The "Model 2" exists for PH1-sLD3, ProXstream2/PH1-LD6b.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/arch/arm/mach-uniphier/include/mach/soc_info.h b/arch/arm/mach-uniphier/include/mach/soc_info.h
index 623e7ef20eec36daea4de6d8a9fad533d50becaa..6e25baad3d86e8bea5fbf195aeaa6eeaf94c0d91 100644 (file)
--- a/arch/arm/mach-uniphier/include/mach/soc_info.h
+++ b/arch/arm/mach-uniphier/include/mach/soc_info.h
@@ -60,4 +60,7 @@ static inline enum uniphier_soc_id uniphier_get_soc_type(void)
 }
 #endif
 
+int uniphier_get_soc_model(void);
+int uniphier_get_soc_revision(void);
+
 #endif /* __MACH_SOC_INFO_H__ */

diff --git a/arch/arm/mach-uniphier/soc_info.c b/arch/arm/mach-uniphier/soc_info.c
index 3e8e7f4ef33bdf838cb0dd6d45fdf14e40341efc..a4010eb3f72d7e9270983e934ee65012bd07f224 100644 (file)
--- a/arch/arm/mach-uniphier/soc_info.c
+++ b/arch/arm/mach-uniphier/soc_info.c
@@ -59,3 +59,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;
+}