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:
 "Most of this branch consists of updates, additions and general churn
  of the device tree source files in the kernel (arch/arm/boot/dts).
  Besides that, there are a few things to point out:

   - Lots of platform conversion on OMAP2+, with removal of old board
     files for various platforms.
   - Final conversion of a bunch of ux500 (ST-Ericsson) platforms as
     well
   - Some updates to pinctrl and other subsystems.  Most of these are
     for DT-enablement of the various platforms and acks have been
     collected"

* tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (385 commits)
  ARM: dts: bcm11351: Use GIC/IRQ defines for sdio interrupts
  ARM: dts: bcm: Add missing UARTs for bcm11351 (bcm281xx)
  ARM: dts: bcm281xx: Add card detect GPIO
  ARM: dts: rename ARCH_BCM to ARCH_BCM_MOBILE (dt)
  ARM: bcm281xx: Add device node for the GPIO controller
  ARM: mvebu: Add Netgear ReadyNAS 104 board
  ARM: tegra: fix Tegra114 IOMMU register address
  ARM: kirkwood: add support for OpenBlocks A7 platform
  ARM: dts: omap4-panda: add DPI pinmuxing
  ARM: dts: AM33xx: Add RNG node
  ARM: dts: AM33XX: Add hwspinlock node
  ARM: dts: OMAP5: Add hwspinlock node
  ARM: dts: OMAP4: Add hwspinlock node
  ARM: dts: use 'status' property for PCIe nodes
  ARM: dts: sirf: add missed address-cells and size-cells for prima2 I2C
  ARM: dts: sirf: add missed cell, cs and dma channel for SPI nodes
  ARM: dts: sirf: add missed graphics2d iobg in atlas6 dts
  ARM: dts: sirf: add missed chhifbg node in prima2 and atlas6 dts
  ARM: dts: sirf: add missed memcontrol-monitor node in prima2 and atlas6 dts
  ARM: mvebu: Add the core-divider clock to Armada 370/XP
  ...

6 files changed, 181 insertions, 68 deletions

