openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Samsung DTS ARM changes for v4.17, part two 

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.
 -----BEGIN PGP SIGNATURE-----
 
 iQItBAABCAAXBQJaroYtEBxrcnprQGtlcm5lbC5vcmcACgkQwTdm5oaLg9dbMw//
 UA8I3kDZJVbogefxJfK1/UpmuYo6aVnGMfZGBpuZY00Mwuv8C43Pvk7i5UlcKG8R
 TLbvYSkASuDoNvyXadvttdNg8buI220MQfrMBvD6shAHDkru/3XIy9ZI9rME39C+
 ckkC2LqcD2/k+KsKARr5B4s101H1EYeOtKK0D0J+hngfOSxkny1DoGV48TtXOT+v
 mcqLj9VcCO2e6SayHWkmsrLHOjKCCTFqNaT/CgKGKjhxIuIVdaLmr8TcvzEi39bo
 Nga4XVso+BvXcSH9s9FFMCiYNqGdy1LXxRR1GZ/QVmkJZK1pSlyClWb6LB7xSjET
 K7WJzidy0Qevzsidx3lY02iCHzDc2wXMc0oSgZHlDhnQc+l3d4U7lAyghgsLCfXL
 2FWWzzmObnXibuiQ8y4O98TN7q1rlhwNVXYPmXFs+qqdanlQ2E29SDcvRmJ9faJE
 a8U7D92n4OKQDSzwj6vyZnW8tu+Sxhf8v4C+A4zB9iYFUXtHauayRV8BUZ8hPOrk
 BxIlVrjCkXvkYRTcihFTorc1s/YH+uMs+59Om9ZHK4mLXtBYUT6xUNyIUG73kSAb
 t4HMyJrnuWzaOHXQhfxLA7Hi+/XU1JKc6H05GHFS32jlKhHmyexmW0LdPsjwb6uz
 F/TQIrR1lsPkY85K0DPdocgSYsgtSxqE1An+id5hQw4=
 =CfAz
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Arnd Bergmann 2018-03-27 14:11:05 +02:00
parent cdcdbbf350 720b5fc3ca
commit 7c006f5eea
6 changed files with 69 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/exynos4412-midas.dtsi
View File

@ -127,7 +127,7 @@ key-ok {
gpios = <&gpx0 1 GPIO_ACTIVE_LOW>;
linux,code = <139>;
label = "ok";
debounce-inteval = <10>;
debounce-interval = <10>;
wakeup-source;
};
};

18
arch/arm/boot/dts/exynos5250-snow-common.dtsi
View File

@ -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 @@ mmc3_pwrseq: mmc3_pwrseq {
};
};
&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 @@ &i2c_8 {
};
&i2s0 {
assigned-clocks = <&i2s0 CLK_I2S_RCLK_SRC>;
assigned-clock-parents = <&clock_audss EXYNOS_I2S_BUS>;
status = "okay";
};
@ -649,6 +662,11 @@ arb_our_claim: arb-our-claim {
};
};
&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>;

11
arch/arm/boot/dts/exynos5250-snow.dts
View File

@ -18,6 +18,14 @@ sound {
samsung,model = "Snow-I2S-MAX98095";
samsung,audio-codec = <&max98095>;
cpu {
sound-dai = <&i2s0 0>;
};
codec {
sound-dai = <&max98095 0>, <&hdmi>;
};
};
};
@ -27,6 +35,9 @@ max98095: codec@11 {
reg = <0x11>;
pinctrl-names = "default";
pinctrl-0 = <&max98095_en>;
clocks = <&pmu_system_controller 0>;
clock-names = "mclk";
#sound-dai-cells = <1>;
};
};

5
arch/arm/boot/dts/exynos5250.dtsi
View File

@ -498,6 +498,8 @@ &pdma0 9
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 @@ i2s1: i2s@12d60000 {
pinctrl-names = "default";
pinctrl-0 = <&i2s1_bus>;
power-domains = <&pd_mau>;
#sound-dai-cells = <1>;
};
i2s2: i2s@12d70000 {
@ -526,6 +529,7 @@ i2s2: i2s@12d70000 {
pinctrl-names = "default";
pinctrl-0 = <&i2s2_bus>;
power-domains = <&pd_mau>;
#sound-dai-cells = <1>;
};
usb_dwc3 {
@ -698,6 +702,7 @@ hdmi: hdmi@14530000 {
"sclk_hdmiphy", "mout_hdmi";
samsung,syscon-phandle = <&pmu_system_controller>;
phy = <&hdmiphy>;
#sound-dai-cells = <0>;
status = "disabled";
};

17
arch/arm/boot/dts/exynos5420-peach-pit.dts
View File

@ -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 @@ sound {
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 @@ &adc {
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 @@ max98090: codec@10 {
pinctrl-0 = <&max98090_irq>;
clocks = <&pmu_system_controller 0>;
clock-names = "mclk";
#sound-dai-cells = <0>;
};
light-sensor@44 {
@ -690,6 +705,8 @@ &i2c_2 {
};
&i2s0 {
assigned-clocks = <&i2s0 CLK_I2S_RCLK_SRC>;
assigned-clock-parents = <&clock_audss EXYNOS_I2S_BUS>;
status = "okay";
};

17
arch/arm/boot/dts/exynos5800-peach-pi.dts
View File

@ -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 "exynos5800.dtsi"
#include "exynos5420-cpus.dtsi"
@ -86,6 +87,14 @@ sound {
samsung,model = "Peach-Pi-I2S-MAX98091";
samsung,i2s-controller = <&i2s0>;
samsung,audio-codec = <&max98091>;
cpu {
sound-dai = <&i2s0 0>;
};
codec {
sound-dai = <&max98091>, <&hdmi>;
};
};
usb300_vbus_reg: regulator-usb300 {
@ -142,6 +151,11 @@ &adc {
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 @@ max98091: codec@10 {
pinctrl-0 = <&max98091_irq>;
clocks = <&pmu_system_controller 0>;
clock-names = "mclk";
#sound-dai-cells = <0>;
};
light-sensor@44 {
@ -658,6 +673,8 @@ &i2c_2 {
};
&i2s0 {
assigned-clocks = <&i2s0 CLK_I2S_RCLK_SRC>;
assigned-clock-parents = <&clock_audss EXYNOS_I2S_BUS>;
status = "okay";
};