Merge tag 'renesas-r7s72100-ccf-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards

Merge "Renesas ARM Based r7s72100 SoC CCF Updates for v3.16" from Simon Horman:

r7s72100 (RZ/A1H) SoC and its Genmai board
* Add and use CCF support
* Initislise SCIF, I2C and SPI via DT

* tag 'renesas-r7s72100-ccf-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r7s72100: use workaround for non DT-clocks
  ARM: shmobile: Add forward declaration of struct clk to silence warning
  ARM: shmobile: r7s72100: remove SPI DT clocks from legacy clock support
  ARM: shmobile: r7s72100: add spi clocks to dtsi
  ARM: shmobile: r7s72100: remove I2C DT clocks from legacy clock support
  ARM: shmobile: r7s72100: add i2c clocks to dtsi
  ARM: shmobile: r7s72100: genmai: platform scif devices only for legacy support
  ARM: shmobile: r7s72100: genmai: add uart alias and activate scif2 as console
  ARM: shmobile: r7s72100: add scif nodes to dtsi
  ARM: shmobile: r7s72100: genmai: populate nodes for external clocks
  ARM: shmobile: r7s72100: add essential clock nodes to dtsi
  ARM: shmobile: r7s72100: document MSTP clock support

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

1 files changed, 41 insertions, 0 deletions

diff --git a/include/dt-bindings/clock/r7s72100-clock.h b/include/dt-bindings/clock/r7s72100-clock.h
new file mode 100644
index 000000000000..5128f4d94f44
--- /dev/null
+++ b/include/dt-bindings/clock/r7s72100-clock.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2014 Renesas Solutions Corp.
+ * Copyright (C) 2014 Wolfram Sang, Sang Engineering <wsa@sang-engineering.com>
+ *
+ * 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; version 2 of the License.
+ */
+
+#ifndef __DT_BINDINGS_CLOCK_R7S72100_H__
+#define __DT_BINDINGS_CLOCK_R7S72100_H__
+
+#define R7S72100_CLK_PLL        0
+
+/* MSTP3 */
+#define R7S72100_CLK_MTU2       3
+
+/* MSTP4 */
+#define R7S72100_CLK_SCIF0      7
+#define R7S72100_CLK_SCIF1      6
+#define R7S72100_CLK_SCIF2      5
+#define R7S72100_CLK_SCIF3      4
+#define R7S72100_CLK_SCIF4      3
+#define R7S72100_CLK_SCIF5      2
+#define R7S72100_CLK_SCIF6      1
+#define R7S72100_CLK_SCIF7      0
+
+/* MSTP9 */
+#define R7S72100_CLK_I2C0       7
+#define R7S72100_CLK_I2C1       6
+#define R7S72100_CLK_I2C2       5
+#define R7S72100_CLK_I2C3       4
+
+/* MSTP10 */
+#define R7S72100_CLK_SPI0       7
+#define R7S72100_CLK_SPI1       6
+#define R7S72100_CLK_SPI2       5
+#define R7S72100_CLK_SPI3       4
+#define R7S72100_CLK_SPI4       3
+
+#endif /* __DT_BINDINGS_CLOCK_R7S72100_H__ */