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

Pull ARM SoC DT updates from Olof Johansson:
 "DT and DT-conversion-related changes for various ARM platforms.  Most
  of these are to enable various devices on various boards, etc, and not
  necessarily worth enumerating.

  New boards and systems continue to come in as new devicetree files
  that don't require corresponding C changes any more, which is
  indicating that the system is starting to work fairly well.

  A few things worth pointing out:

   * ST Ericsson ux500 platforms have made the major push to move over
     to fully support the platform with DT
   * Renesas platforms continue their conversion over from legacy
     platform devices to DT-based for hardware description"

* tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (327 commits)
  ARM: dts: SiRF: add pin group for USP0 with only RX or TX frame sync
  ARM: dts: SiRF: add lost usp1_uart_nostreamctrl pin group for atlas6
  ARM: dts: sirf: add lost minigpsrtc device node
  ARM: dts: sirf: add clock, frequence-voltage table for CPU0
  ARM: dts: sirf: add lost bus_width, clock and status for sdhci
  ARM: dts: sirf: add lost clocks for cphifbg
  ARM: dts: socfpga: add pl330 clock
  ARM: dts: socfpga: update L2 tag and data latency
  arm: sun7i: cubietruck: Enable the i2c controllers
  ARM: dts: add support for EXYNOS4412 based TINY4412 board
  ARM: dts: Add initial support for Arndale Octa board
  ARM: bcm2835: add USB controller to device tree
  ARM: dts: MSM8974: Add MMIO architected timer node
  ARM: dts: MSM8974: Add restart node
  ARM: dts: sun7i: external clock outputs
  ARM: dts: sun7i: Change 32768 Hz oscillator node name to clk@N style
  ARM: dts: sun7i: Add pin muxing options for clock outputs
  ARM: dts: sun7i: Add rtp controller node
  ARM: dts: sun5i: Add rtp controller node
  ARM: dts: sun4i: Add rtp controller node
  ...

2 files changed, 31 insertions, 43 deletions

diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c
index 473e21b87364..17c0fe627435 100644
--- a/arch/arm/mach-integrator/integrator_ap.c
+++ b/arch/arm/mach-integrator/integrator_ap.c
@@ -63,6 +63,9 @@
 
 /* Base address to the AP system controller */
 void __iomem *ap_syscon_base;
+/* Base address to the external bus interface */
+static void __iomem *ebi_base;
+
 
 /*
  * All IO addresses are mapped onto VA 0xFFFx.xxxx, where x.xxxx
@@ -72,15 +75,11 @@ void __iomem *ap_syscon_base;
  * just for now).
  */
 #define VA_IC_BASE      __io_address(INTEGRATOR_IC_BASE)
-#define VA_EBI_BASE     __io_address(INTEGRATOR_EBI_BASE)
-#define VA_CMIC_BASE    __io_address(INTEGRATOR_HDR_IC)
 
 /*
  * Logical      Physical
  * ef000000                     Cache flush
- * f1000000     10000000        Core module registers
  * f1100000     11000000        System controller registers
- * f1200000     12000000        EBI registers
  * f1300000     13000000        Counter/Timer
  * f1400000     14000000        Interrupt controller
  * f1600000     16000000        UART 0
@@ -91,16 +90,6 @@ void __iomem *ap_syscon_base;
 
 static struct map_desc ap_io_desc[] __initdata __maybe_unused = {
         {
-                .virtual        = IO_ADDRESS(INTEGRATOR_HDR_BASE),
-                .pfn            = __phys_to_pfn(INTEGRATOR_HDR_BASE),
-                .length         = SZ_4K,
-                .type           = MT_DEVICE
-        }, {
-                .virtual        = IO_ADDRESS(INTEGRATOR_EBI_BASE),
-                .pfn            = __phys_to_pfn(INTEGRATOR_EBI_BASE),
-                .length         = SZ_4K,
-                .type           = MT_DEVICE
-        }, {
                 .virtual        = IO_ADDRESS(INTEGRATOR_CT_BASE),
                 .pfn            = __phys_to_pfn(INTEGRATOR_CT_BASE),
                 .length         = SZ_4K,
@@ -174,9 +163,6 @@ device_initcall(irq_syscore_init);
 /*
  * Flash handling.
  */
