From patchwork Mon Jan 23 13:47:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Perier X-Patchwork-Id: 9532665 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 1E6126042D for ; Mon, 23 Jan 2017 14:47:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1715F27F17 for ; Mon, 23 Jan 2017 14:47:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0B33A28409; Mon, 23 Jan 2017 14:47:22 +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=-1.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3201E27F17 for ; Mon, 23 Jan 2017 14:47:20 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 5564B26701F; Mon, 23 Jan 2017 15:47:17 +0100 (CET) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id E1880266FD4; Mon, 23 Jan 2017 15:44:58 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 73538266FD2; Mon, 23 Jan 2017 14:48:01 +0100 (CET) Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by alsa0.perex.cz (Postfix) with ESMTP id D812E26686A for ; Mon, 23 Jan 2017 14:47:59 +0100 (CET) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: rperier) with ESMTPSA id 98C7B2603D9 From: Romain Perier To: Heiko Stuebner , devicetree@vger.kernel.org, Rob Herring , Ian Campbell , Pawel Moll , Mark Rutland , Kumar Gala , Jaroslav Kysela , Takashi Iwai , alsa-devel@alsa-project.org Date: Mon, 23 Jan 2017 14:47:47 +0100 Message-Id: <20170123134747.1385-4-romain.perier@collabora.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170123134747.1385-1-romain.perier@collabora.com> References: <20170123134747.1385-1-romain.perier@collabora.com> Cc: Romain Perier , linux-rockchip@lists.infradead.org, Sjoerd Simons , linux-arm-kernel@lists.infradead.org Subject: [alsa-devel] [PATCH v2 3/3] arm: dts: Add support for ES8323 to the Firefly-RK3288 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP This commit adds the DT definition of the es8323 i2c device found at address 0x10. It also adds the definition for connecting the Rockchip I2S to the es8323 analog output. Signed-off-by: Romain Perier --- Changes in v2: - Add the pinctrl headphone, that was previously in conflict with otp pins - Renamed sound_es8323 to sound_i2s - Added the property rockchip,routing arch/arm/boot/dts/rk3288-firefly.dtsi | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/arch/arm/boot/dts/rk3288-firefly.dtsi b/arch/arm/boot/dts/rk3288-firefly.dtsi index 44935af..ddb0beb 100644 --- a/arch/arm/boot/dts/rk3288-firefly.dtsi +++ b/arch/arm/boot/dts/rk3288-firefly.dtsi @@ -103,6 +103,19 @@ }; }; + sound_i2s { + compatible = "rockchip,rk3288-hdmi-analog"; + rockchip,model = "I2S"; + rockchip,i2s-controller = <&i2s>; + rockchip,audio-codec = <&es8323>; + rockchip,routing = "Analog", "LOUT2", + "Analog", "ROUT2"; + rockchip,hp-en-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>; + rockchip,hp-det-gpios = <&gpio7 RK_PB7 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&headphone>; + }; + vbat_wl: vcc_sys: vsys-regulator { compatible = "regulator-fixed"; regulator-name = "vcc_sys"; @@ -371,6 +384,17 @@ &i2c2 { status = "okay"; + + es8323: es8323@10 { + compatible = "everest,es8323", "everest,es8328"; + reg = <0x10>; + AVDD-supply = <&vcca_33>; + DVDD-supply = <&vcca_33>; + HPVDD-supply = <&vcca_33>; + PVDD-supply = <&vcca_33>; + clocks = <&cru SCLK_I2S0_OUT>; + clock-names = "i2s_clk_out"; + }; }; &i2c4 { @@ -381,6 +405,10 @@ status = "okay"; }; +&i2s { + status = "okay"; +}; + &io_domains { status = "okay"; @@ -483,6 +511,12 @@ }; }; + sound { + headphone: headphone { + rockchip,pins = <0 10 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; + usb_host { host_vbus_drv: host-vbus-drv { rockchip,pins = <0 14 RK_FUNC_GPIO &pcfg_pull_none>;