Kevin Hilman <khil...@ti.com> writes: > Lesly A M <lesl...@ti.com> writes: > >> Using TWL4030 power scripts to control the LDOs and DCDC regulators >> while going to low power mode. >> >> Signed-off-by: Lesly A M <lesl...@ti.com> > > Minor: Re: Subject: OMAP is an acronym, please capitalize. > >> Cc: Nishanth Menon <n...@ti.com> >> Cc: David Derrick <dderr...@ti.com> >> Cc: Samuel Ortiz <sa...@linux.intel.com> >> --- >> arch/arm/mach-omap2/Makefile | 3 +- >> arch/arm/mach-omap2/board-3430sdp.c | 93 >> +---------------------------------- >> 2 files changed, 4 insertions(+), 92 deletions(-) >> >> diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile >> index 742ca67..bb11329 100644 >> --- a/arch/arm/mach-omap2/Makefile >> +++ b/arch/arm/mach-omap2/Makefile >> @@ -175,7 +175,8 @@ obj-$(CONFIG_MACH_OMAP3_PANDORA) += board-omap3pandora.o >> \ >> hsmmc.o >> obj-$(CONFIG_MACH_OMAP_3430SDP) += board-3430sdp.o \ >> hsmmc.o \ >> - board-flash.o >> + board-flash.o \ >> + twl4030.o > > This should not be board-specific in the Makefile, otherwise it will > have to be added for every single board that uses it. > > Rather, it should probably be built as long as CONFIG_TWL4030_POWER=y. > Also, please be sure to build test when that option is disabled as well.
Just notcied that twl4030.c is already wrapped by CONFIG_TWL4030_POWER, so just build it for CONFIG_PM: diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 65d8701..8bdc969 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -61,7 +61,7 @@ ifeq ($(CONFIG_PM),y) obj-$(CONFIG_ARCH_OMAP2) += pm24xx.o obj-$(CONFIG_ARCH_OMAP2) += sleep24xx.o pm_bus.o obj-$(CONFIG_ARCH_OMAP3) += pm34xx.o sleep34xx.o \ - cpuidle34xx.o pm_bus.o + cpuidle34xx.o pm_bus.o twl4030.o obj-$(CONFIG_ARCH_OMAP4) += pm44xx.o pm_bus.o obj-$(CONFIG_PM_DEBUG) += pm-debug.o obj-$(CONFIG_OMAP_SMARTREFLEX) += sr_device.o smartreflex.o Then, you'll also have to modify twl4030.h so that twl4030_generic_script is NULL when CONFIG_TWL_4030=n so board files will still compile. Kevin -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
