diff options
author | Olof Johansson <olof@lixom.net> | 2015-04-03 23:57:26 +0300 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2015-04-03 23:57:26 +0300 |
commit | f83255cca7ce437e9a071a6e177453371cec78b8 (patch) | |
tree | 5686a30003e6957493b3d3285041bdf92c67bd07 /arch/arm/mach-exynos | |
parent | 50ae4bb946126d1ae52b83446eb125117af9dcd3 (diff) | |
parent | ae4aee959f7959427e99edb3927c9512986cbdc5 (diff) | |
download | linux-f83255cca7ce437e9a071a6e177453371cec78b8.tar.xz |
Merge tag 'imx-soc-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/soc
Merge "ARM: imx: soc changes for 4.1" from Shawn Guo:
The i.MX SoC changes for 4.1:
- An error handling improvement on imx-weim bus driver
- A number of imx6q clock tree update around MIPI support
- Add support for i.MX6 GPU/VPU power domain
- Enable SMP_ON_UP build for Vybrid
- Let MXC_DEBUG_BOARD depend on 3-stack (3DS) boards
* tag 'imx-soc-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: imx: depend MXC debug board on 3DS machines
ARM: imx6: gpc: Add PU power domain for GPU/VPU
Documentation: Add device tree bindings for Freescale i.MX GPC
bus: imx-weim: improve error handling upon child probe-failure
ARM: imx6q: clk: Add support for mipi_ipg clock as a shared clock gate
ARM: imx6q: clk: Add support for mipi_core_cfg clock as a shared clock gate
ARM: imx6q: clk: Change hsi_tx clock to be a shared clock gate
ARM: imx6q: clk: Change hdmi_isfr clock's parent to be video_27m clock
ARM: imx6q: clk: Add the video_27m clock
ARM: imx6q: Add GPR3 MIPI muxing control register field shift bits definition
ARM: vf610: use SMP_ON_UP for Vybrid SoC
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-exynos')
0 files changed, 0 insertions, 0 deletions