p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Samsung DTS ARM changes for v5.1, part 2 

1. Enable ADC on Odroid HC1 board.
 2. Fix clkout register failure on Exynos3250.
 3. Allow using earlycon on Arndale board.
 4. Disable ARM PMU on Odroid XU3 Lite because it is locked by Trusted
    Firmware.
 5. Add support for secondary DAI to Odroid XU3 and XU4 boards.
 -----BEGIN PGP SIGNATURE-----
 
 iQJEBAABCgAuFiEE3dJiKD0RGyM7briowTdm5oaLg9cFAlxsT7EQHGtyemtAa2Vy
 bmVsLm9yZwAKCRDBN2bmhouD13TbD/0eQCYKTS63O9mUBlclpcpaKHt4WnzOfxDC
 ww3JIrjk/lc4bW7rx0s5I70cLxYVMWMZmJYWQsR75QgTwWzECz561KvQAaNCngfh
 OAaIsY1h0wwULGhsL4LJP91zlfxrx31YpnvIT3wtKmxATUBLpcbUbH0AHmhwLmaD
 wRtdFdN9UeaD7gOAakRcS5OGjli7wEju+eO4QP0VZDfxsuAGvPDmeueHJ3B8PDtM
 nLCUdzCqbe0JgY8AUAfNB6JkpDHf4SCzCc0wiwqslYFEWFbLgkeCZR2oTpTeo+St
 WLcxTZCK4qC3pzpQV2bLTNhDlpRZon50kQnWV5OVdKihbtRvNuCstC8PIWTZL8ny
 TL/f9xwka4wNehhA+mkblNF1geAvESxbKfXnY+grZiEdzjGwHAABVwGUoDkCao0I
 SyO85lzdQ0M/I2t562EN/RK8uHhBhIWCoD8mMVteyrDLKXtpEkH2Jw5naznlaFQN
 Moq2hY598NHi3oDMz1A9yy6YJSKUP36k8biVkTBBwaXkkrs3sKNJ6lyHiuEvpaTx
 fslqaMWRfLv99CRnZvjGzNnZ0rdDB+jHV8a9G7GFX83AEt9a1/wcEdK2VWqn05B2
 tGAyf+sayH0JTr+xfmRPn/B185s0ef2+ZuxEWamJxGIpOxMA0Azjntb6ZcVGQz/I
 5sa2wTQItQ==
 =vbXr
 -----END PGP SIGNATURE-----

Merge tag 'samsung-dt-5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/dt

Samsung DTS ARM changes for v5.1, part 2

1. Enable ADC on Odroid HC1 board.
2. Fix clkout register failure on Exynos3250.
3. Allow using earlycon on Arndale board.
4. Disable ARM PMU on Odroid XU3 Lite because it is locked by Trusted
   Firmware.
5. Add support for secondary DAI to Odroid XU3 and XU4 boards.

* tag 'samsung-dt-5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: Add support for secondary DAI to Odroid XU4
  ARM: dts: exynos: Add support for secondary DAI to Odroid XU3
  ARM: dts: exynos: Disable ARM PMU on Odroid XU3-lite
  ARM: dts: exynos: Add stdout path property to Arndale board
  ARM: dts: exynos: Add minimal clkout parameters to Exynos3250 PMU
  ARM: dts: exynos: Enable ADC on Odroid HC1

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2019-02-20 16:10:09 +01:00
parent b258ad994e 625c731d1b
commit 0d6367ca90
7 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/boot/dts/exynos3250.dtsi
View File

