Revert "mfd: vexpress: Remove non-DT code"

This reverts commit f0bd7ccc413f6de0947d6b8e998ef1fb787513ff.

Signed-off-by: Robert Richter <rrichter@cavium.com>
Signed-off-by: Vadim Lomovtsev <Vadim.Lomovtsev@caviumnetworks.com>

diff --git a/drivers/mfd/vexpress-sysreg.c b/drivers/mfd/vexpress-sysreg.c
index 3e628df9280cb58a32d9e8ca4fc3a23161fc295e..8f43ab8fd2d6fec9a01ace9ed1bce4d1e64f2ed7 100644 (file)
--- a/drivers/mfd/vexpress-sysreg.c
+++ b/drivers/mfd/vexpress-sysreg.c
@@ -47,26 +47,71 @@
 #define SYS_HBI_MASK           0xfff
 #define SYS_PROCIDx_HBI_SHIFT  0
 
+#define SYS_MCI_CARDIN         (1 << 0)
+#define SYS_MCI_WPROT          (1 << 1)
+
 #define SYS_MISC_MASTERSITE    (1 << 14)
 
-void vexpress_flags_set(u32 data)
-{
-       static void __iomem *base;
 
-       if (!base) {
+static void __iomem *__vexpress_sysreg_base;
+
+static void __iomem *vexpress_sysreg_base(void)
+{
+       if (!__vexpress_sysreg_base) {
                struct device_node *node = of_find_compatible_node(NULL, NULL,
                                "arm,vexpress-sysreg");
 
-               base = of_iomap(node, 0);
+               __vexpress_sysreg_base = of_iomap(node, 0);
        }
 
-       if (WARN_ON(!base))
-               return;
+       WARN_ON(!__vexpress_sysreg_base);
+
+       return __vexpress_sysreg_base;
+}
+
+
+static int vexpress_sysreg_get_master(void)
+{
+       if (readl(vexpress_sysreg_base() + SYS_MISC) & SYS_MISC_MASTERSITE)
+               return VEXPRESS_SITE_DB2;
+
+       return VEXPRESS_SITE_DB1;
+}
+
+void vexpress_flags_set(u32 data)
+{
+       writel(~0, vexpress_sysreg_base() + SYS_FLAGSCLR);
+       writel(data, vexpress_sysreg_base() + SYS_FLAGSSET);
+}
+
+unsigned int vexpress_get_mci_cardin(struct device *dev)
+{
+       return readl(vexpress_sysreg_base() + SYS_MCI) & SYS_MCI_CARDIN;
+}
+
+u32 vexpress_get_procid(int site)
+{
+       if (site == VEXPRESS_SITE_MASTER)
+               site = vexpress_sysreg_get_master();
 
-       writel(~0, base + SYS_FLAGSCLR);
-       writel(data, base + SYS_FLAGSSET);
+       return readl(vexpress_sysreg_base() + (site == VEXPRESS_SITE_DB1 ?
+                       SYS_PROCID0 : SYS_PROCID1));
 }
 
+void __iomem *vexpress_get_24mhz_clock_base(void)
+{
+       return vexpress_sysreg_base() + SYS_24MHZ;
+}
+
+
+void __init vexpress_sysreg_early_init(void __iomem *base)
+{
+       __vexpress_sysreg_base = base;
+
+       vexpress_config_set_master(vexpress_sysreg_get_master());
+}
+
+
 /* The sysreg block is just a random collection of various functions... */
 
 static struct syscon_platform_data vexpress_sysreg_sys_id_pdata = {
@@ -165,7 +210,6 @@ static int vexpress_sysreg_probe(struct platform_device *pdev)
        struct resource *mem;
        void __iomem *base;
        struct bgpio_chip *mmc_gpio_chip;
-       int master;
        u32 dt_hbi;
 
        mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -176,14 +220,11 @@ static int vexpress_sysreg_probe(struct platform_device *pdev)
        if (!base)
                return -ENOMEM;
 
-       master = readl(base + SYS_MISC) & SYS_MISC_MASTERSITE ?
-                       VEXPRESS_SITE_DB2 : VEXPRESS_SITE_DB1;
-       vexpress_config_set_master(master);
+       vexpress_config_set_master(vexpress_sysreg_get_master());
 
        /* Confirm board type against DT property, if available */
        if (of_property_read_u32(of_root, "arm,hbi", &dt_hbi) == 0) {
-               u32 id = readl(base + (master == VEXPRESS_SITE_DB1 ?
-                                SYS_PROCID0 : SYS_PROCID1));
+               u32 id = vexpress_get_procid(VEXPRESS_SITE_MASTER);
                u32 hbi = (id >> SYS_PROCIDx_HBI_SHIFT) & SYS_HBI_MASK;
 
                if (WARN_ON(dt_hbi != hbi))