Commit 7f502f8b authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'uniphier-dt64-v4.19' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents 952a6f13 1470075d

arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ 
			&i2s_port4

			&spdif_port0

			&comp_spdif_port0>;

		hp-det-gpio = <&gpio UNIPHIER_GPIO_IRQ(0) GPIO_ACTIVE_LOW>;

	};



	spdif-out {

arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ 
			&i2s_port4

			&spdif_port0

			&comp_spdif_port0>;

		hp-det-gpio = <&gpio UNIPHIER_GPIO_IRQ(0) GPIO_ACTIVE_LOW>;

	};



	spdif-out {

arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -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>;

		};

	};

CRA Git | Maintained and supported by SUSTech CRA and CCSE