From patchwork Wed May 4 22:33:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 9019191 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 2A9669F1D3 for ; Wed, 4 May 2016 22:35:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 207F520416 for ; Wed, 4 May 2016 22:35:05 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id B024020414 for ; Wed, 4 May 2016 22:35:03 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 0C6412659F8; Thu, 5 May 2016 00:35:01 +0200 (CEST) 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 294D42651FD; Thu, 5 May 2016 00:34:59 +0200 (CEST) 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 D24D52651FD; Thu, 5 May 2016 00:34:58 +0200 (CEST) Received: from mail-yw0-f177.google.com (mail-yw0-f177.google.com [209.85.161.177]) by alsa0.perex.cz (Postfix) with ESMTP id 913C1265238 for ; Thu, 5 May 2016 00:34:49 +0200 (CEST) Received: by mail-yw0-f177.google.com with SMTP id o66so121917623ywc.3 for ; Wed, 04 May 2016 15:34:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=hd0+1RQ5DWqFwrahpOQBilpP4MyyPRWVN5cQxCryL3k=; b=BBo3vGJOeborSp1F7LAzPIO1JSMx4F0lgHezYsotOQLkAjZ71BnjJ/e/hcWtqeJWeK hGCj2B633f4qDC5PNeamTZni8v6o20Q8lw8x24NQzsG48MvuudwpwhPPYO07GJZBu+ZS TF3tHSp2HzR/mhrU/oQB6Gq6RTY+juQWSuLYsmVDYCf60AKhGxOZ67evyni8xhZGQokK MxkQML4Mlm8GliZso4q4Tp0Rj2hsmUILr0Z1Uo0FRUxtqIpSi8uuglN/S0K4Rqnb5K4f oYwJgUnkhCcnAzzLgCuItaRzpaAOHzGjyTBJ8eMGGsvOo1j/EHOUFgPZy3/+zq4iIPS0 KYNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=hd0+1RQ5DWqFwrahpOQBilpP4MyyPRWVN5cQxCryL3k=; b=WvHySJG7neIZ9UBzxVezVTEUZ0vOksp27wyYhtER+6W3Wfcl3lgrf0Y2d2wao3FvGI 12lpSenohojFSpMxOOczcbl9f6yk7ZGyDUEycs2/oWuRcUKtJrasyD4M8p8+J5fCeiRO 2EXlHPKbUVvzgPbF59CNvSiJtW51xp3I4vQlQmYqhgM+PXCtFgNnj5Grhzaq5THMasxS Wzb1SqX0kVUsv/6On7I71vwvCHDaxYzoDkMfW6hdu7cG+nJpEpeKYLOzxGAQt2Vepp1g TsLocwhEo9rlRTEkQKchN5I6ZSw/JET0LPOJpHT6eVBoCCgTyCdcxFiFdCC9M5X4s5Cm suvw== X-Gm-Message-State: AOPr4FUtpmuQxt8mEopq4zxXhXvDLGfbh/sGvBHHkJQxXdJxrTNzRVs/lb+jYZpYgB0z7A== X-Received: by 10.129.153.68 with SMTP id q65mr1216966ywg.211.1462401288725; Wed, 04 May 2016 15:34:48 -0700 (PDT) Received: from localhost.localdomain ([201.82.53.42]) by smtp.gmail.com with ESMTPSA id u139sm3636029ywf.47.2016.05.04.15.34.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 May 2016 15:34:48 -0700 (PDT) From: Fabio Estevam To: broonie@kernel.org Date: Wed, 4 May 2016 19:33:58 -0300 Message-Id: <1462401239-995-1-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.9.1 Cc: nicoleotsuka@gmail.com, Fabio Estevam , alsa-devel@alsa-project.org, shawnguo@kernel.org, brain@jikos.cz Subject: [alsa-devel] [PATCH v3 1/2] ASoC: fsl_sai: Introduce a compatible string for MX6UL 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 From: Fabio Estevam MX6UL may need to configure the General Purpose Register 1 (GPR1), so it is better to add a new compatible string to differentiate. Signed-off-by: Fabio Estevam Acked-by: Nicolin Chen --- Changes since v2: - Add binding doc entry for mx6ul (Nicolin) Documentation/devicetree/bindings/sound/fsl-sai.txt | 4 ++-- sound/soc/fsl/fsl_sai.c | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/fsl-sai.txt b/Documentation/devicetree/bindings/sound/fsl-sai.txt index 044e5d7..777b941 100644 --- a/Documentation/devicetree/bindings/sound/fsl-sai.txt +++ b/Documentation/devicetree/bindings/sound/fsl-sai.txt @@ -7,8 +7,8 @@ codec/DSP interfaces. Required properties: - - compatible : Compatible list, contains "fsl,vf610-sai" or - "fsl,imx6sx-sai". + - compatible : Compatible list, contains "fsl,vf610-sai", + "fsl,imx6sx-sai" or "fsl,imx6ul-sai" - reg : Offset and length of the register set for the device. diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index 0754df7..d8b673f 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -797,7 +797,8 @@ static int fsl_sai_probe(struct platform_device *pdev) sai->pdev = pdev; - if (of_device_is_compatible(pdev->dev.of_node, "fsl,imx6sx-sai")) + if (of_device_is_compatible(pdev->dev.of_node, "fsl,imx6sx-sai") || + of_device_is_compatible(pdev->dev.of_node, "fsl,imx6ul-sai")) sai->sai_on_imx = true; sai->is_lsb_first = of_property_read_bool(np, "lsb-first"); @@ -898,6 +899,7 @@ static int fsl_sai_probe(struct platform_device *pdev) static const struct of_device_id fsl_sai_ids[] = { { .compatible = "fsl,vf610-sai", }, { .compatible = "fsl,imx6sx-sai", }, + { .compatible = "fsl,imx6ul-sai", }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, fsl_sai_ids);