OMAP GPMC DT bindings
Subsystems (8)
v5 cover OMAP GPMC DT bindings
[Resending +devicetree-discuss, +Rob, +Grant]
This is a series of patches to support GPMC peripherals on OMAP boards.
Depends on Linus' master +
omap-next (branch omap-for-v3.8/cleanup-headers-gpmc)
The only supported peripheral for now is NAND, but other types would be easy to add.
Version 2 addresses details pointed out by Jon Hunter, Afzal Mohammed and Rob Herring:
- add "reg" and "ti,hwmod" properties to Documentation
- use generic of_mtd functions and the property names defined by them, namely "nand-bus-width" and "nand-ecc-mode"
- reduce the default register space size in the Documentation to 8K, as found in the hwmod code
- switch to a DT layout based on ranges and address translation. Although this property is not currently looked at as long as the handling code still uses the runtime calculation methods, we now have these values in the bindings, eventually allowing us to switch the implementation with less pain.
Version 3 includes fixes pointed out by Jon Hunter:
- better documentation of the 'ranges' property to describe the fact that it's representing the CS lines
- GPMC_CS_CONFIGx -> GPMC_CONFIGx in comments
- drop interrupt-parent from example bindings
- add of_node_put() at the end of the child iteration
Version 4 fixes compilation for !CONFIG_MTD_NAND and includes more details from Jon Hunter and Avinash, Philip:
- Add "num-cs" and "num-waitpins" properties, which will eventually be used to get rid of GPMC_CS_NUM
- Better description of generic nand DT properties
- Dropped patch 3/4 as an equivalent fix was already merged
- Added ti,nand-ecc-use-elm property
Version 5 with regards to Avinash, Philip and Peter Korsgaard:
- Re-add accidentially forgotten Documentation/devicetree/bindings/bus/ti-gpmc.txt
- Rename "software" ecc mode to "sw"
- Initialize gpmc_nand_data->is_elm_used to 'true' rather than 1
- Drop ti,nand-ecc-use-elm binding in favor of a new ecc mode named "bch8-am335xrbl-compatible"
- Add two more patches for section mismatch fixups
Daniel Mack (4):
mtd: omap-nand: pass device_node in platform data
ARM: OMAP: gpmc-nand: drop __init annotation
ARM: OMAP: gpmc: enable hwecc for AM33xx SoCs
ARM: OMAP: gpmc: add DT bindings for GPMC timings and NAND
Documentation/devicetree/bindings/bus/ti-gpmc.txt | 76 +++++++++ .../devicetree/bindings/mtd/gpmc-nand.txt | 81 +++++++++ arch/arm/mach-omap2/gpmc-nand.c | 15 +- arch/arm/mach-omap2/gpmc.c | 181 ++++++++++++++++++++- drivers/mtd/nand/omap2.c | 4 +- 5 files changed, 348 insertions(+), 9 deletions(-) create mode 100644 Documentation/devicetree/bindings/bus/ti-gpmc.txt create mode 100644 Documentation/devicetree/bindings/mtd/gpmc-nand.txt
Signature · 1 line
1.7.11.7
PATCH v5 1/4 mtd: omap-nand: pass device_node in platform data
Pass an optional device_node pointer in the platform data, which in turn will be put into a mtd_part_parser_data. This way, code that sets up the platform devices can pass along the node from DT so that the partitions can be parsed.
For non-DT boards, this change has no effect.
--- drivers/mtd/nand/omap2.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/mtd/nand/omap2.c +3 -1
@@ -1331,6 +1331,7 @@ static int __devinit omap_nand_probe(struct platform_device *pdev)dma_cap_mask_t mask;unsigned sig;struct resource *res; +struct mtd_part_parser_data ppdata = {}; pdata = pdev->dev.platform_data;if (pdata ==NULL ) {
@@ -1556,7 +1557,8 @@ static int __devinit omap_nand_probe(struct platform_device *pdev) goto out_release_mem_region; } -mtd_device_parse_register (&info->mtd,NULL ,NULL , pdata->parts, + ppdata.of_node = pdata->of_node; +mtd_device_parse_register (&info->mtd,NULL , &ppdata, pdata->parts, pdata->nr_parts);platform_set_drvdata (pdev, &info->mtd);
Signature · 1 line
1.7.11.7
PATCH v5 2/4 ARM: OMAP: gpmc-nand: drop __init annotation
In reply to Daniel Mackgpmc_nand_init() will be called from another driver's probe() function, so the easiest way to prevent section mismatches is to drop the annotation here.
--- arch/arm/mach-omap2/gpmc-nand.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-omap2/gpmc-nand.c +3 -3
@@ -89,7 +89,7 @@ static int omap2_nand_gpmc_retime(return 0 ; } -static bool __init gpmc_hwecc_bch_capable (enum omap_ecc ecc_opt) +static bool gpmc_hwecc_bch_capable (enum omap_ecc ecc_opt) {/* support only OMAP3 class */ if (!cpu_is_omap34xx ()) {
@@ -110,8 +110,8 @@ static bool __init gpmc_hwecc_bch_capable(enum omap_ecc ecc_opt)return 1 ; } -int __init gpmc_nand_init (struct omap_nand_platform_data *gpmc_nand_data, -struct gpmc_timings *gpmc_t) +int gpmc_nand_init (struct omap_nand_platform_data *gpmc_nand_data, +struct gpmc_timings *gpmc_t) {int err =0 ;struct device *dev = &gpmc_nand_device.dev;
Signature · 1 line
1.7.11.7
PATCH v5 3/4 ARM: OMAP: gpmc: enable hwecc for AM33xx SoCs
In reply to Daniel MackThe am33xx is capable of handling bch error correction modes, so enable that feature in the driver.
--- arch/arm/mach-omap2/gpmc-nand.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
arch/arm/mach-omap2/gpmc-nand.c +5 -4
@@ -92,17 +92,18 @@ static int omap2_nand_gpmc_retime(static bool gpmc_hwecc_bch_capable (enum omap_ecc ecc_opt) {/* support only OMAP3 class */ -if (!cpu_is_omap34xx ()) { +if (!cpu_is_omap34xx () && !soc_is_am33xx ()) {pr_err ("BCH ecc is not supported on this CPU\n" );return 0 ; }/* -* For now, assume 4-bit mode is only supported on OMAP3630 ES1.x, x>=1. -* Other chips may be added if confirmed to work. +* For now, assume 4-bit mode is only supported on OMAP3630 ES1.x, x>=1 +* and AM33xx derivates. Other chips may be added if confirmed to work. */ if ((ecc_opt ==OMAP_ECC_BCH4_CODE_HW ) && - (!cpu_is_omap3630 () || (GET_OMAP_REVISION () ==0 ))) { + (!cpu_is_omap3630 () || (GET_OMAP_REVISION () ==0 )) && + (!soc_is_am33xx ())) {pr_err ("BCH 4-bit mode is not supported on this CPU\n" );return 0 ; }
Signature · 1 line
1.7.11.7
PATCH v5 4/4 ARM: OMAP: gpmc: add DT bindings for GPMC timings and NAND
In reply to Daniel MackThis patch adds basic DT bindings for OMAP GPMC.
The actual peripherals are instantiated from child nodes within the GPMC node, and the only type of device that is currently supported is NAND.
Code was added to parse the generic GPMC timing parameters and some documentation with examples on how to use them.
Successfully tested on an AM33xx board.
--- Documentation/devicetree/bindings/bus/ti-gpmc.txt | 76 +++++++++ .../devicetree/bindings/mtd/gpmc-nand.txt | 81 +++++++++ arch/arm/mach-omap2/gpmc.c | 181 ++++++++++++++++++++- 3 files changed, 337 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/bus/ti-gpmc.txt create mode 100644 Documentation/devicetree/bindings/mtd/gpmc-nand.txt
Documentation/devicetree/bindings/bus/ti-gpmc.txt new file +76 -0
@@ -0,0 +1,76 @@ +Device tree bindings for OMAP general purpose memory controllers (GPMC) + +The actual devices are instantiated from the child nodes of a GPMC node. + +Required properties: + + - compatible: Should be set to "ti,gpmc" + - reg: A resource specifier for the register space + (see the example below) + - ti,hwmods: Should be set to "ti,gpmc" until the DT transition is + completed. + - #address-cells: Must be set to 2 to allow memory address translation + - #size-cells: Must be set to 1 to allow CS address passing + - num-cs: The maximum number of chip-select lines that controller + can support. + - num-waitpins: The maximum number of wait pins that controller can + support. + - ranges: Must be set up to reflect the memory layout with four + integer values for each chip-select line in use: + + <cs-number> 0 <physical address of mapping> <size> + + Note that this property is not currently parsed. + Calculated values derived from the contents of the + per-CS register GPMC_CONFIG7 (as set up by the + bootloader) are used. That will change in the future, + so be sure to fill the correct values here. + +Timing properties for child nodes. All are optional and default to 0. + + - gpmc,sync-clk: Minimum clock period for synchronous mode, in picoseconds + + Chip-select signal timings corresponding to GPMC_CONFIG2: + - gpmc,cs-on: Assertion time + - gpmc,cs-rd-off: Read deassertion time + - gpmc,cs-wr-off: Write deassertion time + + ADV signal timings corresponding to GPMC_CONFIG3: + - gpmc,adv-on: Assertion time + - gpmc,adv-rd-off: Read deassertion time + - gpmc,adv-wr-off: Write deassertion time + + WE signals timings corresponding to GPMC_CONFIG4: + - gpmc,we-on: Assertion time + - gpmc,we-off: Deassertion time + + OE signals timings corresponding to GPMC_CONFIG4: + - gpmc,oe-on: Assertion time + - gpmc,oe-off: Deassertion time + + Access time and cycle time timings corresponding to GPMC_CONFIG5: + - gpmc,page-burst-access: Multiple access word delay + - gpmc,access: Start-cycle to first data valid delay + - gpmc,rd-cycle: Total read cycle time + - gpmc,wr-cycle: Total write cycle time + +The following are only on OMAP3430: + - gpmc,wr-access + - gpmc,wr-data-mux-bus + + +Example for an AM33xx board: + + gpmc: gpmc at 50000000 { + compatible = "ti,gpmc"; + ti,hwmods = "gpmc"; + reg = <0x50000000 0x2000>; + interrupts = <100>; + + num-cs = <8>; + #address-cells = <2>; + #size-cells = <1>; + ranges = <0 0 0x08000000 0x10000000>; /* CS0 @addr 0x8000000, size 0x10000000 */ + + /* child nodes go here */ + };
Documentation/devicetree/bindings/mtd/gpmc-nand.txt new file +81 -0
81 lines not on this page · raw message
arch/arm/mach-omap2/gpmc.c +180 -1
211 lines not on this page · raw message
Signature · 1 line
1.7.11.7
PATCH v5 4/4 ARM: OMAP: gpmc: add DT bindings for GPMC timings and NAND
On Wed, Nov 28, 2012 at 22:28:59, Daniel Mack wrote:
[...]
Quoted 4 lines
arch/arm/mach-omap2/gpmc.c +4
-0+if (!of_property_read_string (child,"ti,nand-ecc-opt" , &s)) { +for (val =0 ; val <ARRAY_SIZE (nand_ecc_opts); val++) +if (!strcasecmp (s, nand_ecc_opts[val])) { + gpmc_nand_data->ecc_opt = val;
arch/arm/mach-omap2/gpmc.c static int __devinit gpmc_mem_init(void) · line 877
Quoted 10 lines
arch/arm/mach-omap2/gpmc.c +10
-0+break ; + } + +/* +* AM335x RBL compatibility mode - dependns on runtime +* detection of the error location module. +*/ +if (!strcasecmp (s,"bch8-am335xrbl-compatible" )) { + gpmc_nand_data->ecc_opt =OMAP_ECC_BCH8_CODE_HW ; + gpmc_nand_data->is_elm_used = true;
Remove is_elm_used from struct omap_nand_platform_data. Now this data populated as part of run time detection of elm module. So please remove The usage of is_elm_used;
http://www.spinics.net/lists/arm-kernel/msg210549.html
Thanks
Avinash
Quoted 1 line
PATCH v5 4/4 ARM: OMAP: gpmc: add DT bindings for GPMC timings and NAND
Quoted 12 lines · Avinash
On Wed, Nov 28, 2012 at 22:28:59, Daniel Mack wrote:
[...]Quoted 10 lines
arch/arm/mach-omap2/gpmc.c +10
-0+if (!of_property_read_string (child,"ti,nand-ecc-opt" , &s)) { +for (val =0 ; val <ARRAY_SIZE (nand_ecc_opts); val++) +if (!strcasecmp (s, nand_ecc_opts[val])) { + gpmc_nand_data->ecc_opt = val; +break ; + } + +/* +* AM335x RBL compatibility mode - dependns on runtime +* detection of the error location module.
Quoted 8 lines
arch/arm/mach-omap2/gpmc.c static int __devinit gpmc_mem_init(void) · line 877
Quoted 4 lines
arch/arm/mach-omap2/gpmc.c +4
-0+*/ +if (!strcasecmp (s,"bch8-am335xrbl-compatible" )) { + gpmc_nand_data->ecc_opt =OMAP_ECC_BCH8_CODE_HW ; + gpmc_nand_data->is_elm_used = true;Remove
is_elm_usedfrom structomap_nand_platform_data. Now this data populated as part of run time detection of elm module. So please remove The usage ofis_elm_used;
So why do we need "bch8-am335xrbl-compatible" as special case then?
I thought the whole idea here is to tell the driver we want bch8 *and* the usage of the elm, instead of falling back to the (incompatible) software mode? If I remove that assignment, "bch8-am335xrbl-compatible" is the same than "bch8".
Which detail am I missing? :)
Daniel
PATCH v5 4/4 ARM: OMAP: gpmc: add DT bindings for GPMC timings and NAND
Quoted 22 lines · Daniel Mack
Quoted 12 lines · Avinash
On Wed, Nov 28, 2012 at 22:28:59, Daniel Mack wrote:
[...]Quoted 10 lines
arch/arm/mach-omap2/gpmc.c +10
-0+if (!of_property_read_string (child,"ti,nand-ecc-opt" , &s)) { +for (val =0 ; val <ARRAY_SIZE (nand_ecc_opts); val++) +if (!strcasecmp (s, nand_ecc_opts[val])) { + gpmc_nand_data->ecc_opt = val; +break ; + } + +/* +* AM335x RBL compatibility mode - dependns on runtime +* detection of the error location module. Quoted 8 lines
arch/arm/mach-omap2/gpmc.c static int __devinit gpmc_mem_init(void) · line 877
Quoted 4 lines
arch/arm/mach-omap2/gpmc.c +4
-0+*/ +if (!strcasecmp (s,"bch8-am335xrbl-compatible" )) { + gpmc_nand_data->ecc_opt =OMAP_ECC_BCH8_CODE_HW ; + gpmc_nand_data->is_elm_used = true;Remove
is_elm_usedfrom structomap_nand_platform_data. Now this data populated as part of run time detection of elm module. So please remove The usage ofis_elm_used;
Quoted 7 lines
So why do we need "bch8-am335xrbl-compatible" as special case then?
I thought the whole idea here is to tell the driver we want bch8 *and* the usage of the elm, instead of falling back to the (incompatible) software mode? If I remove that assignment, "bch8-am335xrbl-compatible" is the same than "bch8".
Here we have different problems present.
1. GPMC-NAND DT binding support.
2. Compatible ECC layout between kernel, boot loader.
3. Support for hardware accelerator, i.e ELM for error correction.
So priority should go for GPMC DT binding support.
Can you please proceed with GPMC-NAND DT bindings without considering ELM so that driver features existing can be obtained with DT.
I will take care of ECC layout (or RBL) compatibility along with ELM series. I will make ELM series on top of your changes. This way we can avoid circular dependency
Quoted 2 lines
Which detail am I missing? :)
I think what you need is NAND ECC layout to be common across Kernel and boot loader. Strictly speaking ELM is not a necessity for it. The common layout can be obtained even without presence of ELM, ELM is only a hardware accelerator for error correction. If ELM is not used, we can rely on software error correction, at least theoretically. But the way software error correction is handled currently in omap nand driver will not help us as ecc layout assumed is different.
Thanks
Avinash
Quoted 5 lines
Daniel
PATCH v5 4/4 ARM: OMAP: gpmc: add DT bindings for GPMC timings and NAND
Quoted 36 lines · Avinash
Quoted 22 lines · Daniel Mack
Quoted 12 lines · Avinash
On Wed, Nov 28, 2012 at 22:28:59, Daniel Mack wrote:
[...]Quoted 10 lines
arch/arm/mach-omap2/gpmc.c +10
-0+if (!of_property_read_string (child,"ti,nand-ecc-opt" , &s)) { +for (val =0 ; val <ARRAY_SIZE (nand_ecc_opts); val++) +if (!strcasecmp (s, nand_ecc_opts[val])) { + gpmc_nand_data->ecc_opt = val; +break ; + } + +/* +* AM335x RBL compatibility mode - dependns on runtime +* detection of the error location module. Quoted 8 lines
arch/arm/mach-omap2/gpmc.c static int __devinit gpmc_mem_init(void) · line 877
Quoted 4 lines
arch/arm/mach-omap2/gpmc.c +4
-0+*/ +if (!strcasecmp (s,"bch8-am335xrbl-compatible" )) { + gpmc_nand_data->ecc_opt =OMAP_ECC_BCH8_CODE_HW ; + gpmc_nand_data->is_elm_used = true;Remove
is_elm_usedfrom structomap_nand_platform_data. Now this data populated as part of run time detection of elm module. So please remove The usage ofis_elm_used;Quoted 7 lines
So why do we need "bch8-am335xrbl-compatible" as special case then?
I thought the whole idea here is to tell the driver we want bch8 *and* the usage of the elm, instead of falling back to the (incompatible) software mode? If I remove that assignment, "bch8-am335xrbl-compatible" is the same than "bch8".
Here we have different problems present.
1. GPMC-NAND DT binding support.
2. Compatible ECC layout between kernel, boot loader.
3. Support for hardware accelerator, i.e ELM for error correction.
Quoted 7 lines
So priority should go for GPMC DT binding support.
Can you please proceed with GPMC-NAND DT bindings without considering ELM so that driver features existing can be obtained with DT.I will take care of ECC layout (or RBL) compatibility along with ELM series. I will make ELM series on top of your changes. This way we can avoid circular dependency
Ok, fair enough. I'll drop "bch8-am335xrbl-compatible" from the list again and only care for those that are present in the enum.
Before I send the patches again, could you quickly state which repository they will go through? I'll make sure there are no conflicts when applying.
Quoted 9 lines
Quoted 1 line
Which detail am I missing? :)
I think what you need is NAND ECC layout to be common across Kernel and boot loader. Strictly speaking ELM is not a necessity for it. The common layout can be obtained even without presence of ELM, ELM is only a hardware accelerator for error correction. If ELM is not used, we can rely on software error correction, at least theoretically. But the way software error correction is handled currently in omap nand driver will not help us as ecc layout assumed is different.
Yes, understood, hence I need some workaround for now, which I can happily keep in my local branch.
Thanks,
Daniel
PATCH v5 4/4 ARM: OMAP: gpmc: add DT bindings for GPMC timings and NAND
Quoted 45 lines · Daniel Mack
Quoted 36 lines · Avinash
Quoted 22 lines · Daniel Mack
Quoted 12 lines · Avinash
On Wed, Nov 28, 2012 at 22:28:59, Daniel Mack wrote:
[...]Quoted 10 lines
arch/arm/mach-omap2/gpmc.c +10
-0+if (!of_property_read_string (child,"ti,nand-ecc-opt" , &s)) { +for (val =0 ; val <ARRAY_SIZE (nand_ecc_opts); val++) +if (!strcasecmp (s, nand_ecc_opts[val])) { + gpmc_nand_data->ecc_opt = val; +break ; + } + +/* +* AM335x RBL compatibility mode - dependns on runtime +* detection of the error location module. Quoted 8 lines
arch/arm/mach-omap2/gpmc.c static int __devinit gpmc_mem_init(void) · line 877
Quoted 4 lines
arch/arm/mach-omap2/gpmc.c +4
-0+*/ +if (!strcasecmp (s,"bch8-am335xrbl-compatible" )) { + gpmc_nand_data->ecc_opt =OMAP_ECC_BCH8_CODE_HW ; + gpmc_nand_data->is_elm_used = true;Remove
is_elm_usedfrom structomap_nand_platform_data. Now this data populated as part of run time detection of elm module. So please remove The usage ofis_elm_used;Quoted 7 lines
So why do we need "bch8-am335xrbl-compatible" as special case then?
I thought the whole idea here is to tell the driver we want bch8 *and* the usage of the elm, instead of falling back to the (incompatible) software mode? If I remove that assignment, "bch8-am335xrbl-compatible" is the same than "bch8".
Here we have different problems present.
1. GPMC-NAND DT binding support.
2. Compatible ECC layout between kernel, boot loader.
3. Support for hardware accelerator, i.e ELM for error correction.Quoted 7 lines
So priority should go for GPMC DT binding support.
Can you please proceed with GPMC-NAND DT bindings without considering ELM so that driver features existing can be obtained with DT.I will take care of ECC layout (or RBL) compatibility along with ELM series. I will make ELM series on top of your changes. This way we can avoid circular dependency
Quoted 6 lines
Ok, fair enough. I'll drop "bch8-am335xrbl-compatible" from the list again and only care for those that are present in the enum.
Before I send the patches again, could you quickly state which repository they will go through? I'll make sure there are no conflicts when applying.
I believe it should go through the OMAP trees.
Thanks
Avinash
Quoted 19 lines
Quoted 10 lines
Quoted 2 lines
Which detail am I missing? :)
I think what you need is NAND ECC layout to be common across Kernel and boot loader. Strictly speaking ELM is not a necessity for it. The common layout can be obtained even without presence of ELM, ELM is only a hardware accelerator for error correction. If ELM is not used, we can rely on software error correction, at least theoretically. But the way software error correction is handled currently in omap nand driver will not help us as ecc layout assumed is different.
Yes, understood, hence I need some workaround for now, which I can happily keep in my local branch.
Thanks,
Daniel
v5 cover OMAP GPMC DT bindings
In reply to Daniel MackQuoted 7 lines · Daniel Mack
[Resending +devicetree-discuss, +Rob, +Grant]
This is a series of patches to support GPMC peripherals on OMAP boards.
Depends on Linus' master +
omap-next (branch omap-for-v3.8/cleanup-headers-gpmc)
Can you resend this series on top of linux_next?
Some of the missing items I seen
1. Of_node not populated in omap_nand_platform_data structure.
2. Remove platform device creation from hwmod as GPMC DT is populating. Currently GPMC device creaing from DT & HWMOD.
Also can you address how this patch series depends on
mtd: nand: OMAP: ELM error correction support for BCH ecc
Thanks
Avinash
Quoted 64 lines
The only supported peripheral for now is NAND, but other types would be easy to add.
Version 2 addresses details pointed out by Jon Hunter, Afzal Mohammed and Rob Herring:
- add "reg" and "ti,hwmod" properties to Documentation
- use genericof_mtdfunctions and the property names defined by them, namely "nand-bus-width" and "nand-ecc-mode"
- reduce the default register space size in the Documentation to 8K, as found in the hwmod code
- switch to a DT layout based on ranges and address translation. Although this property is not currently looked at as long as the handling code still uses the runtime calculation methods, we now have these values in the bindings, eventually allowing us to switch the implementation with less pain.Version 3 includes fixes pointed out by Jon Hunter:
- better documentation of the 'ranges' property to describe the fact that it's representing the CS lines
-GPMC_CS_CONFIGx->GPMC_CONFIGxin comments
- drop interrupt-parent from example bindings
- addof_node_put()at the end of the child iterationVersion 4 fixes compilation for !CONFIG_MTD_NAND and includes more details from Jon Hunter and Avinash, Philip:
- Add "num-cs" and "num-waitpins" properties, which will eventually be used to get rid of
GPMC_CS_NUM
- Better description of generic nand DT properties
- Dropped patch 3/4 as an equivalent fix was already merged
- Added ti,nand-ecc-use-elm propertyVersion 5 with regards to Avinash, Philip and Peter Korsgaard:
- Re-add accidentially forgotten
Documentation/devicetree/bindings/bus/ti-gpmc.txt
- Rename "software" ecc mode to "sw"
- Initializegpmc_nand_data->is_elm_usedto 'true' rather than 1
- Drop ti,nand-ecc-use-elm binding in favor of a new ecc mode named "bch8-am335xrbl-compatible"
- Add two more patches for section mismatch fixupsDaniel Mack (4):
mtd: omap-nand: passdevice_nodein platform data
ARM: OMAP: gpmc-nand: drop__initannotation
ARM: OMAP: gpmc: enable hwecc for AM33xx SoCs
ARM: OMAP: gpmc: add DT bindings for GPMC timings and NANDDocumentation/devicetree/bindings/bus/ti-gpmc.txt | 76 +++++++++ .../devicetree/bindings/mtd/gpmc-nand.txt | 81 +++++++++ arch/arm/mach-omap2/gpmc-nand.c | 15 +- arch/arm/mach-omap2/gpmc.c | 181 ++++++++++++++++++++- drivers/mtd/nand/omap2.c | 4 +- 5 files changed, 348 insertions(+), 9 deletions(-) create mode 100644 Documentation/devicetree/bindings/bus/ti-gpmc.txt create mode 100644 Documentation/devicetree/bindings/mtd/gpmc-nand.txtSignature · 1 line
1.7.11.7
v5 cover OMAP GPMC DT bindings
Hi Avinash,
Quoted 10 lines · Avinash
Quoted 7 lines · Daniel Mack
[Resending +devicetree-discuss, +Rob, +Grant]
This is a series of patches to support GPMC peripherals on OMAP boards.
Depends on Linus' master +
omap-next (branch omap-for-v3.8/cleanup-headers-gpmc)Can you resend this series on top of
linux_next?
The only branch these patches depend on is the "omap-for-v3.8/cleanup-headers-gpmc" branch from omap_next. Are you actually seeing any merge conflicts with my series? If so, which branch are you referring to exactly?
Quoted 2 lines
Some of the missing items I seen
1.Of_nodenot populated inomap_nand_platform_datastructure.
Hmm - gpmc_probe_nand_child() from 4/4 adds
gpmc_nand_data->of_node = child;
Do I miss anything?
Quoted 2 lines
2. Remove platform device creation from hwmod as GPMC DT is populating. Currently GPMC device creaing from DT & HWMOD.
This is already addressed in cd00b0530 ("ARM: OMAP2+: gpmc: Fix kernel BUG for DT boot mode") by Vaibhav Hiremath, which I got via Afzal's USB branch:
As that fix is on the way, I dropped my version which did the same thing.
Quoted 2 lines
Also can you address how this patch series depends on
mtd: nand: OMAP: ELM error correction support for BCH ecc
I have your ELM patches on top of mine, and they apply cleanly. But I believe it shouldn't be an issue if you base mine on top of yours.
Let me know if you want me to rebase anything again. The best solution probably if I make sure the series applies cleanly to whatever tree it will be merged trough - but I don't know which that would be eventually.
Thanks for the continuing feedback,
Daniel
Quoted 65 lines
Quoted 64 lines
The only supported peripheral for now is NAND, but other types would be easy to add.
Version 2 addresses details pointed out by Jon Hunter, Afzal Mohammed and Rob Herring:
- add "reg" and "ti,hwmod" properties to Documentation
- use genericof_mtdfunctions and the property names defined by them, namely "nand-bus-width" and "nand-ecc-mode"
- reduce the default register space size in the Documentation to 8K, as found in the hwmod code
- switch to a DT layout based on ranges and address translation. Although this property is not currently looked at as long as the handling code still uses the runtime calculation methods, we now have these values in the bindings, eventually allowing us to switch the implementation with less pain.Version 3 includes fixes pointed out by Jon Hunter:
- better documentation of the 'ranges' property to describe the fact that it's representing the CS lines
-GPMC_CS_CONFIGx->GPMC_CONFIGxin comments
- drop interrupt-parent from example bindings
- addof_node_put()at the end of the child iterationVersion 4 fixes compilation for !CONFIG_MTD_NAND and includes more details from Jon Hunter and Avinash, Philip:
- Add "num-cs" and "num-waitpins" properties, which will eventually be used to get rid of
GPMC_CS_NUM
- Better description of generic nand DT properties
- Dropped patch 3/4 as an equivalent fix was already merged
- Added ti,nand-ecc-use-elm propertyVersion 5 with regards to Avinash, Philip and Peter Korsgaard:
- Re-add accidentially forgotten
Documentation/devicetree/bindings/bus/ti-gpmc.txt
- Rename "software" ecc mode to "sw"
- Initializegpmc_nand_data->is_elm_usedto 'true' rather than 1
- Drop ti,nand-ecc-use-elm binding in favor of a new ecc mode named "bch8-am335xrbl-compatible"
- Add two more patches for section mismatch fixupsDaniel Mack (4):
mtd: omap-nand: passdevice_nodein platform data
ARM: OMAP: gpmc-nand: drop__initannotation
ARM: OMAP: gpmc: enable hwecc for AM33xx SoCs
ARM: OMAP: gpmc: add DT bindings for GPMC timings and NANDDocumentation/devicetree/bindings/bus/ti-gpmc.txt | 76 +++++++++ .../devicetree/bindings/mtd/gpmc-nand.txt | 81 +++++++++ arch/arm/mach-omap2/gpmc-nand.c | 15 +- arch/arm/mach-omap2/gpmc.c | 181 ++++++++++++++++++++- drivers/mtd/nand/omap2.c | 4 +- 5 files changed, 348 insertions(+), 9 deletions(-) create mode 100644 Documentation/devicetree/bindings/bus/ti-gpmc.txt create mode 100644 Documentation/devicetree/bindings/mtd/gpmc-nand.txtSignature · 1 line
1.7.11.7
v5 cover OMAP GPMC DT bindings
Quoted 19 lines · Daniel Mack
Hi Avinash,
Quoted 10 lines · Avinash
Quoted 7 lines · Daniel Mack
[Resending +devicetree-discuss, +Rob, +Grant]
This is a series of patches to support GPMC peripherals on OMAP boards.
Depends on Linus' master +
omap-next (branch omap-for-v3.8/cleanup-headers-gpmc)Can you resend this series on top of
linux_next?The only branch these patches depend on is the "omap-for-v3.8/cleanup-headers-gpmc" branch from
omap_next. Are you actually seeing any merge conflicts with my series? If so, which branch are you referring to exactly?
Quoted 8 lines
Quoted 2 lines
Some of the missing items I seen
1.Of_nodenot populated inomap_nand_platform_datastructure.Hmm -
gpmc_probe_nand_child()from 4/4 addsgpmc_nand_data->of_node = child;Do I miss anything?
I didn't found definition for of_node member in omap_nand_platform_data structure. This also might be missing in liniux-next?
Quoted 7 lines
Quoted 3 lines
2. Remove platform device creation from hwmod as GPMC DT is populating. Currently GPMC device creaing from DT & HWMOD.
This is already addressed in
cd00b0530("ARM: OMAP2+: gpmc: Fix kernel BUG for DT boot mode") by Vaibhav Hiremath, which I got via Afzal's USB branch:
Purpose of VH's patch was to get beagle bone booting, but Jon sent another patch that made beagle bone boot and it has reached mainline by v3.7-rc2, hence the patch you are referring to is currently not going upstream. Still to have GPMC DT work, we need that patch as other wise there would be two GPMC devices. In earlier versions of your series, you had a similar patch, it is required, can you please add it to your series as otherwise with your series GPMC DT won't work.
Quoted 11 lines
As that fix is on the way, I dropped my version which did the same thing.
Quoted 2 lines
Also can you address how this patch series depends on
mtd: nand: OMAP: ELM error correction support for BCH eccI have your ELM patches on top of mine, and they apply cleanly. But I believe it shouldn't be an issue if you base mine on top of yours.
Yes they are independent. So go ahead and submit GPMC DT binding support.
Quoted 4 lines
Let me know if you want me to rebase anything again. The best solution probably if I make sure the series applies cleanly to whatever tree it will be merged trough - but I don't know which that would be eventually.
My intention was just to tell you to test on linux-next not to resend (mistake).
Thanks
Avinash
Quoted 73 lines
Thanks for the continuing feedback,
DanielQuoted 65 lines
Quoted 64 lines
The only supported peripheral for now is NAND, but other types would be easy to add.
Version 2 addresses details pointed out by Jon Hunter, Afzal Mohammed and Rob Herring:
- add "reg" and "ti,hwmod" properties to Documentation
- use genericof_mtdfunctions and the property names defined by them, namely "nand-bus-width" and "nand-ecc-mode"
- reduce the default register space size in the Documentation to 8K, as found in the hwmod code
- switch to a DT layout based on ranges and address translation. Although this property is not currently looked at as long as the handling code still uses the runtime calculation methods, we now have these values in the bindings, eventually allowing us to switch the implementation with less pain.Version 3 includes fixes pointed out by Jon Hunter:
- better documentation of the 'ranges' property to describe the fact that it's representing the CS lines
-GPMC_CS_CONFIGx->GPMC_CONFIGxin comments
- drop interrupt-parent from example bindings
- addof_node_put()at the end of the child iterationVersion 4 fixes compilation for !CONFIG_MTD_NAND and includes more details from Jon Hunter and Avinash, Philip:
- Add "num-cs" and "num-waitpins" properties, which will eventually be used to get rid of
GPMC_CS_NUM
- Better description of generic nand DT properties
- Dropped patch 3/4 as an equivalent fix was already merged
- Added ti,nand-ecc-use-elm propertyVersion 5 with regards to Avinash, Philip and Peter Korsgaard:
- Re-add accidentially forgotten
Documentation/devicetree/bindings/bus/ti-gpmc.txt
- Rename "software" ecc mode to "sw"
- Initializegpmc_nand_data->is_elm_usedto 'true' rather than 1
- Drop ti,nand-ecc-use-elm binding in favor of a new ecc mode named "bch8-am335xrbl-compatible"
- Add two more patches for section mismatch fixupsDaniel Mack (4):
mtd: omap-nand: passdevice_nodein platform data
ARM: OMAP: gpmc-nand: drop__initannotation
ARM: OMAP: gpmc: enable hwecc for AM33xx SoCs
ARM: OMAP: gpmc: add DT bindings for GPMC timings and NANDDocumentation/devicetree/bindings/bus/ti-gpmc.txt | 76 +++++++++ .../devicetree/bindings/mtd/gpmc-nand.txt | 81 +++++++++ arch/arm/mach-omap2/gpmc-nand.c | 15 +- arch/arm/mach-omap2/gpmc.c | 181 ++++++++++++++++++++- drivers/mtd/nand/omap2.c | 4 +- 5 files changed, 348 insertions(+), 9 deletions(-) create mode 100644 Documentation/devicetree/bindings/bus/ti-gpmc.txt create mode 100644 Documentation/devicetree/bindings/mtd/gpmc-nand.txtSignature · 1 line
1.7.11.7
v5 cover OMAP GPMC DT bindings
Quoted 23 lines · Avinash
Quoted 22 lines · Daniel Mack
Hi Avinash,
Quoted 10 lines · Avinash
Quoted 7 lines · Daniel Mack
[Resending +devicetree-discuss, +Rob, +Grant]
This is a series of patches to support GPMC peripherals on OMAP boards.
Depends on Linus' master +
omap-next (branch omap-for-v3.8/cleanup-headers-gpmc)Can you resend this series on top of
linux_next?The only branch these patches depend on is the "omap-for-v3.8/cleanup-headers-gpmc" branch from
omap_next. Are you actually seeing any merge conflicts with my series? If so, which branch are you referring to exactly?Quoted 2 lines
Some of the missing items I seen
1.Of_nodenot populated inomap_nand_platform_datastructure.
Quoted 8 lines
Quoted 5 lines
Hmm -
gpmc_probe_nand_child()from 4/4 addsgpmc_nand_data->of_node = child;Do I miss anything?
I didn't found definition for
of_nodemember inomap_nand_platform_datastructure. This also might be missing in liniux-next?
Ah, right. I got that entry from your patch ("mtd: nand: omap2: Support for hardware BCH error correction"). But you're right, it should be part of my series. Will add that when resending, but note that your ELM series will then cause a (trivial) merge conflict.
Quoted 7 lines
Quoted 6 lines
Quoted 2 lines
2. Remove platform device creation from hwmod as GPMC DT is populating. Currently GPMC device creaing from DT & HWMOD.
This is already addressed in
cd00b0530("ARM: OMAP2+: gpmc: Fix kernel BUG for DT boot mode") by Vaibhav Hiremath, which I got via Afzal's USB branch:
Quoted 7 lines
Purpose of VH's patch was to get beagle bone booting, but Jon sent another patch that made beagle bone boot and it has reached mainline by v3.7-rc2, hence the patch you are referring to is currently not going upstream. Still to have GPMC DT work, we need that patch as other wise there would be two GPMC devices. In earlier versions of your series, you had a similar patch, it is required, can you please add it to your series as otherwise with your series GPMC DT won't work.
Ok, fine. Will do.
Daniel
v5 cover OMAP GPMC DT bindings
Quoted 53 lines · Daniel Mack
Quoted 23 lines · Avinash
Quoted 22 lines · Daniel Mack
Hi Avinash,
Quoted 10 lines · Avinash
Quoted 7 lines · Daniel Mack
[Resending +devicetree-discuss, +Rob, +Grant]
This is a series of patches to support GPMC peripherals on OMAP boards.
Depends on Linus' master +
omap-next (branch omap-for-v3.8/cleanup-headers-gpmc)Can you resend this series on top of
linux_next?The only branch these patches depend on is the "omap-for-v3.8/cleanup-headers-gpmc" branch from
omap_next. Are you actually seeing any merge conflicts with my series? If so, which branch are you referring to exactly?Quoted 2 lines
Some of the missing items I seen
1.Of_nodenot populated inomap_nand_platform_datastructure.Quoted 8 lines
Quoted 5 lines
Hmm -
gpmc_probe_nand_child()from 4/4 addsgpmc_nand_data->of_node = child;Do I miss anything?
I didn't found definition for
of_nodemember inomap_nand_platform_datastructure. This also might be missing in liniux-next?Ah, right. I got that entry from your patch ("mtd: nand: omap2: Support for hardware BCH error correction"). But you're right, it should be part of my series. Will add that when resending, but note that your ELM series will then cause a (trivial) merge conflict.
Quoted 7 lines
Quoted 6 lines
Quoted 2 lines
2. Remove platform device creation from hwmod as GPMC DT is populating. Currently GPMC device creaing from DT & HWMOD.
This is already addressed in
cd00b0530("ARM: OMAP2+: gpmc: Fix kernel BUG for DT boot mode") by Vaibhav Hiremath, which I got via Afzal's USB branch:Quoted 7 lines
Purpose of VH's patch was to get beagle bone booting, but Jon sent another patch that made beagle bone boot and it has reached mainline by v3.7-rc2, hence the patch you are referring to is currently not going upstream. Still to have GPMC DT work, we need that patch as other wise there would be two GPMC devices. In earlier versions of your series, you had a similar patch, it is required, can you please add it to your series as otherwise with your series GPMC DT won't work.
Quoted 2 lines
Ok, fine. Will do.
Feel free to take that patch forward, merge into your series.
Thanks,
Vaibhav
Quoted 8 lines
Daniel
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html