diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-03-02 17:33:56 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-03-02 17:33:56 +0100 |
| commit | 9d6c3eb811fce4b3f470fd853165928841527d7c (patch) | |
| tree | e58f99cb07537092f9eb810ce53c9e26ea2b6cf9 /include/linux | |
| parent | 87023bc2ed11ea6b0944b34cc0281454c01832bf (diff) | |
| parent | e116c0545d17be6cc95a559aa5a68c221330501b (diff) | |
Merge tag 'gpmc-omap-for-v4.6' of https://github.com/rogerq/linux into next/drivers
Merge "OMAP-GPMC: Add address/data muxed timings" from Roger Quadros:
* Add support for the GPMC Advanced AAD (address/data muxed) timings
on hardware supporting the feature like the AM335x and DM816X.
* tag 'gpmc-omap-for-v4.6' of https://github.com/rogerq/linux:
dt-bindings: bus: ti-gpmc: Add AAD timings properties
memory: omap-gpmc: Add support for AAD timings
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/omap-gpmc.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/omap-gpmc.h b/include/linux/omap-gpmc.h index 7dee00143afd..d833eb4dd446 100644 --- a/include/linux/omap-gpmc.h +++ b/include/linux/omap-gpmc.h @@ -51,6 +51,9 @@ struct gpmc_timings { u32 adv_on; /* Assertion time */ u32 adv_rd_off; /* Read deassertion time */ u32 adv_wr_off; /* Write deassertion time */ + u32 adv_aad_mux_on; /* ADV assertion time for AAD */ + u32 adv_aad_mux_rd_off; /* ADV read deassertion time for AAD */ + u32 adv_aad_mux_wr_off; /* ADV write deassertion time for AAD */ /* WE signals timings corresponding to GPMC_CONFIG4 */ u32 we_on; /* WE assertion time */ @@ -59,6 +62,8 @@ struct gpmc_timings { /* OE signals timings corresponding to GPMC_CONFIG4 */ u32 oe_on; /* OE assertion time */ u32 oe_off; /* OE deassertion time */ + u32 oe_aad_mux_on; /* OE assertion time for AAD */ + u32 oe_aad_mux_off; /* OE deassertion time for AAD */ /* Access time and cycle time timings corresponding to GPMC_CONFIG5 */ u32 page_burst_access; /* Multiple access word delay */ |