From patchwork Fri Sep 22 03:46:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 113946 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp2797789qgf; Thu, 21 Sep 2017 20:48:53 -0700 (PDT) X-Google-Smtp-Source: AOwi7QA7RChpEEoePdDAjg3huYZuJX5UmMHUn5ELbD/amWtK4zN7e7jyjsjsqn7FkhZYLIb30Qys X-Received: by 10.99.115.92 with SMTP id d28mr8007703pgn.280.1506052132976; Thu, 21 Sep 2017 20:48:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506052132; cv=none; d=google.com; s=arc-20160816; b=iMi1AAC5tqzIMWXOLVuQtBZScRu5GQHwrYGYce7iPyvGLy+jwqez7KlMG9M2DeliVd l6L5t6FC3GV4gJqQk6N5Onar0CdsPFdWfnYlbYre5ufeN+fzkeTQJVEKkfxa9HfuYhDy Xd+Jh9YgHUK4o+QcXSbTngfBFML9o4MXMElPZUWs04ubsUmkhfCm72DIlVakJwMKj/Xi 73VewrjhGA1WgvuPIrH96IJFq1LJm7S9mU8aZrgX++bLtYLpwtLLl0MqN2y2ePtVdVUU fz8NXcH1kx2lqJVS5IF1imcdJ1IFTx8qTJDjxJuLeFlI3Fy9npY2+4F9z0E3JneBSrnV rfUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=3luMy4L57nnx0Dq3jtJCQGpVx5fmTXxWjwCXaeyTPac=; b=qH+RhsqHf/cgx/S45MBX4jPB8+gMtqlg4fe/C/oQNKyweAoUnaayzMegkFOj6k1FjU plqypVqe0E3XWEppRGOeL7sEJjonmg35l/Ep+Qo6sZ51n+zAypZm5iKP9scDPhNQcDMQ XEt8dWAz3Dt8kvPBTIUpXENBQj5LO5r84EhkqLApo316e1Lkmra2VLe0p0495i5fsivW CWH6ZL3aiPBPgSCFBUVp3NIm0JxdlK0IVFeWNcpPyE3z7PH+qSvrkH/fC1HXIxRp3UkV m4Zd3aesE7gh33o3yHHPo0KOi0e5HQiRTbjbq66Q0LOi+LKeuorJABi2Bdfoizn/hBA5 c2tA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=GHqaq2JC; 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 t2si2053219pgb.259.2017.09.21.20.48.52; Thu, 21 Sep 2017 20:48:52 -0700 (PDT) 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=@nifty.com header.s=dec2015msa header.b=GHqaq2JC; 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 S1751847AbdIVDst (ORCPT + 26 others); Thu, 21 Sep 2017 23:48:49 -0400 Received: from conuserg-09.nifty.com ([210.131.2.76]:59293 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751726AbdIVDsq (ORCPT ); Thu, 21 Sep 2017 23:48:46 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id v8M3kwAV029389; Fri, 22 Sep 2017 12:47:09 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com v8M3kwAV029389 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1506052029; bh=3luMy4L57nnx0Dq3jtJCQGpVx5fmTXxWjwCXaeyTPac=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GHqaq2JCJaG5udEyUq27bWDobZr9jMPKMSAT49T/C7jPtJ6znm26b2JYZpYzps6TS v1u/wyBTkr957UxXg81QX0lrznkA5qG9jCvy3WhqlXtT3c5Hk7X2tQ/F+p0XZESycU 9qngH1C3+NAajWC1R9SbEOsdtP9sj/1YYLAZsTCjCGeyLy+OnCVmyr2R6a8cFtgHtL WQ30lLy8vQhv2u2ixpBxarUKEqkXQ2maMs/pAiutwiT/kvDDIXPpfNvin6pyBnWusZ FuC9nNzj9LUaxCmj8CN/jP0rhIkDdPPFEqPJEdP96yp2GxfwwCd2n0N23uYzRFmbcH mv4Q/T1Wvo0qA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-mtd@lists.infradead.org Cc: Masahiro Yamada , Cyrille Pitchen , linux-kernel@vger.kernel.org, Boris Brezillon , Marek Vasut , Brian Norris , Richard Weinberger , David Woodhouse Subject: [PATCH v2 12/12] mtd: nand: denali: change the setup_dma choice into hook Date: Fri, 22 Sep 2017 12:46:49 +0900 Message-Id: <1506052009-8285-13-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1506052009-8285-1-git-send-email-yamada.masahiro@socionext.com> References: <1506052009-8285-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The previous commit added some hooks into struct denali_nand_info, so here is one more for clean-up. Signed-off-by: Masahiro Yamada --- Changes in v2: - Newly added drivers/mtd/nand/denali.c | 15 +++++---------- drivers/mtd/nand/denali.h | 2 ++ 2 files changed, 7 insertions(+), 10 deletions(-) -- 2.7.4 diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c index 7c24983..0b268ec 100644 --- a/drivers/mtd/nand/denali.c +++ b/drivers/mtd/nand/denali.c @@ -519,15 +519,6 @@ static void denali_setup_dma32(struct denali_nand_info *denali, denali->host_write(denali, mode | 0x14000, 0x2400); } -static void denali_setup_dma(struct denali_nand_info *denali, - dma_addr_t dma_addr, int page, int write) -{ - if (denali->caps & DENALI_CAP_DMA_64BIT) - denali_setup_dma64(denali, dma_addr, page, write); - else - denali_setup_dma32(denali, dma_addr, page, write); -} - static int denali_pio_read(struct denali_nand_info *denali, void *buf, size_t size, int page, int raw) { @@ -619,7 +610,7 @@ static int denali_dma_xfer(struct denali_nand_info *denali, void *buf, iowrite32(DMA_ENABLE__FLAG, denali->reg + DMA_ENABLE); denali_reset_irq(denali); - denali_setup_dma(denali, dma_addr, page, write); + denali->setup_dma(denali, dma_addr, page, write); irq_status = denali_wait_for_irq(denali, irq_mask); if (!(irq_status & INTR__DMA_CMD_COMP)) @@ -1314,6 +1305,10 @@ int denali_init(struct denali_nand_info *denali) if (denali->dma_avail) { chip->options |= NAND_USE_BOUNCE_BUFFER; chip->buf_align = 16; + if (denali->caps & DENALI_CAP_DMA_64BIT) + denali->setup_dma = denali_setup_dma64; + else + denali->setup_dma = denali_setup_dma32; } chip->bbt_options |= NAND_BBT_USE_FLASH; diff --git a/drivers/mtd/nand/denali.h b/drivers/mtd/nand/denali.h index 3aeb272..2911066 100644 --- a/drivers/mtd/nand/denali.h +++ b/drivers/mtd/nand/denali.h @@ -321,6 +321,8 @@ struct denali_nand_info { const struct nand_ecc_caps *ecc_caps; u32 (*host_read)(struct denali_nand_info *denali, u32 addr); void (*host_write)(struct denali_nand_info *denali, u32 addr, u32 data); + void (*setup_dma)(struct denali_nand_info *denali, dma_addr_t dma_addr, + int page, int write); }; #define DENALI_CAP_HW_ECC_FIXUP BIT(0)