aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-10-08 17:22:23 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-10-08 17:22:23 -0400
commiteb785bef684f2b7d03b530efc8e6f199e9777e2f (patch)
treee43c96f5fb5fafe59a680da792d2d182e2270fb2 /include
parentcf377ad7d42c566356d79049536d9cb37499cb77 (diff)
parentee48874d4aa50d9c4921b44a38dc33110b90638b (diff)
Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC DT updates from Arnd Bergmann: "As usual, this is the largest branch, though this time a little under half of the total changes with 307 individual non-merge changesets. The largest changes are the addition of new machines, in particular the Tegra based Chromebook, the Renesas r8a7794 SoC, and DT support for the old i.MX1 platform. Other changes include - at91: various sam9 and sama5 updates - exynos: much extended Peach Pi/Pit (Chromebook 2) support - keystone: new peripherals - meson: added DT for meson6 SoC - mvebu: new device support for Armada 370/375 - qcom: improved support for IPQ8064 and MSM8x60 - rockchip: much improved support for rk3288 - shmobile: lots of updates all over the place - sunxi: dts license change - sunxi: more a23 device support - vexpress: CLCD DT description" * tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (308 commits) ARM: DTS: meson: update DTSI to add watchdog node ARM: dts: keystone-k2l: fix mdio io start address ARM: dts: keystone-k2e: fix mdio io start address ARM: dts: keystone-k2e: update usb1 node for dma properties ARM: dts: keystone: fix io range for usb_phy0 Revert "Merge tag 'hix5hd2-dt-for-3.18' of git://github.com/hisilicon/linux-hisi into next/dt" Revert "ARM: dts: hix5hd2: add wdg node" ARM: dts: add rk3288 i2s controller ARM: vexpress: Add CLCD Device Tree properties ARM: bcm2835: add I2S pinctrl to device tree ARM: meson: documentation: add bindings documentation ARM: meson: dts: add basic Meson/Meson6/Meson6-atv1200 DTSI/DTS ARM: dts: mt6589: Change compatible string for GIC ARM: dts: mediatek: Add compatible property for aquaris5 ARM: dts: mt6589-aquaris5: Add boot argument earlyprintk ARM: dts: mt6589: Fix typo in GIC unit address ARM: dts: Build dtb for Mediatek board ARM: dts: keystone: fix bindings for pcie and usb clock nodes ARM: dts: keystone: k2l: Fix chip selects for SPI devices ARM: dts: keystone: add dsp gpio controllers nodes ...
Diffstat (limited to 'include')
-rw-r--r--include/dt-bindings/clock/r8a7790-clock.h1
-rw-r--r--include/dt-bindings/clock/r8a7791-clock.h1
-rw-r--r--include/dt-bindings/clock/r8a7794-clock.h80
3 files changed, 82 insertions, 0 deletions
diff --git a/include/dt-bindings/clock/r8a7790-clock.h b/include/dt-bindings/clock/r8a7790-clock.h
index f929a79e6998..8ea7ab0346ad 100644
--- a/include/dt-bindings/clock/r8a7790-clock.h
+++ b/include/dt-bindings/clock/r8a7790-clock.h
@@ -26,6 +26,7 @@
26#define R8A7790_CLK_MSIOF0 0 26#define R8A7790_CLK_MSIOF0 0
27 27
28/* MSTP1 */ 28/* MSTP1 */
29#define R8A7790_CLK_JPU 6
29#define R8A7790_CLK_TMU1 11 30#define R8A7790_CLK_TMU1 11
30#define R8A7790_CLK_TMU3 21 31#define R8A7790_CLK_TMU3 21
31#define R8A7790_CLK_TMU2 22 32#define R8A7790_CLK_TMU2 22
diff --git a/include/dt-bindings/clock/r8a7791-clock.h b/include/dt-bindings/clock/r8a7791-clock.h
index f0d4d1049162..58c3f49d068c 100644
--- a/include/dt-bindings/clock/r8a7791-clock.h
+++ b/include/dt-bindings/clock/r8a7791-clock.h
@@ -25,6 +25,7 @@
25#define R8A7791_CLK_MSIOF0 0 25#define R8A7791_CLK_MSIOF0 0
26 26
27/* MSTP1 */ 27/* MSTP1 */
28#define R8A7791_CLK_JPU 6
28#define R8A7791_CLK_TMU1 11 29#define R8A7791_CLK_TMU1 11
29#define R8A7791_CLK_TMU3 21 30#define R8A7791_CLK_TMU3 21
30#define R8A7791_CLK_TMU2 22 31#define R8A7791_CLK_TMU2 22
diff --git a/include/dt-bindings/clock/r8a7794-clock.h b/include/dt-bindings/clock/r8a7794-clock.h
new file mode 100644
index 000000000000..9ac1043e25bc
--- /dev/null
+++ b/include/dt-bindings/clock/r8a7794-clock.h
@@ -0,0 +1,80 @@
1/*
2 * Copyright (C) 2014 Renesas Electronics Corporation
3 * Copyright 2013 Ideas On Board SPRL
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
9 */
10
11#ifndef __DT_BINDINGS_CLOCK_R8A7794_H__
12#define __DT_BINDINGS_CLOCK_R8A7794_H__
13
14/* CPG */
15#define R8A7794_CLK_MAIN 0
16#define R8A7794_CLK_PLL0 1
17#define R8A7794_CLK_PLL1 2
18#define R8A7794_CLK_PLL3 3
19#define R8A7794_CLK_LB 4
20#define R8A7794_CLK_QSPI 5
21#define R8A7794_CLK_SDH 6
22#define R8A7794_CLK_SD0 7
23#define R8A7794_CLK_Z 8
24
25/* MSTP0 */
26#define R8A7794_CLK_MSIOF0 0
27
28/* MSTP1 */
29#define R8A7794_CLK_TMU1 11
30#define R8A7794_CLK_TMU3 21
31#define R8A7794_CLK_TMU2 22
32#define R8A7794_CLK_CMT0 24
33#define R8A7794_CLK_TMU0 25
34
35/* MSTP2 */
36#define R8A7794_CLK_SCIFA2 2
37#define R8A7794_CLK_SCIFA1 3
38#define R8A7794_CLK_SCIFA0 4
39#define R8A7794_CLK_MSIOF2 5
40#define R8A7794_CLK_SCIFB0 6
41#define R8A7794_CLK_SCIFB1 7
42#define R8A7794_CLK_MSIOF1 8
43#define R8A7794_CLK_SCIFB2 16
44
45/* MSTP3 */
46#define R8A7794_CLK_CMT1 29
47
48/* MSTP5 */
49#define R8A7794_CLK_THERMAL 22
50#define R8A7794_CLK_PWM 23
51
52/* MSTP7 */
53#define R8A7794_CLK_HSCIF2 13
54#define R8A7794_CLK_SCIF5 14
55#define R8A7794_CLK_SCIF4 15
56#define R8A7794_CLK_HSCIF1 16
57#define R8A7794_CLK_HSCIF0 17
58#define R8A7794_CLK_SCIF3 18
59#define R8A7794_CLK_SCIF2 19
60#define R8A7794_CLK_SCIF1 20
61#define R8A7794_CLK_SCIF0 21
62
63/* MSTP8 */
64#define R8A7794_CLK_ETHER 13
65
66/* MSTP9 */
67#define R8A7794_CLK_GPIO6 5
68#define R8A7794_CLK_GPIO5 7
69#define R8A7794_CLK_GPIO4 8
70#define R8A7794_CLK_GPIO3 9
71#define R8A7794_CLK_GPIO2 10
72#define R8A7794_CLK_GPIO1 11
73#define R8A7794_CLK_GPIO0 12
74
75/* MSTP11 */
76#define R8A7794_CLK_SCIFA3 6
77#define R8A7794_CLK_SCIFA4 7
78#define R8A7794_CLK_SCIFA5 8
79
80#endif /* __DT_BINDINGS_CLOCK_R8A7794_H__ */