From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 89C92C433F5 for ; Tue, 23 Nov 2021 10:28:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235341AbhKWKbc (ORCPT ); Tue, 23 Nov 2021 05:31:32 -0500 Received: from mail.kernel.org ([198.145.29.99]:46604 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235146AbhKWKbc (ORCPT ); Tue, 23 Nov 2021 05:31:32 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id A1B3960ED4; Tue, 23 Nov 2021 10:28:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1637663304; bh=82zLsD1/kJ0fI0M0BCmFm0SsC1r/oUVVvTaESdHggQI=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=jAXnTfLxhCKUoWGUOOPGCF0sYl+pSPeGH5gDVSGUZQychTNFS4yaef5npL6q2R4q0 pKgSoDOQfwBJYqbvltuas50YOhr3JTIkPkX3Y3idDlJ1OLaPID9ceN2JyjTY4I8V7x lRzfOFWqQewXazehJ+C1ay0hKqLhVNC+NGFWoWXVGqG+dvGmM1oJagyhapIYa5TvUN XKyoIzBXvlhX9to7S07zYiCiZ17ZIo6nvEc1rT6UQioVaRSTwF3AZTju1AOmlYqXdW +Q1kD4gZw9NNNElGltWUTrkN1whZDg3vJdXSlx+p/uHgAGT7KWlgFC86Z+dfKNleRI xQ1aN0pwTOA3g== Subject: Re: [PATCH 3/4] memory: omap-gpmc: memory: omap-gpmc: Add support for GPMC on AM64 SoC To: krzysztof.kozlowski@canonical.com, tony@atomide.com Cc: kishon@ti.com, nm@ti.com, vigneshr@ti.com, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org References: <20211123102607.13002-1-rogerq@kernel.org> <20211123102607.13002-6-rogerq@kernel.org> From: Roger Quadros Message-ID: Date: Tue, 23 Nov 2021 12:28:20 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 MIME-Version: 1.0 In-Reply-To: <20211123102607.13002-6-rogerq@kernel.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org 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 > --- > 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; >