From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C31D5C5519F for ; Wed, 18 Nov 2020 07:39:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6F68124656 for ; Wed, 18 Nov 2020 07:39:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="gvckPsfX" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726650AbgKRHiu (ORCPT ); Wed, 18 Nov 2020 02:38:50 -0500 Received: from fllv0016.ext.ti.com ([198.47.19.142]:35628 "EHLO fllv0016.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726204AbgKRHiu (ORCPT ); Wed, 18 Nov 2020 02:38:50 -0500 Received: from lelv0265.itg.ti.com ([10.180.67.224]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 0AI7cgAS058209; Wed, 18 Nov 2020 01:38:42 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1605685122; bh=3c4+ZvBmhawwfbGFylJ9QbPP9QAcJvbNFCqaO1sfmKk=; h=Subject:From:To:CC:References:Date:In-Reply-To; b=gvckPsfXObe/QZ2nBMw+79/DWn+yWZxiaazzWNuytENMyVmWaTr5zffM0mHAQnmuH 5rQjFHJ3mZaVRjRKnOPyNo1cgbXmrLwMfxqGkMqmkcMHy7cWWDNgp0V2yNVno/2Be7 LQvwvx/qxa6h4aa7qIO2hBYLJwP9HVcwOS8rAsmw= Received: from DLEE112.ent.ti.com (dlee112.ent.ti.com [157.170.170.23]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 0AI7cgTY042772 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 18 Nov 2020 01:38:42 -0600 Received: from DLEE100.ent.ti.com (157.170.170.30) by DLEE112.ent.ti.com (157.170.170.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3; Wed, 18 Nov 2020 01:38:41 -0600 Received: from lelv0326.itg.ti.com (10.180.67.84) by DLEE100.ent.ti.com (157.170.170.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3 via Frontend Transport; Wed, 18 Nov 2020 01:38:41 -0600 Received: from [192.168.2.6] (ileax41-snat.itg.ti.com [10.172.224.153]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 0AI7cdRH010486; Wed, 18 Nov 2020 01:38:40 -0600 Subject: Re: [PATCH] ARM: dts: keystone-k2g-evm: add HDMI and analog audio data From: Peter Ujfalusi To: CC: , , , , , References: <20201117101749.26187-1-peter.ujfalusi@ti.com> Message-ID: Date: Wed, 18 Nov 2020 09:39:30 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.4.2 MIME-Version: 1.0 In-Reply-To: <20201117101749.26187-1-peter.ujfalusi@ti.com> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 8bit X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On 17/11/2020 12.17, Peter Ujfalusi wrote: > The board is using McASP2 for both analog (tlv320aic3106) and > HDMI (SiI9022) audio. > > Signed-off-by: Peter Ujfalusi > --- > arch/arm/boot/dts/keystone-k2g-evm.dts | 112 +++++++++++++++++++++++++ > 1 file changed, 112 insertions(+) > > diff --git a/arch/arm/boot/dts/keystone-k2g-evm.dts b/arch/arm/boot/dts/keystone-k2g-evm.dts > index 8b3d64c913d8..4d7e3514a3a7 100644 > --- a/arch/arm/boot/dts/keystone-k2g-evm.dts > +++ b/arch/arm/boot/dts/keystone-k2g-evm.dts > @@ -46,6 +46,14 @@ vcc1v8_ldo1_reg: fixedregulator-vcc1v8-ldo1 { > regulator-always-on; > }; > > + vcc1v8_ldo2_reg: fixedregulator-vcc1v8-ldo2 { > + compatible = "regulator-fixed"; > + regulator-name = "ldo2"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <1800000>; > + regulator-always-on; > + }; > + > hdmi: connector { > compatible = "hdmi-connector"; > label = "hdmi"; > @@ -58,6 +66,57 @@ hdmi_connector_in: endpoint { > }; > }; > }; > + > + sound0: sound@0 { > + compatible = "simple-audio-card"; > + simple-audio-card,name = "K2G-EVM"; > + simple-audio-card,widgets = > + "Headphone", "Headphone Jack", > + "Line", "Line In"; > + simple-audio-card,routing = > + "Headphone Jack", "HPLOUT", > + "Headphone Jack", "HPROUT", > + "LINE1L", "Line In", > + "LINE1R", "Line In"; > + > + simple-audio-card,dai-link@0 { > + format = "i2s"; > + bitclock-master = <&sound0_0_master>; > + frame-master = <&sound0_0_master>; > + sound0_0_master: cpu { > + sound-dai = <&mcasp2>; > + clocks = <&k2g_clks 0x6 1>; > + system-clock-direction-out; > + }; > + > + codec { > + sound-dai = <&tlv320aic3106>; > + system-clock-frequency = <12288000>; I think it would be better to use: clocks = <&aud_mclk>; > + }; > + }; > + > + simple-audio-card,dai-link@1 { > + format = "i2s"; > + bitclock-master = <&sound0_1_master>; > + frame-master = <&sound0_1_master>; > + sound0_1_master: cpu { > + sound-dai = <&mcasp2>; > + clocks = <&k2g_clks 0x6 1>; > + system-clock-direction-out; > + }; > + > + codec { > + sound-dai = <&sii9022>; > + system-clock-frequency = <12288000>; and here as well: clocks = <&aud_mclk>; > + }; > + }; > + }; > + > + sii9022_mclk: sii9022_mclk { and rename the fixed clock to aud_mclk as the same clock is connected to both aic3106 and SiI9022 > + compatible = "fixed-clock"; > + #clock-cells = <0>; > + clock-frequency = <12288000>; > + }; > }; > > &k2g_pinctrl { > @@ -214,6 +273,15 @@ K2G_CORE_IOPAD(0x10e4) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* dssde.dssd > K2G_CORE_IOPAD(0x10e8) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* dssfid.dssfid */ > >; > }; > + > + mcasp2_pins: pinmux_mcasp2_pins { > + pinctrl-single,pins = < > + K2G_CORE_IOPAD(0x1234) (BUFFER_CLASS_B | PIN_PULLDOWN | MUX_MODE4) /* pr0_pru_gpo2.mcasp2_axr2 */ > + K2G_CORE_IOPAD(0x1238) (BUFFER_CLASS_B | PIN_PULLDOWN | MUX_MODE4) /* pr0_pru_gpo3.mcasp2_axr3 */ > + K2G_CORE_IOPAD(0x1254) (BUFFER_CLASS_B | PIN_PULLDOWN | MUX_MODE4) /* pr0_pru_gpo10.mcasp2_afsx */ > + K2G_CORE_IOPAD(0x125c) (BUFFER_CLASS_B | PIN_PULLDOWN | MUX_MODE4) /* pr0_pru_gpo12.mcasp2_aclkx */ > + >; > + }; > }; > > &uart0 { > @@ -423,6 +491,10 @@ sii9022: sii9022@3b { > compatible = "sil,sii9022"; > reg = <0x3b>; > > + sil,i2s-data-lanes = < 0 >; > + clocks = <&sii9022_mclk>; > + clock-names = "mclk"; > + > ports { > #address-cells = <1>; > #size-cells = <0>; > @@ -444,6 +516,19 @@ sii9022_out: endpoint { > }; > }; > }; > + > + tlv320aic3106: tlv320aic3106@1b { > + #sound-dai-cells = <0>; > + compatible = "ti,tlv320aic3106"; > + reg = <0x1b>; > + status = "okay"; > + > + /* Regulators */ > + AVDD-supply = <&vcc3v3_dcin_reg>; > + IOVDD-supply = <&vcc3v3_dcin_reg>; > + DRVDD-supply = <&vcc3v3_dcin_reg>; > + DVDD-supply = <&vcc1v8_ldo2_reg>; > + }; > }; > > &dss { > @@ -458,3 +543,30 @@ dpi_out: endpoint { > }; > }; > }; > + > +&k2g_clks { > + /* on the board 22.5792MHz is connected to AUDOSC_IN */ > + assigned-clocks = <&k2g_clks 0x4c 2>; > + assigned-clock-rates = <22579200>; > +}; > + > +&mcasp2 { > + #sound-dai-cells = <0>; > + > + pinctrl-names = "default"; > + pinctrl-0 = <&mcasp2_pins>; > + > + assigned-clocks = <&k2g_clks 0x6 1>; > + assigned-clock-parents = <&k2g_clks 0x6 2>; > + > + status = "okay"; > + > + op-mode = <0>; /* MCASP_IIS_MODE */ > + tdm-slots = <2>; > + /* 6 serializer */ > + serial-dir = < /* 0: INACTIVE, 1: TX, 2: RX */ > + 0 0 1 2 0 0 // AXR2: TX, AXR3: rx > + >; > + tx-num-evt = <32>; > + rx-num-evt = <32>; > +}; > - Péter Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki