| Message ID | 1392716606-7436-1-git-send-email-paolo.pisati@canonical.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi, On 02/18/2014 11:43 AM, Paolo Pisati wrote: > HDMI codec dummy entries for Panda/ES. > > Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com> > --- > Depends on "0f7f3d1 ASoC: hdmi-codec: Add devicetree binding with documentation", eligible for a 3.14-rcX fix. > > arch/arm/boot/dts/omap4-panda-common.dtsi | 9 ++++++++- > arch/arm/boot/dts/omap4-panda-es.dts | 3 ++- > 2 files changed, 10 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi > index 88c6a05..f4aeaa1 100644 > --- a/arch/arm/boot/dts/omap4-panda-common.dtsi > +++ b/arch/arm/boot/dts/omap4-panda-common.dtsi > @@ -36,9 +36,15 @@ > }; > }; > > + hdmi_audio: hdmi_audio@0 { > + compatible = "linux,hdmi-audio"; > + status = "okay"; > + }; > + > sound: sound { > compatible = "ti,abe-twl6040"; > ti,model = "PandaBoard"; > + ti,audio-codec = <&hdmi_audio>; I don't think this is going to work. The omap-abe-twl6040 machine driver only handles mcpdm and dmic right know. 'ti,audio-codec' is not even supported and it is kind of misleading naming in this context since twl6040 is also a codec, so why only the dummy-hdmi codec deserves to be called as codec. Furthermore: we have the omap-hdmi-card machine driver to handle the HDMI audio. It lacks DT support AFAIK but should not be a big deal to add the bindings. To get the hdmi audio working you also need to have phandle for the omap-hdmi DAI, the codec alone is not enough. Is this patch actually works at all? > > ti,mclk-freq = <38400000>; > > @@ -57,7 +63,8 @@ > "HSMIC", "Headset Mic", > "Headset Mic", "Headset Mic Bias", > "AFML", "Line In", > - "AFMR", "Line In"; > + "AFMR", "Line In", > + "HDMI Out", "TX"; > }; > > /* HS USB Port 1 Power */ > diff --git a/arch/arm/boot/dts/omap4-panda-es.dts b/arch/arm/boot/dts/omap4-panda-es.dts > index 816d1c9..70152d6 100644 > --- a/arch/arm/boot/dts/omap4-panda-es.dts > +++ b/arch/arm/boot/dts/omap4-panda-es.dts > @@ -23,7 +23,8 @@ > "Line Out", "AUXL", > "Line Out", "AUXR", > "AFML", "Line In", > - "AFMR", "Line In"; > + "AFMR", "Line In", > + "HDMI Out", "TX"; > }; > > /* PandaboardES has external pullups on SCL & SDA */ >
diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi index 88c6a05..f4aeaa1 100644 --- a/arch/arm/boot/dts/omap4-panda-common.dtsi +++ b/arch/arm/boot/dts/omap4-panda-common.dtsi @@ -36,9 +36,15 @@ }; }; + hdmi_audio: hdmi_audio@0 { + compatible = "linux,hdmi-audio"; + status = "okay"; + }; + sound: sound { compatible = "ti,abe-twl6040"; ti,model = "PandaBoard"; + ti,audio-codec = <&hdmi_audio>; ti,mclk-freq = <38400000>; @@ -57,7 +63,8 @@ "HSMIC", "Headset Mic", "Headset Mic", "Headset Mic Bias", "AFML", "Line In", - "AFMR", "Line In"; + "AFMR", "Line In", + "HDMI Out", "TX"; }; /* HS USB Port 1 Power */ diff --git a/arch/arm/boot/dts/omap4-panda-es.dts b/arch/arm/boot/dts/omap4-panda-es.dts index 816d1c9..70152d6 100644 --- a/arch/arm/boot/dts/omap4-panda-es.dts +++ b/arch/arm/boot/dts/omap4-panda-es.dts @@ -23,7 +23,8 @@ "Line Out", "AUXL", "Line Out", "AUXR", "AFML", "Line In", - "AFMR", "Line In"; + "AFMR", "Line In", + "HDMI Out", "TX"; }; /* PandaboardES has external pullups on SCL & SDA */
HDMI codec dummy entries for Panda/ES. Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com> --- Depends on "0f7f3d1 ASoC: hdmi-codec: Add devicetree binding with documentation", eligible for a 3.14-rcX fix. arch/arm/boot/dts/omap4-panda-common.dtsi | 9 ++++++++- arch/arm/boot/dts/omap4-panda-es.dts | 3 ++- 2 files changed, 10 insertions(+), 2 deletions(-)