| Message ID | 1477622229-32060-5-git-send-email-jun.nie@linaro.org |
|---|---|
| State | New |
| Headers | show |
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 <jun.nie@linaro.org> > --- > 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; > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
2016-10-28 13:24 GMT+08:00 Jaehoon Chung <jh80.chung@samsung.com>: > 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 <jun.nie@linaro.org> >> --- >> 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? Okay, will change to this. > >> 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. You name it, will change to data_addr_override. > > 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; >> > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 10/31/2016 05:50 PM, Jun Nie wrote: > 2016-10-28 13:24 GMT+08:00 Jaehoon Chung <jh80.chung@samsung.com>: >> 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 <jun.nie@linaro.org> >>> --- >>> 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? > > Okay, will change to this. > >> >>> 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. > > You name it, will change to data_addr_override. Yes, data_addr or data_addr_override? It's more clear than fifo. Best Regards, Jaehoon Chung >> >> 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; >>> >> > > > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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; + 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_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;
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 <jun.nie@linaro.org> --- drivers/mmc/host/dw_mmc.c | 5 +++++ include/linux/mmc/dw_mmc.h | 2 ++ 2 files changed, 7 insertions(+) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html