From patchwork Mon Nov 7 14:07:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 9415317 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 EDD6760512 for ; Mon, 7 Nov 2016 14:26:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E05532838C for ; Mon, 7 Nov 2016 14:26:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D4A3128B94; Mon, 7 Nov 2016 14:26:57 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 414D92838C for ; Mon, 7 Nov 2016 14:26:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752672AbcKGO0z (ORCPT ); Mon, 7 Nov 2016 09:26:55 -0500 Received: from kirsty.vergenet.net ([202.4.237.240]:52243 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752364AbcKGO0z (ORCPT ); Mon, 7 Nov 2016 09:26:55 -0500 Received: from penelope.kanocho.kobe.vergenet.net (unknown [217.111.208.18]) by kirsty.vergenet.net (Postfix) with ESMTPSA id 143CA25B795; Tue, 8 Nov 2016 01:26:52 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=verge.net.au; s=mail; t=1478528812; bh=6ba1TSjZH41RmvcKGbIh1+0e+lPixBhIzjK+s2EnGR8=; h=From:To:Cc:Subject:Date:From; b=BuSt7yqf0keb/Oj8SN8xsb5lIrFNzO7mYmGNIrkqnOiFHwicVDe1U9TQYav0jB+Qn aWlCnrzFDJAwl7ZPC5WDJjHpf9wSm6cE4u+B77HiQcboOXcCSXrqtrAcpLEJAWsL5U ogYOzfQOl90dp89BsoQ+Cm50RsUo8Wg4nSp0H7GE= Received: by penelope.kanocho.kobe.vergenet.net (Postfix, from userid 7100) id 9684C6064C; Mon, 7 Nov 2016 15:07:19 +0100 (CET) From: Simon Horman To: Geert Uytterhoeven Cc: Magnus Damm , linux-spi@vger.kernel.org, linux-renesas-soc@vger.kernel.org Subject: [PATCH/RFC] spi: sh-msiof: Fix MSIOF address for DMAC Date: Mon, 7 Nov 2016 15:07:15 +0100 Message-Id: <1478527635-18031-1-git-send-email-horms+renesas@verge.net.au> X-Mailer: git-send-email 2.7.0.rc3.207.g0ac5344 Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Ryo Kataoka MSIOF Base Address H'E6xx can be accessed by CPU and DMAC. MSIOF Base Address H'E7xx for DMAC was removed from H/W manual. Fixes: b0d0ce8b6b91 ("spi: sh-msiof: Add DMA support") Signed-off-by: Ryo Kataoka Signed-off-by: Hiromitsu Yamasaki Signed-off-by: Simon Horman --- Geert, this is a patch from the Gen3 BSP 3.3.2 kernel. Please consider if it is appropriate for mainline. --- drivers/spi/spi-sh-msiof.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c index cbf02ebb30a2..b882e0a500f8 100644 --- a/drivers/spi/spi-sh-msiof.c +++ b/drivers/spi/spi-sh-msiof.c @@ -1076,10 +1076,7 @@ static int sh_msiof_request_dma(struct sh_msiof_spi_priv *p) return 0; } - /* The DMA engine uses the second register set, if present */ - res = platform_get_resource(pdev, IORESOURCE_MEM, 1); - if (!res) - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); master = p->master; master->dma_tx = sh_msiof_request_dma_chan(dev, DMA_MEM_TO_DEV,