| Message ID | 1351859566-24818-6-git-send-email-vaibhav.bedia@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Friday 02 November 2012 06:02 PM, Vaibhav Bedia wrote: > Add the reset status offset for WKUP_M3 in the hwmod data > > Signed-off-by: Vaibhav Bedia <vaibhav.bedia@ti.com> > --- > arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c > index 3c235d8..2e470ce 100644 > --- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c > +++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c > @@ -269,6 +269,7 @@ static struct omap_hwmod am33xx_wkup_m3_hwmod = { > .omap4 = { > .clkctrl_offs = AM33XX_CM_WKUP_WKUP_M3_CLKCTRL_OFFSET, > .rstctrl_offs = AM33XX_RM_WKUP_RSTCTRL_OFFSET, > + .rstst_offs = AM33XX_RM_WKUP_RSTST_OFFSET, > .modulemode = MODULEMODE_SWCTRL, > }, > }, > You are adding reset bit in this patch but using it in 4/15. Probably you can re-order it to keep git bisect happy. Regards Santosh -- 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
On Sat, Nov 03, 2012 at 21:45:29, Shilimkar, Santosh wrote: [...] > > > You are adding reset bit in this patch but using it in 4/15. Probably > you can re-order it to keep git bisect happy. > Ok. Will reorder. Regards, Vaibhav -- 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
On 11/2/2012 6:02 PM, Vaibhav Bedia wrote: > Add the reset status offset for WKUP_M3 in the hwmod data > > Signed-off-by: Vaibhav Bedia <vaibhav.bedia@ti.com> > --- > arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > Thanks for the patch, Probably you can resubmit this patch separately which can be merged independently from this patch-series. Acked-by: Vaibhav Hiremath <hvaibhav@ti.com> Thanks, Vaibhav > diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c > index 3c235d8..2e470ce 100644 > --- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c > +++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c > @@ -269,6 +269,7 @@ static struct omap_hwmod am33xx_wkup_m3_hwmod = { > .omap4 = { > .clkctrl_offs = AM33XX_CM_WKUP_WKUP_M3_CLKCTRL_OFFSET, > .rstctrl_offs = AM33XX_RM_WKUP_RSTCTRL_OFFSET, > + .rstst_offs = AM33XX_RM_WKUP_RSTST_OFFSET, > .modulemode = MODULEMODE_SWCTRL, > }, > }, > -- 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
diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c index 3c235d8..2e470ce 100644 --- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c @@ -269,6 +269,7 @@ static struct omap_hwmod am33xx_wkup_m3_hwmod = { .omap4 = { .clkctrl_offs = AM33XX_CM_WKUP_WKUP_M3_CLKCTRL_OFFSET, .rstctrl_offs = AM33XX_RM_WKUP_RSTCTRL_OFFSET, + .rstst_offs = AM33XX_RM_WKUP_RSTST_OFFSET, .modulemode = MODULEMODE_SWCTRL, }, },
Add the reset status offset for WKUP_M3 in the hwmod data Signed-off-by: Vaibhav Bedia <vaibhav.bedia@ti.com> --- arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)