Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC device tree changes from Arnd Bergmann:
 "These changes from 30 individual branches for the most part update
  device tree files, but there are also a few source code changes that
  have crept in this time, usually in order to atomically move over a
  driver from using hardcoded data to DT probing.

  A number of platforms change their DT files to use the C preprocessor,
  which is causing a bit of churn, but that is hopefully only this once"

* tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (372 commits)
  ARM: at91: dt: rm9200ek: add spi support
  ARM: at91: dt: rm9200: add spi support
  ARM: at91/DT: at91sam9n12: add SPI DMA client infos
  ARM: at91/DT: sama5d3: add SPI DMA client infos
  ARM: at91/DT: fix SPI compatibility string
  ARM: Kirkwood: Fix the internal register ranges translation
  ARM: dts: bcm281xx: change comment to C89 style
  ARM: mmc: bcm281xx SDHCI driver (dt mods)
  ARM: nomadik: add the new clocks to the device tree
  clk: nomadik: implement the Nomadik clocks properly
  ARM: dts: omap5-uevm: Provide USB Host PHY clock frequency
  ARM: dts: omap4-panda: Fix DVI EDID reads
  ARM: dts: omap4-panda: Add USB Host support
  arm: mvebu: enable mini-PCIe connectors on Armada 370 RD
  ARM: shmobile: irqpin: add a DT property to enable masking on parent
  ARM: dts: AM43x EPOS EVM support
  ARM: dts: OMAP5: Add bandgap DT entry
  ARM: dts: AM33XX: Add pinmux configuration for CPSW to am335x EVM
  ARM: dts: AM33XX: Add pinmux configuration for CPSW to EVMsk
  ARM: dts: AM33XX: Add pinmux configuration for CPSW to beaglebone
  ...

2 files changed, 120 insertions, 10 deletions

diff --git a/arch/arm/mach-mxs/Kconfig b/arch/arm/mach-mxs/Kconfig
index 3a66635e7d17..616fe0210da1 100644
--- a/arch/arm/mach-mxs/Kconfig
+++ b/arch/arm/mach-mxs/Kconfig
@@ -23,6 +23,7 @@ config ARCH_MXS
         select GENERIC_CLOCKEVENTS
         select HAVE_CLK_PREPARE
         select PINCTRL
+        select SOC_BUS
         select SOC_IMX23
         select SOC_IMX28
         select STMP_DEVICE
diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c
index d67ecc1c8847..7fa611c1b287 100644
--- a/arch/arm/mach-mxs/mach-mxs.c
+++ b/arch/arm/mach-mxs/mach-mxs.c
@@ -19,13 +19,13 @@
 #include <linux/err.h>
 #include <linux/gpio.h>
 #include <linux/init.h>
-#include <linux/irqchip.h>
 #include <linux/irqchip/mxs.h>
 #include <linux/micrel_phy.h>
 #include <linux/of_address.h>
 #include <linux/of_platform.h>
 #include <linux/phy.h>
 #include <linux/pinctrl/consumer.h>
+#include <linux/sys_soc.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/time.h>
@@ -39,12 +39,28 @@
 #define MXS_DIGCTL_SAIF_CLKMUX_EXTMSTR0         0x2
 #define MXS_DIGCTL_SAIF_CLKMUX_EXTMSTR1         0x3
 
+#define HW_DIGCTL_CHIPID        0x310
+#define HW_DIGCTL_CHIPID_MASK   (0xffff << 16)
+#define HW_DIGCTL_REV_MASK      0xff
+#define HW_DIGCTL_CHIPID_MX23   (0x3780 << 16)
+#define HW_DIGCTL_CHIPID_MX28   (0x2800 << 16)
+
+#define MXS_CHIP_REVISION_1_0   0x10
+#define MXS_CHIP_REVISION_1_1   0x11
+#define MXS_CHIP_REVISION_1_2   0x12
+#define MXS_CHIP_REVISION_1_3   0x13
+#define MXS_CHIP_REVISION_1_4   0x14
+#define MXS_CHIP_REV_UNKNOWN    0xff
+
 #define MXS_GPIO_NR(bank, nr)   ((bank) * 32 + (nr))
 
 #define MXS_SET_ADDR            0x4
 #define MXS_CLR_ADDR            0x8
 #define MXS_TOG_ADDR            0xc
 
+static u32 chipid;
+static u32 socid;
+
 static inline void __mxs_setl(u32 mask, void __iomem *reg)
 {
         __raw_writel(mask, reg + MXS_SET_ADDR);
@@ -352,29 +368,123 @@ static void __init tx28_post_init(void)
         pinctrl_put(pctl);
 }
 
-static void __init cfa10049_init(void)
+static void __init crystalfontz_init(void)
 {
         update_fec_mac_prop(OUI_CRYSTALFONTZ);
 }
 
