diff options
author | Olof Johansson <olof@lixom.net> | 2013-12-30 01:38:18 +0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-12-30 01:38:18 +0400 |
commit | dd7d395883adce2e623e4ef0af7598e6987685d9 (patch) | |
tree | a9fb6917372834203dba85ce1ab58cf54712f66c /include/dt-bindings/clock/tegra114-car.h | |
parent | d578759ed8a6babd9c9aecd4211b3aa5a8e4a27b (diff) | |
parent | 250d829f68ecb5e775a99deb03c56832acec28f4 (diff) | |
download | linux-dd7d395883adce2e623e4ef0af7598e6987685d9.tar.xz |
Merge tag 'renesas-soc2-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
From Simon Horman:
Second Round of Renesas ARM Based SoC Updates for v3.14
* Global
- Add select MIGHT_HAVE_PCI for PCI-AHB bridge code
* r7s72100 SoC (RZ/A1H)
- clks: remove duplicated clock from r7s72100
* R-Car Gen 2: r8a7791 (R-Car M2) and r8a7790 (R-Car H2)
* Initialize CCF before clock sources
* Do not setup timer in non-secure mode
* r8a7791 (R-Car M2)
- Conditionally select MICREL_PHY
- Add clock index macros for DT sources
- Add Ether clock
* r8a7790 (R-Car H2)
- Add clock index macros for DT sources
- Add I2C support
* r8a7778 (R-Car M1)
- Add USB Func DMAEngine support
- camera-rcar header cleanup
- Add SSIx DMAEngine support
* sh73a0 (SH-Mobile AG5)
- Add FSI clock support for DT
* tag 'renesas-soc2-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
arm: shmobile: clks: remove duplicated clock from r7s72100
ARM: shmobile: koelsch: Conditionally select MICREL_PHY
ARM: shmobile: rcar-gen2: Initialize CCF before clock sources
ARM: shmobile: r8a7791: Add clock index macros for DT sources
ARM: shmobile: r8a7790: Add clock index macros for DT sources
ARM: shmobile: Add select MIGHT_HAVE_PCI for PCI-AHB bridge code
ARM: shmobile: r8a7778: add USB Func DMAEngine support
ARM: rcar-gen2: Do not setup timer in non-secure mode
ARM: shmobile: r8a7791: add Ether clock
ARM: shmobile: r8a7778: camera-rcar header cleanup
ARM: shmobile: sh73a0: add FSI clock support for DT
ARM: shmobile: r8a7790: add I2C support
ARM: shmobile: r8a7778: add SSIx DMAEngine support
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include/dt-bindings/clock/tegra114-car.h')
0 files changed, 0 insertions, 0 deletions