From patchwork Fri Nov 8 18:50:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 178949 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp3155180ilf; Fri, 8 Nov 2019 11:18:28 -0800 (PST) X-Google-Smtp-Source: APXvYqwUhT54gJfon8TOzE49QcEvuxVr2MCWkAfYcWLY0lfHyvf/W0I+wLh3p6AEzUZQHp03RCHs X-Received: by 2002:aa7:cf8b:: with SMTP id z11mr12186744edx.294.1573240708797; Fri, 08 Nov 2019 11:18:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573240708; cv=none; d=google.com; s=arc-20160816; b=CCJoAUPlraP5W5aQbuUjqPRyGpUNKnc/5M3TThEpyUkS+beaVG50KE8UkqQ0jGaCyZ hPyUlJOS4jBthtY1sk13Pu5/edbIjKoxSs4DCh5pivAsGAeeFt7j5qF60MTunLgEpw7E 92NvecGseo/3rSIy6Yfr/gJxeoLjfNsjeoRHewOtt40s0MxRuxmfmVM8mYjnMn3TLL2h dFjmqMYEuYbZbyWf3s/oA4evVGss4ovpiB1rT0/ddQ1+VxHm1MLi6mQsS1hYPWN0G93G tvzSD1Tq9PtOanWcWtfIro1SWfvf92mArAcQliXiWkZt8RZMl+tn6APHTztdxwqQQS7J wC/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=CxRap1isgLcjVurzyMRuHv6NztPZxnnQMNtJ14ICBhM=; b=DYDQOJbubM07z209UFtgE0zOrmb39dDwHZy+TsC+wvUhF8EaKtDCRccqXwh9GcTEr1 oVnJDHHYb26//E/fxKmb/oB/KwmvYvFaO9XA3BcxMwF1Q4Isc2TmL3TUG6Mg0rLeqC0Y f8sdFU/rIlHIFR7Z8O4Q/dlcfa+IfT/3maGXzeCDHgJjMbK21EjNG7clv4HTnC7J2vTn zI2UDFC8XFw3dnYo5bzPK48WKB0kvI/qk6nAvrNDpriCgrVaAxC1yBo+WU4sEdETRjMt hbRpypQzbj0yBUHOHs5pj1eCMUT862wpw05gMxR9q71JwJrxinzwD+Fln5f8qdW4flBn 6iOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=f3z8vVIR; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b7si4777905edb.439.2019.11.08.11.18.28; Fri, 08 Nov 2019 11:18:28 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=f3z8vVIR; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389678AbfKHTAU (ORCPT + 26 others); Fri, 8 Nov 2019 14:00:20 -0500 Received: from mail.kernel.org ([198.145.29.99]:57268 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389510AbfKHTAM (ORCPT ); Fri, 8 Nov 2019 14:00:12 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id AC4BC222CF; Fri, 8 Nov 2019 18:57:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573239467; bh=HE82Gu0srBbHPVO2IXUmKw/tid8jQwbjFCwCHNinGWE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f3z8vVIRTtFqhghUYhbPE0hGq9wj45wX1gl8RYxGq20UCBBl2LStHhDbuXUGFD3qI fv0xgjIaWAUOHVnEfBjO0+UAnSiJKdFErS2bDHJ+3DrSxYKgGdf+Vth2HR3Hug/PKY Ni1+nGNGRJTXfbuYhokcc8e/WCI1ebXR8yKdmZ3A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Peter Ujfalusi , Sekhar Nori , Sasha Levin Subject: [PATCH 4.14 15/62] ARM: davinci: dm365: Fix McBSP dma_slave_map entry Date: Fri, 8 Nov 2019 19:50:03 +0100 Message-Id: <20191108174733.078832836@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191108174719.228826381@linuxfoundation.org> References: <20191108174719.228826381@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Peter Ujfalusi [ Upstream commit 564b6bb9d42d31fc80c006658cf38940a9b99616 ] dm365 have only single McBSP, so the device name is without .0 Fixes: 0c750e1fe481d ("ARM: davinci: dm365: Add dma_slave_map to edma") Signed-off-by: Peter Ujfalusi Signed-off-by: Sekhar Nori Signed-off-by: Sasha Levin --- arch/arm/mach-davinci/dm365.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c index 8be04ec95adf5..d80b2290ac2e0 100644 --- a/arch/arm/mach-davinci/dm365.c +++ b/arch/arm/mach-davinci/dm365.c @@ -856,8 +856,8 @@ static s8 dm365_queue_priority_mapping[][2] = { }; static const struct dma_slave_map dm365_edma_map[] = { - { "davinci-mcbsp.0", "tx", EDMA_FILTER_PARAM(0, 2) }, - { "davinci-mcbsp.0", "rx", EDMA_FILTER_PARAM(0, 3) }, + { "davinci-mcbsp", "tx", EDMA_FILTER_PARAM(0, 2) }, + { "davinci-mcbsp", "rx", EDMA_FILTER_PARAM(0, 3) }, { "davinci_voicecodec", "tx", EDMA_FILTER_PARAM(0, 2) }, { "davinci_voicecodec", "rx", EDMA_FILTER_PARAM(0, 3) }, { "spi_davinci.2", "tx", EDMA_FILTER_PARAM(0, 10) },