mach-ux500: expose system info through socinfou8500-android-2.3_v4.27

Generalize the exposure of socinfo for MBL and FB.

ST-Ericsson Linux next: NA
ST-Ericsson ID: 370604
ST-Ericsson FOSS-OUT ID: Trivial

Change-Id: Ie05c5dae9bc606b8a5716e183b04d590877d9dc3
Signed-off-by: Arun Murthy <arun.murthy@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35848
Reviewed-by: QATOOLS
Reviewed-by: Rabin VINCENT <rabin.vincent@stericsson.com>

2 files changed, 80 insertions, 79 deletions

diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index d2def0828a6..67330b8dd24 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -179,82 +179,3 @@ void __init u8500_init_devices(void)
 
 	return ;
 }
-
-#ifdef CONFIG_SYS_SOC
-#define U8500_BB_UID_BASE (U8500_BACKUPRAM1_BASE + 0xFC0)
-#define U8500_BB_UID_LENGTH 5
-
-static ssize_t ux500_get_machine(char *buf, struct sysfs_soc_info *si)
-{
-	return sprintf(buf, "DB%2x00\n", dbx500_id.partnumber);
-}
-
-static ssize_t ux500_get_soc_id(char *buf, struct sysfs_soc_info *si)
-{
-	void __iomem *uid_base;
-	int i;
-	ssize_t sz = 0;
-
-	if (dbx500_id.partnumber == 0x85) {
-		uid_base = __io_address(U8500_BB_UID_BASE);
-		for (i = 0; i < U8500_BB_UID_LENGTH; i++)
-			sz += sprintf(buf + sz, "%08x", readl(uid_base + i * sizeof(u32)));
-		sz += sprintf(buf + sz, "\n");
-	}
-	else {
-		/* Don't know where it is located for U5500 */
-		sz = sprintf(buf, "N/A\n");
-	}
-
-	return sz;
-}
-
-static ssize_t ux500_get_revision(char *buf, struct sysfs_soc_info *si)
-{
-	unsigned int rev = dbx500_id.revision;
-
-	if (rev == 0x01)
-		return sprintf(buf, "%s\n", "ED");
-	else if (rev >= 0xA0)
-		return sprintf(buf, "%d.%d\n" , (rev >> 4) - 0xA + 1, rev & 0xf);
-
-	return sprintf(buf, "%s", "Unknown\n");
-}
-
-static ssize_t ux500_get_process(char *buf, struct sysfs_soc_info *si)
-{
-	if (dbx500_id.process == 0x00)
-		return sprintf(buf, "Standard\n");
-
-	return sprintf(buf, "%02xnm\n", dbx500_id.process);
-}
-
-static ssize_t ux500_get_reset_code(char *buf, struct sysfs_soc_info *si)
-{
-	return sprintf(buf, "0x%04x\n", prcmu_get_reset_code());
-}
-
-static ssize_t ux500_get_reset_reason(char *buf, struct sysfs_soc_info *si)
-{
-	return sprintf(buf, "%s\n",
-		reboot_reason_string(prcmu_get_reset_code()));
-}
-
-static struct sysfs_soc_info soc_info[] = {
-	SYSFS_SOC_ATTR_CALLBACK("machine", ux500_get_machine),
-	SYSFS_SOC_ATTR_VALUE("family", "Ux500"),
-	SYSFS_SOC_ATTR_CALLBACK("soc_id", ux500_get_soc_id),
-	SYSFS_SOC_ATTR_CALLBACK("revision", ux500_get_revision),
-	SYSFS_SOC_ATTR_CALLBACK("process", ux500_get_process),
-	SYSFS_SOC_ATTR_CALLBACK("reset_code", ux500_get_reset_code),
-	SYSFS_SOC_ATTR_CALLBACK("reset_reason", ux500_get_reset_reason),
-};
-
-static int __init ux500_sys_soc_init(void)
-{
-	return register_sysfs_soc(soc_info, ARRAY_SIZE(soc_info));
-}
-
-module_init(ux500_sys_soc_init);
-#endif
-
diff --git a/arch/arm/mach-ux500/cpu.c b/arch/arm/mach-ux500/cpu.c
index bfdebbeab3e..ec106bbdc48 100644
--- a/arch/arm/mach-ux500/cpu.c
+++ b/arch/arm/mach-ux500/cpu.c
@@ -9,6 +9,7 @@
 #include <linux/io.h>
 #include <linux/clk.h>
 #include <linux/delay.h>
