From patchwork Fri May 12 13:22:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Perier X-Patchwork-Id: 9724149 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 EF070600CB for ; Fri, 12 May 2017 13:24:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DDD712880B for ; Fri, 12 May 2017 13:24:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D2A7728822; Fri, 12 May 2017 13:24:47 +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,DKIM_SIGNED, DKIM_VALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9396D2880B for ; Fri, 12 May 2017 13:24:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=jWssdWzvIO9amEZD5tBw/BwzSds2/vcAZZR4qUBjJsw=; b=aqXFRNKEyjWm7JGlM/jl9Tb7Ng 47mvaKZWuSW++pScmVfvdXhsqITaqa5MEL8MDFAWzDW7fu3PpY9a9LsISAa8JSYtiuyiPnBwcvOTe iiR+m9jS3UIufGsujnrPDhtVjfk5AHHrct7KgBeErA/q8vgwAt6pTbmON97gAyUHXuJKmtmy9j4cb j/LPJakqjqS7Bys9Ps2K8648zlWZs2Xs/ioMfhxxWQGVjMK+3V/peu38I0cBXAov4UYbPKlP8NmMU 2Ov8TTPFUMCa4Y2JWEYpleTFj6e9pC6HiUI8D5ZFpUCnSy/BOo4/XogvnRpJhcd+yU8OWeA7WTfEo D7aQvwCA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1d9AYo-00032X-RS; Fri, 12 May 2017 13:24:46 +0000 Received: from bhuna.collabora.co.uk ([2a00:1098:0:82:1000:25:2eeb:e3e3]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1d9AXm-0001OG-Kt; Fri, 12 May 2017 13:23:47 +0000 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: rperier) with ESMTPSA id A64E026B3CB From: Romain Perier To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , alsa-devel@alsa-project.org, Heiko Stuebner Subject: [PATCH v3 3/3] arm: dts: Add support for ES8323 to the Firefly-RK3288 Date: Fri, 12 May 2017 15:22:23 +0200 Message-Id: <20170512132227.24916-8-romain.perier@collabora.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170512132227.24916-1-romain.perier@collabora.com> References: <20170512132227.24916-1-romain.perier@collabora.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170512_062343_274148_9231F773 X-CRM114-Status: UNSURE ( 8.94 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Pawel Moll , Ian Campbell , linux-rockchip@lists.infradead.org, Rob Herring , Kumar Gala , Romain Perier , 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 This commit adds the DT definition of the es8388 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 v3: - Renamed sound_i2s to sound-i2s - Re-ordered properties in the right order - Splitted headphone into phone_ctl and hp_det 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 | 38 +++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/arch/arm/boot/dts/rk3288-firefly.dtsi b/arch/arm/boot/dts/rk3288-firefly.dtsi index 10793ac18599..f80b17f0d1bf 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"; + pinctrl-names = "default"; + pinctrl-0 = <&phone_ctl>, <&hp_det>; + rockchip,audio-codec = <&es8323>; + rockchip,hp-det-gpios = <&gpio7 15 GPIO_ACTIVE_HIGH>; + rockchip,hp-en-gpios = <&gpio0 10 GPIO_ACTIVE_HIGH>; + rockchip,i2s-controller = <&i2s>; + rockchip,model = "I2S"; + rockchip,routing = "Analog", "LOUT2", + "Analog", "ROUT2"; + }; + 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,16 @@ }; }; + headphone { + hp_det: hp-det { + rockchip,pins = <7 15 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + phone_ctl: phone-ctl { + 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>;