-#define EBI_CSR1 (VA_EBI_BASE + INTEGRATOR_EBI_CSR1_OFFSET)
-#define EBI_LOCK (VA_EBI_BASE + INTEGRATOR_EBI_LOCK_OFFSET)
-
 static int ap_flash_init(struct platform_device *dev)
 {
         u32 tmp;
@@ -184,13 +170,15 @@ static int ap_flash_init(struct platform_device *dev)
         writel(INTEGRATOR_SC_CTRL_nFLVPPEN | INTEGRATOR_SC_CTRL_nFLWP,
                ap_syscon_base + INTEGRATOR_SC_CTRLC_OFFSET);
 
-        tmp = readl(EBI_CSR1) | INTEGRATOR_EBI_WRITE_ENABLE;
-        writel(tmp, EBI_CSR1);
+        tmp = readl(ebi_base + INTEGRATOR_EBI_CSR1_OFFSET) |
+                INTEGRATOR_EBI_WRITE_ENABLE;
+        writel(tmp, ebi_base + INTEGRATOR_EBI_CSR1_OFFSET);
 
-        if (!(readl(EBI_CSR1) & INTEGRATOR_EBI_WRITE_ENABLE)) {
-                writel(0xa05f, EBI_LOCK);
-                writel(tmp, EBI_CSR1);
-                writel(0, EBI_LOCK);
+        if (!(readl(ebi_base + INTEGRATOR_EBI_CSR1_OFFSET)
+              & INTEGRATOR_EBI_WRITE_ENABLE)) {
+                writel(0xa05f, ebi_base + INTEGRATOR_EBI_LOCK_OFFSET);
+                writel(tmp, ebi_base + INTEGRATOR_EBI_CSR1_OFFSET);
+                writel(0, ebi_base + INTEGRATOR_EBI_LOCK_OFFSET);
         }
         return 0;
 }
@@ -202,13 +190,15 @@ static void ap_flash_exit(struct platform_device *dev)
         writel(INTEGRATOR_SC_CTRL_nFLVPPEN | INTEGRATOR_SC_CTRL_nFLWP,
                ap_syscon_base + INTEGRATOR_SC_CTRLC_OFFSET);
 
-        tmp = readl(EBI_CSR1) & ~INTEGRATOR_EBI_WRITE_ENABLE;
-        writel(tmp, EBI_CSR1);
+        tmp = readl(ebi_base + INTEGRATOR_EBI_CSR1_OFFSET) &
+                ~INTEGRATOR_EBI_WRITE_ENABLE;
+        writel(tmp, ebi_base + INTEGRATOR_EBI_CSR1_OFFSET);
 
-        if (readl(EBI_CSR1) & INTEGRATOR_EBI_WRITE_ENABLE) {
-                writel(0xa05f, EBI_LOCK);
-                writel(tmp, EBI_CSR1);
-                writel(0, EBI_LOCK);
+        if (readl(ebi_base + INTEGRATOR_EBI_CSR1_OFFSET) &
+            INTEGRATOR_EBI_WRITE_ENABLE) {
+                writel(0xa05f, ebi_base + INTEGRATOR_EBI_LOCK_OFFSET);
+                writel(tmp, ebi_base + INTEGRATOR_EBI_CSR1_OFFSET);
+                writel(0, ebi_base + INTEGRATOR_EBI_LOCK_OFFSET);
         }
 }
 
@@ -475,11 +465,17 @@ static const struct of_device_id ap_syscon_match[] = {
         { },
 };
 
+static const struct of_device_id ebi_match[] = {
+        { .compatible = "arm,external-bus-interface"},
+        { },
+};
+
 static void __init ap_init_of(void)
 {
         unsigned long sc_dec;
         struct device_node *root;
         struct device_node *syscon;
+        struct device_node *ebi;
         struct device *parent;
         struct soc_device *soc_dev;
         struct soc_device_attribute *soc_dev_attr;
@@ -495,10 +491,16 @@ static void __init ap_init_of(void)
         syscon = of_find_matching_node(root, ap_syscon_match);
         if (!syscon)
                 return;
+        ebi = of_find_matching_node(root, ebi_match);
+        if (!ebi)
+                return;
 
         ap_syscon_base = of_iomap(syscon, 0);
         if (!ap_syscon_base)
                 return;
+        ebi_base = of_iomap(ebi, 0);
+        if (!ebi_base)
+                return;
 
         ap_sc_id = readl(ap_syscon_base);
 
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
index 4fc0a195de01..5e84149d1790 100644
--- a/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
@@ -64,9 +64,6 @@ static void __iomem *intcp_con_base;
 
 /*
  * Logical      Physical
- * f1000000     10000000        Core module registers
- * f1100000     11000000        System controller registers
- * f1200000     12000000        EBI registers
  * f1300000     13000000        Counter/Timer
  * f1400000     14000000        Interrupt controller
  * f1600000     16000000        UART 0
@@ -74,21 +71,10 @@ static void __iomem *intcp_con_base;
  * f1a00000     1a000000        Debug LEDs
  * fc900000     c9000000        GPIO
  * fca00000     ca000000        SIC
- * fcb00000     cb000000        CP system control
  */
 
 static struct map_desc intcp_io_desc[] __initdata __maybe_unused = {
         {
-                .virtual        = IO_ADDRESS(INTEGRATOR_HDR_BASE),
-                .pfn            = __phys_to_pfn(INTEGRATOR_HDR_BASE),
-                .length         = SZ_4K,
-                .type           = MT_DEVICE
-        }, {
-                .virtual        = IO_ADDRESS(INTEGRATOR_EBI_BASE),
-                .pfn            = __phys_to_pfn(INTEGRATOR_EBI_BASE),
-                .length         = SZ_4K,
-                .type           = MT_DEVICE
-        }, {
                 .virtual        = IO_ADDRESS(INTEGRATOR_CT_BASE),
                 .pfn            = __phys_to_pfn(INTEGRATOR_CT_BASE),
                 .length         = SZ_4K,