From patchwork Thu Jun 18 05:58:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shengjiu Wang X-Patchwork-Id: 6633201 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id DAC0AC0020 for ; Thu, 18 Jun 2015 06:02:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C6CE12081F for ; Thu, 18 Jun 2015 06:02:28 +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 85DC420808 for ; Thu, 18 Jun 2015 06:02:27 +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 1Z5SrM-0003gv-P3; Thu, 18 Jun 2015 05:59:32 +0000 Received: from mail-bn1bon0144.outbound.protection.outlook.com ([157.56.111.144] helo=na01-bn1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Z5SrI-0003fA-W7 for linux-arm-kernel@lists.infradead.org; Thu, 18 Jun 2015 05:59:30 +0000 Received: from BN3PR0301CA0071.namprd03.prod.outlook.com (10.160.152.167) by BY2PR03MB607.namprd03.prod.outlook.com (10.255.93.38) with Microsoft SMTP Server (TLS) id 15.1.190.14; Thu, 18 Jun 2015 05:59:05 +0000 Received: from BN1AFFO11OLC002.protection.gbl (2a01:111:f400:7c10::168) by BN3PR0301CA0071.outlook.office365.com (2a01:111:e400:401e::39) with Microsoft SMTP Server (TLS) id 15.1.195.15 via Frontend Transport; Thu, 18 Jun 2015 05:59:05 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=freescale.com; lists.infradead.org; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1AFFO11OLC002.mail.protection.outlook.com (10.58.53.73) with Microsoft SMTP Server (TLS) id 15.1.190.9 via Frontend Transport; Thu, 18 Jun 2015 05:59:05 +0000 Received: from audiosh1.ap.freescale.net (audiosh1.ap.freescale.net [10.192.241.212]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id t5I5wx6K027825; Wed, 17 Jun 2015 22:59:00 -0700 From: Shengjiu Wang To: , , , , , , , Subject: [PATCH] ARM: dts: imx6qdl-sabreauto: Add audio support Date: Thu, 18 Jun 2015 13:58:44 +0800 Message-ID: <1434607124-29870-1-git-send-email-shengjiu.wang@freescale.com> X-Mailer: git-send-email 1.7.9.5 X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11OLC002; 1:JUiMYlnaVMgNmHNhTAFbgYM/rf324vt4BCSVAXfEfKPNTvSCBwUZhwt2Enni7YygeKZ2QXwv7cGCSGioX6tY44fjZcoGat6BRTXHYifSRq2FnX/wGaT4gwNJxCi/LXFSAXrjRiHhPiMByDDKIkRivuMH+hp3UyI77yXuGLF+0A+VBaDy63qi5sksv2oLad8a508oSG3hxLCvMhWhKTu1HxBYu2qv7MQOpN5lIigmTX004meoXzK3h5ZmcDt2KQeNwVcaW+scMXXEIYT0JTv0W731wZAZAlFINtDgJ9OEo26JIbjlOqfzQjfF88BQnXqpBqVaHeqE5/In1bEjQJV8gg== X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(339900001)(199003)(189002)(77096005)(62966003)(77156002)(85426001)(19580405001)(19580395003)(50986999)(106466001)(47776003)(6806004)(64706001)(87936001)(5001960100002)(92566002)(229853001)(189998001)(105606002)(33646002)(50226001)(86362001)(46102003)(36756003)(104016003)(50466002)(5001770100001)(48376002)(32563001); DIR:OUT; SFP:1102; SCL:1; SRVR:BY2PR03MB607; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; A:1; MX:1; PTR:InfoDomainNonexistent; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB607; 2:HFQlhBwhYLgGpVb5g4xlh7bF6BFhdscxp+yLEPZiLUMbtNyfl3/O797biDdlblia; 2:qBVnkvNLbaPz8ksVg6SEkweE/UqZUjhUynFdBLPHGTEZERHYQ74hLq+FdWy+dzfM+a9soQDwOcFc+2RUq4+YLJEU/YNu8YgCPPl0ia2ZsHMzRA/6UnUo2FmcK9sr7ar6tJuHgIY1W84EXGnuOkdYC6AewmNyuCBWYO0BsHtkkeHp7dFgYoqD12Pkv6FDUtyz63xl3gFNt2Yq56peWom2ae8ngE768JB3jsBQevsEcO0=; 6:66U1tjQ7xAxd4up9/aHsuxiuwC+pSjdGjlVewvWhj4w7bO8IIt7YWJ+jZAmfmFbtA6QLaSV679TiczxRJLYE3SqKbrvM9ksdhy5Z0bdgHwQWJyFmIapA+Gzko0/Sk2sHZLT5xSRf4Ej3lx6AkDK8YPfrQmYz/n9MqdOc/treTwJp9KbF/aZy4h+iFBmykS4tsiA/2QK6b5kjBtggynvV6FdEtbbk+QSEWo4hjx/kNy4fuQ7F12/Xi3pIwWl3lcxQLTivHCShSqu0O6rhwjSgYhehDAxAvQhioWxWzf6I75k/PIsYokTK114E45kcF9H5e/kimc/gfXtBTfnuqUH23Q==; 3:vfgsgIyfFC1ZEWhOh8M/8Ul8j0VokBI1P+K8O9aFT1xx9hGYB46I21sRvcFtX/aWpexdmuJ7tKHKQaY+6PLRExFbX4GDTZ0D4B3XXRm1G+AoPDQDcaVsXAlm5W9x8OvITJPNm8l8DGmlH/I5XrMeyMLJVGgbz1nuQtIKGUgl/jusQcKwTyUHt5WZ+WYUZTiDiIlhjriWYFt21plNUFg3fRkuizHWXo6ATmtvQECCBszKPqK/EX8RP8ClMMVMaY5aRmAeSHYtYZm3wJd54EFFXr9IcjrYmLTD2y/EPpSfHUA8PPuYCWpPkhrNTUSunfIP X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR03MB607; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(520003)(3002001); SRVR:BY2PR03MB607; BCL:0; PCL:0; RULEID:; SRVR:BY2PR03MB607; X-Forefront-PRVS: 0611A21987 X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB607; 9:4v4FL4yQXARtj3q7Y+leS8PxBfMnuTzAqrVGlT+oJvaA7FujwjB+M1OAH3spsRSelVig0eBBM65tN/tYIv0B68jSNrsLnZ7sviWftQm6KEgZmnIBYrEdq6CktFtmYf+mCwI1U3+PR3Bt7s8mJbZWSDXmHBFyMZAbYpoL67uISBYVECP91sp8NfxdFb01FYVPiuT2z+nWjQM3vccKcf/SCYjDDx1vhUvqfwu0ENEObyKVjXAb8S1AL2pAjF7j0SWHS3SgrrWoEBl13Ji05bRVKWLVH8qzZkuqpcIHyGhmH+oHnEEuArtxeuHqzE0wWTbkLq26ThU5Ut/6bMDsU2ysahrzZV+cGCgiOTpRuw5OnlCySUSiMJQPOL93jMeEtIO0JLwd8ebKW57xD1jawcmv9EiCx02WSmErEShJdq3JON3OBdVdKHizxPW3EEn3pRGkV5HT4T43anCd6uVuMaPDbpgfts8iXEJrniPQCgkAQ85npvG06asB9QoYPAMREMHA2zuRrX39okVBh068E1TdcrI9nybYZRu28ppL++6RiSs5aiYyaevOI10qyQgv3Y9I1jPzN2ea90f+fWbXC19J/A093cQEWFnY8qfXx7DWSdrCcgMOloJSp/v6NMHn6/DhdVQiqoCDYd+zB2CfvU3vvzUMDm5n99eDGtWo0HT5TyBxxLjWAZxoffbgLHYiEmfshfsO5pYjEkG6d4199W8iPzCPBK44w282xJstZySI9jQOc2e0MwOina6WhiHR/+6svA8hN+HihM6x6Qma3gGhMLk9zm9Is7sO1Y0YvFn4l50a0HGfVbF5fPn+I1hg2PKPR0eICW6veD3J0bfLQXZi4I00t439dh5jf4a0BfmZdtg= X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB607; 3:/5cgZz896lB+STwnYx6lgIs6S7YLjP7nfiayfcfXAttANp9I2ScQz71BbLlDZlDya4Z4rlpiQcLvhcoREXUS2ouPluCGw3gtlrtR/6Z6B3V3RFu5v0PbVk811vwZjFA/ScFRzUhVcnzrlsP8ckSl3A==; 10:zdPJ0mSqAzEhwlIr4byG35CAOHtcZGNo812JY/usYZN+kqhXA+y5jl4ZAvixcAVxdNE7+qd/hTrdXABUm4s5GlTvwnHFKZQXRFKT/bpTiSk=; 6:izNceH2a6r88v0UqCpHT0jtvdtp8znp1z8LEsu0MHcf5MoIE+46qr6KkHoTYp+dT X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jun 2015 05:59:05.7604 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR03MB607 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150617_225929_309636_C645978D X-CRM114-Status: UNSURE ( 5.41 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) Cc: linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 ESAI, ASRC, CS42888 for imx6qdl-sabreauto board Signed-off-by: Shengjiu Wang --- arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 91 ++++++++++++++++++++++++++++++ arch/arm/boot/dts/imx6qdl.dtsi | 31 ++++++++++ 2 files changed, 122 insertions(+) diff --git a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi index 3b24b126..4f4ca2a 100644 --- a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi +++ b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi @@ -28,6 +28,51 @@ }; }; + clocks { + codec_osc: anaclk2 { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <24576000>; + }; + }; + + regulators { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; + + reg_audio: regulator@0 { + compatible = "regulator-fixed"; + reg = <0>; + regulator-name = "cs42888_supply"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + }; + + sound-cs42888 { + compatible = "fsl,imx6-sabreauto-cs42888", + "fsl,imx-audio-cs42888"; + model = "imx-cs42888"; + audio-cpu = <&esai>; + audio-asrc = <&asrc>; + audio-codec = <&codec>; + audio-routing = + "Line Out Jack", "AOUT1L", + "Line Out Jack", "AOUT1R", + "Line Out Jack", "AOUT2L", + "Line Out Jack", "AOUT2R", + "Line Out Jack", "AOUT3L", + "Line Out Jack", "AOUT3R", + "Line Out Jack", "AOUT4L", + "Line Out Jack", "AOUT4R", + "AIN1L", "Line In Jack", + "AIN1R", "Line In Jack", + "AIN2L", "Line In Jack", + "AIN2R", "Line In Jack"; + }; + sound-spdif { compatible = "fsl,imx-audio-spdif", "fsl,imx-sabreauto-spdif"; @@ -45,6 +90,15 @@ }; }; +&clks { + assigned-clocks = <&clks IMX6QDL_PLL4_BYPASS_SRC>, + <&clks IMX6QDL_PLL4_BYPASS>, + <&clks IMX6QDL_CLK_PLL4_POST_DIV>; + assigned-clock-parents = <&clks IMX6QDL_CLK_LVDS2_IN>, + <&clks IMX6QDL_PLL4_BYPASS_SRC>; + assigned-clock-rates = <0>, <0>, <24576000>; +}; + &ecspi1 { fsl,spi-num-chipselects = <1>; cs-gpios = <&gpio3 19 0>; @@ -61,6 +115,16 @@ }; }; +&esai { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_esai>; + assigned-clocks = <&clks IMX6QDL_CLK_ESAI_SEL>, + <&clks IMX6QDL_CLK_ESAI_EXTAL>; + assigned-clock-parents = <&clks IMX6QDL_CLK_PLL4_AUDIO_DIV>; + assigned-clock-rates = <0>, <24576000>; + status = "okay"; +}; + &fec { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet>; @@ -180,6 +244,18 @@ }; }; }; + + codec: cs42888@48 { + compatible = "cirrus,cs42888"; + reg = <0x48>; + clocks = <&codec_osc>; + clock-names = "mclk"; + VA-supply = <®_audio>; + VD-supply = <®_audio>; + VLS-supply = <®_audio>; + VLC-supply = <®_audio>; + }; + }; &i2c3 { @@ -257,6 +333,21 @@ >; }; + pinctrl_esai: esaigrp { + fsl,pins = < + MX6QDL_PAD_ENET_CRS_DV__ESAI_TX_CLK 0x1b030 + MX6QDL_PAD_ENET_RXD1__ESAI_TX_FS 0x1b030 + MX6QDL_PAD_ENET_TX_EN__ESAI_TX3_RX2 0x1b030 + MX6QDL_PAD_GPIO_5__ESAI_TX2_RX3 0x1b030 + MX6QDL_PAD_ENET_TXD0__ESAI_TX4_RX1 0x1b030 + MX6QDL_PAD_ENET_MDC__ESAI_TX5_RX0 0x1b030 + MX6QDL_PAD_GPIO_17__ESAI_TX0 0x1b030 + MX6QDL_PAD_NANDF_CS3__ESAI_TX1 0x1b030 + MX6QDL_PAD_ENET_MDIO__ESAI_RX_CLK 0x1b030 + MX6QDL_PAD_GPIO_9__ESAI_RX_FS 0x1b030 + >; + }; + pinctrl_gpio_leds: gpioledsgrp { fsl,pins = < MX6QDL_PAD_DISP0_DAT21__GPIO5_IO15 0x80000000 diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi index e6d1359..ceba982 100644 --- a/arch/arm/boot/dts/imx6qdl.dtsi +++ b/arch/arm/boot/dts/imx6qdl.dtsi @@ -300,8 +300,19 @@ }; esai: esai@02024000 { + #sound-dai-cells = <0>; + compatible = "fsl,imx35-esai"; reg = <0x02024000 0x4000>; interrupts = <0 51 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&clks IMX6QDL_CLK_ESAI_IPG>, + <&clks IMX6QDL_CLK_ESAI_MEM>, + <&clks IMX6QDL_CLK_ESAI_EXTAL>, + <&clks IMX6QDL_CLK_ESAI_IPG>, + <&clks IMX6QDL_CLK_SPBA>; + clock-names = "core", "mem", "extal", "fsys", "dma"; + dmas = <&sdma 23 21 0>, <&sdma 24 21 0>; + dma-names = "rx", "tx"; + status = "disabled"; }; ssi1: ssi@02028000 { @@ -353,8 +364,28 @@ }; asrc: asrc@02034000 { + compatible = "fsl,imx53-asrc"; reg = <0x02034000 0x4000>; interrupts = <0 50 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&clks IMX6QDL_CLK_ASRC_IPG>, + <&clks IMX6QDL_CLK_ASRC_MEM>, <&clks 0>, + <&clks 0>, <&clks 0>, <&clks 0>, <&clks 0>, + <&clks 0>, <&clks 0>, <&clks 0>, <&clks 0>, + <&clks 0>, <&clks 0>, <&clks 0>, <&clks 0>, + <&clks IMX6QDL_CLK_ASRC>, <&clks 0>, <&clks 0>, + <&clks IMX6QDL_CLK_SPBA>; + clock-names = "mem", "ipg", "asrck_0", + "asrck_1", "asrck_2", "asrck_3", "asrck_4", + "asrck_5", "asrck_6", "asrck_7", "asrck_8", + "asrck_9", "asrck_a", "asrck_b", "asrck_c", + "asrck_d", "asrck_e", "asrck_f", "dma"; + dmas = <&sdma 17 23 1>, <&sdma 18 23 1>, <&sdma 19 23 1>, + <&sdma 20 23 1>, <&sdma 21 23 1>, <&sdma 22 23 1>; + dma-names = "rxa", "rxb", "rxc", + "txa", "txb", "txc"; + fsl,asrc-rate = <48000>; + fsl,asrc-width = <16>; + status = "okay"; }; spba@0203c000 {