| Message ID | 20211123102607.13002-1-rogerq@kernel.org |
|---|---|
| Headers | show |
| Series | memory: omap-gpmc: Add AM64 SoC support | expand |
please ignore this. Went out by mistake. On 23/11/2021 12:26, Roger Quadros wrote: > GPMC was not being visible if COMPILE_TEST is not enabled. > > Signed-off-by: Roger Quadros <rogerq@kernel.org> > --- > drivers/memory/Kconfig | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/memory/Kconfig b/drivers/memory/Kconfig > index 30bff6cb1b8d..da2af9c38fe3 100644 > --- a/drivers/memory/Kconfig > +++ b/drivers/memory/Kconfig > @@ -103,8 +103,8 @@ config TI_EMIF > temperature changes > > config OMAP_GPMC > - bool "Texas Instruments OMAP SoC GPMC driver" if COMPILE_TEST > - depends on OF_ADDRESS > + bool "Texas Instruments OMAP SoC GPMC driver" > + depends on OF_ADDRESS || COMPILE_TEST > select GPIOLIB > help > This driver is for the General Purpose Memory Controller (GPMC) >
Please ignore this one as well. On 23/11/2021 12:26, Roger Quadros wrote: > The TI's AM64 SoC has the GPMC module. Add compatible for it. > > Traditionally GPMC external addresses have always been mapped to first > 1GB physical address. However newer platforms, can have it mapped > at different locations. Support this address provision via device tree. > > Signed-off-by: Roger Quadros <rogerq@kernel.org> > --- > drivers/memory/omap-gpmc.c | 40 ++++++++++++++++++++++++++++---------- > 1 file changed, 30 insertions(+), 10 deletions(-) > > diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c > index be0858bff4d3..624153048182 100644 > --- a/drivers/memory/omap-gpmc.c > +++ b/drivers/memory/omap-gpmc.c > @@ -237,6 +237,7 @@ struct gpmc_device { > struct omap3_gpmc_regs context; > int nirqs; > unsigned int is_suspended:1; > + struct resource *data; > }; > > static struct irq_domain *gpmc_irq_domain; > @@ -1456,12 +1457,18 @@ static void gpmc_mem_exit(void) > } > } > > -static void gpmc_mem_init(void) > +static void gpmc_mem_init(struct gpmc_device *gpmc) > { > int cs; > > - gpmc_mem_root.start = GPMC_MEM_START; > - gpmc_mem_root.end = GPMC_MEM_END; > + if (!gpmc->data) { > + /* All legacy devices have same data IO window */ > + gpmc_mem_root.start = GPMC_MEM_START; > + gpmc_mem_root.end = GPMC_MEM_END; > + } else { > + gpmc_mem_root.start = gpmc->data->start; > + gpmc_mem_root.end = gpmc->data->end; > + } > > /* Reserve all regions that has been set up by bootloader */ > for (cs = 0; cs < gpmc_cs_num; cs++) { > @@ -1888,6 +1895,7 @@ static const struct of_device_id gpmc_dt_ids[] = { > { .compatible = "ti,omap3430-gpmc" }, /* omap3430 & omap3630 */ > { .compatible = "ti,omap4430-gpmc" }, /* omap4430 & omap4460 & omap543x */ > { .compatible = "ti,am3352-gpmc" }, /* am335x devices */ > + { .compatible = "ti,am64-gpmc" }, > { } > }; > > @@ -2502,13 +2510,25 @@ static int gpmc_probe(struct platform_device *pdev) > gpmc->dev = &pdev->dev; > platform_set_drvdata(pdev, gpmc); > > - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > - if (!res) > - return -ENOENT; > + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "cfg"); > + if (!res) { > + /* legacy DT */ > + gpmc_base = devm_platform_ioremap_resource(pdev, 0); > + if (IS_ERR(gpmc_base)) > + return PTR_ERR(gpmc_base); > + } else { > + gpmc_base = devm_ioremap_resource(&pdev->dev, res); > + if (IS_ERR(gpmc_base)) > + return PTR_ERR(gpmc_base); > + > + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "data"); > + if (!res) { > + dev_err(&pdev->dev, "couldn't get data reg resource\n"); > + return -ENOENT; > + } > > - gpmc_base = devm_ioremap_resource(&pdev->dev, res); > - if (IS_ERR(gpmc_base)) > - return PTR_ERR(gpmc_base); > + gpmc->data = res; > + } > > res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); > if (!res) { > @@ -2562,7 +2582,7 @@ static int gpmc_probe(struct platform_device *pdev) > dev_info(gpmc->dev, "GPMC revision %d.%d\n", GPMC_REVISION_MAJOR(l), > GPMC_REVISION_MINOR(l)); > > - gpmc_mem_init(); > + gpmc_mem_init(gpmc); > rc = gpmc_gpio_init(gpmc); > if (rc) > goto gpio_init_failed; >
On 23/11/2021 11:26, Roger Quadros wrote: > GPMC was not being visible if COMPILE_TEST is not enabled. > > Signed-off-by: Roger Quadros <rogerq@kernel.org> > --- > drivers/memory/Kconfig | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > ... which was probably on purpose, similarly to many other SoC drivers which are selected by platform. Therefore there is no bug to fix here - lack of visibility is not a problem. Please document instead why you want to change it, e.g. why this is a problem or unwanted behavior. Best regards, Krzysztof
On 23/11/2021 21:43, Krzysztof Kozlowski wrote: > On 23/11/2021 11:26, Roger Quadros wrote: >> GPMC was not being visible if COMPILE_TEST is not enabled. >> >> Signed-off-by: Roger Quadros <rogerq@kernel.org> >> --- >> drivers/memory/Kconfig | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> > > ... which was probably on purpose, similarly to many other SoC drivers > which are selected by platform. Therefore there is no bug to fix here - > lack of visibility is not a problem. Please document instead why you > want to change it, e.g. why this is a problem or unwanted behavior. > No strong enough reason. I'll drop this patch. cheers, -roger
Hi, TI's AM64 SoC contains one GPMC module. Add driver support for it. cheers, -roger Roger Quadros (4): dt-bindings: memory-controllers: ti,gpmc: Add compatible for AM64 memory: omap-gpmc: Fix menuconfig visibility memory: omap-gpmc: Add support for GPMC on AM64 SoC memory: omap-gpmc: check for nand node name instead of just compatibility .../bindings/memory-controllers/ti,gpmc.yaml | 12 +++++- drivers/memory/Kconfig | 4 +- drivers/memory/omap-gpmc.c | 43 ++++++++++++++----- 3 files changed, 45 insertions(+), 14 deletions(-)