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

Commit 7c006f5e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-dt-4.17-2' of... 

Merge tag 'samsung-dt-4.17-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt

Pull "Samsung DTS ARM changes for v4.17, part two" from Krzysztof Kozłowski:

1. Fix audio on Exynos5250 Chromebook Snow.
2. Enable HDMI audio Chromebook Snow, Peach Pit and Peach Pi.
3. Fix debounce of "OK" key on Midas (Trats2, Galaxy S3) boards.

* tag 'samsung-dt-4.17-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: Add #sound-dai-cells property to exynos5250 i2s nodes
  ARM: dts: exynos: Fix "debounce-interval" property misspelling in Midas
  ARM: dts: exynos: Enable HDMI audio support on Peach Pi
  ARM: dts: exynos: Enable HDMI audio support on Peach Pit
  ARM: dts: exynos: Enable HDMI audio on Snow Chromebook
  ARM: dts: exynos: Add missing clock and DAI properties to the max98095 node in Snow Chromebook
  ARM: dts: exynos: Add audio clocks configuration for Snow Chromebook
  ARM: dts: exynos: Add #sound-dai-cells property to hdmi node in exynos5250.dtsi
parents cdcdbbf3 720b5fc3

arch/arm/boot/dts/exynos4412-midas.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ 
			gpios = <&gpx0 1 GPIO_ACTIVE_LOW>;

			linux,code = <139>;

			label = "ok";

			debounce-inteval = <10>;

			debounce-interval = <10>;

			wakeup-source;

		};

	};

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

+18 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <dt-bindings/clock/maxim,max77686.h>

#include <dt-bindings/interrupt-controller/irq.h>

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

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

#include "exynos5250.dtsi"



/ {
@@ -225,6 +226,16 @@ 
	};

};



&clock {

	assigned-clocks = <&clock CLK_FOUT_EPLL>;

	assigned-clock-rates = <49152000>;

};



&clock_audss {

	assigned-clocks = <&clock_audss EXYNOS_MOUT_AUDSS>;

	assigned-clock-parents = <&clock CLK_FOUT_EPLL>;

};



&cpu0 {

	cpu0-supply = <&buck2_reg>;

};
@@ -513,6 +524,8 @@ 
};



&i2s0 {

	assigned-clocks = <&i2s0 CLK_I2S_RCLK_SRC>;

	assigned-clock-parents = <&clock_audss EXYNOS_I2S_BUS>;

	status = "okay";

};
@@ -649,6 +662,11 @@ 
	};

};



&pmu_system_controller {

	assigned-clocks = <&pmu_system_controller 0>;

	assigned-clock-parents = <&clock CLK_FIN_PLL>;

};



&rtc {

	status = "okay";

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

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

+11 −0
Original line number Diff line number Diff line
@@ -18,6 +18,14 @@ 


		samsung,model = "Snow-I2S-MAX98095";

		samsung,audio-codec = <&max98095>;



		cpu {

			sound-dai = <&i2s0 0>;

		};



		codec {

			sound-dai = <&max98095 0>, <&hdmi>;

		};

	};

};
@@ -27,6 +35,9 @@ 
		reg = <0x11>;

		pinctrl-names = "default";

		pinctrl-0 = <&max98095_en>;

		clocks = <&pmu_system_controller 0>;

		clock-names = "mclk";

		#sound-dai-cells = <1>;

	};

};

arch/arm/boot/dts/exynos5250.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -498,6 +498,8 @@ 
			pinctrl-names = "default";

			pinctrl-0 = <&i2s0_bus>;

			power-domains = <&pd_mau>;

			#clock-cells = <1>;

			#sound-dai-cells = <1>;

		};



		i2s1: i2s@12d60000 {
@@ -512,6 +514,7 @@ 
			pinctrl-names = "default";

			pinctrl-0 = <&i2s1_bus>;

			power-domains = <&pd_mau>;

			#sound-dai-cells = <1>;

		};



		i2s2: i2s@12d70000 {
@@ -526,6 +529,7 @@ 
			pinctrl-names = "default";

			pinctrl-0 = <&i2s2_bus>;

			power-domains = <&pd_mau>;

			#sound-dai-cells = <1>;

		};



		usb_dwc3 {
@@ -698,6 +702,7 @@ 
					"sclk_hdmiphy", "mout_hdmi";

			samsung,syscon-phandle = <&pmu_system_controller>;

			phy = <&hdmiphy>;

			#sound-dai-cells = <0>;

			status = "disabled";

		};

arch/arm/boot/dts/exynos5420-peach-pit.dts

+17 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <dt-bindings/interrupt-controller/irq.h>

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

#include <dt-bindings/regulator/maxim,max77802.h>

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

#include "exynos5420.dtsi"

#include "exynos5420-cpus.dtsi"
@@ -86,6 +87,14 @@ 
		samsung,model = "Peach-Pit-I2S-MAX98090";

		samsung,i2s-controller = <&i2s0>;

		samsung,audio-codec = <&max98090>;



		cpu {

			sound-dai = <&i2s0 0>;

		};



		codec {

			sound-dai = <&max98090>, <&hdmi>;

		};

	};



	usb300_vbus_reg: regulator-usb300 {
@@ -142,6 +151,11 @@ 
	vdd-supply = <&ldo9_reg>;

};



&clock_audss {

	assigned-clocks = <&clock_audss EXYNOS_MOUT_AUDSS>;

	assigned-clock-parents = <&clock CLK_FOUT_EPLL>;

};



&cpu0 {

	cpu-supply = <&buck2_reg>;

};
@@ -606,6 +620,7 @@ 
		pinctrl-0 = <&max98090_irq>;

		clocks = <&pmu_system_controller 0>;

		clock-names = "mclk";

		#sound-dai-cells = <0>;

	};



	light-sensor@44 {
@@ -690,6 +705,8 @@ 
};



&i2s0 {

	assigned-clocks = <&i2s0 CLK_I2S_RCLK_SRC>;

	assigned-clock-parents = <&clock_audss EXYNOS_I2S_BUS>;

	status = "okay";

};