+#include <linux/sys_soc.h>
 #include <linux/clksrc-dbx500-prcmu.h>
 #include <linux/mfd/dbx500-prcmu.h>
 
@@ -155,3 +156,82 @@ static int ux500_l2x0_init(void)
 }
 early_initcall(ux500_l2x0_init);
 #endif
+
+#ifdef CONFIG_SYS_SOC
+#define U8500_BB_UID_BASE (U8500_BACKUPRAM1_BASE + 0xFC0)
+#define U8500_BB_UID_LENGTH 5
+
+static ssize_t ux500_get_machine(char *buf, struct sysfs_soc_info *si)
+{
+	return sprintf(buf, "DB%2x00\n", dbx500_id.partnumber);
+}
+
+static ssize_t ux500_get_soc_id(char *buf, struct sysfs_soc_info *si)
+{
+	void __iomem *uid_base;
+	int i;
+	ssize_t sz = 0;
+
+	if (dbx500_id.partnumber == 0x85) {
+		uid_base = __io_address(U8500_BB_UID_BASE);
+		for (i = 0; i < U8500_BB_UID_LENGTH; i++)
+			sz += sprintf(buf + sz, "%08x",
+					readl(uid_base + i * sizeof(u32)));
+		sz += sprintf(buf + sz, "\n");
+	} else {
+		/* Don't know where it is located for U5500 */
+		sz = sprintf(buf, "N/A\n");
+	}
+
+	return sz;
+}
+
+static ssize_t ux500_get_revision(char *buf, struct sysfs_soc_info *si)
+{
+	unsigned int rev = dbx500_id.revision;
+
+	if (rev == 0x01)
+		return sprintf(buf, "%s\n", "ED");
+	else if (rev >= 0xA0)
+		return sprintf(buf, "%d.%d\n" ,
+				(rev >> 4) - 0xA + 1, rev & 0xf);
+
+	return sprintf(buf, "%s", "Unknown\n");
+}
+
+static ssize_t ux500_get_process(char *buf, struct sysfs_soc_info *si)
+{
+	if (dbx500_id.process == 0x00)
+		return sprintf(buf, "Standard\n");
+
+	return sprintf(buf, "%02xnm\n", dbx500_id.process);
+}
+
+static ssize_t ux500_get_reset_code(char *buf, struct sysfs_soc_info *si)
+{
+	return sprintf(buf, "0x%04x\n", prcmu_get_reset_code());
+}
+
+static ssize_t ux500_get_reset_reason(char *buf, struct sysfs_soc_info *si)
+{
+	return sprintf(buf, "%s\n",
+		reboot_reason_string(prcmu_get_reset_code()));
+}
+
+static struct sysfs_soc_info soc_info[] = {
+	SYSFS_SOC_ATTR_CALLBACK("machine", ux500_get_machine),
+	SYSFS_SOC_ATTR_VALUE("family", "Ux500"),
+	SYSFS_SOC_ATTR_CALLBACK("soc_id", ux500_get_soc_id),
+	SYSFS_SOC_ATTR_CALLBACK("revision", ux500_get_revision),
+	SYSFS_SOC_ATTR_CALLBACK("process", ux500_get_process),
+	SYSFS_SOC_ATTR_CALLBACK("reset_code", ux500_get_reset_code),
+	SYSFS_SOC_ATTR_CALLBACK("reset_reason", ux500_get_reset_reason),
+};
+
+static int __init ux500_sys_soc_init(void)
+{
+	return register_sysfs_soc(soc_info, ARRAY_SIZE(soc_info));
+}
+
+module_init(ux500_sys_soc_init);
+#endif