From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jaehoon Chung Subject: Re: [PATCH v2 4/5] mmc: dw: Add fifo address property Date: Fri, 28 Oct 2016 14:24:40 +0900 Message-ID: References: <1477622229-32060-1-git-send-email-jun.nie@linaro.org> <1477622229-32060-5-git-send-email-jun.nie@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Return-path: Received: from mailout2.samsung.com ([203.254.224.25]:59078 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751401AbcJ1FYm (ORCPT ); Fri, 28 Oct 2016 01:24:42 -0400 Received: from epcpsbgm1new.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OFQ00FVNSCXBX50@mailout2.samsung.com> for linux-mmc@vger.kernel.org; Fri, 28 Oct 2016 14:24:40 +0900 (KST) In-reply-to: <1477622229-32060-5-git-send-email-jun.nie@linaro.org> Sender: linux-mmc-owner@vger.kernel.org List-Id: linux-mmc@vger.kernel.org To: Jun Nie , shawn.guo@linaro.org, xie.baoyou@zte.com.cn Cc: ulf.hansson@linaro.org, jason.liu@linaro.org, linux-mmc@vger.kernel.org On 10/28/2016 11:37 AM, Jun Nie wrote: > The FIFO address may break default address assumption of 0x100 > (version < 0x240A) and 0x200(version >= 0x240A) in current driver. > The new property is introduced to override fifo address via DT > node information. > > Signed-off-by: Jun Nie > --- > drivers/mmc/host/dw_mmc.c | 5 +++++ > include/linux/mmc/dw_mmc.h | 2 ++ > 2 files changed, 7 insertions(+) > > diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c > index 1c9ee36..24ae05b6 100644 > --- a/drivers/mmc/host/dw_mmc.c > +++ b/drivers/mmc/host/dw_mmc.c > @@ -2955,6 +2955,8 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host) > > of_property_read_u32(np, "card-detect-delay", &pdata->detect_delay_ms); > > + of_property_read_u32(np, "fifo-addr", &host->fifo_addr_override); > + > if (!of_property_read_u32(np, "clock-frequency", &clock_frequency)) > pdata->bus_hz = clock_frequency; > > @@ -3163,6 +3165,9 @@ int dw_mci_probe(struct dw_mci *host) > else > host->fifo_reg = host->regs + DATA_240A_OFFSET; > > + if (host->fifo_addr_override) > + host->fifo_reg = host->regs + host->fifo_addr_override; > + Check condition the sequentially. if (host->fifo_addr_override) { ... } else if (host->verid < DW_MMC_240A) { .. } else { .. } how about? > tasklet_init(&host->tasklet, dw_mci_tasklet_func, (unsigned long)host); > ret = devm_request_irq(host->dev, host->irq, dw_mci_interrupt, > host->irq_flags, "dw-mci", host); > diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h > index f5af2bd..4866ef5 100644 > --- a/include/linux/mmc/dw_mmc.h > +++ b/include/linux/mmc/dw_mmc.h > @@ -107,6 +107,7 @@ struct dw_mci_dma_slave { > * @ciu_clk: Pointer to card interface unit clock instance. > * @slot: Slots sharing this MMC controller. > * @fifo_depth: depth of FIFO. > + * @fifo_addr_override: override fifo reg offset with this value. DATA addr is more correct. it's related with DATA register. Best Regards, Jaehoon Chung > * @data_shift: log2 of FIFO item size. > * @part_buf_start: Start index in part_buf. > * @part_buf_count: Bytes of partial data in part_buf. > @@ -154,6 +155,7 @@ struct dw_mci { > spinlock_t irq_lock; > void __iomem *regs; > void __iomem *fifo_reg; > + u32 fifo_addr_override; > > struct scatterlist *sg; > struct sg_mapping_iter sg_miter; >