-static void __init cfa10037_init(void)
+static const char __init *mxs_get_soc_id(void)
 {
-        update_fec_mac_prop(OUI_CRYSTALFONTZ);
+        struct device_node *np;
+        void __iomem *digctl_base;
+
+        np = of_find_compatible_node(NULL, NULL, "fsl,imx23-digctl");
+        digctl_base = of_iomap(np, 0);
+        WARN_ON(!digctl_base);
+
+        chipid = readl(digctl_base + HW_DIGCTL_CHIPID);
+        socid = chipid & HW_DIGCTL_CHIPID_MASK;
+
+        iounmap(digctl_base);
+        of_node_put(np);
+
+        switch (socid) {
+        case HW_DIGCTL_CHIPID_MX23:
+                return "i.MX23";
+        case HW_DIGCTL_CHIPID_MX28:
+                return "i.MX28";
+        default:
+                return "Unknown";
+        }
+}
+
+static u32 __init mxs_get_cpu_rev(void)
+{
+        u32 rev = chipid & HW_DIGCTL_REV_MASK;
+
+        switch (socid) {
+        case HW_DIGCTL_CHIPID_MX23:
+                switch (rev) {
+                case 0x0:
+                        return MXS_CHIP_REVISION_1_0;
+                case 0x1:
+                        return MXS_CHIP_REVISION_1_1;
+                case 0x2:
+                        return MXS_CHIP_REVISION_1_2;
+                case 0x3:
+                        return MXS_CHIP_REVISION_1_3;
+                case 0x4:
+                        return MXS_CHIP_REVISION_1_4;
+                default:
+                        return MXS_CHIP_REV_UNKNOWN;
+                }
+        case HW_DIGCTL_CHIPID_MX28:
+                switch (rev) {
+                case 0x0:
+                        return MXS_CHIP_REVISION_1_1;
+                case 0x1:
+                        return MXS_CHIP_REVISION_1_2;
+                default:
+                        return MXS_CHIP_REV_UNKNOWN;
+                }
+        default:
+                return MXS_CHIP_REV_UNKNOWN;
+        }
+}
+
+static const char __init *mxs_get_revision(void)
+{
+        u32 rev = mxs_get_cpu_rev();
+
+        if (rev != MXS_CHIP_REV_UNKNOWN)
+                return kasprintf(GFP_KERNEL, "TO%d.%d", (rev >> 4) & 0xf,
+                                rev & 0xf);
+        else
+                return kasprintf(GFP_KERNEL, "%s", "Unknown");
 }
 
 static void __init mxs_machine_init(void)
 {
+        struct device_node *root;
+        struct device *parent;
+        struct soc_device *soc_dev;
+        struct soc_device_attribute *soc_dev_attr;
+        int ret;
+
+        soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL);
+        if (!soc_dev_attr)
+                return;
+
+        root = of_find_node_by_path("/");
+        ret = of_property_read_string(root, "model", &soc_dev_attr->machine);
+        if (ret)
+                return;
+
+        soc_dev_attr->family = "Freescale MXS Family";
+        soc_dev_attr->soc_id = mxs_get_soc_id();
+        soc_dev_attr->revision = mxs_get_revision();
+
+        soc_dev = soc_device_register(soc_dev_attr);
+        if (IS_ERR(soc_dev)) {
+                kfree(soc_dev_attr->revision);
+                kfree(soc_dev_attr);
+                return;
+        }
+
+        parent = soc_device_to_device(soc_dev);
+
         if (of_machine_is_compatible("fsl,imx28-evk"))
                 imx28_evk_init();
         else if (of_machine_is_compatible("bluegiga,apx4devkit"))
                 apx4devkit_init();
-        else if (of_machine_is_compatible("crystalfontz,cfa10037"))
-                cfa10037_init();
-        else if (of_machine_is_compatible("crystalfontz,cfa10049"))
-                cfa10049_init();
+        else if (of_machine_is_compatible("crystalfontz,cfa10037") ||
+                 of_machine_is_compatible("crystalfontz,cfa10049") ||
+                 of_machine_is_compatible("crystalfontz,cfa10055") ||
+                 of_machine_is_compatible("crystalfontz,cfa10057"))
+                crystalfontz_init();
 
         of_platform_populate(NULL, of_default_bus_match_table,
-                             mxs_auxdata_lookup, NULL);
+                             mxs_auxdata_lookup, parent);
 
         if (of_machine_is_compatible("karo,tx28"))
                 tx28_post_init();
@@ -434,7 +544,6 @@ static const char *mxs_dt_compat[] __initdata = {
 };
 
 DT_MACHINE_START(MXS, "Freescale MXS (Device Tree)")
-        .init_irq       = irqchip_init,
         .handle_irq     = icoll_handle_irq,
         .init_time      = mxs_timer_init,
         .init_machine   = mxs_machine_init,