lkml.org 
[lkml]   [2019]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH v3 4/4] memory: jz4780_nemc: Add support for the JZ4740
Hi,

Any feedback on this patchset? Should I resend?

Thanks,
-Paul

Le mar. 5 févr. 2019 à 4:52, Paul Cercueil <paul@crapouillou.net> a
écrit :
> Add support for the JZ4740 SoC from Ingenic.
>
> Signed-off-by: Paul Cercueil <paul@crapouillou.net>
> Reviewed-by: Boris Brezillon <bbrezillon@kernel.org>
> ---
>
> v2: No change
>
> v3: Support the JZ4740 instead of the JZ4725B (exact same
> functionality
> but JZ4740 is already fully upstream)
>
> drivers/memory/jz4780-nemc.c | 24 +++++++++++++++++++++---
> 1 file changed, 21 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/memory/jz4780-nemc.c
> b/drivers/memory/jz4780-nemc.c
> index 66b8b43eaeff..f3a19b9b76ac 100644
> --- a/drivers/memory/jz4780-nemc.c
> +++ b/drivers/memory/jz4780-nemc.c
> @@ -44,9 +44,14 @@
> #define NEMC_NFCSR_NFCEn(n) BIT((((n) - 1) << 1) + 1)
> #define NEMC_NFCSR_TNFEn(n) BIT(16 + (n) - 1)
>
> +struct jz_soc_info {
> + u8 tas_tah_cycles_max;
> +};
> +
> struct jz4780_nemc {
> spinlock_t lock;
> struct device *dev;
> + const struct jz_soc_info *soc_info;
> void __iomem *base;
> struct clk *clk;
> uint32_t clk_period;
> @@ -202,7 +207,7 @@ static bool jz4780_nemc_configure_bank(struct
> jz4780_nemc *nemc,
> if (of_property_read_u32(node, "ingenic,nemc-tAS", &val) == 0) {
> smcr &= ~NEMC_SMCR_TAS_MASK;
> cycles = jz4780_nemc_ns_to_cycles(nemc, val);
> - if (cycles > 15) {
> + if (cycles > nemc->soc_info->tas_tah_cycles_max) {
> dev_err(nemc->dev, "tAS %u is too high (%u cycles)\n",
> val, cycles);
> return false;
> @@ -214,7 +219,7 @@ static bool jz4780_nemc_configure_bank(struct
> jz4780_nemc *nemc,
> if (of_property_read_u32(node, "ingenic,nemc-tAH", &val) == 0) {
> smcr &= ~NEMC_SMCR_TAH_MASK;
> cycles = jz4780_nemc_ns_to_cycles(nemc, val);
> - if (cycles > 15) {
> + if (cycles > nemc->soc_info->tas_tah_cycles_max) {
> dev_err(nemc->dev, "tAH %u is too high (%u cycles)\n",
> val, cycles);
> return false;
> @@ -278,6 +283,10 @@ static int jz4780_nemc_probe(struct
> platform_device *pdev)
> if (!nemc)
> return -ENOMEM;
>
> + nemc->soc_info = device_get_match_data(dev);
> + if (!nemc->soc_info)
> + return -EINVAL;
> +
> spin_lock_init(&nemc->lock);
> nemc->dev = dev;
>
> @@ -370,8 +379,17 @@ static int jz4780_nemc_remove(struct
> platform_device *pdev)
> return 0;
> }
>
> +static const struct jz_soc_info jz4740_soc_info = {
> + .tas_tah_cycles_max = 7,
> +};
> +
> +static const struct jz_soc_info jz4780_soc_info = {
> + .tas_tah_cycles_max = 15,
> +};
> +
> static const struct of_device_id jz4780_nemc_dt_match[] = {
> - { .compatible = "ingenic,jz4780-nemc" },
> + { .compatible = "ingenic,jz4740-nemc", .data = &jz4740_soc_info, },
> + { .compatible = "ingenic,jz4780-nemc", .data = &jz4780_soc_info, },
> {},
> };
>
> --
> 2.11.0
>

\
 
 \ /
  Last update: 2019-03-19 14:01    [W:0.723 / U:0.084 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site