Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8425ac7a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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 ea08de16 ("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
parents 8f59ae06 8cf5e6dc

arch/arm/boot/dts/exynos4412-odroid-common.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 


#include <dt-bindings/sound/samsung-i2s.h>

#include <dt-bindings/input/input.h>

#include <dt-bindings/clock/maxim,max77686.h>

#include "exynos4412.dtsi"



/ {
@@ -105,6 +106,8 @@ 


	rtc@10070000 {

		status = "okay";

		clocks = <&clock CLK_RTC>, <&max77686 MAX77686_CLK_AP>;

		clock-names = "rtc", "rtc_src";

	};



	g2d@10800000 {

arch/arm/boot/dts/exynos5250-snow.dts

+1 −0
Original line number Diff line number Diff line
@@ -567,6 +567,7 @@ 
	num-slots = <1>;

	broken-cd;

	cap-sdio-irq;

	keep-power-in-suspend;

	card-detect-delay = <200>;

	samsung,dw-mshc-ciu-div = <3>;

	samsung,dw-mshc-sdr-timing = <2 3>;

arch/arm/boot/dts/exynos5420-trip-points.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ trips { 
		type = "active";

	};

	cpu-crit-0 {

		temperature = <1200000>; /* millicelsius */

		temperature = <120000>; /* millicelsius */

		hysteresis = <0>; /* millicelsius */

		type = "critical";

	};

arch/arm/boot/dts/exynos5420.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -536,6 +536,7 @@ 
		clock-names = "dp";

		phys = <&dp_phy>;

		phy-names = "dp";

		power-domains = <&disp_pd>;

	};



	mipi_phy: video-phy@10040714 {

arch/arm/boot/dts/exynos5440-trip-points.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ trips { 
		type = "active";

	};

	cpu-crit-0 {

		temperature = <1050000>; /* millicelsius */

		temperature = <105000>; /* millicelsius */

		hysteresis = <0>; /* millicelsius */

		type = "critical";

	};