Merge tag 'armsoc-multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC multiplatform code changes from Olof Johansson:
 "The changes here belong to two main platforms:

   - Atmel At91 is flipping the bit and going multiplatform.  This
     includes some cleanups and removal of code, and the final flip of
     config dependencies

   - Shmobile has several platforms that are going multiplatform, but
     this branch also contains a bunch of cleanups that they weren't
     able to keep separate in a good way.  THere's also a removal of one
     of their SoCs and the corresponding boards (sh7372 and mackerel)"

* tag 'armsoc-multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (67 commits)
  ARM: at91/pm: move AT91_MEMCTRL_* to pm.h
  ARM: at91/pm: move the standby functions to pm.c
  ARM: at91: fix pm_suspend.S compilation when ARMv6 is selected
  ARM: at91: add a Kconfig dependency on multi-platform
  ARM: at91: drop AT91_TIMER_HZ
  ARM: at91: remove hardware.h
  ARM: at91: remove SoC headers
  ARM: at91: remove useless mach/cpu.h
  ARM: at91: remove unused headers
  ARM: at91: switch at91_dt_defconfig to multiplatform
  ARM: at91: switch to multiplatform
  ARM: shmobile: r8a7778: enable multiplatform target
  ARM: shmobile: bockw: add sound to DT
  ARM: shmobile: r8a7778: add sound to DT
  ARM: shmobile: bockw: add devices hooked up to i2c0 to DT
  DT: i2c: add trivial binding for OKI ML86V7667 video decoder
  ARM: shmobile: r8a7778: common clock framework CPG driver
  ARM: shmobile: bockw dts: set extal clock frequency
  ARM: shmobile: bockw dts: Move Ethernet node to BSC
  ARM: shmobile: r8a73a4: Remove legacy code
  ...

3 files changed, 134 insertions, 0 deletions