diff --git a/include/dt-bindings/mfd/dbx500-prcmu.h b/include/dt-bindings/mfd/dbx500-prcmu.h
new file mode 100644
index 000000000000..552a2d174f01
--- /dev/null
+++ b/include/dt-bindings/mfd/dbx500-prcmu.h
@@ -0,0 +1,83 @@
+/*
+ * This header provides constants for the PRCMU bindings.
+ *
+ */
+
+#ifndef _DT_BINDINGS_MFD_PRCMU_H
+#define _DT_BINDINGS_MFD_PRCMU_H
+
+/*
+ * Clock identifiers.
+ */
+#define ARMCLK                  0
+#define PRCMU_ACLK              1
+#define PRCMU_SVAMMCSPCLK       2
+#define PRCMU_SDMMCHCLK         2  /* DBx540 only. */
+#define PRCMU_SIACLK            3
+#define PRCMU_SIAMMDSPCLK       3  /* DBx540 only. */
+#define PRCMU_SGACLK            4
+#define PRCMU_UARTCLK           5
+#define PRCMU_MSP02CLK          6
+#define PRCMU_MSP1CLK           7
+#define PRCMU_I2CCLK            8
+#define PRCMU_SDMMCCLK          9
+#define PRCMU_SLIMCLK           10
+#define PRCMU_CAMCLK            10 /* DBx540 only. */
+#define PRCMU_PER1CLK           11
+#define PRCMU_PER2CLK           12
+#define PRCMU_PER3CLK           13
+#define PRCMU_PER5CLK           14
+#define PRCMU_PER6CLK           15
+#define PRCMU_PER7CLK           16
+#define PRCMU_LCDCLK            17
+#define PRCMU_BMLCLK            18
+#define PRCMU_HSITXCLK          19
+#define PRCMU_HSIRXCLK          20
+#define PRCMU_HDMICLK           21
+#define PRCMU_APEATCLK          22
+#define PRCMU_APETRACECLK       23
+#define PRCMU_MCDECLK           24
+#define PRCMU_IPI2CCLK          25
+#define PRCMU_DSIALTCLK         26
+#define PRCMU_DMACLK            27
+#define PRCMU_B2R2CLK           28
+#define PRCMU_TVCLK             29
+#define SPARE_UNIPROCLK         30
+#define PRCMU_SSPCLK            31
+#define PRCMU_RNGCLK            32
+#define PRCMU_UICCCLK           33
+#define PRCMU_G1CLK             34 /* DBx540 only. */
+#define PRCMU_HVACLK            35 /* DBx540 only. */
+#define PRCMU_SPARE1CLK         36
+#define PRCMU_SPARE2CLK         37
+
+#define PRCMU_NUM_REG_CLOCKS    38
+
+#define PRCMU_RTCCLK            PRCMU_NUM_REG_CLOCKS
+#define PRCMU_SYSCLK            39
+#define PRCMU_CDCLK             40
+#define PRCMU_TIMCLK            41
+#define PRCMU_PLLSOC0           42
+#define PRCMU_PLLSOC1           43
+#define PRCMU_ARMSS             44
+#define PRCMU_PLLDDR            45
+
+/* DSI Clocks */
+#define PRCMU_PLLDSI            46
+#define PRCMU_DSI0CLK           47
+#define PRCMU_DSI1CLK           48
+#define PRCMU_DSI0ESCCLK        49
+#define PRCMU_DSI1ESCCLK        50
+#define PRCMU_DSI2ESCCLK        51
+
+/* LCD DSI PLL - Ux540 only */
+#define PRCMU_PLLDSI_LCD        52
+#define PRCMU_DSI0CLK_LCD       53
+#define PRCMU_DSI1CLK_LCD       54
+#define PRCMU_DSI0ESCCLK_LCD    55
+#define PRCMU_DSI1ESCCLK_LCD    56
+#define PRCMU_DSI2ESCCLK_LCD    57
+
+#define PRCMU_NUM_CLKS          58
+
+#endif
diff --git a/include/dt-bindings/pinctrl/am43xx.h b/include/dt-bindings/pinctrl/am43xx.h
new file mode 100644
index 000000000000..eb6c366adfba
--- /dev/null
+++ b/include/dt-bindings/pinctrl/am43xx.h
@@ -0,0 +1,31 @@
+/*
+ * This header provides constants specific to AM43XX pinctrl bindings.
+ */
+
+#ifndef _DT_BINDINGS_PINCTRL_AM43XX_H
+#define _DT_BINDINGS_PINCTRL_AM43XX_H
+
+#define MUX_MODE0       0
+#define MUX_MODE1       1
+#define MUX_MODE2       2
+#define MUX_MODE3       3
+#define MUX_MODE4       4
+#define MUX_MODE5       5
+#define MUX_MODE6       6
+#define MUX_MODE7       7
+
+#define PULL_DISABLE            (1 << 16)
+#define PULL_UP                 (1 << 17)
+#define INPUT_EN                (1 << 18)
+#define SLEWCTRL_FAST           (1 << 19)
+#define DS0_PULL_UP_DOWN_EN     (1 << 27)
+
+#define PIN_OUTPUT              (PULL_DISABLE)
+#define PIN_OUTPUT_PULLUP       (PULL_UP)
+#define PIN_OUTPUT_PULLDOWN     0
+#define PIN_INPUT               (INPUT_EN | PULL_DISABLE)
+#define PIN_INPUT_PULLUP        (INPUT_EN | PULL_UP)
+#define PIN_INPUT_PULLDOWN      (INPUT_EN)
+
+#endif
+
diff --git a/include/dt-bindings/pinctrl/dra.h b/include/dt-bindings/pinctrl/dra.h
new file mode 100644
index 000000000000..002a2855c046
--- /dev/null
+++ b/include/dt-bindings/pinctrl/dra.h
@@ -0,0 +1,50 @@
+/*
+ * This header provides constants for DRA pinctrl bindings.
+ *
+ * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
+ * Author: Rajendra Nayak <rnayak@ti.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef _DT_BINDINGS_PINCTRL_DRA_H
+#define _DT_BINDINGS_PINCTRL_DRA_H
+
+/* DRA7 mux mode options for each pin. See TRM for options */
+#define MUX_MODE0       0x0
+#define MUX_MODE1       0x1
+#define MUX_MODE2       0x2
+#define MUX_MODE3       0x3
+#define MUX_MODE4       0x4
+#define MUX_MODE5       0x5
+#define MUX_MODE6       0x6
+#define MUX_MODE7       0x7
+#define MUX_MODE8       0x8
+#define MUX_MODE9       0x9
+#define MUX_MODE10      0xa
+#define MUX_MODE11      0xb
+#define MUX_MODE12      0xc
+#define MUX_MODE13      0xd
+#define MUX_MODE14      0xe
+#define MUX_MODE15      0xf
+
+#define PULL_ENA                (1 << 16)
+#define PULL_UP                 (1 << 17)
+#define INPUT_EN                (1 << 18)
+#define SLEWCONTROL             (1 << 19)
+#define WAKEUP_EN               (1 << 24)
+#define WAKEUP_EVENT            (1 << 25)
+
+/* Active pin states */
+#define PIN_OUTPUT              0
+#define PIN_OUTPUT_PULLUP       (PIN_OUTPUT | PULL_ENA | PULL_UP)
+#define PIN_OUTPUT_PULLDOWN     (PIN_OUTPUT | PULL_ENA)
+#define PIN_INPUT               INPUT_EN
+#define PIN_INPUT_SLEW          (INPUT_EN | SLEWCONTROL)
+#define PIN_INPUT_PULLUP        (PULL_ENA | INPUT_EN | PULL_UP)
+#define PIN_INPUT_PULLDOWN      (PULL_ENA | INPUT_EN)
+
+#endif
+
diff --git a/include/linux/mfd/dbx500-prcmu.h b/include/linux/mfd/dbx500-prcmu.h
index ca0790fba2f5..060e11256fbc 100644
--- a/include/linux/mfd/dbx500-prcmu.h
+++ b/include/linux/mfd/dbx500-prcmu.h
@@ -12,6 +12,8 @@
 #include <linux/notifier.h>
 #include <linux/err.h>
 
