soc: move SoC driver for the ARM Integrator

This creates a new SoC bus driver for the ARM Integrator
family core modules to register the SoC bus and provide
sysfs info for the core module. We delete the corresponding
code from the Integrator machine and select this driver to
get a clean result.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

1 files changed, 0 insertions, 95 deletions

diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c
index b06fd9f99a46..948872a419c1 100644
--- a/arch/arm/mach-integrator/core.c
+++ b/arch/arm/mach-integrator/core.c
@@ -60,40 +60,6 @@ void cm_control(u32 mask, u32 set)
         raw_spin_unlock_irqrestore(&cm_lock, flags);
 }
 
-static const char *integrator_arch_str(u32 id)
-{
-        switch ((id >> 16) & 0xff) {
-        case 0x00:
-                return "ASB little-endian";
-        case 0x01:
-                return "AHB little-endian";
-        case 0x03:
-                return "AHB-Lite system bus, bi-endian";
-        case 0x04:
-                return "AHB";
-        case 0x08:
-                return "AHB system bus, ASB processor bus";
-        default:
-                return "Unknown";
-        }
-}
-
-static const char *integrator_fpga_str(u32 id)
-{
-        switch ((id >> 12) & 0xf) {
-        case 0x01:
-                return "XC4062";
-        case 0x02:
-                return "XC4085";
-        case 0x03:
-                return "XVC600";
-        case 0x04:
-                return "EPM7256AE (Altera PLD)";
-        default:
-                return "Unknown";
-        }
-}
-
 void cm_clear_irqs(void)
 {
         /* disable core module IRQs */
@@ -109,7 +75,6 @@ static const struct of_device_id cm_match[] = {
 void cm_init(void)
 {
         struct device_node *cm = of_find_matching_node(NULL, cm_match);
-        u32 val;
 
         if (!cm) {
                 pr_crit("no core module node found in device tree\n");
@@ -121,13 +86,6 @@ void cm_init(void)
                 return;
         }
         cm_clear_irqs();
-        val = readl(cm_base + INTEGRATOR_HDR_ID_OFFSET);
-        pr_info("Detected ARM core module:\n");
-        pr_info("    Manufacturer: %02x\n", (val >> 24));
-        pr_info("    Architecture: %s\n", integrator_arch_str(val));
-        pr_info("    FPGA: %s\n", integrator_fpga_str(val));
-        pr_info("    Build: %02x\n", (val >> 4) & 0xFF);
-        pr_info("    Rev: %c\n", ('A' + (val & 0x03)));
 }
 
 /*
@@ -139,56 +97,3 @@ void __init integrator_reserve(void)
 {
         memblock_reserve(PHYS_OFFSET, __pa(swapper_pg_dir) - PHYS_OFFSET);
 }
-
-static u32 integrator_id;
-
-static ssize_t intcp_get_manf(struct device *dev,
-                              struct device_attribute *attr,
-                              char *buf)
-{
-        return sprintf(buf, "%02x\n", integrator_id >> 24);
-}
-
-static struct device_attribute intcp_manf_attr =
-        __ATTR(manufacturer,  S_IRUGO, intcp_get_manf,  NULL);
-
-static ssize_t intcp_get_arch(struct device *dev,
-                              struct device_attribute *attr,
-                              char *buf)
-{
-        return sprintf(buf, "%s\n", integrator_arch_str(integrator_id));
-}
-
-static struct device_attribute intcp_arch_attr =
-        __ATTR(architecture,  S_IRUGO, intcp_get_arch,  NULL);
-
-static ssize_t intcp_get_fpga(struct device *dev,
-                              struct device_attribute *attr,
-                              char *buf)
-{
-        return sprintf(buf, "%s\n", integrator_fpga_str(integrator_id));
-}
-
-static struct device_attribute intcp_fpga_attr =
-        __ATTR(fpga,  S_IRUGO, intcp_get_fpga,  NULL);
-
-static ssize_t intcp_get_build(struct device *dev,
-                               struct device_attribute *attr,
-                               char *buf)
-{
-        return sprintf(buf, "%02x\n", (integrator_id >> 4) & 0xFF);
-}
-
-static struct device_attribute intcp_build_attr =
-        __ATTR(build,  S_IRUGO, intcp_get_build,  NULL);
-
-
-
-void integrator_init_sysfs(struct device *parent, u32 id)
-{
-        integrator_id = id;
-        device_create_file(parent, &intcp_manf_attr);
-        device_create_file(parent, &intcp_arch_attr);
-        device_create_file(parent, &intcp_fpga_attr);
-        device_create_file(parent, &intcp_build_attr);
-}