| Message ID | 1348497799-32143-2-git-send-email-ulf.hansson@stericsson.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Sam and Linus, Do you see any issues with this patch? Can we advise Mike to merge it though his clock tree? Kind regards Ulf Hansson On 24 September 2012 16:43, Ulf Hansson <ulf.hansson@stericsson.com> wrote: > From: Ulf Hansson <ulf.hansson@linaro.org> > > This function needs to be exported to let clients be able to > request the ape opp 100 voltage. > > Cc: Samuel Ortiz <sameo@linux.intel.com> > Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> > --- > drivers/mfd/db8500-prcmu.c | 4 ++-- > include/linux/mfd/db8500-prcmu.h | 4 ++-- > include/linux/mfd/dbx500-prcmu.h | 10 ++++++++++ > 3 files changed, 14 insertions(+), 4 deletions(-) > > diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c > index e7f9539..0b8e0a0 100644 > --- a/drivers/mfd/db8500-prcmu.c > +++ b/drivers/mfd/db8500-prcmu.c > @@ -1167,12 +1167,12 @@ int db8500_prcmu_get_ape_opp(void) > } > > /** > - * prcmu_request_ape_opp_100_voltage - Request APE OPP 100% voltage > + * db8500_prcmu_request_ape_opp_100_voltage - Request APE OPP 100% voltage > * @enable: true to request the higher voltage, false to drop a request. > * > * Calls to this function to enable and disable requests must be balanced. > */ > -int prcmu_request_ape_opp_100_voltage(bool enable) > +int db8500_prcmu_request_ape_opp_100_voltage(bool enable) > { > int r = 0; > u8 header; > diff --git a/include/linux/mfd/db8500-prcmu.h b/include/linux/mfd/db8500-prcmu.h > index b82f6ee..6ee4247 100644 > --- a/include/linux/mfd/db8500-prcmu.h > +++ b/include/linux/mfd/db8500-prcmu.h > @@ -515,7 +515,6 @@ enum romcode_read prcmu_get_rc_p2a(void); > enum ap_pwrst prcmu_get_xp70_current_state(void); > bool prcmu_has_arm_maxopp(void); > struct prcmu_fw_version *prcmu_get_fw_version(void); > -int prcmu_request_ape_opp_100_voltage(bool enable); > int prcmu_release_usb_wakeup_state(void); > void prcmu_configure_auto_pm(struct prcmu_auto_pm_config *sleep, > struct prcmu_auto_pm_config *idle); > @@ -564,6 +563,7 @@ int db8500_prcmu_set_arm_opp(u8 opp); > int db8500_prcmu_get_arm_opp(void); > int db8500_prcmu_set_ape_opp(u8 opp); > int db8500_prcmu_get_ape_opp(void); > +int db8500_prcmu_request_ape_opp_100_voltage(bool enable); > int db8500_prcmu_set_ddr_opp(u8 opp); > int db8500_prcmu_get_ddr_opp(void); > > @@ -610,7 +610,7 @@ static inline int db8500_prcmu_get_ape_opp(void) > return APE_100_OPP; > } > > -static inline int prcmu_request_ape_opp_100_voltage(bool enable) > +static inline int db8500_prcmu_request_ape_opp_100_voltage(bool enable) > { > return 0; > } > diff --git a/include/linux/mfd/dbx500-prcmu.h b/include/linux/mfd/dbx500-prcmu.h > index c410d99..c202d6c 100644 > --- a/include/linux/mfd/dbx500-prcmu.h > +++ b/include/linux/mfd/dbx500-prcmu.h > @@ -336,6 +336,11 @@ static inline int prcmu_get_ape_opp(void) > return db8500_prcmu_get_ape_opp(); > } > > +static inline int prcmu_request_ape_opp_100_voltage(bool enable) > +{ > + return db8500_prcmu_request_ape_opp_100_voltage(enable); > +} > + > static inline void prcmu_system_reset(u16 reset_code) > { > return db8500_prcmu_system_reset(reset_code); > @@ -507,6 +512,11 @@ static inline int prcmu_get_ape_opp(void) > return APE_100_OPP; > } > > +static inline int prcmu_request_ape_opp_100_voltage(bool enable) > +{ > + return 0; > +} > + > static inline int prcmu_set_arm_opp(u8 opp) > { > return 0; > -- > 1.7.10 >
Hi Ulf, On Mon, Sep 24, 2012 at 04:43:17PM +0200, Ulf Hansson wrote: > From: Ulf Hansson <ulf.hansson@linaro.org> > > This function needs to be exported to let clients be able to > request the ape opp 100 voltage. > > Cc: Samuel Ortiz <sameo@linux.intel.com> > Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Acked-by: Samuel Ortiz <sameo@linux.intel.com> Cheers, Samuel.
On Mon, Sep 24, 2012 at 4:43 PM, Ulf Hansson <ulf.hansson@stericsson.com> wrote: > From: Ulf Hansson <ulf.hansson@linaro.org> > > This function needs to be exported to let clients be able to > request the ape opp 100 voltage. > > Cc: Samuel Ortiz <sameo@linux.intel.com> > Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Acked-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
Quoting Ulf Hansson (2012-10-04 05:03:05) > Hi Sam and Linus, > > Do you see any issues with this patch? Can we advise Mike to merge it > though his clock tree? > Thanks for the re-ping and gathering Ack's. I'll pull into my clk-next as soon as I push out a new branch towards 3.8. Regards, Mike > Kind regards > Ulf Hansson > > On 24 September 2012 16:43, Ulf Hansson <ulf.hansson@stericsson.com> wrote: > > From: Ulf Hansson <ulf.hansson@linaro.org> > > > > This function needs to be exported to let clients be able to > > request the ape opp 100 voltage. > > > > Cc: Samuel Ortiz <sameo@linux.intel.com> > > Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> > > --- > > drivers/mfd/db8500-prcmu.c | 4 ++-- > > include/linux/mfd/db8500-prcmu.h | 4 ++-- > > include/linux/mfd/dbx500-prcmu.h | 10 ++++++++++ > > 3 files changed, 14 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c > > index e7f9539..0b8e0a0 100644 > > --- a/drivers/mfd/db8500-prcmu.c > > +++ b/drivers/mfd/db8500-prcmu.c > > @@ -1167,12 +1167,12 @@ int db8500_prcmu_get_ape_opp(void) > > } > > > > /** > > - * prcmu_request_ape_opp_100_voltage - Request APE OPP 100% voltage > > + * db8500_prcmu_request_ape_opp_100_voltage - Request APE OPP 100% voltage > > * @enable: true to request the higher voltage, false to drop a request. > > * > > * Calls to this function to enable and disable requests must be balanced. > > */ > > -int prcmu_request_ape_opp_100_voltage(bool enable) > > +int db8500_prcmu_request_ape_opp_100_voltage(bool enable) > > { > > int r = 0; > > u8 header; > > diff --git a/include/linux/mfd/db8500-prcmu.h b/include/linux/mfd/db8500-prcmu.h > > index b82f6ee..6ee4247 100644 > > --- a/include/linux/mfd/db8500-prcmu.h > > +++ b/include/linux/mfd/db8500-prcmu.h > > @@ -515,7 +515,6 @@ enum romcode_read prcmu_get_rc_p2a(void); > > enum ap_pwrst prcmu_get_xp70_current_state(void); > > bool prcmu_has_arm_maxopp(void); > > struct prcmu_fw_version *prcmu_get_fw_version(void); > > -int prcmu_request_ape_opp_100_voltage(bool enable); > > int prcmu_release_usb_wakeup_state(void); > > void prcmu_configure_auto_pm(struct prcmu_auto_pm_config *sleep, > > struct prcmu_auto_pm_config *idle); > > @@ -564,6 +563,7 @@ int db8500_prcmu_set_arm_opp(u8 opp); > > int db8500_prcmu_get_arm_opp(void); > > int db8500_prcmu_set_ape_opp(u8 opp); > > int db8500_prcmu_get_ape_opp(void); > > +int db8500_prcmu_request_ape_opp_100_voltage(bool enable); > > int db8500_prcmu_set_ddr_opp(u8 opp); > > int db8500_prcmu_get_ddr_opp(void); > > > > @@ -610,7 +610,7 @@ static inline int db8500_prcmu_get_ape_opp(void) > > return APE_100_OPP; > > } > > > > -static inline int prcmu_request_ape_opp_100_voltage(bool enable) > > +static inline int db8500_prcmu_request_ape_opp_100_voltage(bool enable) > > { > > return 0; > > } > > diff --git a/include/linux/mfd/dbx500-prcmu.h b/include/linux/mfd/dbx500-prcmu.h > > index c410d99..c202d6c 100644 > > --- a/include/linux/mfd/dbx500-prcmu.h > > +++ b/include/linux/mfd/dbx500-prcmu.h > > @@ -336,6 +336,11 @@ static inline int prcmu_get_ape_opp(void) > > return db8500_prcmu_get_ape_opp(); > > } > > > > +static inline int prcmu_request_ape_opp_100_voltage(bool enable) > > +{ > > + return db8500_prcmu_request_ape_opp_100_voltage(enable); > > +} > > + > > static inline void prcmu_system_reset(u16 reset_code) > > { > > return db8500_prcmu_system_reset(reset_code); > > @@ -507,6 +512,11 @@ static inline int prcmu_get_ape_opp(void) > > return APE_100_OPP; > > } > > > > +static inline int prcmu_request_ape_opp_100_voltage(bool enable) > > +{ > > + return 0; > > +} > > + > > static inline int prcmu_set_arm_opp(u8 opp) > > { > > return 0; > > -- > > 1.7.10 > >
diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c index e7f9539..0b8e0a0 100644 --- a/drivers/mfd/db8500-prcmu.c +++ b/drivers/mfd/db8500-prcmu.c @@ -1167,12 +1167,12 @@ int db8500_prcmu_get_ape_opp(void) } /** - * prcmu_request_ape_opp_100_voltage - Request APE OPP 100% voltage + * db8500_prcmu_request_ape_opp_100_voltage - Request APE OPP 100% voltage * @enable: true to request the higher voltage, false to drop a request. * * Calls to this function to enable and disable requests must be balanced. */ -int prcmu_request_ape_opp_100_voltage(bool enable) +int db8500_prcmu_request_ape_opp_100_voltage(bool enable) { int r = 0; u8 header; diff --git a/include/linux/mfd/db8500-prcmu.h b/include/linux/mfd/db8500-prcmu.h index b82f6ee..6ee4247 100644 --- a/include/linux/mfd/db8500-prcmu.h +++ b/include/linux/mfd/db8500-prcmu.h @@ -515,7 +515,6 @@ enum romcode_read prcmu_get_rc_p2a(void); enum ap_pwrst prcmu_get_xp70_current_state(void); bool prcmu_has_arm_maxopp(void); struct prcmu_fw_version *prcmu_get_fw_version(void); -int prcmu_request_ape_opp_100_voltage(bool enable); int prcmu_release_usb_wakeup_state(void); void prcmu_configure_auto_pm(struct prcmu_auto_pm_config *sleep, struct prcmu_auto_pm_config *idle); @@ -564,6 +563,7 @@ int db8500_prcmu_set_arm_opp(u8 opp); int db8500_prcmu_get_arm_opp(void); int db8500_prcmu_set_ape_opp(u8 opp); int db8500_prcmu_get_ape_opp(void); +int db8500_prcmu_request_ape_opp_100_voltage(bool enable); int db8500_prcmu_set_ddr_opp(u8 opp); int db8500_prcmu_get_ddr_opp(void); @@ -610,7 +610,7 @@ static inline int db8500_prcmu_get_ape_opp(void) return APE_100_OPP; } -static inline int prcmu_request_ape_opp_100_voltage(bool enable) +static inline int db8500_prcmu_request_ape_opp_100_voltage(bool enable) { return 0; } diff --git a/include/linux/mfd/dbx500-prcmu.h b/include/linux/mfd/dbx500-prcmu.h index c410d99..c202d6c 100644 --- a/include/linux/mfd/dbx500-prcmu.h +++ b/include/linux/mfd/dbx500-prcmu.h @@ -336,6 +336,11 @@ static inline int prcmu_get_ape_opp(void) return db8500_prcmu_get_ape_opp(); } +static inline int prcmu_request_ape_opp_100_voltage(bool enable) +{ + return db8500_prcmu_request_ape_opp_100_voltage(enable); +} + static inline void prcmu_system_reset(u16 reset_code) { return db8500_prcmu_system_reset(reset_code); @@ -507,6 +512,11 @@ static inline int prcmu_get_ape_opp(void) return APE_100_OPP; } +static inline int prcmu_request_ape_opp_100_voltage(bool enable) +{ + return 0; +} + static inline int prcmu_set_arm_opp(u8 opp) { return 0;