diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-08 14:16:58 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-08 14:16:58 -0400 |
commit | d4e1f5a14e17d4f0e8034c0967511884bcb12fba (patch) | |
tree | 8f35e6e4b7925c1aa6981b691aa51b1bfa1b4fa8 /include/dt-bindings | |
parent | 231bf80f7f14107f7ecfa2e0a2b0c56e6a793284 (diff) | |
parent | 8850e0ba5721c2e2db34bc38290722db1b402be5 (diff) |
Merge tag 'dt-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC device-tree changes from Olof Johansson:
"Unlike the board branch, this keeps having large sets of changes for
every release, but that's quite expected and is so far working well.
Most of this is plumbing for various device bindings and new
platforms, but there's also a bit of cleanup and code removal for
things that are moved from platform code to DT contents (some OMAP
clock code in particular).
There's also a pinctrl driver for tegra here (appropriately acked),
that's introduced this way to make it more bisectable.
I'm happy to say that there were no conflicts at all with this branch
this release, which means that changes are flowing through our tree as
expected instead of merged through driver maintainers (or at least not
done with conflicts).
There are several new boards added, and a couple of SoCs. In no
particular order:
- Rockchip RK3288 SoC support, including DTS for a dev board that
they have seeded with some community developers.
- Better support for Hardkernel Exynos4-based ODROID boards.
- CCF conversions (and dtsi contents) for several Renesas platforms.
- Gumstix Pepper (TI AM335x) board support
- TI eval board support for AM437x
- Allwinner A23 SoC, very similar to existing ones which mostly has
resulted in DT changes for support. Also includes support for an
Ippo tablet with the chipset.
- Allwinner A31 Hummingbird board support, not to be confused with
the SolidRun i.MX-based Hummingboard.
- Tegra30 Apalis board support"
* tag 'dt-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (334 commits)
ARM: dts: Enable USB host0 (EHCI) on rk3288-evb
ARM: dts: add rk3288 ehci usb devices
ARM: dts: Turn on USB host vbus on rk3288-evb
ARM: tegra: apalis t30: fix device tree compatible node
ARM: tegra: paz00: Fix some indentation inconsistencies
ARM: zynq: DT: Clarify Xilinx Zynq platform
ARM: dts: rockchip: add watchdog node
ARM: dts: rockchip: remove pinctrl setting from radxarock uart2
ARM: dts: Add missing pinctrl for uart0/1 for exynos3250
ARM: dts: Remove duplicate 'interrput-parent' property for exynos3250
ARM: dts: Add TMU dt node to monitor the temperature for exynos3250
ARM: dts: Specify MAX77686 pmic interrupt for exynos5250-smdk5250
ARM: dts: cypress,cyapa trackpad is exynos5250-Snow only
ARM: dts: max77686 is exynos5250-snow only
ARM: zynq: DT: Remove DMA from board DTs
ARM: zynq: DT: Add CAN node
ARM: EXYNOS: Add exynos5260 PMU compatible string to DT match table
ARM: dts: Add PMU DT node for exynos5260 SoC
ARM: EXYNOS: Add support for Exynos5410 PMU
ARM: dts: Add PMU to exynos5410
...
Diffstat (limited to 'include/dt-bindings')
-rw-r--r-- | include/dt-bindings/clock/r8a7790-clock.h | 27 | ||||
-rw-r--r-- | include/dt-bindings/clock/r8a7791-clock.h | 27 | ||||
-rw-r--r-- | include/dt-bindings/pinctrl/pinctrl-tegra-xusb.h | 7 |
3 files changed, 61 insertions, 0 deletions
diff --git a/include/dt-bindings/clock/r8a7790-clock.h b/include/dt-bindings/clock/r8a7790-clock.h index 1118f7a4bca6..f929a79e6998 100644 --- a/include/dt-bindings/clock/r8a7790-clock.h +++ b/include/dt-bindings/clock/r8a7790-clock.h | |||
@@ -59,6 +59,7 @@ | |||
59 | #define R8A7790_CLK_SDHI0 14 | 59 | #define R8A7790_CLK_SDHI0 14 |
60 | #define R8A7790_CLK_MMCIF0 15 | 60 | #define R8A7790_CLK_MMCIF0 15 |
61 | #define R8A7790_CLK_IIC0 18 | 61 | #define R8A7790_CLK_IIC0 18 |
62 | #define R8A7790_CLK_PCIEC 19 | ||
62 | #define R8A7790_CLK_IIC1 23 | 63 | #define R8A7790_CLK_IIC1 23 |
63 | #define R8A7790_CLK_SSUSB 28 | 64 | #define R8A7790_CLK_SSUSB 28 |
64 | #define R8A7790_CLK_CMT1 29 | 65 | #define R8A7790_CLK_CMT1 29 |
@@ -107,4 +108,30 @@ | |||
107 | #define R8A7790_CLK_I2C1 30 | 108 | #define R8A7790_CLK_I2C1 30 |
108 | #define R8A7790_CLK_I2C0 31 | 109 | #define R8A7790_CLK_I2C0 31 |
109 | 110 | ||
111 | /* MSTP10 */ | ||
112 | #define R8A7790_CLK_SSI_ALL 5 | ||
113 | #define R8A7790_CLK_SSI9 6 | ||
114 | #define R8A7790_CLK_SSI8 7 | ||
115 | #define R8A7790_CLK_SSI7 8 | ||
116 | #define R8A7790_CLK_SSI6 9 | ||
117 | #define R8A7790_CLK_SSI5 10 | ||
118 | #define R8A7790_CLK_SSI4 11 | ||
119 | #define R8A7790_CLK_SSI3 12 | ||
120 | #define R8A7790_CLK_SSI2 13 | ||
121 | #define R8A7790_CLK_SSI1 14 | ||
122 | #define R8A7790_CLK_SSI0 15 | ||
123 | #define R8A7790_CLK_SCU_ALL 17 | ||
124 | #define R8A7790_CLK_SCU_DVC1 18 | ||
125 | #define R8A7790_CLK_SCU_DVC0 19 | ||
126 | #define R8A7790_CLK_SCU_SRC9 22 | ||
127 | #define R8A7790_CLK_SCU_SRC8 23 | ||
128 | #define R8A7790_CLK_SCU_SRC7 24 | ||
129 | #define R8A7790_CLK_SCU_SRC6 25 | ||
130 | #define R8A7790_CLK_SCU_SRC5 26 | ||
131 | #define R8A7790_CLK_SCU_SRC4 27 | ||
132 | #define R8A7790_CLK_SCU_SRC3 28 | ||
133 | #define R8A7790_CLK_SCU_SRC2 29 | ||
134 | #define R8A7790_CLK_SCU_SRC1 30 | ||
135 | #define R8A7790_CLK_SCU_SRC0 31 | ||
136 | |||
110 | #endif /* __DT_BINDINGS_CLOCK_R8A7790_H__ */ | 137 | #endif /* __DT_BINDINGS_CLOCK_R8A7790_H__ */ |
diff --git a/include/dt-bindings/clock/r8a7791-clock.h b/include/dt-bindings/clock/r8a7791-clock.h index b050d18437ce..f0d4d1049162 100644 --- a/include/dt-bindings/clock/r8a7791-clock.h +++ b/include/dt-bindings/clock/r8a7791-clock.h | |||
@@ -53,6 +53,7 @@ | |||
53 | #define R8A7791_CLK_SDHI0 14 | 53 | #define R8A7791_CLK_SDHI0 14 |
54 | #define R8A7791_CLK_MMCIF0 15 | 54 | #define R8A7791_CLK_MMCIF0 15 |
55 | #define R8A7791_CLK_IIC0 18 | 55 | #define R8A7791_CLK_IIC0 18 |
56 | #define R8A7791_CLK_PCIEC 19 | ||
56 | #define R8A7791_CLK_IIC1 23 | 57 | #define R8A7791_CLK_IIC1 23 |
57 | #define R8A7791_CLK_SSUSB 28 | 58 | #define R8A7791_CLK_SSUSB 28 |
58 | #define R8A7791_CLK_CMT1 29 | 59 | #define R8A7791_CLK_CMT1 29 |
@@ -107,6 +108,32 @@ | |||
107 | #define R8A7791_CLK_I2C1 30 | 108 | #define R8A7791_CLK_I2C1 30 |
108 | #define R8A7791_CLK_I2C0 31 | 109 | #define R8A7791_CLK_I2C0 31 |
109 | 110 | ||
111 | /* MSTP10 */ | ||
112 | #define R8A7791_CLK_SSI_ALL 5 | ||
113 | #define R8A7791_CLK_SSI9 6 | ||
114 | #define R8A7791_CLK_SSI8 7 | ||
115 | #define R8A7791_CLK_SSI7 8 | ||
116 | #define R8A7791_CLK_SSI6 9 | ||
117 | #define R8A7791_CLK_SSI5 10 | ||
118 | #define R8A7791_CLK_SSI4 11 | ||
119 | #define R8A7791_CLK_SSI3 12 | ||
120 | #define R8A7791_CLK_SSI2 13 | ||
121 | #define R8A7791_CLK_SSI1 14 | ||
122 | #define R8A7791_CLK_SSI0 15 | ||
123 | #define R8A7791_CLK_SCU_ALL 17 | ||
124 | #define R8A7791_CLK_SCU_DVC1 18 | ||
125 | #define R8A7791_CLK_SCU_DVC0 19 | ||
126 | #define R8A7791_CLK_SCU_SRC9 22 | ||
127 | #define R8A7791_CLK_SCU_SRC8 23 | ||
128 | #define R8A7791_CLK_SCU_SRC7 24 | ||
129 | #define R8A7791_CLK_SCU_SRC6 25 | ||
130 | #define R8A7791_CLK_SCU_SRC5 26 | ||
131 | #define R8A7791_CLK_SCU_SRC4 27 | ||
132 | #define R8A7791_CLK_SCU_SRC3 28 | ||
133 | #define R8A7791_CLK_SCU_SRC2 29 | ||
134 | #define R8A7791_CLK_SCU_SRC1 30 | ||
135 | #define R8A7791_CLK_SCU_SRC0 31 | ||
136 | |||
110 | /* MSTP11 */ | 137 | /* MSTP11 */ |
111 | #define R8A7791_CLK_SCIFA3 6 | 138 | #define R8A7791_CLK_SCIFA3 6 |
112 | #define R8A7791_CLK_SCIFA4 7 | 139 | #define R8A7791_CLK_SCIFA4 7 |
diff --git a/include/dt-bindings/pinctrl/pinctrl-tegra-xusb.h b/include/dt-bindings/pinctrl/pinctrl-tegra-xusb.h new file mode 100644 index 000000000000..914d56da9324 --- /dev/null +++ b/include/dt-bindings/pinctrl/pinctrl-tegra-xusb.h | |||
@@ -0,0 +1,7 @@ | |||
1 | #ifndef _DT_BINDINGS_PINCTRL_TEGRA_XUSB_H | ||
2 | #define _DT_BINDINGS_PINCTRL_TEGRA_XUSB_H 1 | ||
3 | |||
4 | #define TEGRA_XUSB_PADCTL_PCIE 0 | ||
5 | #define TEGRA_XUSB_PADCTL_SATA 1 | ||
6 | |||
7 | #endif /* _DT_BINDINGS_PINCTRL_TEGRA_XUSB_H */ | ||