From patchwork Sun Jan 7 17:05:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 10148403 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 3B9E860247 for ; Sun, 7 Jan 2018 17:06:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 263742879C for ; Sun, 7 Jan 2018 17:06:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1A247287A7; Sun, 7 Jan 2018 17:06:03 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_NONE,T_DKIM_INVALID autolearn=no version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 89F6F2879C for ; Sun, 7 Jan 2018 17:06:01 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 249B1266E71; Sun, 7 Jan 2018 18:05:59 +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 06B422670F8; Sun, 7 Jan 2018 18:05:57 +0100 (CET) Received: from mail-pl0-f66.google.com (mail-pl0-f66.google.com [209.85.160.66]) by alsa0.perex.cz (Postfix) with ESMTP id 4AD9C266AE1 for ; Sun, 7 Jan 2018 18:05:55 +0100 (CET) Received: by mail-pl0-f66.google.com with SMTP id q3so916062plr.8 for ; Sun, 07 Jan 2018 09:05:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=OQX3tvLp0ooV0l+85paUgYrTglW0r73bAOtGUJWtLLk=; b=fpebCiqJA9J+gYS6UBJSJuJcvzzpMoAI5xSfLu+wjhgdgRXvNAIjLBBtOWvrvKM8KU oGL7xpCnkeTIMgsuXTC4Cu2IYL1WvdlPCfAtECOiSrCkD8vBId3DiCFGPGHH0oq/i7kd vGDS+CJd4/++RanLLDBDGoJX/ihknsE1eKxZURpAY1itThrOiSLC/WdYuqPZga26OtkD fcrldXDCPmOVefUu2r7gW9WwluSuddeP8zUdI2vz2G3mEUGiQ029/l3JeJNxA4CkI+U1 kpC2vX7J60MK7osvRW8F7/uy56C4ORmWP7rpEvRjGZTGmd1SOnNlUbW+b+EeWfXHpOFa 74Ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=OQX3tvLp0ooV0l+85paUgYrTglW0r73bAOtGUJWtLLk=; b=h62+28MIe8zHmZD5RypKyeQ72vIXeU7WHqb/LLhkQYDteE9OHLVcycQ/udGrQ+trmz Yi75QvHQkwAJ12p2hfEnke1mzpddStfCJnG3I3QQOGpVPx4NfDRNb+GsFSocvF2NtThl gAgHoUT5jq7jsO2kC5D+IOOjtEnCKbs5N44L25KE4GVPqBFR2zGmY71ocqjNSpwupi9v 469M6MdX+jYj8P4heUDWtbbDV2pklxt/5waMgxTXdYWD7m6LA7jKZvJyNCjLHGg8fTPR cTZJoPIWoHpAhelD4wTmIX10x8DflVN/gQFi7SlicJxKMcD5EAYcOP5gWSGLYckJgKzD JNOg== X-Gm-Message-State: AKGB3mLSCxF8Tb0UEHZzJktf70jyjeeHQF1YSnFO0SjxcgKKaDQmu8PO JX/x6Ywhqr0oGuaj9cukaW0= X-Google-Smtp-Source: ACJfBov5/lCsy6kpNOsH42XeoT5IAl1jz7scNAHwY48IK9u8EcqJ0y0L2hsSb2OZ1cPq9bYpj1h9kA== X-Received: by 10.84.246.201 with SMTP id j9mr9650373plt.406.1515344753626; Sun, 07 Jan 2018 09:05:53 -0800 (PST) Received: from localhost (108-223-40-66.lightspeed.sntcca.sbcglobal.net. [108.223.40.66]) by smtp.gmail.com with ESMTPSA id y79sm21011391pfb.113.2018.01.07.09.05.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 07 Jan 2018 09:05:52 -0800 (PST) From: Guenter Roeck To: Mark Brown Date: Sun, 7 Jan 2018 09:05:50 -0800 Message-Id: <1515344750-6159-1-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.7.4 Cc: alsa-devel@alsa-project.org, Timur Tabi , Xiubo Li , linux-kernel@vger.kernel.org, Liam Girdwood , Nicolin Chen , Fabio Estevam , "Maciej S . Szmigiero" , linuxppc-dev@lists.ozlabs.org, Guenter Roeck Subject: [alsa-devel] [PATCH -next] ASoC: fsl_ssi: Fix build error 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 powerpc:mpc85xx_defconfig fails to build with the following errors. sound/soc/fsl/fsl_dma.c: In function 'fsl_soc_dma_probe': sound/soc/fsl/fsl_dma.c:916:34: error: 'CCSR_SSI_STX0' undeclared sound/soc/fsl/fsl_dma.c:917:34: error: 'CCSR_SSI_SRX0' undeclared Fixes: a818aa5f967b ("ASoC: fsl_ssi: Rename registers and fields macros") Cc: Nicolin Chen Cc: Maciej S. Szmigiero Cc: Timur Tabi Signed-off-by: Guenter Roeck Acked-by: Nicolin Chen --- I would suggest to merge this patch into the offending patch to preserve bisectability. sound/soc/fsl/fsl_dma.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/fsl/fsl_dma.c b/sound/soc/fsl/fsl_dma.c index 0c11f434a374..8c2981b70f64 100644 --- a/sound/soc/fsl/fsl_dma.c +++ b/sound/soc/fsl/fsl_dma.c @@ -913,8 +913,8 @@ static int fsl_soc_dma_probe(struct platform_device *pdev) dma->dai.pcm_free = fsl_dma_free_dma_buffers; /* Store the SSI-specific information that we need */ - dma->ssi_stx_phys = res.start + CCSR_SSI_STX0; - dma->ssi_srx_phys = res.start + CCSR_SSI_SRX0; + dma->ssi_stx_phys = res.start + REG_SSI_STX0; + dma->ssi_srx_phys = res.start + REG_SSI_SRX0; iprop = of_get_property(ssi_np, "fsl,fifo-depth", NULL); if (iprop)