+#include <dt-bindings/mfd/dbx500-prcmu.h> /* For clock identifiers */
+
 /* Offset for the firmware version within the TCPM */
 #define DB8500_PRCMU_FW_VERSION_OFFSET 0xA4
 #define DBX540_PRCMU_FW_VERSION_OFFSET 0xA8
@@ -94,74 +96,6 @@ enum prcmu_wakeup_index {
 #define PRCMU_CLKSRC_ARMCLKFIX          0x46
 #define PRCMU_CLKSRC_HDMICLK            0x47
 
-/*
- * Clock identifiers.
- */
-enum prcmu_clock {
-        PRCMU_SGACLK,
-        PRCMU_UARTCLK,
-        PRCMU_MSP02CLK,
-        PRCMU_MSP1CLK,
-        PRCMU_I2CCLK,
-        PRCMU_SDMMCCLK,
-        PRCMU_SPARE1CLK,
-        PRCMU_SLIMCLK,
-        PRCMU_PER1CLK,
-        PRCMU_PER2CLK,
-        PRCMU_PER3CLK,
-        PRCMU_PER5CLK,
-        PRCMU_PER6CLK,
-        PRCMU_PER7CLK,
-        PRCMU_LCDCLK,
-        PRCMU_BMLCLK,
-        PRCMU_HSITXCLK,
-        PRCMU_HSIRXCLK,
-        PRCMU_HDMICLK,
-        PRCMU_APEATCLK,
-        PRCMU_APETRACECLK,
-        PRCMU_MCDECLK,
-        PRCMU_IPI2CCLK,
-        PRCMU_DSIALTCLK,
-        PRCMU_DMACLK,
-        PRCMU_B2R2CLK,
-        PRCMU_TVCLK,
-        PRCMU_SSPCLK,
-        PRCMU_RNGCLK,
-        PRCMU_UICCCLK,
-        PRCMU_PWMCLK,
-        PRCMU_IRDACLK,
-        PRCMU_IRRCCLK,
-        PRCMU_SIACLK,
-        PRCMU_SVACLK,
-        PRCMU_ACLK,
-        PRCMU_HVACLK, /* Ux540 only */
-        PRCMU_G1CLK, /* Ux540 only */
-        PRCMU_SDMMCHCLK,
-        PRCMU_CAMCLK,
-        PRCMU_BML8580CLK,
-        PRCMU_NUM_REG_CLOCKS,
-        PRCMU_SYSCLK = PRCMU_NUM_REG_CLOCKS,
-        PRCMU_CDCLK,
-        PRCMU_TIMCLK,
-        PRCMU_PLLSOC0,
-        PRCMU_PLLSOC1,
-        PRCMU_ARMSS,
-        PRCMU_PLLDDR,
-        PRCMU_PLLDSI,
-        PRCMU_DSI0CLK,
-        PRCMU_DSI1CLK,
-        PRCMU_DSI0ESCCLK,
-        PRCMU_DSI1ESCCLK,
-        PRCMU_DSI2ESCCLK,
-        /* LCD DSI PLL - Ux540 only */
-        PRCMU_PLLDSI_LCD,
-        PRCMU_DSI0CLK_LCD,
-        PRCMU_DSI1CLK_LCD,
-        PRCMU_DSI0ESCCLK_LCD,
-        PRCMU_DSI1ESCCLK_LCD,
-        PRCMU_DSI2ESCCLK_LCD,
-};
-
 /**
  * enum prcmu_wdog_id - PRCMU watchdog IDs
  * @PRCMU_WDOG_ALL: use all timers
diff --git a/include/linux/platform_data/clk-ux500.h b/include/linux/platform_data/clk-ux500.h
index 9d98f3aaa16c..97baf831e071 100644
--- a/include/linux/platform_data/clk-ux500.h
+++ b/include/linux/platform_data/clk-ux500.h
@@ -10,6 +10,9 @@
 #ifndef __CLK_UX500_H
 #define __CLK_UX500_H
 
+void u8500_of_clk_init(u32 clkrst1_base, u32 clkrst2_base, u32 clkrst3_base,
+                       u32 clkrst5_base, u32 clkrst6_base);
+
 void u8500_clk_init(u32 clkrst1_base, u32 clkrst2_base, u32 clkrst3_base,
                     u32 clkrst5_base, u32 clkrst6_base);
 void u9540_clk_init(u32 clkrst1_base, u32 clkrst2_base, u32 clkrst3_base,
diff --git a/include/linux/platform_data/pinctrl-single.h b/include/linux/platform_data/pinctrl-single.h
new file mode 100644
index 000000000000..72eacda9b360
--- /dev/null
+++ b/include/linux/platform_data/pinctrl-single.h
@@ -0,0 +1,12 @@
+/**
+ * irq:         optional wake-up interrupt
+ * rearm:       optional soc specific rearm function
+ *
+ * Note that the irq and rearm setup should come from device
+ * tree except for omap where there are still some dependencies
+ * to the legacy PRM code.
+ */
+struct pcs_pdata {
+        int irq;
+        void (*rearm)(void);
+};