3 files changed, 111 insertions, 3 deletions

diff --git a/arch/arm/mach-ep93xx/Kconfig b/arch/arm/mach-ep93xx/Kconfig
index 93e54fd4e3d5..bec570ae6494 100644
--- a/arch/arm/mach-ep93xx/Kconfig
+++ b/arch/arm/mach-ep93xx/Kconfig
@@ -5,6 +5,7 @@ menu "Cirrus EP93xx Implementation Options"
 config EP93XX_SOC_COMMON
         bool
         default y
+        select SOC_BUS
         select LEDS_GPIO_REGISTER
 
 config CRUNCH
diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c
index 94b141fcf944..6c705472da6c 100644
--- a/arch/arm/mach-ep93xx/core.c
+++ b/arch/arm/mach-ep93xx/core.c
@@ -21,6 +21,7 @@
 #include <linux/platform_device.h>
 #include <linux/interrupt.h>
 #include <linux/dma-mapping.h>
+#include <linux/sys_soc.h>
 #include <linux/timex.h>
 #include <linux/irq.h>
 #include <linux/io.h>
@@ -44,6 +45,7 @@
 #include <linux/platform_data/spi-ep93xx.h>
 #include <mach/gpio-ep93xx.h>
 
+#include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/time.h>
 
@@ -137,7 +139,7 @@ static irqreturn_t ep93xx_timer_interrupt(int irq, void *dev_id)
 
 static struct irqaction ep93xx_timer_irq = {
         .name           = "ep93xx timer",
-        .flags          = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,
+        .flags          = IRQF_TIMER | IRQF_IRQPOLL,
         .handler        = ep93xx_timer_interrupt,
 };
 
@@ -925,8 +927,108 @@ void ep93xx_ide_release_gpio(struct platform_device *pdev)
 }
 EXPORT_SYMBOL(ep93xx_ide_release_gpio);
 
