tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge tag 'samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

Pull samsung fixes from Kukjin Kim:
"Here is Samsung fixes for v4.1. Since I've missed to send this via
arm-soc tree before v4.1-rc3, so I'm sending this to you directly

- fix commit ea08de16eb1b ("ARM: dts: Add DISP1 power domain for
exynos5420") which causes 'unhandled fault: imprecise external
abort' error when PD turned off. ("make DP a consumer of DISP1
power domain")

- fix 's3c-rtc' probe failure on Odriod-X2/U2/U3 boards ("add
'rtc_src' clock to rtc node for source clock of rtc")

- fix typo for 'cpu-crit-0' trip point on exynos5420/5440

- fix S2R failure on exynos5250-snow due to card power of Marvell
WiFi driver (suspend/resume) ("add keep-power-in-susped to WiFi
SDIO node")"

* tag 'samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: dts: Add keep-power-in-suspend to WiFi SDIO node for exynos5250-snow
ARM: dts: Fix typo in trip point temperature for exynos5420/5440
ARM: dts: add 'rtc_src' clock to rtc node for exynos4412-odroid boards
ARM: dts: Make DP a consumer of DISP1 power domain on Exynos5420

Linus Torvalds 8425ac7a 8f59ae06

options
unified split
Changed files
+7 -2
arch
arm
boot
dts
exynos4412-odroid-common.dtsi
exynos5250-snow.dts
exynos5420-trip-points.dtsi
exynos5420.dtsi
exynos5440-trip-points.dtsi
+3
arch/arm/boot/dts/exynos4412-odroid-common.dtsi
··· 9 9 10 10 #include <dt-bindings/sound/samsung-i2s.h> 11 11 #include <dt-bindings/input/input.h> 12 + #include <dt-bindings/clock/maxim,max77686.h> 12 13 #include "exynos4412.dtsi" 13 14 14 15 / { ··· 106 105 107 106 rtc@10070000 { 108 107 status = "okay"; 108 + clocks = <&clock CLK_RTC>, <&max77686 MAX77686_CLK_AP>; 109 + clock-names = "rtc", "rtc_src"; 109 110 }; 110 111 111 112 g2d@10800000 {
+1
arch/arm/boot/dts/exynos5250-snow.dts
··· 567 567 num-slots = <1>; 568 568 broken-cd; 569 569 cap-sdio-irq; 570 + keep-power-in-suspend; 570 571 card-detect-delay = <200>; 571 572 samsung,dw-mshc-ciu-div = <3>; 572 573 samsung,dw-mshc-sdr-timing = <2 3>;
+1 -1
arch/arm/boot/dts/exynos5420-trip-points.dtsi
··· 28 28 type = "active"; 29 29 }; 30 30 cpu-crit-0 { 31 - temperature = <1200000>; /* millicelsius */ 31 + temperature = <120000>; /* millicelsius */ 32 32 hysteresis = <0>; /* millicelsius */ 33 33 type = "critical"; 34 34 };
+1
arch/arm/boot/dts/exynos5420.dtsi
··· 536 536 clock-names = "dp"; 537 537 phys = <&dp_phy>; 538 538 phy-names = "dp"; 539 + power-domains = <&disp_pd>; 539 540 }; 540 541 541 542 mipi_phy: video-phy@10040714 {
+1 -1
arch/arm/boot/dts/exynos5440-trip-points.dtsi
··· 18 18 type = "active"; 19 19 }; 20 20 cpu-crit-0 { 21 - temperature = <1050000>; /* millicelsius */ 21 + temperature = <105000>; /* millicelsius */ 22 22 hysteresis = <0>; /* millicelsius */ 23 23 type = "critical"; 24 24 };