From patchwork Wed Feb 19 10:54:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 3680231 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 25EEABF13A for ; Wed, 19 Feb 2014 10:54:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3C350201CD for ; Wed, 19 Feb 2014 10:54:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5DE7B2016C for ; Wed, 19 Feb 2014 10:54:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752149AbaBSKyj (ORCPT ); Wed, 19 Feb 2014 05:54:39 -0500 Received: from mail-ee0-f41.google.com ([74.125.83.41]:47605 "EHLO mail-ee0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751126AbaBSKyi (ORCPT ); Wed, 19 Feb 2014 05:54:38 -0500 Received: by mail-ee0-f41.google.com with SMTP id e49so135241eek.14 for ; Wed, 19 Feb 2014 02:54:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=La/IU9TtYTh1glNEX14n6u41suNvvZZLvitYHkOMJGE=; b=f7q78CnoT5EfqzKc118jq/ehU1xT462/BgjPKeeKHB2E436kmatRxOEhw/tukSqaVl LN0jvFKZ6AwFpyDFiRQFx7INyU8DYHXYPTII0VKFrExPDxANzAwzu44NaUncOuqwS6Tl LMqq6AqRt5mx/5yyw3F1BRkKd+Hx2tL7re5ma35Co+rt3UsSvt6B1tzqZJeWZhWLQq5z CWEmCxFxHbqbB2q9TWuF97hbah8egf3IbLj2ebpuezXMMuhbgevXHKKFR5waeHarkusR 3+8bF6/qAMaJcnnEQnfGFG+h8ABPzZndoJ/1yyZNnxVBBkTqsKDF8L7inzd7mHBvzTWJ IDhQ== X-Received: by 10.14.225.195 with SMTP id z43mr39953654eep.19.1392807277065; Wed, 19 Feb 2014 02:54:37 -0800 (PST) Received: from gmail.com (2-230-238-136.ip204.fastwebnet.it. [2.230.238.136]) by mx.google.com with ESMTPSA id d9sm81629780eei.9.2014.02.19.02.54.35 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 19 Feb 2014 02:54:36 -0800 (PST) Date: Wed, 19 Feb 2014 11:54:34 +0100 From: Paolo Pisati To: Peter Ujfalusi Cc: Paolo Pisati , bcousson@baylibre.com, tony@atomide.com, devicetree@vger.kernel.org, linux-omap@vger.kernel.org Subject: Re: [PATCH v2] ARM/dts: hdmi-codec: panda/es dt entries Message-ID: <20140219105434.GA5738@luxor.wired.org> References: <1392716606-7436-1-git-send-email-paolo.pisati@canonical.com> <5304681C.4010106@ti.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <5304681C.4010106@ti.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Wed, Feb 19, 2014 at 10:15:24AM +0200, Peter Ujfalusi wrote: > > 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. i see what you mean: i thought that hdmi_audio to actually work had to be referenced inside the sound node (hence my inclusion there) but i was wrong and it had nothing to do with twl6040, would this one be ok for you? i finally get my OMAPHDMI device back: flag@panda:~$ cat /proc/asound/cards 0 [OMAPHDMI ]: OMAPHDMI - OMAPHDMI OMAPHDMI 1 [PandaBoardES ]: PandaBoardES - PandaBoardES PandaBoardES [*]: in arch/arm/mach-omap2/board-omap4panda.c we had: -static struct platform_device panda_hdmi_audio_codec = { - .name = "hdmi-audio-codec", - .id = -1, -}; -static struct platform_device *panda_devices[] __initdata = { ... - &panda_hdmi_audio_codec, ... -}; that was registered as part of omap4_panda_init(): - platform_add_devices(panda_devices, ARRAY_SIZE(panda_devices)); diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi index 88c6a05..b6dd458 100644 --- a/arch/arm/boot/dts/omap4-panda-common.dtsi +++ b/arch/arm/boot/dts/omap4-panda-common.dtsi @@ -36,6 +36,11 @@ }; }; + hdmi_audio: hdmi_audio@0 { + compatible = "linux,hdmi-audio"; + status = "okay"; + }; + sound: sound { compatible = "ti,abe-twl6040"; ti,model = "PandaBoard"; > 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. > you mean sound/soc/omap/omap-hdmi-card.c? that's exactly what i'm trying to fix. With the above patch, plus: -CONFIG_DISPLAY_CONNECTOR_HDMI=m +CONFIG_DISPLAY_CONNECTOR_HDMI=y CONFIG_DISPLAY_ENCODER_TFP410=m -CONFIG_DISPLAY_ENCODER_TPD12S015=m +CONFIG_DISPLAY_ENCODER_TPD12S015=y to make the omap-hdmi-audio-dai attach (sound/soc/omap/omap-hdmi.c) and something like this (that is not upstreamable as i understand but is an unfortunate fallout from the board removal[*]): --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -335,6 +335,11 @@ static struct platform_device omap_hdmi_audio = { .id = -1, }; +static struct platform_device hdmi_audio_codec = { + .name = "hdmi-audio-codec", + .id = -1, +}; + static void __init omap_init_hdmi_audio(void) { struct omap_hwmod *oh; @@ -349,6 +354,7 @@ static void __init omap_init_hdmi_audio(void) "Can't build omap_device for omap-hdmi-audio-dai.\n"); platform_device_register(&omap_hdmi_audio); + platform_device_register(&hdmi_audio_codec); } #else static inline void omap_init_hdmi_audio(void) {}