@ -168,6 +168,9 @@ pmu_system_controller: system-controller@10020000 {
interrupt-controller; interrupt-controller;
#interrupt-cells = <3>; #interrupt-cells = <3>;
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
clock-names = "clkout8";
clocks = <&cmu CLK_FIN_PLL>;
#clock-cells = <1>;
}; };
mipi_phy: video-phy { mipi_phy: video-phy {

2
arch/arm/boot/dts/exynos5250-arndale.dts
View File

@ -23,7 +23,7 @@ memory@40000000 {
}; };
chosen { chosen {
bootargs = "console=ttySAC2,115200"; stdout-path = "serial2:115200n8";
}; };
gpio_keys { gpio_keys {

5
arch/arm/boot/dts/exynos5422-odroid-core.dtsi
View File

@ -36,6 +36,11 @@ oscclk {
}; };
}; };
&adc {
vdd-supply = <&ldo4_reg>;
status = "okay";
};
&bus_wcore { &bus_wcore {
devfreq-events = <&nocp_mem0_0>, <&nocp_mem0_1>, devfreq-events = <&nocp_mem0_0>, <&nocp_mem0_1>,
<&nocp_mem1_0>, <&nocp_mem1_1>; <&nocp_mem1_0>, <&nocp_mem1_1>;

6
arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi
View File

@ -24,7 +24,9 @@ sound: sound {
"Headphone Jack", "MICBIAS", "Headphone Jack", "MICBIAS",
"IN1", "Headphone Jack", "IN1", "Headphone Jack",
"Speakers", "SPKL", "Speakers", "SPKL",
"Speakers", "SPKR"; "Speakers", "SPKR",
"I2S Playback", "Mixer DAI TX",
"HiFi Playback", "Mixer DAI TX";
assigned-clocks = <&clock CLK_MOUT_EPLL>, assigned-clocks = <&clock CLK_MOUT_EPLL>,
<&clock CLK_MOUT_MAU_EPLL>, <&clock CLK_MOUT_MAU_EPLL>,
@ -51,7 +53,7 @@ sound: sound {
<196608000>; <196608000>;
cpu { cpu {
sound-dai = <&i2s0 0>; sound-dai = <&i2s0 0>, <&i2s0 1>;
}; };
codec { codec {
sound-dai = <&hdmi>, <&max98090>; sound-dai = <&hdmi>, <&max98090>;

5
arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
View File

@ -362,11 +362,6 @@ map4 {
}; };
}; };
&adc {
vdd-supply = <&ldo4_reg>;
status = "okay";
};
&hdmi { &hdmi {
status = "okay"; status = "okay";
ddc = <&i2c_2>; ddc = <&i2c_2>;

8
arch/arm/boot/dts/exynos5422-odroidxu3-lite.dts
View File

@ -18,6 +18,14 @@ / {
compatible = "hardkernel,odroid-xu3-lite", "samsung,exynos5800", "samsung,exynos5"; compatible = "hardkernel,odroid-xu3-lite", "samsung,exynos5800", "samsung,exynos5";
}; };
&arm_a7_pmu {
status = "disabled";
};
&arm_a15_pmu {
status = "disabled";
};
&pwm { &pwm {
/* /*
* PWM 0 -- fan * PWM 0 -- fan

4
arch/arm/boot/dts/exynos5422-odroidxu4.dts
View File

@ -33,6 +33,8 @@ sound: sound {
compatible = "samsung,odroid-xu3-audio"; compatible = "samsung,odroid-xu3-audio";
model = "Odroid-XU4"; model = "Odroid-XU4";
samsung,audio-routing = "I2S Playback", "Mixer DAI TX";
assigned-clocks = <&clock CLK_MOUT_EPLL>, assigned-clocks = <&clock CLK_MOUT_EPLL>,
<&clock CLK_MOUT_MAU_EPLL>, <&clock CLK_MOUT_MAU_EPLL>,
<&clock CLK_MOUT_USER_MAU_EPLL>, <&clock CLK_MOUT_USER_MAU_EPLL>,
@ -58,7 +60,7 @@ sound: sound {
<196608000>; <196608000>;
cpu { cpu {
sound-dai = <&i2s0 0>; sound-dai = <&i2s0 0>, <&i2s0 1>;
}; };
codec { codec {