diff --git a/include/dt-bindings/clock/r8a73a4-clock.h b/include/dt-bindings/clock/r8a73a4-clock.h
new file mode 100644
index 000000000000..9a4b4c9ca44a
--- /dev/null
+++ b/include/dt-bindings/clock/r8a73a4-clock.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2014 Ulrich Hecht
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef __DT_BINDINGS_CLOCK_R8A73A4_H__
+#define __DT_BINDINGS_CLOCK_R8A73A4_H__
+
+/* CPG */
+#define R8A73A4_CLK_MAIN        0
+#define R8A73A4_CLK_PLL0        1
+#define R8A73A4_CLK_PLL1        2
+#define R8A73A4_CLK_PLL2        3
+#define R8A73A4_CLK_PLL2S       4
+#define R8A73A4_CLK_PLL2H       5
+#define R8A73A4_CLK_Z           6
+#define R8A73A4_CLK_Z2          7
+#define R8A73A4_CLK_I           8
+#define R8A73A4_CLK_M3          9
+#define R8A73A4_CLK_B           10
+#define R8A73A4_CLK_M1          11
+#define R8A73A4_CLK_M2          12
+#define R8A73A4_CLK_ZX          13
+#define R8A73A4_CLK_ZS          14
+#define R8A73A4_CLK_HP          15
+
+/* MSTP2 */
+#define R8A73A4_CLK_DMAC        18
+#define R8A73A4_CLK_SCIFB3      17
+#define R8A73A4_CLK_SCIFB2      16
+#define R8A73A4_CLK_SCIFB1      7
+#define R8A73A4_CLK_SCIFB0      6
+#define R8A73A4_CLK_SCIFA0      4
+#define R8A73A4_CLK_SCIFA1      3
+
+/* MSTP3 */
+#define R8A73A4_CLK_CMT1        29
+#define R8A73A4_CLK_IIC1        23
+#define R8A73A4_CLK_IIC0        18
+#define R8A73A4_CLK_IIC7        17
+#define R8A73A4_CLK_IIC6        16
+#define R8A73A4_CLK_MMCIF0      15
+#define R8A73A4_CLK_SDHI0       14
+#define R8A73A4_CLK_SDHI1       13
+#define R8A73A4_CLK_SDHI2       12
+#define R8A73A4_CLK_MMCIF1      5
+#define R8A73A4_CLK_IIC2        0
+
+/* MSTP4 */
+#define R8A73A4_CLK_IIC3        11
+#define R8A73A4_CLK_IIC4        10
+#define R8A73A4_CLK_IIC5        9
+
+/* MSTP5 */
+#define R8A73A4_CLK_THERMAL     22
+#define R8A73A4_CLK_IIC8        15
+
+#endif /* __DT_BINDINGS_CLOCK_R8A73A4_H__ */
diff --git a/include/dt-bindings/clock/r8a7778-clock.h b/include/dt-bindings/clock/r8a7778-clock.h
new file mode 100644
index 000000000000..f6b07c5399de
--- /dev/null
+++ b/include/dt-bindings/clock/r8a7778-clock.h
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2014 Ulrich Hecht
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef __DT_BINDINGS_CLOCK_R8A7778_H__
+#define __DT_BINDINGS_CLOCK_R8A7778_H__
+
+/* CPG */
+#define R8A7778_CLK_PLLA        0
+#define R8A7778_CLK_PLLB        1
+#define R8A7778_CLK_B           2
+#define R8A7778_CLK_OUT         3
+#define R8A7778_CLK_P           4
+#define R8A7778_CLK_S           5
+#define R8A7778_CLK_S1          6
+
+/* MSTP0 */
+#define R8A7778_CLK_I2C0        30
+#define R8A7778_CLK_I2C1        29
+#define R8A7778_CLK_I2C2        28
+#define R8A7778_CLK_I2C3        27
+#define R8A7778_CLK_SCIF0       26
+#define R8A7778_CLK_SCIF1       25
+#define R8A7778_CLK_SCIF2       24
+#define R8A7778_CLK_SCIF3       23
+#define R8A7778_CLK_SCIF4       22
+#define R8A7778_CLK_SCIF5       21
+#define R8A7778_CLK_TMU0        16
+#define R8A7778_CLK_TMU1        15
+#define R8A7778_CLK_TMU2        14
+#define R8A7778_CLK_SSI0        12
+#define R8A7778_CLK_SSI1        11
+#define R8A7778_CLK_SSI2        10
+#define R8A7778_CLK_SSI3        9
+#define R8A7778_CLK_SRU         8
+#define R8A7778_CLK_HSPI        7
+
+/* MSTP1 */
+#define R8A7778_CLK_ETHER       14
+#define R8A7778_CLK_VIN0        10
+#define R8A7778_CLK_VIN1        9
+#define R8A7778_CLK_USB         0
+
+/* MSTP3 */
+#define R8A7778_CLK_MMC         31
+#define R8A7778_CLK_SDHI0       23
+#define R8A7778_CLK_SDHI1       22
+#define R8A7778_CLK_SDHI2       21
+#define R8A7778_CLK_SSI4        11
+#define R8A7778_CLK_SSI5        10
+#define R8A7778_CLK_SSI6        9
+#define R8A7778_CLK_SSI7        8
+#define R8A7778_CLK_SSI8        7
+
+/* MSTP5 */
+#define R8A7778_CLK_SRU_SRC0    31
+#define R8A7778_CLK_SRU_SRC1    30
+#define R8A7778_CLK_SRU_SRC2    29
+#define R8A7778_CLK_SRU_SRC3    28
+#define R8A7778_CLK_SRU_SRC4    27
+#define R8A7778_CLK_SRU_SRC5    26
+#define R8A7778_CLK_SRU_SRC6    25
+#define R8A7778_CLK_SRU_SRC7    24
+#define R8A7778_CLK_SRU_SRC8    23
+
+#endif /* __DT_BINDINGS_CLOCK_R8A7778_H__ */
diff --git a/include/linux/clk/shmobile.h b/include/linux/clk/shmobile.h
index 9f8a14041dd5..63a8159c4e64 100644
--- a/include/linux/clk/shmobile.h
+++ b/include/linux/clk/shmobile.h
@@ -16,6 +16,7 @@
 
 #include <linux/types.h>
 
+void r8a7778_clocks_init(u32 mode);
 void r8a7779_clocks_init(u32 mode);
 void rcar_gen2_clocks_init(u32 mode);