-void __init ep93xx_init_devices(void)
+/*************************************************************************
+ * EP93xx Security peripheral
+ *************************************************************************/
+
+/*
+ * The Maverick Key is 256 bits of micro fuses blown at the factory during
+ * manufacturing to uniquely identify a part.
+ *
+ * See: http://arm.cirrus.com/forum/viewtopic.php?t=486&highlight=maverick+key
+ */
+#define EP93XX_SECURITY_REG(x)          (EP93XX_SECURITY_BASE + (x))
+#define EP93XX_SECURITY_SECFLG          EP93XX_SECURITY_REG(0x2400)
+#define EP93XX_SECURITY_FUSEFLG         EP93XX_SECURITY_REG(0x2410)
+#define EP93XX_SECURITY_UNIQID          EP93XX_SECURITY_REG(0x2440)
+#define EP93XX_SECURITY_UNIQCHK         EP93XX_SECURITY_REG(0x2450)
+#define EP93XX_SECURITY_UNIQVAL         EP93XX_SECURITY_REG(0x2460)
+#define EP93XX_SECURITY_SECID1          EP93XX_SECURITY_REG(0x2500)
+#define EP93XX_SECURITY_SECID2          EP93XX_SECURITY_REG(0x2504)
+#define EP93XX_SECURITY_SECCHK1         EP93XX_SECURITY_REG(0x2520)
+#define EP93XX_SECURITY_SECCHK2         EP93XX_SECURITY_REG(0x2524)
+#define EP93XX_SECURITY_UNIQID2         EP93XX_SECURITY_REG(0x2700)
+#define EP93XX_SECURITY_UNIQID3         EP93XX_SECURITY_REG(0x2704)
+#define EP93XX_SECURITY_UNIQID4         EP93XX_SECURITY_REG(0x2708)
+#define EP93XX_SECURITY_UNIQID5         EP93XX_SECURITY_REG(0x270c)
+
+static char ep93xx_soc_id[33];
+
+static const char __init *ep93xx_get_soc_id(void)
 {
+        unsigned int id, id2, id3, id4, id5;
+
+        if (__raw_readl(EP93XX_SECURITY_UNIQVAL) != 1)
+                return "bad Hamming code";
+
+        id = __raw_readl(EP93XX_SECURITY_UNIQID);
+        id2 = __raw_readl(EP93XX_SECURITY_UNIQID2);
+        id3 = __raw_readl(EP93XX_SECURITY_UNIQID3);
+        id4 = __raw_readl(EP93XX_SECURITY_UNIQID4);
+        id5 = __raw_readl(EP93XX_SECURITY_UNIQID5);
+
+        if (id != id2)
+                return "invalid";
+
+        snprintf(ep93xx_soc_id, sizeof(ep93xx_soc_id),
+                 "%08x%08x%08x%08x", id2, id3, id4, id5);
+
+        return ep93xx_soc_id;
+}
+
+static const char __init *ep93xx_get_soc_rev(void)
+{
+        int rev = ep93xx_chip_revision();
+
+        switch (rev) {
+        case EP93XX_CHIP_REV_D0:
+                return "D0";
+        case EP93XX_CHIP_REV_D1:
+                return "D1";
+        case EP93XX_CHIP_REV_E0:
+                return "E0";
+        case EP93XX_CHIP_REV_E1:
+                return "E1";
+        case EP93XX_CHIP_REV_E2:
+                return "E2";
+        default:
+                return "unknown";
+        }
+}
+
+static const char __init *ep93xx_get_machine_name(void)
+{
+        return kasprintf(GFP_KERNEL,"%s", machine_desc->name);
+}
+
+static struct device __init *ep93xx_init_soc(void)
+{
+        struct soc_device_attribute *soc_dev_attr;
+        struct soc_device *soc_dev;
+
+        soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL);
+        if (!soc_dev_attr)
+                return NULL;
+
+        soc_dev_attr->machine = ep93xx_get_machine_name();
+        soc_dev_attr->family = "Cirrus Logic EP93xx";
+        soc_dev_attr->revision = ep93xx_get_soc_rev();
+        soc_dev_attr->soc_id = ep93xx_get_soc_id();
+
+        soc_dev = soc_device_register(soc_dev_attr);
+        if (IS_ERR(soc_dev)) {
+                kfree(soc_dev_attr->machine);
+                kfree(soc_dev_attr);
+                return NULL;
+        }
+
+        return soc_device_to_device(soc_dev);
+}
+
+struct device __init *ep93xx_init_devices(void)
+{
+        struct device *parent;
+
         /* Disallow access to MaverickCrunch initially */
         ep93xx_devcfg_clear_bits(EP93XX_SYSCON_DEVCFG_CPENA);
 
@@ -937,6 +1039,8 @@ void __init ep93xx_init_devices(void)
                                EP93XX_SYSCON_DEVCFG_GONIDE |
                                EP93XX_SYSCON_DEVCFG_HONIDE);
 
+        parent = ep93xx_init_soc();
+
         /* Get the GPIO working early, other devices need it */
         platform_device_register(&ep93xx_gpio_device);
 
@@ -949,6 +1053,8 @@ void __init ep93xx_init_devices(void)
         platform_device_register(&ep93xx_wdt_device);
 
         gpio_led_register_device(-1, &ep93xx_led_data);
+
+        return parent;
 }
 
 void ep93xx_restart(enum reboot_mode mode, const char *cmd)
diff --git a/arch/arm/mach-ep93xx/include/mach/platform.h b/arch/arm/mach-ep93xx/include/mach/platform.h
index e256e0baec2e..4c0bbd97f741 100644
--- a/arch/arm/mach-ep93xx/include/mach/platform.h
+++ b/arch/arm/mach-ep93xx/include/mach/platform.h
@@ -6,6 +6,7 @@
 
 #include <linux/reboot.h>
 
+struct device;
 struct i2c_gpio_platform_data;
 struct i2c_board_info;
 struct spi_board_info;
@@ -54,7 +55,7 @@ void ep93xx_register_ide(void);
 int ep93xx_ide_acquire_gpio(struct platform_device *pdev);
 void ep93xx_ide_release_gpio(struct platform_device *pdev);
 
-void ep93xx_init_devices(void);
+struct device *ep93xx_init_devices(void);
 extern void ep93xx_timer_init(void);
 
 void ep93xx_restart(enum reboot_mode, const char *);