> -----Original Message----- > From: linux-omap-owner@xxxxxxxxxxxxxxx > [mailto:linux-omap-owner@xxxxxxxxxxxxxxx] On Behalf Of Premi, Sanjeev > Sent: Thursday, May 27, 2010 4:56 PM > To: linux-omap@xxxxxxxxxxxxxxx > Subject: omap3 pm: dependency between opp layer and cpufreq > > Hi, > > While compiling for omap3_evm_defconfig, at the head of > linux-omap, I encounter > these errors: > > arch/arm/mach-omap2/built-in.o: In function `sr_configure_vp': > /home/premi/linux-pm/arch/arm/mach-omap2/smartreflex.c:315: > undefined reference to `omap_twl_uv_to_vsel' > /home/premi/linux-pm/arch/arm/mach-omap2/smartreflex.c:364: > undefined reference to `omap_twl_uv_to_vsel' > arch/arm/mach-omap2/built-in.o: In function `sr_enable': > /home/premi/linux-pm/arch/arm/mach-omap2/smartreflex.c:609: > undefined reference to `omap_twl_uv_to_vsel' > arch/arm/mach-omap2/built-in.o: In function `sr_reset_voltage': > /home/premi/linux-pm/arch/arm/mach-omap2/smartreflex.c:478: > undefined reference to `omap_twl_uv_to_vsel' > /home/premi/linux-pm/arch/arm/mach-omap2/smartreflex.c:496: > undefined reference to `omap_twl_uv_to_vsel' > make: *** [.tmp_vmlinux1] Error 1 > > Turn our that comment and code in plat-omap/Makefile don't match: > > # OPP support in (OMAP3+ only at the moment) > # XXX The OPP TWL/TPS code should only be included when a TWL/TPS > # PMIC is selected. > ifdef CONFIG_CPU_FREQ > obj-$(CONFIG_ARCH_OMAP3) += opp.o opp_twl_tps.o > endif > > But changing CONFIG_CPU_FREQ to CONFIG_TWL4030_POWER leads to > these errors: > > CC arch/arm/plat-omap/opp.o > arch/arm/plat-omap/opp.c:54: error: redefinition of 'opp_get_voltage' > arch/arm/plat-omap/include/plat/opp.h:240: error: previous > definition of 'opp_get_voltage' was here > arch/arm/plat-omap/opp.c:63: error: redefinition of 'opp_get_freq' > arch/arm/plat-omap/include/plat/opp.h:245: error: previous > definition of 'opp_get_freq' was here > arch/arm/plat-omap/opp.c:79: error: conflicting types for > 'opp_find_by_opp_id' > arch/arm/plat-omap/include/plat/opp.h:296: error: previous > definition of 'opp_find_by_opp_id' was here > arch/arm/plat-omap/opp.c:102: error: redefinition of 'opp_get_opp_id' > arch/arm/plat-omap/include/plat/opp.h:301: error: previous > definition of 'opp_get_opp_id' was here > arch/arm/plat-omap/opp.c:107: error: conflicting types for > 'opp_get_opp_count' > arch/arm/plat-omap/include/plat/opp.h:250: error: previous > definition of 'opp_get_opp_count' was here > arch/arm/plat-omap/opp.c:129: error: conflicting types for > 'opp_find_freq_exact' > arch/arm/plat-omap/include/plat/opp.h:256: error: previous > definition of 'opp_find_freq_exact' was here > arch/arm/plat-omap/opp.c:153: error: conflicting types for > 'opp_find_freq_ceil' > arch/arm/plat-omap/include/plat/opp.h:268: error: previous > definition of 'opp_find_freq_ceil' was here > arch/arm/plat-omap/opp.c:182: error: conflicting types for > 'opp_find_freq_floor' > arch/arm/plat-omap/include/plat/opp.h:262: error: previous > definition of 'opp_find_freq_floor' was here > arch/arm/plat-omap/opp.c:223: error: conflicting types for 'opp_add' > arch/arm/plat-omap/include/plat/opp.h:280: error: previous > definition of 'opp_add' was here > arch/arm/plat-omap/opp.c:291: error: conflicting types for > 'opp_init_list' > arch/arm/plat-omap/include/plat/opp.h:274: error: previous > definition of 'opp_init_list' was here > arch/arm/plat-omap/opp.c:335: error: redefinition of 'opp_enable' > arch/arm/plat-omap/include/plat/opp.h:285: error: previous > definition of 'opp_enable' was here > arch/arm/plat-omap/opp.c:345: error: redefinition of 'opp_disable' > arch/arm/plat-omap/include/plat/opp.h:290: error: previous > definition of 'opp_disable' was here > arch/arm/plat-omap/opp.c:356: error: conflicting types for > 'opp_init_cpufreq_table' > arch/arm/plat-omap/include/plat/opp.h:307: error: previous > definition of 'opp_init_cpufreq_table' was here > make[1]: *** [arch/arm/plat-omap/opp.o] Error 1 > > The contents of "plat-omap/include/plat/opp.h" seem to be > based on assumption that definition of OPP is > needed only for cpufreq. But even if cpufreq is disabled, > this information is required for setting the > correct voltage against 'pre-defined' ARM frequency. > > Questions/ comments: > > 1) The linkage between OPP and Voltage are not driven by the PMIC. > They are defined by/for the silicon itself. > > 2) The implementation for setting the voltage should depend > upon the PMIC. > > 3) Was there any specific need to tie the functions > "opp_get_voltage" and others to cpufreq only? > > I am working on a patch that should remove some of these dependencies. > But, trying to open up a discussion as well... > > Best regards, > Sanjeev Here is a quick patch for discussion. (Will wait for comments before submitting a formal patch) diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile index 2b9ebf0..18d291f 100644 --- a/arch/arm/plat-omap/Makefile +++ b/arch/arm/plat-omap/Makefile @@ -15,7 +15,7 @@ obj-$(CONFIG_ARCH_OMAP16XX) += ocpi.o # OPP support in (OMAP3+ only at the moment) # XXX The OPP TWL/TPS code should only be included when a TWL/TPS # PMIC is selected. -ifdef CONFIG_CPU_FREQ +ifdef CONFIG_TWL4030_POWER obj-$(CONFIG_ARCH_OMAP3) += opp.o opp_twl_tps.o endif diff --git a/arch/arm/plat-omap/include/plat/opp.h b/arch/arm/plat-omap/include/plat/opp.h index 7d16a46..03463d5 100644 --- a/arch/arm/plat-omap/include/plat/opp.h +++ b/arch/arm/plat-omap/include/plat/opp.h @@ -67,6 +67,14 @@ struct omap_opp_def { struct omap_opp; #ifdef CONFIG_CPU_FREQ +void opp_init_cpufreq_table(enum opp_t opp_type, + struct cpufreq_frequency_table **table); +#else +static inline void opp_init_cpufreq_table(struct omap_opp *opps, + struct cpufreq_frequency_table **table) +{ +} +#endif /** * opp_get_voltage() - Gets the voltage corresponding to an opp @@ -233,79 +241,4 @@ struct omap_opp * __deprecated opp_find_by_opp_id(enum opp_t opp_type, u8 opp_id); u8 __deprecated opp_get_opp_id(struct omap_opp *opp); -void opp_init_cpufreq_table(enum opp_t opp_type, - struct cpufreq_frequency_table **table); -#else -static inline unsigned long opp_get_voltage(const struct omap_opp *opp) -{ - return 0; -} - -static inline unsigned long opp_get_freq(const struct omap_opp *opp) -{ - return 0; -} - -static inline int opp_get_opp_count(struct omap_opp *oppl) -{ - return 0; -} - -static inline struct omap_opp *opp_find_freq_exact(struct omap_opp *oppl, - unsigned long freq, bool enabled) -{ - return ERR_PTR(-EINVAL); -} - -static inline struct omap_opp *opp_find_freq_floor(struct omap_opp *oppl, - unsigned long *freq) -{ - return ERR_PTR(-EINVAL); -} - -static inline struct omap_opp *opp_find_freq_ceil(struct omap_opp *oppl, - unsigned long *freq) -{ - return ERR_PTR(-EINVAL); -} - -static inline -struct omap_opp __init *opp_init_list(const struct omap_opp_def *opp_defs) -{ - return ERR_PTR(-EINVAL); -} - -static inline struct omap_opp *opp_add(struct omap_opp *oppl, - const struct omap_opp_def *opp_def) -{ - return ERR_PTR(-EINVAL); -} - -static inline int opp_enable(struct omap_opp *opp) -{ - return 0; -} - -static inline int opp_disable(struct omap_opp *opp) -{ - return 0; -} - -static inline struct omap_opp * __deprecated -opp_find_by_opp_id(struct omap_opp *opps, u8 opp_id) -{ - return ERR_PTR(-EINVAL); -} - -static inline u8 __deprecated opp_get_opp_id(struct omap_opp *opp) -{ - return 0; -} - -static inline void opp_init_cpufreq_table(struct omap_opp *opps, - struct cpufreq_frequency_table **table) -{ -} - -#endif /* CONFIG_CPU_FREQ */ #endif /* __ASM_ARM_OMAP_OPP_H */ diff --git a/arch/arm/plat-omap/opp.c b/arch/arm/plat-omap/opp.c index 13da451..76466fb 100644 --- a/arch/arm/plat-omap/opp.c +++ b/arch/arm/plat-omap/opp.c @@ -352,7 +352,7 @@ int opp_disable(struct omap_opp *opp) return 0; } -/* XXX document */ +#ifdef CONFIG_CPU_FREQ void opp_init_cpufreq_table(enum opp_t opp_type, struct cpufreq_frequency_table **table) { @@ -397,3 +397,4 @@ void opp_init_cpufreq_table(enum opp_t opp_type, *table = &freq_table[0]; } +#endif > -- > To unsubscribe from this list: send the line "unsubscribe > linux-omap" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
