Hi Jon, I have some tiny nitpicks... On Fri, Mar 15, 2013 at 10:21:08AM -0500, Jon Hunter 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> > --- > Documentation/devicetree/bindings/bus/ti-gpmc.txt | 23 ++++++++++ > arch/arm/mach-omap2/gpmc.c | 49 +++++++++++++++++++++ > arch/arm/mach-omap2/gpmc.h | 2 + > 3 files changed, 74 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. > +- 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. > +- 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. > > Example for an AM33xx board: > > diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c > index 3ec1937..1e7eef3 100644 > --- a/arch/arm/mach-omap2/gpmc.c > +++ b/arch/arm/mach-omap2/gpmc.c > @@ -1190,6 +1190,55 @@ static struct of_device_id gpmc_dt_ids[] = { > }; > MODULE_DEVICE_TABLE(of, gpmc_dt_ids); > > +/** > + * gpmc_read_settings_dt - read gpmc settings from device-tree > + * @np: pointer to device-tree node for a gpmc child device > + * @p: pointer to gpmc settings structure > + * > + * Reads the GPMC settings for a GPMC child device from device-tree and > + * stores them in the GPMC settings structure passed. The GPMC settings > + * structure is initialise to zero by this function and so any previously s/initialise/initialized ? > + * stored settings will be clearer. s/clearer/cleared ? I'm not an english native speaker, so please bare with me if I'm wrong on these... -- Ezequiel García, Free Electrons Embedded Linux, Kernel and Android Engineering http://free-electrons.com -- 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