diff for duplicates of <87lj0u8mrf.fsf@ti.com> diff --git a/a/1.txt b/N1/1.txt index 3a8edc5..1d6db6a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -152,39 +152,3 @@ detailed description. Again, naming here could improve readability. Maybe: bool omap_hmwod_get_io_wakeup_status(struct omap_hwmod *oh) - ->From the name and the bool return, it should be clear that this is just -checking for the wakeup event. I also think it should be clear that -this is checking for IO-ring wakeups, not module wakeups. - -Also, in PATCH 5/7, you're calling this hwmod API directly from a -driver. Drivers should not know anything about hwmods. Any -OMAP-specific hooks must be called through pdata function pointers. -Also, they should go through omap_device, which would then call -omap_hwmod. - -Thinking more about this (and how you use it in PATCH 5/7), what is -needed is an omap_device level API to check if a wakeup occured for that -device. That function would check for either module-level wakeup or IO -pad wakeup. The driver should not need to care about how the wakeup -occurred. - -> +{ -> + if (oh->mux) -> + return omap_hwmod_mux_wakeup(oh->mux); -> + return -EINVAL; -> +} -> diff --git a/arch/arm/plat-omap/include/plat/omap_hwmod.h b/arch/arm/plat-omap/include/plat/omap_hwmod.h -> index fedd829..4100be0 100644 -> --- a/arch/arm/plat-omap/include/plat/omap_hwmod.h -> +++ b/arch/arm/plat-omap/include/plat/omap_hwmod.h -> @@ -588,6 +588,7 @@ int omap_hwmod_for_each_by_class(const char *classname, -> int omap_hwmod_set_postsetup_state(struct omap_hwmod *oh, u8 state); -> u32 omap_hwmod_get_context_loss_count(struct omap_hwmod *oh); -> -> +int omap_hmwod_pad_wakeup_status(struct omap_hwmod *oh); -> /* -> * Chip variant-specific hwmod init routines - XXX should be converted -> * to use initcalls once the initial boot ordering is straightened out - -Kevin diff --git a/a/content_digest b/N1/content_digest index 8e5d098..6db004a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,8 @@ "ref\01299064343-28534-1-git-send-email-govindraj.raja@ti.com\0" - "From\0Kevin Hilman <khilman@ti.com>\0" - "Subject\0Re: [PATCH 2/7] OMAP2+: mux: Enable wakeup for wakeup enable requested pads\0" + "From\0khilman@ti.com (Kevin Hilman)\0" + "Subject\0[PATCH 2/7] OMAP2+: mux: Enable wakeup for wakeup enable requested pads\0" "Date\0Fri, 04 Mar 2011 15:54:44 -0800\0" - "To\0Govindraj.R <govindraj.raja@ti.com>\0" - "Cc\0linux-omap@vger.kernel.org" - linux-serial@vger.kernel.org - linux-arm-kernel@lists.infradead.org - Tony Lindgren <tony@atomide.com> - Benoit Cousson <b-cousson@ti.com> - Paul Walmsley <paul@pwsan.com> - " Rajendra Nayak <rnayak@ti.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi Govindraj,\n" @@ -165,42 +158,6 @@ "\n" "Again, naming here could improve readability. Maybe:\n" "\n" - "bool omap_hmwod_get_io_wakeup_status(struct omap_hwmod *oh)\n" - "\n" - ">From the name and the bool return, it should be clear that this is just\n" - "checking for the wakeup event. I also think it should be clear that\n" - "this is checking for IO-ring wakeups, not module wakeups.\n" - "\n" - "Also, in PATCH 5/7, you're calling this hwmod API directly from a\n" - "driver. Drivers should not know anything about hwmods. Any\n" - "OMAP-specific hooks must be called through pdata function pointers.\n" - "Also, they should go through omap_device, which would then call\n" - "omap_hwmod.\n" - "\n" - "Thinking more about this (and how you use it in PATCH 5/7), what is\n" - "needed is an omap_device level API to check if a wakeup occured for that\n" - "device. That function would check for either module-level wakeup or IO\n" - "pad wakeup. The driver should not need to care about how the wakeup\n" - "occurred.\n" - "\n" - "> +{\n" - "> +\tif (oh->mux)\n" - "> +\t\treturn omap_hwmod_mux_wakeup(oh->mux);\n" - "> +\treturn -EINVAL;\n" - "> +}\n" - "> diff --git a/arch/arm/plat-omap/include/plat/omap_hwmod.h b/arch/arm/plat-omap/include/plat/omap_hwmod.h\n" - "> index fedd829..4100be0 100644\n" - "> --- a/arch/arm/plat-omap/include/plat/omap_hwmod.h\n" - "> +++ b/arch/arm/plat-omap/include/plat/omap_hwmod.h\n" - "> @@ -588,6 +588,7 @@ int omap_hwmod_for_each_by_class(const char *classname,\n" - "> int omap_hwmod_set_postsetup_state(struct omap_hwmod *oh, u8 state);\n" - "> u32 omap_hwmod_get_context_loss_count(struct omap_hwmod *oh);\n" - "> \n" - "> +int omap_hmwod_pad_wakeup_status(struct omap_hwmod *oh);\n" - "> /*\n" - "> * Chip variant-specific hwmod init routines - XXX should be converted\n" - "> * to use initcalls once the initial boot ordering is straightened out\n" - "\n" - Kevin + bool omap_hmwod_get_io_wakeup_status(struct omap_hwmod *oh) -a42f39e123629de6b8d90333961737694c15f5898a0b7b107e0ff5f6b81d2d9f +c829fa64abfc59703eb05199056ba7b39c0d32e6548bb485a2468f5340d836d2
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.