From: Patrice Chotard <patrice.chotard@st.com>
Date: Wed, 7 Dec 2016 09:49:51 +0000 (+0100)
Subject: ARM: dts: STiH410-B2120: enable sti-hda at board level
X-Git-Tag: v4.11-rc1~87^2~37^2~10
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=9d65f902ddcaf2f37ef58b937650805d697cfcd2;p=linux.git

ARM: dts: STiH410-B2120: enable sti-hda at board level

As sti-hda is only available on STiH410-B2120,
disable it in STiH410.dtsi and enable it at board level.

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
---

diff --git a/arch/arm/boot/dts/stih410-b2120.dts b/arch/arm/boot/dts/stih410-b2120.dts
index 118ac284fc4b..83313b51915d 100644
--- a/arch/arm/boot/dts/stih410-b2120.dts
+++ b/arch/arm/boot/dts/stih410-b2120.dts
@@ -60,5 +60,11 @@ ohci1: usb@9a83c00 {
 		ehci1: usb@9a83e00 {
 			status = "okay";
 		};
+
+		sti-display-subsystem {
+			sti-hda@8d02000 {
+				status = "okay";
+			};
+		};
 	};
 };
diff --git a/arch/arm/boot/dts/stih410.dtsi b/arch/arm/boot/dts/stih410.dtsi
index 281a12424cf6..fe994ebb5ec2 100644
--- a/arch/arm/boot/dts/stih410.dtsi
+++ b/arch/arm/boot/dts/stih410.dtsi
@@ -221,6 +221,7 @@ sti_hdmi: sti-hdmi@8d04000 {
 
 			sti-hda@8d02000 {
 				compatible = "st,stih407-hda";
+				status = "disabled";
 				reg = <0x8d02000 0x400>, <0x92b0120 0x4>;
 				reg-names = "hda-reg", "video-dacs-ctrl";
 				clock-names = "pix",