From patchwork Mon Mar 7 20:54:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 8523131 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5085F9F7CA for ; Mon, 7 Mar 2016 20:55:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5936620295 for ; Mon, 7 Mar 2016 20:55:09 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id B607F2027D for ; Mon, 7 Mar 2016 20:55:07 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 65D752651C7; Mon, 7 Mar 2016 21:55:06 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id C9B1A261555; Mon, 7 Mar 2016 21:54: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 9E5A826154F; Mon, 7 Mar 2016 21:54:57 +0100 (CET) Received: from mail-ig0-f182.google.com (mail-ig0-f182.google.com [209.85.213.182]) by alsa0.perex.cz (Postfix) with ESMTP id 59F4726154F for ; Mon, 7 Mar 2016 21:54:50 +0100 (CET) Received: by mail-ig0-f182.google.com with SMTP id vs8so33492233igb.1 for ; Mon, 07 Mar 2016 12:54:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc; bh=faC2QRxjERvQWb21TlzMucg2WXkubZXmG+ExQE2ItJE=; b=pyFQw+HA09fjdge0aE27YJobvoEBVhwUvr2wTEOnprbHK716mSpOsC4hsN4iPs/yyH TXAWkGCX/mz3SUV2iTyidQKLySnqmV4zLISOSA/1vVk1Qjfaal5glOJiu4CG9dVtStrq ELF+fAbrb1TiF0N2DyAOuOhHo4VIctMYtzrPtZAu9MA1XhGbS3wEJ6U9qfm35xkjThH1 VxS1qzI1u4or0jBmanYkHmNFarvcUrRUY24Lq4BHKPjLbL59oB4J3wjDGNepbcvfoWeq uaCLCdnGBJNI4T7/aTpRXRcifTiObXiuCDehV+pMX+tOiDvIyDJ4/oDspaP4QVpC2doS iR1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc; bh=faC2QRxjERvQWb21TlzMucg2WXkubZXmG+ExQE2ItJE=; b=DKWQVMRH3oEQn4iQ3ClHbXkLgx925LoH//556aztlS/Kgf9K+neaENsSsxOA6tewo+ jGV9mV7sq1s/9ymqL/PJTOcT81HPOpkazM7uXrYRHr0dWDySMAniuakhH4pZ97ml6KUk z1ndHeoOU+OSVrt8TbHdXDriYDag5GKf/gI1wI4Si31ek312uNzlPhLrnLoAKkwuHBrT lBxO7oPbRZveQ+Usom2Ls3CZN5P8x3luFUXyhLoubkNsy5p0vVPjQ5xZ5oL2t6lSE13z jeJ+orjMWHxDyyXpyyKuDZVH+L196Q/LdRUsQ27AdfKzUyXDss0vVz6sFlPNpSiPP8RL QqPA== X-Gm-Message-State: AD7BkJKDf1kRyFVnbu6/hop4pkl+dDDJsaS7Ro1hIEEjVOoONCWrJ1pKEFjqZTW40madtdoJM4rO4/xjKLGiRg== MIME-Version: 1.0 X-Received: by 10.50.1.6 with SMTP id 6mr14343309igi.28.1457384089731; Mon, 07 Mar 2016 12:54:49 -0800 (PST) Received: by 10.79.67.2 with HTTP; Mon, 7 Mar 2016 12:54:49 -0800 (PST) In-Reply-To: <20160307205109.GA10095@Asurada-Nvidia> References: <20160307205109.GA10095@Asurada-Nvidia> Date: Mon, 7 Mar 2016 17:54:49 -0300 Message-ID: From: Fabio Estevam To: Nicolin Chen Cc: "alsa-devel@alsa-project.org" , Zidan Wang Subject: Re: [alsa-devel] Testing SAI with mainline 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP On Mon, Mar 7, 2016 at 5:51 PM, Nicolin Chen wrote: > Can't access your link. Here it goes: diff --git a/arch/arm/boot/dts/imx6sx-sdb.dtsi b/arch/arm/boot/dts/imx6sx-sdb.dtsi index f1d3730..28f43b5 100644 --- a/arch/arm/boot/dts/imx6sx-sdb.dtsi +++ b/arch/arm/boot/dts/imx6sx-sdb.dtsi @@ -134,7 +134,7 @@ sound { compatible = "fsl,imx6sx-sdb-wm8962", "fsl,imx-audio-wm8962"; model = "wm8962-audio"; - ssi-controller = <&ssi2>; + audio-cpu = <&sai1>; audio-codec = <&codec>; audio-routing = "Headphone Jack", "HPOUTL", @@ -143,15 +143,13 @@ "Ext Spk", "SPKOUTR", "AMIC", "MICBIAS", "IN3R", "AMIC"; - mux-int-port = <2>; - mux-ext-port = <6>; }; }; &audmux { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_audmux>; - status = "okay"; + status = "disabled"; }; &fec1 { @@ -254,10 +252,22 @@ status = "okay"; }; -&ssi2 { +&sai1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sai1>; status = "okay"; }; +&sdma { + gpr = <&gpr>; + /* SDMA event remap for SAI1 */ + fsl,sdma-event-remap = <0 15 1>, <0 16 1>; +}; + +&ssi2 { + status = "disabled"; +}; + &uart1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart1>; @@ -468,6 +478,16 @@ >; }; + pinctrl_sai1: sai1grp { + fsl,pins = < + MX6SX_PAD_CSI_DATA00__SAI1_TX_BCLK 0x130b0 + MX6SX_PAD_CSI_DATA01__SAI1_TX_SYNC 0x130b0 + MX6SX_PAD_CSI_HSYNC__SAI1_TX_DATA_0 0x120b0 + MX6SX_PAD_CSI_VSYNC__SAI1_RX_DATA_0 0x130b0 + MX6SX_PAD_CSI_PIXCLK__AUDMUX_MCLK 0x130b0 + >; + }; + pinctrl_uart1: uart1grp { fsl,pins = < MX6SX_PAD_GPIO1_IO04__UART1_TX 0x1b0b1 diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 0f6fd42..01ecb95 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -477,6 +477,24 @@ static struct sdma_driver_data sdma_imx6q = { .script_addrs = &sdma_script_imx6q, }; +static struct sdma_script_start_addrs sdma_script_imx6sx = { + .ap_2_ap_addr = 642, + .uart_2_mcu_addr = 817, + .mcu_2_app_addr = 747, + .uartsh_2_mcu_addr = 1032, + .mcu_2_shp_addr = 960, + .app_2_mcu_addr = 683, + .shp_2_mcu_addr = 891, + .spdif_2_mcu_addr = 1100, + .mcu_2_spdif_addr = 1134, +}; + +static struct sdma_driver_data sdma_imx6sx = { + .chnenbl0 = SDMA_CHNENBL0_IMX35, + .num_events = 48, + .script_addrs = &sdma_script_imx6sx, +}; + static const struct platform_device_id sdma_devtypes[] = { { .name = "imx25-sdma", @@ -497,12 +515,16 @@ static const struct platform_device_id sdma_devtypes[] = { .name = "imx6q-sdma", .driver_data = (unsigned long)&sdma_imx6q, }, { + .name = "imx6sx-sdma", + .driver_data = (unsigned long)&sdma_imx6sx, + }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(platform, sdma_devtypes); static const struct of_device_id sdma_dt_ids[] = { + { .compatible = "fsl,imx6sx-sdma", .data = &sdma_imx6sx, }, { .compatible = "fsl,imx6q-sdma", .data = &sdma_imx6q, }, { .compatible = "fsl,imx53-sdma", .data = &sdma_imx53, }, { .compatible = "fsl,imx51-sdma", .data = &sdma_imx51, },