From patchwork Mon Dec 15 02:56:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yakir Yang X-Patchwork-Id: 5490001 Return-Path: X-Original-To: patchwork-linux-rockchip@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 D76D0BEEA8 for ; Mon, 15 Dec 2014 02:57:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0A46820A03 for ; Mon, 15 Dec 2014 02:57:17 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3C23E20A01 for ; Mon, 15 Dec 2014 02:57:16 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Y0LqV-0003oh-Gu; Mon, 15 Dec 2014 02:57:15 +0000 Received: from regular1.263xmail.com ([211.150.99.137]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Y0LqF-0003fZ-QC; Mon, 15 Dec 2014 02:57:00 +0000 Received: from ykk?rock-chips.com (unknown [192.168.167.223]) by regular1.263xmail.com (Postfix) with SMTP id E421C63D0; Mon, 15 Dec 2014 10:56:32 +0800 (CST) X-263anti-spam: KSV:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 4 Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.263.net (Postfix) with ESMTP id 999243E9; Mon, 15 Dec 2014 10:56:18 +0800 (CST) X-RL-SENDER: ykk@rock-chips.com X-FST-TO: ykk@rock-chips.com X-SENDER-IP: 104.167.231.7 X-LOGIN-NAME: ykk@rock-chips.com X-UNIQUE-TAG: X-ATTACHMENT-NUM: 0 X-SENDER: ykk@rock-chips.com X-DNS-TYPE: 0 Received: from localhost.localdomain (unknown [104.167.231.7]) by smtp.263.net (Postfix) whith ESMTP id 24869AOF98C; Mon, 15 Dec 2014 10:56:32 +0800 (CST) From: Yakir Yang To: ykk@rock-chips.com Subject: [PATCH 6/6] ARM: dts: rockchip: add hdmi audio nodes Date: Mon, 15 Dec 2014 10:56:14 +0800 Message-Id: <1418612174-19784-1-git-send-email-ykk@rock-chips.com> X-Mailer: git-send-email 2.1.2 In-Reply-To: <1418609494-15820-1-git-send-email-ykk@rock-chips.com> References: <1418609494-15820-1-git-send-email-ykk@rock-chips.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141214_185700_489280_A105A88B X-CRM114-Status: UNSURE ( 6.01 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) Cc: Mark Rutland , alsa-devel@alsa-project.org, Heiko Stuebner , devicetree@vger.kernel.org, David Airlie , dri-devel@lists.freedesktop.org, Liam Girdwood , Max Filippov , Bard Liao , Lars-Peter Clausen , Russell King , Arnd Bergmann , Takashi Iwai , linux-rockchip@lists.infradead.org, Grant Likely , Dylan Reid , Xu Jianqun , Oder Chiou , Zubair.Kakakhel@imgtec.com, Pawel Moll , Ian Campbell , Jyri Sarha , Ben Zhang , Rob Herring , Daniel Kurtz , =?UTF-8?q?St=A8=A6phane=20Marchesin?= , Jaroslav Kysela , Sonny Rao , Sean Cross , linux-arm-kernel@lists.infradead.org, Fabio Estevam , Brian Austin , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, Mark Brown , Philipp Zabel , Kumar Gala , Shawn Guo X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_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 Add hdmi_audio to rk3288.dtsi, enable hdmi_audio in rk3288-evb.dts Signed-off-by: Yakir Yang series-cc: Dominik Behr --- arch/arm/boot/dts/rk3288-evb.dtsi | 11 +++++++++++ arch/arm/boot/dts/rk3288.dtsi | 8 ++++++++ 2 files changed, 19 insertions(+) diff --git a/arch/arm/boot/dts/rk3288-evb.dtsi b/arch/arm/boot/dts/rk3288-evb.dtsi index 3e067dd..53115d4 100644 --- a/arch/arm/boot/dts/rk3288-evb.dtsi +++ b/arch/arm/boot/dts/rk3288-evb.dtsi @@ -120,6 +120,17 @@ status = "okay"; }; +&i2s { + status = "okay"; + clock-names = "i2s_hclk", "i2s_clk", "i2s_clk_out"; + clocks = <&cru HCLK_I2S0>, <&cru SCLK_I2S0>, + <&cru SCLK_I2S0_OUT>; +}; + +&hdmi_audio { + status = "okay"; +}; + &wdt { status = "okay"; }; diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi index fd19f00..3eeba16 100644 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -588,6 +588,14 @@ interrupts = ; }; + hdmi_audio: hdmi_audio { + compatible = "rockchip,rk3288-hdmi-audio"; + cpu-of-node = <&i2s>; + codec-name = "dw-hdmi-audio"; + codec-dai-name = "dw-hdmi-hifi"; + status = "disable"; + }; + pinctrl: pinctrl { compatible = "rockchip,rk3288-pinctrl"; rockchip,grf = <&grf>;