From 236506ec0bf325be10b083cfbfc528745159c7a9 Mon Sep 17 00:00:00 2001 From: Sameer Date: Wed, 5 Dec 2007 15:05:51 -0800 Subject: [PATCH] - onenand - OMAP3 support - Kconfig update The following patch provides the onenand support for OMAP3. The patch enables the onenand in def_config file, enable onenand Kconfig for OMAP3 and enables omap2_sleep_block() only if CONFIG_PM is defined. Also adding the signed off by line which was missed in the previous mail. Signed-off-by: Nishant Kamat Signed-off-by: Sameer Acked-by: Felipe Balbi Signed-off-by: Tony Lindgren --- arch/arm/configs/omap_3430sdp_defconfig | 3 +++ drivers/mtd/onenand/Kconfig | 6 +++--- include/asm-arm/arch-omap/pm.h | 8 +++++++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/arch/arm/configs/omap_3430sdp_defconfig b/arch/arm/configs/omap_3430sdp_defconfig index ccb59807819..0a50bb84095 100644 --- a/arch/arm/configs/omap_3430sdp_defconfig +++ b/arch/arm/configs/omap_3430sdp_defconfig @@ -461,7 +461,10 @@ CONFIG_MTD_OMAP_NOR=y CONFIG_MTD_ONENAND=y CONFIG_MTD_ONENAND_VERIFY_WRITE=y # CONFIG_MTD_ONENAND_GENERIC is not set +CONFIG_MTD_ONENAND_OMAP2=y # CONFIG_MTD_ONENAND_OTP is not set +# CONFIG_MTD_ONENAND_2X_PROGRAM is not set +# CONFIG_MTD_ONENAND_SIM is not set # # UBI - Unsorted block images diff --git a/drivers/mtd/onenand/Kconfig b/drivers/mtd/onenand/Kconfig index c2c117ac9d1..2d7c301d0d1 100644 --- a/drivers/mtd/onenand/Kconfig +++ b/drivers/mtd/onenand/Kconfig @@ -28,10 +28,10 @@ config MTD_ONENAND_GENERIC Support for OneNAND flash via platform device driver. config MTD_ONENAND_OMAP2 - tristate "OneNAND on OMAP2 support" - depends on MTD_ONENAND && ARCH_OMAP2 + tristate "OneNAND on OMAP2/OMAP3 support" + depends on MTD_ONENAND && (ARCH_OMAP2 || ARCH_OMAP3) help - Support for a OneNAND flash device connected to an OMAP2 CPU + Support for a OneNAND flash device connected to an OMAP2/OMAP3 CPU via the GPMC memory controller. config MTD_ONENAND_OTP diff --git a/include/asm-arm/arch-omap/pm.h b/include/asm-arm/arch-omap/pm.h index 297590308d1..0ce03fd6fbc 100644 --- a/include/asm-arm/arch-omap/pm.h +++ b/include/asm-arm/arch-omap/pm.h @@ -107,7 +107,8 @@ #if !defined(CONFIG_ARCH_OMAP730) && \ !defined(CONFIG_ARCH_OMAP15XX) && \ !defined(CONFIG_ARCH_OMAP16XX) && \ - !defined(CONFIG_ARCH_OMAP24XX) + !defined(CONFIG_ARCH_OMAP24XX) && \ + !defined(CONFIG_ARCH_OMAP34XX) #error "Power management for this processor not implemented yet" #endif @@ -134,8 +135,13 @@ void clk_deny_idle(struct clk *clk); extern void omap_pm_idle(void); extern void omap_pm_suspend(void); +#ifdef CONFIG_PM extern void omap2_block_sleep(void); extern void omap2_allow_sleep(void); +#else +static inline void omap2_block_sleep(void) { } +static inline void omap2_allow_sleep(void) { } +#endif extern void omap730_cpu_suspend(unsigned short, unsigned short); extern void omap1510_cpu_suspend(unsigned short, unsigned short); extern void omap1610_cpu_suspend(unsigned short, unsigned short); -- 2.41.1