diff options
| author | Olof Johansson <olof@lixom.net> | 2018-07-21 14:26:49 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-07-21 14:26:49 -0700 |
| commit | 7f502f8b34091565ec3cd7d4255f10623f99c616 (patch) | |
| tree | decd5f61f748d9e067bb3d3dfed4293383c359f2 /arch/arm64/boot/dts/socionext | |
| parent | 952a6f1326f2add1451383c9bbb694959ed66150 (diff) | |
| parent | 1470075d5e354da8f46f5aa2e6956de794eb406a (diff) | |
Merge tag 'uniphier-dt64-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier into next/dt
UniPhier ARM64 SoC DT updates for v4.19
- Add missing #cooling-cells properties
- Add hp-det-gpio property to detect headphone via GPIO
* tag 'uniphier-dt64-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier:
arm64: dts: uniphier: add headphone detect gpio for LD11 global board
arm64: dts: uniphier: add headphone detect gpio for LD20 global board
arm64: dts: uniphier: Add missing cooling device properties for CPUs
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm64/boot/dts/socionext')
| -rw-r--r-- | arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts | 1 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts | 1 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts b/arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts index ae3b5adf32df..7968d524351b 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts +++ b/arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts @@ -60,6 +60,7 @@ &i2s_port4 &spdif_port0 &comp_spdif_port0>; + hp-det-gpio = <&gpio UNIPHIER_GPIO_IRQ(0) GPIO_ACTIVE_LOW>; }; spdif-out { diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts b/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts index 7919233c9ce2..1a5e7c24b901 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts +++ b/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts @@ -60,6 +60,7 @@ &i2s_port4 &spdif_port0 &comp_spdif_port0>; + hp-det-gpio = <&gpio UNIPHIER_GPIO_IRQ(0) GPIO_ACTIVE_LOW>; }; spdif-out { diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi index 0298bd0d0e1a..caf112629caa 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi +++ b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi @@ -58,6 +58,7 @@ clocks = <&sys_clk 32>; enable-method = "psci"; operating-points-v2 = <&cluster0_opp>; + #cooling-cells = <2>; }; cpu2: cpu@100 { @@ -77,6 +78,7 @@ clocks = <&sys_clk 33>; enable-method = "psci"; operating-points-v2 = <&cluster1_opp>; + #cooling-cells = <2>; }; }; |