summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/common-board-devices.h
diff options
context:
space:
mode:
authorMike Rapoport <mike@compulab.co.il>2011-04-25 02:09:07 +0400
committerTony Lindgren <tony@atomide.com>2011-05-03 13:53:37 +0400
commit9a3f39ff36e11ea6b6c8b5f90337a864cb7e81f6 (patch)
treebdce8353ab8670fa603d5ace590c2a467df3537d /arch/arm/mach-omap2/common-board-devices.h
parentfbd8071c188e3053fb318d78214e54d4615d93f2 (diff)
downloadlinux-9a3f39ff36e11ea6b6c8b5f90337a864cb7e81f6.tar.xz
omap: move detection of NAND CS to common-board-devices
and reduce amount of copy/paste Signed-off-by: Mike Rapoport <mike@compulab.co.il> CC: Oleg Drokin <green@linuxhacker.ru> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/common-board-devices.h')
-rw-r--r--arch/arm/mach-omap2/common-board-devices.h11
1 files changed, 2 insertions, 9 deletions
diff --git a/arch/arm/mach-omap2/common-board-devices.h b/arch/arm/mach-omap2/common-board-devices.h
index 0ec3e07239fc..eb80b3b0ef47 100644
--- a/arch/arm/mach-omap2/common-board-devices.h
+++ b/arch/arm/mach-omap2/common-board-devices.h
@@ -2,6 +2,7 @@
#define __OMAP_COMMON_BOARD_DEVICES__
struct twl4030_platform_data;
+struct mtd_partition;
void omap_pmic_init(int bus, u32 clkrate, const char *pmic_type, int pmic_irq,
struct twl4030_platform_data *pmic_data);
@@ -25,18 +26,10 @@ static inline void omap4_pmic_init(const char *pmic_type,
omap_pmic_init(1, 400, pmic_type, OMAP44XX_IRQ_SYS_1N, pmic_data);
}
-#if defined(CONFIG_TOUCHSCREEN_ADS7846) || \
- defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE)
struct ads7846_platform_data;
void omap_ads7846_init(int bus_num, int gpio_pendown, int gpio_debounce,
struct ads7846_platform_data *board_pdata);
-#else
-static inline void omap_ads7846_init(int bus_num,
- int gpio_pendown, int gpio_debounce,
- struct ads7846_platform_data *board_data)
-{
-}
-#endif
+void omap_nand_flash_init(int opts, struct mtd_partition *parts, int n_parts);
#endif /* __OMAP_COMMON_BOARD_DEVICES__ */