* [PATCH 0/2] ti-gpmc: Add support for AAD timings @ 2015-12-28 13:39 Neil Armstrong 2015-12-28 13:39 ` [PATCH 1/2] memory: omap-gpmc: " Neil Armstrong 2015-12-28 13:39 ` [PATCH 2/2] dt-bindings: bus: ti-gpmc: Add AAD timings properties Neil Armstrong 0 siblings, 2 replies; 6+ messages in thread From: Neil Armstrong @ 2015-12-28 13:39 UTC (permalink / raw) To: Roger Quadros, Tony Lindgren, Robert ABEL, devicetree, linux-kernel, linux-omap Cc: Neil Armstrong This serie add support for the GPMC Advanced AAD timings on hardware supporting the feature like the AM335x and DM816X. Neil Armstrong (2): memory: omap-gpmc: Add support for AAD timings dt-bindings: bus: ti-gpmc: Add AAD timings properties Documentation/devicetree/bindings/bus/ti-gpmc.txt | 5 ++++ drivers/memory/omap-gpmc.c | 30 +++++++++++++++++++++++ include/linux/omap-gpmc.h | 5 ++++ 3 files changed, 40 insertions(+) -- 1.9.1 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/2] memory: omap-gpmc: Add support for AAD timings 2015-12-28 13:39 [PATCH 0/2] ti-gpmc: Add support for AAD timings Neil Armstrong @ 2015-12-28 13:39 ` Neil Armstrong 2016-01-27 18:58 ` Tony Lindgren 2015-12-28 13:39 ` [PATCH 2/2] dt-bindings: bus: ti-gpmc: Add AAD timings properties Neil Armstrong 1 sibling, 1 reply; 6+ messages in thread From: Neil Armstrong @ 2015-12-28 13:39 UTC (permalink / raw) To: Roger Quadros, Tony Lindgren, Robert ABEL, devicetree, linux-kernel, linux-omap Cc: Neil Armstrong In order to support extended timings parameters on hardware supporting the "AAD" mode like the AM335x or DM816x, add these entries into the GPMC driver if the hardware is capable. Tested on DM816x and AM335x. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- drivers/memory/omap-gpmc.c | 30 ++++++++++++++++++++++++++++++ include/linux/omap-gpmc.h | 5 +++++ 2 files changed, 35 insertions(+) diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c index 6515dfc..21825dd 100644 --- a/drivers/memory/omap-gpmc.c +++ b/drivers/memory/omap-gpmc.c @@ -541,9 +541,20 @@ static void gpmc_cs_show_timings(int cs, const char *desc) GPMC_GET_TICKS(GPMC_CS_CONFIG3, 0, 3, "adv-on-ns"); GPMC_GET_TICKS(GPMC_CS_CONFIG3, 8, 12, "adv-rd-off-ns"); GPMC_GET_TICKS(GPMC_CS_CONFIG3, 16, 20, "adv-wr-off-ns"); + if (gpmc_capability & GPMC_HAS_MUX_AAD) { + GPMC_GET_TICKS(GPMC_CS_CONFIG3, 4, 6, "adv-aad-mux-on-ns"); + GPMC_GET_TICKS(GPMC_CS_CONFIG3, 24, 26, + "adv-aad-mux-rd-off-ns"); + GPMC_GET_TICKS(GPMC_CS_CONFIG3, 28, 30, + "adv-aad-mux-wr-off-ns"); + } GPMC_GET_TICKS(GPMC_CS_CONFIG4, 0, 3, "oe-on-ns"); GPMC_GET_TICKS(GPMC_CS_CONFIG4, 8, 12, "oe-off-ns"); + if (gpmc_capability & GPMC_HAS_MUX_AAD) { + GPMC_GET_TICKS(GPMC_CS_CONFIG4, 4, 6, "oe-aad-mux-on-ns"); + GPMC_GET_TICKS(GPMC_CS_CONFIG4, 13, 15, "oe-aad-mux-off-ns"); + } GPMC_GET_TICKS(GPMC_CS_CONFIG4, 16, 19, "we-on-ns"); GPMC_GET_TICKS(GPMC_CS_CONFIG4, 24, 28, "we-off-ns"); @@ -734,9 +745,18 @@ int gpmc_cs_set_timings(int cs, const struct gpmc_timings *t, GPMC_SET_ONE(GPMC_CS_CONFIG3, 0, 3, adv_on); GPMC_SET_ONE(GPMC_CS_CONFIG3, 8, 12, adv_rd_off); GPMC_SET_ONE(GPMC_CS_CONFIG3, 16, 20, adv_wr_off); + if (gpmc_capability & GPMC_HAS_MUX_AAD) { + GPMC_SET_ONE(GPMC_CS_CONFIG3, 4, 6, adv_aad_mux_on); + GPMC_SET_ONE(GPMC_CS_CONFIG3, 24, 26, adv_aad_mux_rd_off); + GPMC_SET_ONE(GPMC_CS_CONFIG3, 28, 30, adv_aad_mux_wr_off); + } GPMC_SET_ONE(GPMC_CS_CONFIG4, 0, 3, oe_on); GPMC_SET_ONE(GPMC_CS_CONFIG4, 8, 12, oe_off); + if (gpmc_capability & GPMC_HAS_MUX_AAD) { + GPMC_SET_ONE(GPMC_CS_CONFIG4, 4, 6, oe_aad_mux_on); + GPMC_SET_ONE(GPMC_CS_CONFIG4, 13, 15, oe_aad_mux_off); + } GPMC_SET_ONE(GPMC_CS_CONFIG4, 16, 19, we_on); GPMC_SET_ONE(GPMC_CS_CONFIG4, 24, 28, we_off); @@ -1722,6 +1742,12 @@ static void __maybe_unused gpmc_read_timings_dt(struct device_node *np, of_property_read_u32(np, "gpmc,adv-on-ns", &gpmc_t->adv_on); of_property_read_u32(np, "gpmc,adv-rd-off-ns", &gpmc_t->adv_rd_off); of_property_read_u32(np, "gpmc,adv-wr-off-ns", &gpmc_t->adv_wr_off); + of_property_read_u32(np, "gpmc,adv-aad-mux-on-ns", + &gpmc_t->adv_aad_mux_on); + of_property_read_u32(np, "gpmc,adv-aad-mux-rd-off-ns", + &gpmc_t->adv_aad_mux_rd_off); + of_property_read_u32(np, "gpmc,adv-aad-mux-wr-off-ns", + &gpmc_t->adv_aad_mux_wr_off); /* WE signal timings */ of_property_read_u32(np, "gpmc,we-on-ns", &gpmc_t->we_on); @@ -1730,6 +1756,10 @@ static void __maybe_unused gpmc_read_timings_dt(struct device_node *np, /* OE signal timings */ of_property_read_u32(np, "gpmc,oe-on-ns", &gpmc_t->oe_on); of_property_read_u32(np, "gpmc,oe-off-ns", &gpmc_t->oe_off); + of_property_read_u32(np, "gpmc,oe-aad-mux-on-ns", + &gpmc_t->oe_aad_mux_on); + of_property_read_u32(np, "gpmc,oe-aad-mux-off-ns", + &gpmc_t->oe_aad_mux_off); /* access and cycle timings */ of_property_read_u32(np, "gpmc,page-burst-access-ns", diff --git a/include/linux/omap-gpmc.h b/include/linux/omap-gpmc.h index 7dee0014..d833eb4 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 */ -- 1.9.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] memory: omap-gpmc: Add support for AAD timings 2015-12-28 13:39 ` [PATCH 1/2] memory: omap-gpmc: " Neil Armstrong @ 2016-01-27 18:58 ` Tony Lindgren 2016-02-08 12:51 ` Roger Quadros 0 siblings, 1 reply; 6+ messages in thread From: Tony Lindgren @ 2016-01-27 18:58 UTC (permalink / raw) To: Neil Armstrong Cc: Roger Quadros, Robert ABEL, devicetree, linux-kernel, linux-omap * Neil Armstrong <narmstrong@baylibre.com> [151228 05:39]: > In order to support extended timings parameters on hardware supporting the > "AAD" mode like the AM335x or DM816x, add these entries into the GPMC driver > if the hardware is capable. > > Tested on DM816x and AM335x. Both look OK to me, assuming Roger will queue these: Acked-by: Tony Lindgren <tony@atomide.com> ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] memory: omap-gpmc: Add support for AAD timings 2016-01-27 18:58 ` Tony Lindgren @ 2016-02-08 12:51 ` Roger Quadros 0 siblings, 0 replies; 6+ messages in thread From: Roger Quadros @ 2016-02-08 12:51 UTC (permalink / raw) To: Tony Lindgren, Neil Armstrong Cc: Robert ABEL, devicetree, linux-kernel, linux-omap On 27/01/16 20:58, Tony Lindgren wrote: > * Neil Armstrong <narmstrong@baylibre.com> [151228 05:39]: >> In order to support extended timings parameters on hardware supporting the >> "AAD" mode like the AM335x or DM816x, add these entries into the GPMC driver >> if the hardware is capable. >> >> Tested on DM816x and AM335x. > > Both look OK to me, assuming Roger will queue these: > > Acked-by: Tony Lindgren <tony@atomide.com> > Thanks. Queuing both for -next. cheers, -roger ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] dt-bindings: bus: ti-gpmc: Add AAD timings properties 2015-12-28 13:39 [PATCH 0/2] ti-gpmc: Add support for AAD timings Neil Armstrong 2015-12-28 13:39 ` [PATCH 1/2] memory: omap-gpmc: " Neil Armstrong @ 2015-12-28 13:39 ` Neil Armstrong 2015-12-29 18:35 ` Rob Herring 1 sibling, 1 reply; 6+ messages in thread From: Neil Armstrong @ 2015-12-28 13:39 UTC (permalink / raw) To: Roger Quadros, Tony Lindgren, Robert ABEL, devicetree, linux-kernel, linux-omap Cc: Neil Armstrong In order to support advanced AAD timings, add these properties to the DT GPMC bindings. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- Documentation/devicetree/bindings/bus/ti-gpmc.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Documentation/devicetree/bindings/bus/ti-gpmc.txt b/Documentation/devicetree/bindings/bus/ti-gpmc.txt index 704be93..0168370 100644 --- a/Documentation/devicetree/bindings/bus/ti-gpmc.txt +++ b/Documentation/devicetree/bindings/bus/ti-gpmc.txt @@ -46,6 +46,9 @@ Timing properties for child nodes. All are optional and default to 0. - gpmc,adv-on-ns: Assertion time - gpmc,adv-rd-off-ns: Read deassertion time - gpmc,adv-wr-off-ns: Write deassertion time + - gpmc,adv-aad-mux-on-ns: Assertion time for AAD + - gpmc,adv-aad-mux-rd-off-ns: Read deassertion time for AAD + - gpmc,adv-aad-mux-wr-off-ns: Write deassertion time for AAD WE signals timings (in nanoseconds) corresponding to GPMC_CONFIG4: - gpmc,we-on-ns Assertion time @@ -54,6 +57,8 @@ Timing properties for child nodes. All are optional and default to 0. OE signals timings (in nanoseconds) corresponding to GPMC_CONFIG4: - gpmc,oe-on-ns: Assertion time - gpmc,oe-off-ns: Deassertion time + - gpmc,oe-aad-mux-on-ns: Assertion time for AAD + - gpmc,oe-aad-mux-off-ns: Deassertion time for AAD Access time and cycle time timings (in nanoseconds) corresponding to GPMC_CONFIG5: -- 1.9.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] dt-bindings: bus: ti-gpmc: Add AAD timings properties 2015-12-28 13:39 ` [PATCH 2/2] dt-bindings: bus: ti-gpmc: Add AAD timings properties Neil Armstrong @ 2015-12-29 18:35 ` Rob Herring 0 siblings, 0 replies; 6+ messages in thread From: Rob Herring @ 2015-12-29 18:35 UTC (permalink / raw) To: Neil Armstrong Cc: Roger Quadros, Tony Lindgren, Robert ABEL, devicetree, linux-kernel, linux-omap On Mon, Dec 28, 2015 at 02:39:21PM +0100, Neil Armstrong wrote: > In order to support advanced AAD timings, add these properties to the DT > GPMC bindings. > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > --- > Documentation/devicetree/bindings/bus/ti-gpmc.txt | 5 +++++ > 1 file changed, 5 insertions(+) Acked-by: Rob Herring <robh@kernel.org> ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-02-08 12:51 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-12-28 13:39 [PATCH 0/2] ti-gpmc: Add support for AAD timings Neil Armstrong 2015-12-28 13:39 ` [PATCH 1/2] memory: omap-gpmc: " Neil Armstrong 2016-01-27 18:58 ` Tony Lindgren 2016-02-08 12:51 ` Roger Quadros 2015-12-28 13:39 ` [PATCH 2/2] dt-bindings: bus: ti-gpmc: Add AAD timings properties Neil Armstrong 2015-12-29 18:35 ` Rob Herring
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).