diff options
| author | Olof Johansson <olof@lixom.net> | 2015-07-21 14:05:48 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-07-21 14:08:47 -0700 |
| commit | 82567c85d5b0b96e3c2724fb878a65a7867614df (patch) | |
| tree | 5431f6a3cf0e3c3c4a52608b05e164471793b430 /arch/arm/mach-omap2/omap_hwmod_7xx_data.c | |
| parent | 3eae03daa538303e0d28f56412c6c51f6452e493 (diff) | |
| parent | 300bde79f3d86b1af6fcde7b7b2439ecffccbff4 (diff) | |
| download | op-kernel-dev-82567c85d5b0b96e3c2724fb878a65a7867614df.zip op-kernel-dev-82567c85d5b0b96e3c2724fb878a65a7867614df.tar.gz | |
Merge tag 'samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
Merge "Samsung fixes for v4.2" from Kukjin Kim:
From Krzysztof Kozlowski:
1. Fix exynos3250 MIPI DSI display and MIPI CSIS-2 camera sensorx
after adding support for PMU regmap in exynos-video-mipi driver
(issue introduced in v4.0).
2. Bring back cpufreq for exynos4210 after incomplete switch to
cpufreq-dt driver in 4.2 merge window. The necessary DT changes
for exynos4210 cpufreq was not applied to the same tree as rest
of patchset because of multiple conflicts between clk and arm-soc
trees. Unfortunately without the change the exynos4210 boards
loose cpufreq feature.
* tag 'samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: dts: add CPU OPP and regulator supply property for exynos4210
ARM: dts: Update video-phy node with syscon phandle for exynos3250
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod_7xx_data.c')
0 files changed, 0 insertions, 0 deletions
