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

Commit c3e81b9d authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-dt-4.13' of... 

Merge tag 'samsung-dt-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt

Samsung DeviceTree update for v4.13:
1. Add HDMI CEC to Exynos5 SoCs.
2. Minor cleanups and readability improvements.

* tag 'samsung-dt-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux

:
  ARM: dts: exynos: Use human-friendly symbols for GIC interrupt properties
  ARM: dts: exynos: Use human-friendly symbols for interrupt flags in board sources
  ARM: dts: exynos: Add HDMI CEC device to Exynos5 SoC family
  ARM: dts: exynos: Remove MFC reserved buffers

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 63a677bc c92a4fb2

arch/arm/boot/dts/exynos3250-monk.dts

+3 −3
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ 
		max77836: subpmic@25 {

			compatible = "maxim,max77836";

			interrupt-parent = <&gpx1>;

			interrupts = <5 0>;

			interrupts = <5 IRQ_TYPE_NONE>;

			reg = <0x25>;

			wakeup-source;
@@ -191,7 +191,7 @@ 
	s2mps14_pmic@66 {

		compatible = "samsung,s2mps14-pmic";

		interrupt-parent = <&gpx0>;

		interrupts = <7 0>;

		interrupts = <7 IRQ_TYPE_NONE>;

		reg = <0x66>;

		wakeup-source;
@@ -414,7 +414,7 @@ 
	fuelgauge@36 {

		compatible = "maxim,max77836-battery";

		interrupt-parent = <&gpx1>;

		interrupts = <2 8>;

		interrupts = <2 IRQ_TYPE_LEVEL_LOW>;

		reg = <0x36>;

	};

};

arch/arm/boot/dts/exynos3250-rinato.dts

+3 −3
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 
		max77836: subpmic@25 {

			compatible = "maxim,max77836";

			interrupt-parent = <&gpx1>;

			interrupts = <5 0>;

			interrupts = <5 IRQ_TYPE_NONE>;

			reg = <0x25>;

			wakeup-source;
@@ -295,7 +295,7 @@ 
	s2mps14_pmic@66 {

		compatible = "samsung,s2mps14-pmic";

		interrupt-parent = <&gpx0>;

		interrupts = <7 0>;

		interrupts = <7 IRQ_TYPE_NONE>;

		reg = <0x66>;

		wakeup-source;
@@ -626,7 +626,7 @@ 
	fuelgauge@36 {

		compatible = "maxim,max77836-battery";

		interrupt-parent = <&gpx1>;

		interrupts = <2 8>;

		interrupts = <2 IRQ_TYPE_LEVEL_LOW>;

		reg = <0x36>;

	};

};

arch/arm/boot/dts/exynos4210-origen.dts

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ 
		compatible = "maxim,max8997-pmic";

		reg = <0x66>;

		interrupt-parent = <&gpx0>;

		interrupts = <4 0>, <3 0>;

		interrupts = <4 IRQ_TYPE_NONE>, <3 IRQ_TYPE_NONE>;



		max8997,pmic-buck1-dvs-voltage = <1350000>;

		max8997,pmic-buck2-dvs-voltage = <1100000>;

arch/arm/boot/dts/exynos4210-trats.dts

+2 −2
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ 
		compatible = "melfas,mms114";

		reg = <0x48>;

		interrupt-parent = <&gpx0>;

		interrupts = <4 2>;

		interrupts = <4 IRQ_TYPE_EDGE_FALLING>;

		x-size = <720>;

		y-size = <1280>;

		avdd-supply = <&tsp_reg>;
@@ -302,7 +302,7 @@ 


		reg = <0x66>;

		interrupt-parent = <&gpx0>;

		interrupts = <7 0>;

		interrupts = <7 IRQ_TYPE_NONE>;



		max8997,pmic-buck1-uses-gpio-dvs;

		max8997,pmic-buck2-uses-gpio-dvs;

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

+3 −3
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 


		power_key {

			interrupt-parent = <&gpx1>;

			interrupts = <3 0>;

			interrupts = <3 IRQ_TYPE_NONE>;

			gpios = <&gpx1 3 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_POWER>;

			label = "power key";
@@ -266,7 +266,7 @@ 
	max77686: pmic@09 {

		compatible = "maxim,max77686";

		interrupt-parent = <&gpx3>;

		interrupts = <2 0>;

		interrupts = <2 IRQ_TYPE_NONE>;

		pinctrl-names = "default";

		pinctrl-0 = <&max77686_irq>;

		reg = <0x09>;
@@ -484,7 +484,7 @@ 
		compatible = "maxim,max98090";

		reg = <0x10>;

		interrupt-parent = <&gpx0>;

		interrupts = <0 0>;

		interrupts = <0 IRQ_TYPE_NONE>;

		clocks = <&i2s0 CLK_I2S_CDCLK>;

		clock-names = "mclk";

		#sound-dai-cells = <0>;