Re: [PATCH 3/4] memory: omap-gpmc: memory: omap-gpmc: Add support for GPMC on AM64 SoC

[Roger Quadros]

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@xxxxxxxxxx>
> ---
>  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;
>