dt-bindings: memory-controllers: ti,gpmc: Add compatible for AM64
Subsystems (4)
Roger Quadros
maintainerPATCH v2 1/4 dt-bindings: memory-controllers: ti,gpmc: Add compatible for AM64
AM64 SoC contains the GPMC module. Add compatible for it.
Newer SoCs don't necessarily map GPMC data region at the same place as legacy SoCs. Add reg-names "data", to provide this information to the device driver.
--- .../bindings/memory-controllers/ti,gpmc.yaml | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/memory-controllers/ti,gpmc.yaml +22 -1
@@ -23,13 +23,20 @@ properties: items: - enum: - ti,am3352-gpmc + - ti,am64-gpmc - ti,omap2420-gpmc - ti,omap2430-gpmc - ti,omap3430-gpmc - ti,omap4430-gpmc reg: - maxItems: 1 + minItems: 1 + maxItems: 2 + + reg-names: + items: + - const: cfg + - const: data interrupts: maxItems: 1
@@ -44,6 +51,9 @@ properties: items: - const: fck + power-domains: + maxItems: 1 + dmas: items: - description: DMA channel for GPMC NAND prefetch
@@ -133,6 +143,17 @@ required: - "#address-cells" - "#size-cells" +allOf: + - if: + properties: + compatible: + contains: + const: ti,am64-gpmc + then: + required: + - reg-names + - power-domains + additionalProperties: false examples:
Signature · 1 line
2.17.1
Roger Quadros
maintainerPATCH v2 2/4 memory: omap-gpmc: Add support for GPMC on AM64 SoC
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.
--- drivers/memory/omap-gpmc.c | 40 ++++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 10 deletions(-)
drivers/memory/omap-gpmc.c +30 -10
@@ -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;
Signature · 1 line
2.17.1
Roger Quadros
maintainerPATCH v2 3/4 memory: omap-gpmc: check for nand node name instead of just compatibility
In reply to Roger QuadrosWe have added new compatibles for controller so just checking for "ti,omap2-nand" compatible is not enough. Check for "nand" node name as well.
--- drivers/memory/omap-gpmc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/memory/omap-gpmc.c +2 -1
@@ -2183,7 +2183,8 @@ static int gpmc_probe_generic_child(struct platform_device *pdev, } } -if (of_device_is_compatible (child,"ti,omap2-nand" )) { +if (of_device_is_compatible (child,"ti,omap2-nand" ) || +of_node_name_eq (child,"nand" )) {/* NAND specific setup */ val =8 ;of_property_read_u32 (child,"nand-bus-width" , &val);
Signature · 1 line
2.17.1
Rob Herring
maintainerRe: [PATCH v2 3/4] memory: omap-gpmc: check for nand node name instead of just compatibility
Quoted 14 lines · Roger Quadros
We have added new compatibles for controller so just checking for "ti,omap2-nand" compatible is not enough. Check for "nand" node name as well.
Signed-off-by Roger Quadros <[email protected]>--- drivers/memory/omap-gpmc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/memory/omap-gpmc.c +0
-0
drivers/memory/omap-gpmc.c static int gpmc_probe_generic_child(struct platform_device *pdev, · line 2187
Quoted 6 lines
drivers/memory/omap-gpmc.c +2
-1@@ -2183,7 +2183,8 @@ static int gpmc_probe_generic_child(struct platform_device *pdev, } } -if (of_device_is_compatible (child,"ti,omap2-nand" )) { +if (of_device_is_compatible (child,"ti,omap2-nand" ) || +of_node_name_eq (child,"nand" )) {
It would be better to stick with compatible strings. You can match against a match table. This should be 'nand-controller' really if this binding had a proper split between the controller and nand chips.
Rob
Roger Quadros
maintainerRe: [PATCH v2 3/4] memory: omap-gpmc: check for nand node name instead of just compatibility
Hi Rob,
Quoted 18 lines · Rob Herring
Quoted 17 lines · Roger Quadros
We have added new compatibles for controller so just checking for "ti,omap2-nand" compatible is not enough. Check for "nand" node name as well.
Signed-off-by Roger Quadros <[email protected]>--- drivers/memory/omap-gpmc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/memory/omap-gpmc.c +0
-0@@ -2183,7 +2183,8 @@ static int gpmc_probe_generic_child(struct platform_device *pdev, } }
Quoted 7 lines
drivers/memory/omap-gpmc.c static int gpmc_probe_generic_child(struct platform_device *pdev, · line 2187
Quoted 3 lines
drivers/memory/omap-gpmc.c +2
-1-if (of_device_is_compatible (child,"ti,omap2-nand" )) { +if (of_device_is_compatible (child,"ti,omap2-nand" ) || +of_node_name_eq (child,"nand" )) {It would be better to stick with compatible strings. You can match against a match table. This should be 'nand-controller' really if this binding had a proper split between the controller and nand chips.
OK. I will change this to use compatible strings using a match table.
The 'nand-controller' + 'nand' chip change will be done in a separate series sometime later.
cheers,
-roger
Roger Quadros
maintainerPATCH v2 4/4 arm64: arch_k3: Select GPMC device driver
In reply to Roger QuadrosThe GPMC controller is present on some K3 SoCs. It provides access to NOR/NAND flashes and asynchronous SRAM-like memories and ASICs.
--- arch/arm64/Kconfig.platforms | 1 + 1 file changed, 1 insertion(+)
arch/arm64/Kconfig.platforms +1 -0
@@ -122,6 +122,7 @@ config ARCH_K3 select TI_SCI_INTR_IRQCHIP select TI_SCI_INTA_IRQCHIP select TI_K3_SOCINFO + select OMAP_GPMC help This enables support for Texas Instruments' K3 multicore SoC architecture.
Signature · 1 line
2.17.1
Quoted 6 lines · Roger Quadros
AM64 SoC contains the GPMC module. Add compatible for it.
Newer SoCs don't necessarily map GPMC data region at the same place as legacy SoCs. Add reg-names "data", to provide this information to the device driver.
Quoted 6 lines
Cc Rob Herring <[email protected]>Signed-off-by Roger Quadros <[email protected]>--- .../bindings/memory-controllers/ti,gpmc.yaml | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-)