| Message ID | 1309189641-25010-8-git-send-email-b-cousson@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Benoit Cousson |
| Headers | show |
Hi minor issue... On Mon, 27 Jun 2011, Benoit Cousson wrote: > The warm reset function was still using the obsolete API. > Replace it by the new one and move the file to the proper c file. > > Signed-off-by: Benoit Cousson <b-cousson@ti.com> > Cc: Paul Walmsley <paul@pwsan.com> > Cc: Rajendra Nayak <rnayak@ti.com> > --- > arch/arm/mach-omap2/prm44xx.c | 15 --------------- > arch/arm/mach-omap2/prm44xx.h | 2 -- > arch/arm/mach-omap2/prminst44xx.c | 19 +++++++++++++++++++ > 3 files changed, 19 insertions(+), 17 deletions(-) > > diff --git a/arch/arm/mach-omap2/prm44xx.c b/arch/arm/mach-omap2/prm44xx.c > index faec860..f815329 100644 > --- a/arch/arm/mach-omap2/prm44xx.c > +++ b/arch/arm/mach-omap2/prm44xx.c > @@ -87,18 +87,3 @@ u32 omap4_prm_clear_inst_reg_bits(u32 bits, s16 inst, s16 reg) > { > return omap4_prm_rmw_inst_reg_bits(bits, 0x0, inst, reg); > } > - > -void omap4_prm_global_warm_sw_reset(void) > -{ > - u32 v; > - > - v = omap4_prm_read_inst_reg(OMAP4430_PRM_DEVICE_INST, > - OMAP4_RM_RSTCTRL); > - v |= OMAP4430_RST_GLOBAL_WARM_SW_MASK; > - omap4_prm_write_inst_reg(v, OMAP4430_PRM_DEVICE_INST, > - OMAP4_RM_RSTCTRL); > - > - /* OCP barrier */ > - v = omap4_prm_read_inst_reg(OMAP4430_PRM_DEVICE_INST, > - OMAP4_RM_RSTCTRL); > -} > diff --git a/arch/arm/mach-omap2/prm44xx.h b/arch/arm/mach-omap2/prm44xx.h > index 21b0240..a3887b8 100644 > --- a/arch/arm/mach-omap2/prm44xx.h > +++ b/arch/arm/mach-omap2/prm44xx.h > @@ -691,8 +691,6 @@ extern u32 omap4_prm_set_inst_reg_bits(u32 bits, s16 inst, s16 idx); > extern u32 omap4_prm_clear_inst_reg_bits(u32 bits, s16 inst, s16 idx); > extern u32 omap4_prm_read_bits_shift(void __iomem *reg, u32 mask); > > -extern void omap4_prm_global_warm_sw_reset(void); > - > # endif > > #endif > diff --git a/arch/arm/mach-omap2/prminst44xx.c b/arch/arm/mach-omap2/prminst44xx.c > index 95fbbcf..f5a9cf5 100644 > --- a/arch/arm/mach-omap2/prminst44xx.c > +++ b/arch/arm/mach-omap2/prminst44xx.c > @@ -151,3 +151,22 @@ int omap4_prm_deassert_hardreset(u8 shift, u8 part, s16 inst, > > return (c == MAX_MODULE_HARDRESET_WAIT) ? -EBUSY : 0; > } > + > + > +void omap4_prm_global_warm_sw_reset(void) This function should be named 'omap4_prminst_global_warm_sw_reset' if it's in the prminst44xx.c file. > +{ > + u32 v; > + > + v = omap4_prminst_read_inst_reg(OMAP4430_PRM_PARTITION, > + OMAP4430_PRM_DEVICE_INST, > + OMAP4_PRM_RSTCTRL_OFFSET); > + v |= OMAP4430_RST_GLOBAL_WARM_SW_MASK; > + omap4_prminst_write_inst_reg(v, OMAP4430_PRM_PARTITION, > + OMAP4430_PRM_DEVICE_INST, > + OMAP4_PRM_RSTCTRL_OFFSET); > + > + /* OCP barrier */ > + v = omap4_prminst_read_inst_reg(OMAP4430_PRM_PARTITION, > + OMAP4430_PRM_DEVICE_INST, > + OMAP4_PRM_RSTCTRL_OFFSET); > +} > -- > 1.7.0.4 > - Paul -- 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/prm44xx.c b/arch/arm/mach-omap2/prm44xx.c index faec860..f815329 100644 --- a/arch/arm/mach-omap2/prm44xx.c +++ b/arch/arm/mach-omap2/prm44xx.c @@ -87,18 +87,3 @@ u32 omap4_prm_clear_inst_reg_bits(u32 bits, s16 inst, s16 reg) { return omap4_prm_rmw_inst_reg_bits(bits, 0x0, inst, reg); } - -void omap4_prm_global_warm_sw_reset(void) -{ - u32 v; - - v = omap4_prm_read_inst_reg(OMAP4430_PRM_DEVICE_INST, - OMAP4_RM_RSTCTRL); - v |= OMAP4430_RST_GLOBAL_WARM_SW_MASK; - omap4_prm_write_inst_reg(v, OMAP4430_PRM_DEVICE_INST, - OMAP4_RM_RSTCTRL); - - /* OCP barrier */ - v = omap4_prm_read_inst_reg(OMAP4430_PRM_DEVICE_INST, - OMAP4_RM_RSTCTRL); -} diff --git a/arch/arm/mach-omap2/prm44xx.h b/arch/arm/mach-omap2/prm44xx.h index 21b0240..a3887b8 100644 --- a/arch/arm/mach-omap2/prm44xx.h +++ b/arch/arm/mach-omap2/prm44xx.h @@ -691,8 +691,6 @@ extern u32 omap4_prm_set_inst_reg_bits(u32 bits, s16 inst, s16 idx); extern u32 omap4_prm_clear_inst_reg_bits(u32 bits, s16 inst, s16 idx); extern u32 omap4_prm_read_bits_shift(void __iomem *reg, u32 mask); -extern void omap4_prm_global_warm_sw_reset(void); - # endif #endif diff --git a/arch/arm/mach-omap2/prminst44xx.c b/arch/arm/mach-omap2/prminst44xx.c index 95fbbcf..f5a9cf5 100644 --- a/arch/arm/mach-omap2/prminst44xx.c +++ b/arch/arm/mach-omap2/prminst44xx.c @@ -151,3 +151,22 @@ int omap4_prm_deassert_hardreset(u8 shift, u8 part, s16 inst, return (c == MAX_MODULE_HARDRESET_WAIT) ? -EBUSY : 0; } + + +void omap4_prm_global_warm_sw_reset(void) +{ + u32 v; + + v = omap4_prminst_read_inst_reg(OMAP4430_PRM_PARTITION, + OMAP4430_PRM_DEVICE_INST, + OMAP4_PRM_RSTCTRL_OFFSET); + v |= OMAP4430_RST_GLOBAL_WARM_SW_MASK; + omap4_prminst_write_inst_reg(v, OMAP4430_PRM_PARTITION, + OMAP4430_PRM_DEVICE_INST, + OMAP4_PRM_RSTCTRL_OFFSET); + + /* OCP barrier */ + v = omap4_prminst_read_inst_reg(OMAP4430_PRM_PARTITION, + OMAP4430_PRM_DEVICE_INST, + OMAP4_PRM_RSTCTRL_OFFSET); +}
The warm reset function was still using the obsolete API. Replace it by the new one and move the file to the proper c file. Signed-off-by: Benoit Cousson <b-cousson@ti.com> Cc: Paul Walmsley <paul@pwsan.com> Cc: Rajendra Nayak <rnayak@ti.com> --- arch/arm/mach-omap2/prm44xx.c | 15 --------------- arch/arm/mach-omap2/prm44xx.h | 2 -- arch/arm/mach-omap2/prminst44xx.c | 19 +++++++++++++++++++ 3 files changed, 19 insertions(+), 17 deletions(-)