From patchwork Mon May 12 09:12:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jyri Sarha X-Patchwork-Id: 4157361 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B2CEE9F23C for ; Mon, 12 May 2014 09:13:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E7BD7202AE for ; Mon, 12 May 2014 09:13:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 141AD2022D for ; Mon, 12 May 2014 09:13:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754795AbaELJNZ (ORCPT ); Mon, 12 May 2014 05:13:25 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:40797 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753905AbaELJNB (ORCPT ); Mon, 12 May 2014 05:13:01 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id s4C9Cvc7010434; Mon, 12 May 2014 04:12:57 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s4C9CvkR024136; Mon, 12 May 2014 04:12:57 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.3.174.1; Mon, 12 May 2014 04:12:56 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id s4C9CuXe019075; Mon, 12 May 2014 04:12:56 -0500 From: Jyri Sarha To: , , , CC: , , , , , , Jyri Sarha Subject: [PATCH 14/19] ARM: omap4-panda-common.dtsi: Add HDMI audio nodes Date: Mon, 12 May 2014 12:12:25 +0300 Message-ID: X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: MIME-Version: 1.0 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.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 Adds a simple-card sound node for HDMI audio, the associated hdmi-codec node, and sound-dai-cells propeties to the DAI nodes. Signed-off-by: Jyri Sarha --- arch/arm/boot/dts/omap4-panda-common.dtsi | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi index d2c45bf..c04f453 100644 --- a/arch/arm/boot/dts/omap4-panda-common.dtsi +++ b/arch/arm/boot/dts/omap4-panda-common.dtsi @@ -41,7 +41,7 @@ }; }; - sound: sound { + sound: sound@0 { compatible = "ti,abe-twl6040"; ti,model = "PandaBoard"; @@ -65,6 +65,24 @@ "AFMR", "Line In"; }; + sound@1 { + compatible = "simple-audio-card"; + + simple-audio-card,cpu { + sound-dai = <&hdmi>; + }; + + simple-audio-card,codec { + sound-dai = <&hdmi_audio>; + }; + }; + + hdmi_audio: hdmi_audio@0 { + #sound-dai-cells = <0>; + compatible = "linux,hdmi-audio"; + status = "okay"; + }; + /* HS USB Port 1 Power */ hsusb1_power: hsusb1_power_reg { compatible = "regulator-fixed"; @@ -512,6 +530,7 @@ }; &hdmi { + #sound-dai-cells = <0>; status = "ok"; vdda-supply = <&vdac>;