From patchwork Mon Aug 15 20:42:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ayaka X-Patchwork-Id: 9282069 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 796C6607FD for ; Mon, 15 Aug 2016 20:43:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6ADAE28D5E for ; Mon, 15 Aug 2016 20:43:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5FA4028E1F; Mon, 15 Aug 2016 20:43:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id F1D2F28D5E for ; Mon, 15 Aug 2016 20:43:34 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bZOjO-0007dQ-GZ; Mon, 15 Aug 2016 20:43:34 +0000 Received: from kozue.soulik.info ([2001:19f0:7000:8404:5054:ff:fe75:428f]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bZOip-0007Jh-41; Mon, 15 Aug 2016 20:43:00 +0000 Received: from ritsuko.sumomo.pri (unknown [IPv6:2001:470:b30d:2::3bd]) by kozue.soulik.info (Postfix) with ESMTPA id C68F61028B1; Tue, 16 Aug 2016 05:44:29 +0900 (JST) From: Randy Li To: devicetree@vger.kernel.org Subject: [PATCH] ARM: dts: rockchip: add analog audio support for firefly reload Date: Tue, 16 Aug 2016 04:42:07 +0800 Message-Id: <1471293727-26258-2-git-send-email-ayaka@soulik.info> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1471293727-26258-1-git-send-email-ayaka@soulik.info> References: <1471293727-26258-1-git-send-email-ayaka@soulik.info> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160815_134259_506264_F0D4C80F X-CRM114-Status: UNSURE ( 7.85 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, alsa-devel@alsa-project.org, heiko@sntech.de, Randy Li , linux-kernel@vger.kernel.org, linux@armlinux.org.uk, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The ES8323 found on firefly reload board is used to output analog audio to headphone and capture the sound from micphone on board and the one may attach to headphone. It would be also used to capture the sound from HDMI IN. Signed-off-by: Randy Li --- arch/arm/boot/dts/rk3288-firefly-reload.dts | 36 +++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/rk3288-firefly-reload.dts b/arch/arm/boot/dts/rk3288-firefly-reload.dts index 0f5a7c1..ae46231 100644 --- a/arch/arm/boot/dts/rk3288-firefly-reload.dts +++ b/arch/arm/boot/dts/rk3288-firefly-reload.dts @@ -200,8 +200,34 @@ sound { compatible = "simple-audio-card"; - simple-audio-card,name = "SPDIF"; - simple-audio-card,dai-link@1 { /* S/PDIF - S/PDIF */ + simple-audio-card,name = "rockchip-audio"; + /*simple-audio-card,hp-det-gpio = <&gpio7 15 GPIO_ACTIVE_HIGH>;*/ + simple-audio-card,widgets = + "Microphone", "Mic Jack", + "Headphone", "Headphone Jack"; + simple-audio-card,routing = + "Headphone Jack", "LOUT2", + "Headphone Jack", "ROUT2", + "LINPUT2", "Mic Jack", + "LINPUT1", "Mic Jack", + "RINPUT1", "Mic Jack"; + + simple-audio-card,dai-link@0 { + format = "i2s"; + bitclock-master = <&link0_codec>; + frame-master = <&link0_codec>; + + cpu { + sound-dai = <&i2s>; + }; + + link0_codec: codec { + sound-dai = <&codec>; + system-clock-frequency = <11289600>; + }; + }; + + simple-audio-card,dai-link@1 { cpu { sound-dai = <&spdif>; }; codec { sound-dai = <&spdif_out>; }; }; @@ -236,14 +262,15 @@ AVDD-supply = <&vcca_33>; PVDD-supply = <&vcca_33>; HPVDD-supply = <&vcca_33>; - clocks = <&cru HCLK_I2S0>, <&cru SCLK_I2S0>; - clock-names = "i2s_hclk", "i2s_clk"; + clocks = <&cru SCLK_I2S0_OUT>; reg = <0x10>; + #sound-dai-cells = <0>; }; }; &i2s { status = "okay"; + #sound-dai-cells = <0>; }; &sdmmc { @@ -256,7 +283,6 @@ pinctrl-names = "default"; pinctrl-0 = <&sdmmc_clk>, <&sdmmc_cmd>, <&sdmmc_cd>, <&sdmmc_bus4>; vmmc-supply = <&vcc_sd>; - vqmmc-supply = <&vcc_sd>; status = "okay"; };