On 04/15/2013 08:27 AM, Grant Likely wrote: > On Tue, 19 Mar 2013 11:35:48 -0500, Jon Hunter <jon-hunter@xxxxxx> wrote: >> Adds a function to read the various GPMC chip-select settings from >> device-tree and store them in the gpmc_settings structure. >> >> Update the GPMC device-tree binding documentation to describe these >> options. >> >> Signed-off-by: Jon Hunter <jon-hunter@xxxxxx> >> Tested-by: Ezequiel Garcia <ezequiel.garcia@xxxxxxxxxxxxxxxxxx> >> --- >> Documentation/devicetree/bindings/bus/ti-gpmc.txt | 23 ++++++++++++ >> arch/arm/mach-omap2/gpmc.c | 40 +++++++++++++++++++++ >> arch/arm/mach-omap2/gpmc.h | 2 ++ >> 3 files changed, 65 insertions(+) >> >> diff --git a/Documentation/devicetree/bindings/bus/ti-gpmc.txt b/Documentation/devicetree/bindings/bus/ti-gpmc.txt >> index 5ddb2e9..6fde1cf 100644 >> --- a/Documentation/devicetree/bindings/bus/ti-gpmc.txt >> +++ b/Documentation/devicetree/bindings/bus/ti-gpmc.txt >> @@ -65,6 +65,29 @@ The following are only applicable to OMAP3+ and AM335x: >> - gpmc,wr-access >> - gpmc,wr-data-mux-bus >> >> +GPMC chip-select settings properties for child nodes. All are optional. >> + >> +- gpmc,burst-length Page/burst length. Must be 4, 8 or 16. >> +- gpmc,burst-wrap Enables wrap bursting >> +- gpmc,burst-read Enables read page/burst mode >> +- gpmc,burst-write Enables write page/burst mode >> +- gpmc,device-nand Device is NAND >> +- gpmc,device-width Total width of device(s) connected to a GPMC >> + chip-select in bytes. The GPMC supports 8-bit >> + and 16-bit devices and so this property must be >> + 1 or 2. > > I would suggest specifying the actual number of bits. ie. 8 or 16. There is some > precidence for that already in DT bindings. I used bytes and not bits here as it was more convenient for programming a register bit field. However, it would be equally easy to shift the value and program the register if we use bits. So this can be changed. By the way, I have seen some of the flash bindings (eg. mtd-physmap.txt) use bytes and not bits, however, I do see others use bits (nand.txt). However, if the preference is for bits then we can conform to that. Tony has this queued for v3.10 now. However, we can fix this up if you feel strongly about this. >> +- gpmc,mux-add-data Address and data multiplexing configuration. >> + Valid values are 1 for address-address-data >> + multiplexing mode and 2 for address-data >> + multiplexing mode. >> +- gpmc,sync-read Enables synchronous read. Defaults to asynchronous >> + is this is not set. > > 'if'? > >> +- gpmc,sync-write Enables synchronous writes. Defaults to asynchronous >> + is this is not set. >> +- gpmc,wait-pin Wait-pin used by client. Must be less than >> + "gpmc,num-waitpins". >> +- gpmc,wait-on-read Enables wait monitoring on reads. >> +- gpmc,wait-on-write Enables wait monitoring on writes. > > Otherwise looks okay to me. Thanks Jon -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html