From: Paul Walmsley <paul@pwsan.com> To: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: "Péter Ujfalusi" <peter.ujfalusi@ti.com>, "Benoît Cousson" <b-cousson@ti.com>, "Felipe Balbi" <balbi@ti.com> Subject: [PATCHv2 05/12] ARM: OMAP2+: hwmod: add setup_preprogram hook Date: Sun, 10 Jun 2012 18:46:08 -0600 [thread overview] Message-ID: <20120611004605.20034.37067.stgit@dusk> (raw) In-Reply-To: <20120611004502.20034.8840.stgit@dusk> After reset, some IP blocks cannot indicate to the PRCM that they are inactive until they are configured. Some examples on OMAP4 include the AESS and FSUSB IP blocks. To fix this cleanly, this patch adds another optional function pointer, setup_preprogram, to the IP block's hwmod data. The function that is pointed to is called by the hwmod code immediately after the IP block is reset. Signed-off-by: Paul Walmsley <paul@pwsan.com> Cc: Benoît Cousson <b-cousson@ti.com> Cc: Péter Ujfalusi <peter.ujfalusi@ti.com> Cc: Felipe Balbi <balbi@ti.com> --- arch/arm/mach-omap2/omap_hwmod.c | 21 ++++++++++++++++++++- arch/arm/plat-omap/include/plat/omap_hwmod.h | 9 +++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index 2d1111d..d27bf48 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -2108,6 +2108,23 @@ static void __init _setup_iclk_autoidle(struct omap_hwmod *oh) } /** + * _setup_preprogram - Pre-program an IP block during the _setup() process + * @oh: struct omap_hwmod * + * + * Some IP blocks (such as AESS) require some additional programming + * after reset before they can enter idle. If a function pointer to + * do so is present in the hwmod data, then call it and pass along the + * return value; otherwise, return 0. + */ +static int __init _setup_preprogram(struct omap_hwmod *oh) +{ + if (!oh->class->setup_preprogram) + return 0; + + return oh->class->setup_preprogram(oh); +} + +/** * _setup_reset - reset an IP block during the setup process * @oh: struct omap_hwmod * * @@ -2229,8 +2246,10 @@ static int __init _setup(struct omap_hwmod *oh, void *data) _setup_iclk_autoidle(oh); - if (!_setup_reset(oh)) + if (!_setup_reset(oh)) { + _setup_preprogram(oh); _setup_postsetup(oh); + } return 0; } diff --git a/arch/arm/plat-omap/include/plat/omap_hwmod.h b/arch/arm/plat-omap/include/plat/omap_hwmod.h index 038c0d7..2c53648 100644 --- a/arch/arm/plat-omap/include/plat/omap_hwmod.h +++ b/arch/arm/plat-omap/include/plat/omap_hwmod.h @@ -467,6 +467,7 @@ struct omap_hwmod_omap4_prcm { * @rev: revision of the IP class * @pre_shutdown: ptr to fn to be executed immediately prior to device shutdown * @reset: ptr to fn to be executed in place of the standard hwmod reset fn + * @setup_preprogram: ptr to fn to be executed after the reset in _setup() * * Represent the class of a OMAP hardware "modules" (e.g. timer, * smartreflex, gpio, uart...) @@ -483,6 +484,13 @@ struct omap_hwmod_omap4_prcm { * executed in place of the standard hwmod _reset() code in * mach-omap2/omap_hwmod.c. This is needed for IP blocks which have * unusual reset sequences - usually processor IP blocks like the IVA. + * + * @setup_preprogram is called between the calls to _setup_reset() and + * _setup_postsetup(). It is intended to be used for IP blocks that + * require some initial configuration during their first + * initialization. (For example, the AESS IP block on OMAP4+ cannot + * enter idle until its internal autogating bit is set.) Most IP blocks + * will not need this. */ struct omap_hwmod_class { const char *name; @@ -490,6 +498,7 @@ struct omap_hwmod_class { u32 rev; int (*pre_shutdown)(struct omap_hwmod *oh); int (*reset)(struct omap_hwmod *oh); + int (*setup_preprogram)(struct omap_hwmod *oh); }; /** -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
WARNING: multiple messages have this Message-ID (diff)
From: paul@pwsan.com (Paul Walmsley) To: linux-arm-kernel@lists.infradead.org Subject: [PATCHv2 05/12] ARM: OMAP2+: hwmod: add setup_preprogram hook Date: Sun, 10 Jun 2012 18:46:08 -0600 [thread overview] Message-ID: <20120611004605.20034.37067.stgit@dusk> (raw) In-Reply-To: <20120611004502.20034.8840.stgit@dusk> After reset, some IP blocks cannot indicate to the PRCM that they are inactive until they are configured. Some examples on OMAP4 include the AESS and FSUSB IP blocks. To fix this cleanly, this patch adds another optional function pointer, setup_preprogram, to the IP block's hwmod data. The function that is pointed to is called by the hwmod code immediately after the IP block is reset. Signed-off-by: Paul Walmsley <paul@pwsan.com> Cc: Beno?t Cousson <b-cousson@ti.com> Cc: P?ter Ujfalusi <peter.ujfalusi@ti.com> Cc: Felipe Balbi <balbi@ti.com> --- arch/arm/mach-omap2/omap_hwmod.c | 21 ++++++++++++++++++++- arch/arm/plat-omap/include/plat/omap_hwmod.h | 9 +++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index 2d1111d..d27bf48 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -2108,6 +2108,23 @@ static void __init _setup_iclk_autoidle(struct omap_hwmod *oh) } /** + * _setup_preprogram - Pre-program an IP block during the _setup() process + * @oh: struct omap_hwmod * + * + * Some IP blocks (such as AESS) require some additional programming + * after reset before they can enter idle. If a function pointer to + * do so is present in the hwmod data, then call it and pass along the + * return value; otherwise, return 0. + */ +static int __init _setup_preprogram(struct omap_hwmod *oh) +{ + if (!oh->class->setup_preprogram) + return 0; + + return oh->class->setup_preprogram(oh); +} + +/** * _setup_reset - reset an IP block during the setup process * @oh: struct omap_hwmod * * @@ -2229,8 +2246,10 @@ static int __init _setup(struct omap_hwmod *oh, void *data) _setup_iclk_autoidle(oh); - if (!_setup_reset(oh)) + if (!_setup_reset(oh)) { + _setup_preprogram(oh); _setup_postsetup(oh); + } return 0; } diff --git a/arch/arm/plat-omap/include/plat/omap_hwmod.h b/arch/arm/plat-omap/include/plat/omap_hwmod.h index 038c0d7..2c53648 100644 --- a/arch/arm/plat-omap/include/plat/omap_hwmod.h +++ b/arch/arm/plat-omap/include/plat/omap_hwmod.h @@ -467,6 +467,7 @@ struct omap_hwmod_omap4_prcm { * @rev: revision of the IP class * @pre_shutdown: ptr to fn to be executed immediately prior to device shutdown * @reset: ptr to fn to be executed in place of the standard hwmod reset fn + * @setup_preprogram: ptr to fn to be executed after the reset in _setup() * * Represent the class of a OMAP hardware "modules" (e.g. timer, * smartreflex, gpio, uart...) @@ -483,6 +484,13 @@ struct omap_hwmod_omap4_prcm { * executed in place of the standard hwmod _reset() code in * mach-omap2/omap_hwmod.c. This is needed for IP blocks which have * unusual reset sequences - usually processor IP blocks like the IVA. + * + * @setup_preprogram is called between the calls to _setup_reset() and + * _setup_postsetup(). It is intended to be used for IP blocks that + * require some initial configuration during their first + * initialization. (For example, the AESS IP block on OMAP4+ cannot + * enter idle until its internal autogating bit is set.) Most IP blocks + * will not need this. */ struct omap_hwmod_class { const char *name; @@ -490,6 +498,7 @@ struct omap_hwmod_class { u32 rev; int (*pre_shutdown)(struct omap_hwmod *oh); int (*reset)(struct omap_hwmod *oh); + int (*setup_preprogram)(struct omap_hwmod *oh); }; /**
next prev parent reply other threads:[~2012-06-11 0:52 UTC|newest] Thread overview: 106+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-06-11 0:45 [PATCHv2 00/12] ARM: OMAP: core/hwmod: first set of fixes for 3.5-rc Paul Walmsley 2012-06-11 0:45 ` Paul Walmsley 2012-06-11 0:45 ` [PATCHv2 01/12] ARM: OMAP: PM: Lock clocks list while generating summary Paul Walmsley 2012-06-11 0:45 ` Paul Walmsley 2012-06-11 0:45 ` [PATCHv2 02/12] ARM: OMAP2+: hwmod code/data: fix 32K sync timer Paul Walmsley 2012-06-11 0:45 ` Paul Walmsley 2012-06-14 16:47 ` Cousson, Benoit 2012-06-14 16:47 ` Cousson, Benoit 2012-06-14 18:04 ` Paul Walmsley 2012-06-14 18:04 ` Paul Walmsley 2012-06-14 20:13 ` Cousson, Benoit 2012-06-14 20:13 ` Cousson, Benoit 2012-06-15 0:18 ` Paul Walmsley 2012-06-15 0:18 ` Paul Walmsley 2012-06-15 13:28 ` Cousson, Benoit 2012-06-15 13:28 ` Cousson, Benoit 2012-07-04 12:48 ` Paul Walmsley 2012-07-04 12:48 ` Paul Walmsley 2012-07-04 12:53 ` Paul Walmsley 2012-07-04 12:53 ` Paul Walmsley 2012-07-04 14:27 ` Kevin Hilman 2012-07-04 14:27 ` Kevin Hilman 2012-07-04 14:53 ` Paul Walmsley 2012-07-04 14:53 ` Paul Walmsley 2012-07-04 16:14 ` Benoit Cousson 2012-07-04 16:14 ` Benoit Cousson 2012-07-04 16:41 ` Tero Kristo 2012-07-04 16:41 ` Tero Kristo 2012-07-04 16:43 ` Benoit Cousson 2012-07-04 16:43 ` Benoit Cousson 2012-07-04 19:02 ` Paul Walmsley 2012-07-04 19:02 ` Paul Walmsley 2012-07-04 16:57 ` Benoit Cousson 2012-07-04 16:57 ` Benoit Cousson 2012-07-04 18:59 ` Paul Walmsley 2012-07-04 18:59 ` Paul Walmsley 2012-07-05 22:06 ` Kevin Hilman 2012-07-05 22:06 ` Kevin Hilman 2012-07-04 16:01 ` Benoit Cousson 2012-07-04 16:01 ` Benoit Cousson 2012-07-04 19:05 ` Paul Walmsley 2012-07-04 19:05 ` Paul Walmsley 2012-06-11 0:46 ` [PATCHv2 03/12] ARM: OMAP4+: hwmod: fix issue causing IPs not going back to Smart-Standby Paul Walmsley 2012-06-11 0:46 ` Paul Walmsley 2012-06-11 0:46 ` [PATCHv2 04/12] ARM: OMAP4: hwmod data: fix 32k sync timer idle modes Paul Walmsley 2012-06-11 0:46 ` Paul Walmsley 2012-06-11 9:31 ` Cousson, Benoit 2012-06-11 9:31 ` Cousson, Benoit 2012-06-13 17:22 ` Paul Walmsley 2012-06-13 17:22 ` Paul Walmsley 2012-06-11 0:46 ` Paul Walmsley [this message] 2012-06-11 0:46 ` [PATCHv2 05/12] ARM: OMAP2+: hwmod: add setup_preprogram hook Paul Walmsley 2012-06-11 0:46 ` [PATCHv2 06/12] ARM: OMAP2+: hwmod: add flag to prevent hwmod code from touching IP block during init Paul Walmsley 2012-06-11 0:46 ` Paul Walmsley 2012-06-11 0:46 ` [PATCHv2 07/12] ARM: OMAP4+: AESS: enable internal auto-gating during initial setup Paul Walmsley 2012-06-11 0:46 ` Paul Walmsley 2012-06-11 6:29 ` Tony Lindgren 2012-06-11 6:29 ` Tony Lindgren 2012-06-14 9:49 ` Paul Walmsley 2012-06-14 9:49 ` Paul Walmsley 2012-06-14 9:59 ` Tony Lindgren 2012-06-14 9:59 ` Tony Lindgren 2012-06-11 0:46 ` [PATCHv2 08/12] ARM: OMAP4: hwmod data: add SL2IF hardreset line Paul Walmsley 2012-06-11 0:46 ` Paul Walmsley 2012-06-14 12:55 ` Cousson, Benoit 2012-06-14 12:55 ` Cousson, Benoit 2012-06-14 17:09 ` Paul Walmsley 2012-06-14 17:09 ` Paul Walmsley 2012-06-14 21:07 ` Cousson, Benoit 2012-06-14 21:07 ` Cousson, Benoit 2012-06-14 23:02 ` Paul Walmsley 2012-06-14 23:02 ` Paul Walmsley 2012-06-15 9:11 ` Cousson, Benoit 2012-06-15 9:11 ` Cousson, Benoit 2012-06-11 0:46 ` [PATCHv2 09/12] ARM: OMAP2+: usb_host_fs: add custom setup_preprogram for usb_host_fs (fsusb) Paul Walmsley 2012-06-11 0:46 ` Paul Walmsley 2012-06-11 6:34 ` Tony Lindgren 2012-06-11 6:34 ` Tony Lindgren 2012-06-11 7:13 ` Felipe Balbi 2012-06-11 7:13 ` Felipe Balbi 2012-06-11 7:41 ` Tony Lindgren 2012-06-11 7:41 ` Tony Lindgren 2012-06-11 7:48 ` Felipe Balbi 2012-06-11 7:48 ` Felipe Balbi 2012-06-11 8:03 ` Tony Lindgren 2012-06-11 8:03 ` Tony Lindgren 2012-06-11 9:12 ` Felipe Balbi 2012-06-11 9:12 ` Felipe Balbi 2012-06-11 0:46 ` [PATCHv2 10/12] ARM: OMAP2+: CM: increase the module disable timeout Paul Walmsley 2012-06-11 0:46 ` Paul Walmsley 2012-06-11 0:46 ` [PATCHv2 11/12] ARM: OMAP4: clock data: add clockdomains for clocks used as main clocks Paul Walmsley 2012-06-11 0:46 ` Paul Walmsley 2012-06-11 16:28 ` Cousson, Benoit 2012-06-11 16:28 ` Cousson, Benoit 2012-06-11 16:59 ` Paul Walmsley 2012-06-11 16:59 ` Paul Walmsley 2012-06-11 20:15 ` Cousson, Benoit 2012-06-11 20:15 ` Cousson, Benoit 2012-06-11 0:46 ` [PATCHv2 12/12] ARM: OMAP4: hwmod data: do not enable or reset the McPDM during kernel init Paul Walmsley 2012-06-11 0:46 ` Paul Walmsley 2012-06-11 9:54 ` Cousson, Benoit 2012-06-11 9:54 ` Cousson, Benoit 2012-10-30 4:05 ` Paul Walmsley 2012-10-30 4:05 ` Paul Walmsley 2012-10-30 7:41 ` Péter Ujfalusi 2012-10-30 7:41 ` Péter Ujfalusi
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20120611004605.20034.37067.stgit@dusk \ --to=paul@pwsan.com \ --cc=b-cousson@ti.com \ --cc=balbi@ti.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-omap@vger.kernel.org \ --cc=peter.ujfalusi@ti.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.