diff options
| author | Kukjin Kim <kgene@kernel.org> | 2015-09-30 09:42:39 +0300 |
|---|---|---|
| committer | Kukjin Kim <kgene@kernel.org> | 2015-09-30 09:42:39 +0300 |
| commit | 4776dbb3583d10969f991cc89da781884c15979d (patch) | |
| tree | 1d4de5f4b9619a10c6d3ed7758c04b142146a7f0 /arch/arm/boot | |
| parent | 1605b60ad064c7019db8ade07f0b7bdc8c197b93 (diff) | |
| parent | c7d2ecd9f64c351cb4d551f1f472d0fc09c3cae8 (diff) | |
| download | linux-4776dbb3583d10969f991cc89da781884c15979d.tar.xz | |
Merge tag 'samsung-fixes-4.3' of http://github.com/krzk/linux into v4.3-samsung-fixes
Fixes for Exynos (DT and mach code):
1. Finally fix booting of all 8 cores on Exynos Octa (Exynos542x): all
8 cores are booting and can be used. The fix, based on vendor
code and bootloader behavior, is as for time being only
for MCPM enabled path.
2. Fix thermal boot issue on SMDK5250.
3. Fix invalid clock used for FIMD IOMMU.
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/exynos5250-smdk5250.dts | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/exynos5420.dtsi | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts index 15aea760c1da..c625e71217aa 100644 --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts @@ -197,6 +197,7 @@ regulator-name = "P1.8V_LDO_OUT10"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; + regulator-always-on; }; ldo11_reg: LDO11 { diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi index df9aee92ecf4..1b3d6c769a3c 100644 --- a/arch/arm/boot/dts/exynos5420.dtsi +++ b/arch/arm/boot/dts/exynos5420.dtsi @@ -1117,7 +1117,7 @@ interrupt-parent = <&combiner>; interrupts = <3 0>; clock-names = "sysmmu", "master"; - clocks = <&clock CLK_SMMU_FIMD1M0>, <&clock CLK_FIMD1>; + clocks = <&clock CLK_SMMU_FIMD1M1>, <&clock CLK_FIMD1>; power-domains = <&disp_pd>; #iommu-cells = <0>; }; |