From: Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org> To: linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, khilman-l0cyMroinI0@public.gmane.org, rnayak-l0cyMroinI0@public.gmane.org, balajitk-l0cyMroinI0@public.gmane.org, santosh.shilimkar-l0cyMroinI0@public.gmane.org, Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org> Subject: [PATCHv5 1/3] OMAP: I2C: Reset support Date: Fri, 29 Jul 2011 16:06:51 +0530 [thread overview] Message-ID: <1311935813-8481-2-git-send-email-shubhrajyoti@ti.com> (raw) In-Reply-To: <1311935813-8481-1-git-send-email-shubhrajyoti-l0cyMroinI0@public.gmane.org> Under some error conditions the i2c driver may do a reset. Adding a reset field and support in the platform. Signed-off-by: Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org> --- arch/arm/plat-omap/i2c.c | 18 ++++++++++++++++++ include/linux/i2c-omap.h | 1 + 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/arch/arm/plat-omap/i2c.c b/arch/arm/plat-omap/i2c.c index 2388b8e..be36cac 100644 --- a/arch/arm/plat-omap/i2c.c +++ b/arch/arm/plat-omap/i2c.c @@ -146,6 +146,22 @@ static struct omap_device_pm_latency omap_i2c_latency[] = { .flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST, }, }; +/** + * omap2_i2c_reset - reset the omap i2c module. + * @dev: struct device* + */ + +static int omap2_i2c_reset(struct device *dev) +{ + int r = 0; + struct platform_device *pdev = to_platform_device(dev); + struct omap_device *odev = to_omap_device(pdev); + struct omap_hwmod *oh; + + oh = odev->hwmods[0]; + r = omap_hwmod_reset(oh); + return r; +} static inline int omap2_i2c_add_bus(int bus_id) { @@ -187,6 +203,8 @@ static inline int omap2_i2c_add_bus(int bus_id) */ if (cpu_is_omap34xx()) pdata->set_mpu_wkup_lat = omap_pm_set_max_mpu_wakeup_lat_compat; + + pdata->device_reset = omap2_i2c_reset; od = omap_device_build(name, bus_id, oh, pdata, sizeof(struct omap_i2c_bus_platform_data), omap_i2c_latency, ARRAY_SIZE(omap_i2c_latency), 0); diff --git a/include/linux/i2c-omap.h b/include/linux/i2c-omap.h index 98ae49b..8aa91b6 100644 --- a/include/linux/i2c-omap.h +++ b/include/linux/i2c-omap.h @@ -38,6 +38,7 @@ struct omap_i2c_bus_platform_data { int (*device_enable) (struct platform_device *pdev); int (*device_shutdown) (struct platform_device *pdev); int (*device_idle) (struct platform_device *pdev); + int (*device_reset) (struct device *dev); }; #endif -- 1.7.1
WARNING: multiple messages have this Message-ID (diff)
From: shubhrajyoti@ti.com (Shubhrajyoti D) To: linux-arm-kernel@lists.infradead.org Subject: [PATCHv5 1/3] OMAP: I2C: Reset support Date: Fri, 29 Jul 2011 16:06:51 +0530 [thread overview] Message-ID: <1311935813-8481-2-git-send-email-shubhrajyoti@ti.com> (raw) In-Reply-To: <1311935813-8481-1-git-send-email-shubhrajyoti@ti.com> Under some error conditions the i2c driver may do a reset. Adding a reset field and support in the platform. Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com> --- arch/arm/plat-omap/i2c.c | 18 ++++++++++++++++++ include/linux/i2c-omap.h | 1 + 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/arch/arm/plat-omap/i2c.c b/arch/arm/plat-omap/i2c.c index 2388b8e..be36cac 100644 --- a/arch/arm/plat-omap/i2c.c +++ b/arch/arm/plat-omap/i2c.c @@ -146,6 +146,22 @@ static struct omap_device_pm_latency omap_i2c_latency[] = { .flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST, }, }; +/** + * omap2_i2c_reset - reset the omap i2c module. + * @dev: struct device* + */ + +static int omap2_i2c_reset(struct device *dev) +{ + int r = 0; + struct platform_device *pdev = to_platform_device(dev); + struct omap_device *odev = to_omap_device(pdev); + struct omap_hwmod *oh; + + oh = odev->hwmods[0]; + r = omap_hwmod_reset(oh); + return r; +} static inline int omap2_i2c_add_bus(int bus_id) { @@ -187,6 +203,8 @@ static inline int omap2_i2c_add_bus(int bus_id) */ if (cpu_is_omap34xx()) pdata->set_mpu_wkup_lat = omap_pm_set_max_mpu_wakeup_lat_compat; + + pdata->device_reset = omap2_i2c_reset; od = omap_device_build(name, bus_id, oh, pdata, sizeof(struct omap_i2c_bus_platform_data), omap_i2c_latency, ARRAY_SIZE(omap_i2c_latency), 0); diff --git a/include/linux/i2c-omap.h b/include/linux/i2c-omap.h index 98ae49b..8aa91b6 100644 --- a/include/linux/i2c-omap.h +++ b/include/linux/i2c-omap.h @@ -38,6 +38,7 @@ struct omap_i2c_bus_platform_data { int (*device_enable) (struct platform_device *pdev); int (*device_shutdown) (struct platform_device *pdev); int (*device_idle) (struct platform_device *pdev); + int (*device_reset) (struct device *dev); }; #endif -- 1.7.1
next prev parent reply other threads:[~2011-07-29 10:36 UTC|newest] Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-07-29 10:36 [PATCHv5 0/3] I2C driver updates Shubhrajyoti D 2011-07-29 10:36 ` Shubhrajyoti D [not found] ` <1311935813-8481-1-git-send-email-shubhrajyoti-l0cyMroinI0@public.gmane.org> 2011-07-29 10:36 ` Shubhrajyoti D [this message] 2011-07-29 10:36 ` [PATCHv5 1/3] OMAP: I2C: Reset support Shubhrajyoti D [not found] ` <1311935813-8481-2-git-send-email-shubhrajyoti-l0cyMroinI0@public.gmane.org> 2011-08-02 23:23 ` Kevin Hilman 2011-08-02 23:23 ` Kevin Hilman [not found] ` <87sjpj75yq.fsf-l0cyMroinI0@public.gmane.org> 2011-08-04 6:25 ` Shubhrajyoti 2011-08-04 6:25 ` Shubhrajyoti 2011-08-04 15:05 ` Kevin Hilman 2011-08-04 15:05 ` Kevin Hilman 2011-07-29 10:36 ` [PATCHv5 3/3] OMAP: I2C: Remove the SYSC register definition Shubhrajyoti D 2011-07-29 10:36 ` Shubhrajyoti D 2011-07-29 10:36 ` [PATCHv5 2/3] OMAP: I2C: Remove the reset in the init path Shubhrajyoti D 2011-07-29 10:36 ` Shubhrajyoti D [not found] ` <1311935813-8481-3-git-send-email-shubhrajyoti-l0cyMroinI0@public.gmane.org> 2011-08-02 23:27 ` Kevin Hilman 2011-08-02 23:27 ` Kevin Hilman [not found] ` <87d3gn75sh.fsf-l0cyMroinI0@public.gmane.org> 2011-08-04 16:41 ` Shubhrajyoti 2011-08-04 16:41 ` Shubhrajyoti
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=1311935813-8481-2-git-send-email-shubhrajyoti@ti.com \ --to=shubhrajyoti-l0cymroini0@public.gmane.org \ --cc=balajitk-l0cyMroinI0@public.gmane.org \ --cc=khilman-l0cyMroinI0@public.gmane.org \ --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \ --cc=linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=rnayak-l0cyMroinI0@public.gmane.org \ --cc=santosh.shilimkar-l0cyMroinI0@public.gmane.org \ /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.