Merge tag 'berlin-dt-3.16' of https://github.com/shesselba/linux-berlin into next/dt

Merge "ARM: berlin: DT changes for v3.16" from Sebastian Hesselbart:

Quite a lot changes but it looks like DT approach is really paying off.
BG2Q joins Berlin SoC family with corresponding development board, DW
gpio nodes for all SoCs. Most notably, we have settled clock bindings
to allow us to continue on drivers requiring clocks and pinctrl bindings.
Last but not least, BG2Q gained SDHCI support and is able to properly
boot into userspace.

* tag 'berlin-dt-3.16' of https://github.com/shesselba/linux-berlin:
  ARM: dts: berlin: enable SD card reader and eMMC for the BG2Q DMP
  ARM: dts: berlin: add the SDHCI nodes for the BG2Q
  ARM: dts: berlin: add the pinctrl node and muxing setup for uarts
  dt-binding: ARM: add pinctrl binding docs for Marvell Berlin2 SoCs
  ARM: dts: berlin: convert BG2Q to DT clock nodes
  ARM: dts: berlin: convert BG2 to DT clock nodes
  ARM: dts: berlin: convert BG2CD to DT clock nodes
  clk: berlin: add binding include for Berlin SoC clock ids
  dt-binding: ARM: add clock binding docs for Marvell Berlin2 SoCs
  ARM: dts: berlin: add the BG2CD GPIO nodes
  ARM: dts: berlin: add the BG2 GPIO nodes
  ARM: dts: berlin: add the BG2Q GPIO nodes
  ARM: dts: berlin: add scu and chipctrl device nodes for BG2/BG2Q
  ARM: dts: berlin: add the Marvell BG2-Q DMP device tree
  ARM: dts: berlin: add the Marvell Armada 1500 pro

Signed-off-by: Olof Johansson <olof@lixom.net>

2 files changed, 76 insertions, 0 deletions

diff --git a/include/dt-bindings/clock/berlin2.h b/include/dt-bindings/clock/berlin2.h
new file mode 100644
index 000000000000..0c30800175df
--- /dev/null
+++ b/include/dt-bindings/clock/berlin2.h
@@ -0,0 +1,45 @@
+/*
+ * Berlin2 BG2/BG2CD clock tree IDs
+ */
+
+#define CLKID_SYS               0
+#define CLKID_CPU               1
+#define CLKID_DRMFIGO           2
+#define CLKID_CFG               3
+#define CLKID_GFX               4
+#define CLKID_ZSP               5
+#define CLKID_PERIF             6
+#define CLKID_PCUBE             7
+#define CLKID_VSCOPE            8
+#define CLKID_NFC_ECC           9
+#define CLKID_VPP               10
+#define CLKID_APP               11
+#define CLKID_AUDIO0            12
+#define CLKID_AUDIO2            13
+#define CLKID_AUDIO3            14
+#define CLKID_AUDIO1            15
+#define CLKID_GFX3D_CORE        16
+#define CLKID_GFX3D_SYS         17
+#define CLKID_ARC               18
+#define CLKID_VIP               19
+#define CLKID_SDIO0XIN          20
+#define CLKID_SDIO1XIN          21
+#define CLKID_GFX3D_EXTRA       22
+#define CLKID_GC360             23
+#define CLKID_SDIO_DLLMST       24
+#define CLKID_GETH0             25
+#define CLKID_GETH1             26
+#define CLKID_SATA              27
+#define CLKID_AHBAPB            28
+#define CLKID_USB0              29
+#define CLKID_USB1              30
+#define CLKID_PBRIDGE           31
+#define CLKID_SDIO0             32
+#define CLKID_SDIO1             33
+#define CLKID_NFC               34
+#define CLKID_SMEMC             35
+#define CLKID_AUDIOHD           36
+#define CLKID_VIDEO0            37
+#define CLKID_VIDEO1            38
+#define CLKID_VIDEO2            39
+#define CLKID_TWD               40
diff --git a/include/dt-bindings/clock/berlin2q.h b/include/dt-bindings/clock/berlin2q.h
new file mode 100644
index 000000000000..287fc3b4afb2
--- /dev/null
+++ b/include/dt-bindings/clock/berlin2q.h
@@ -0,0 +1,31 @@
+/*
+ * Berlin2 BG2Q clock tree IDs
+ */
+
+#define CLKID_SYS               0
+#define CLKID_DRMFIGO           1
+#define CLKID_CFG               2
+#define CLKID_GFX2D             3
+#define CLKID_ZSP               4
+#define CLKID_PERIF             5
+#define CLKID_PCUBE             6
+#define CLKID_VSCOPE            7
+#define CLKID_NFC_ECC           8
+#define CLKID_VPP               9
+#define CLKID_APP               10
+#define CLKID_SDIO0XIN          11
+#define CLKID_SDIO1XIN          12
+#define CLKID_GFX2DAXI          13
+#define CLKID_GETH0             14
+#define CLKID_SATA              15
+#define CLKID_AHBAPB            16
+#define CLKID_USB0              17
+#define CLKID_USB1              18
+#define CLKID_USB2              19
+#define CLKID_USB3              20
+#define CLKID_PBRIDGE           21
+#define CLKID_SDIO              22
+#define CLKID_NFC               23
+#define CLKID_SMEMC             24
+#define CLKID_PCIE              25
+#define CLKID_TWD               26