diff options
| author | Krzysztof Kozlowski <krzk@kernel.org> | 2017-03-30 17:27:18 -0400 |
|---|---|---|
| committer | Krzysztof Kozlowski <krzk@kernel.org> | 2017-03-30 17:27:18 -0400 |
| commit | a1146328ec47141007a6ec076e1cbfc80f31887f (patch) | |
| tree | 3f9d621bc64d088448fbcaf3fc70321a66bb41ee | |
| parent | c70d219bef3a2636c8220368a71436c339f9ae2e (diff) | |
| parent | 192c1df4a75499a6ab70aca38c6a7e5e40013d77 (diff) | |
Merge tag 'samsung-dt-hdmi-cec-4.12' into next/dt
Add to hdmi-cec node a phandle to hdmi node for new hdmi-cec notifier.
| -rw-r--r-- | arch/arm/boot/dts/exynos4.dtsi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi index 71e2cdae6068..497a9470c888 100644 --- a/arch/arm/boot/dts/exynos4.dtsi +++ b/arch/arm/boot/dts/exynos4.dtsi | |||
| @@ -762,6 +762,7 @@ | |||
| 762 | clocks = <&clock CLK_HDMI_CEC>; | 762 | clocks = <&clock CLK_HDMI_CEC>; |
| 763 | clock-names = "hdmicec"; | 763 | clock-names = "hdmicec"; |
| 764 | samsung,syscon-phandle = <&pmu_system_controller>; | 764 | samsung,syscon-phandle = <&pmu_system_controller>; |
| 765 | hdmi-phandle = <&hdmi>; | ||
| 765 | pinctrl-names = "default"; | 766 | pinctrl-names = "default"; |
| 766 | pinctrl-0 = <&hdmi_cec>; | 767 | pinctrl-0 = <&hdmi_cec>; |
| 767 | status = "disabled"; | 768 | status = "disabled"; |