提交 e3a98fe1 编写于 作者: T Tony Lindgren

ARM: OMAP2+: Fix OMAP_HDQ_BASE build error

If CONFIG_SOC_OMAP3430 is not set and CONFIG_HDQ_MASTER_OMAP
is selected for w1 driver we get the following error:

arch/arm/mach-omap2/devices.c:662:13: error:
'OMAP_HDQ_BASE' undeclared here (not in a function)

Looks like OMAP_HDQ_BASE is valid for all omaps except
2420, so we can remove the ifdef and not register
the device on 2420.
Signed-off-by: NTony Lindgren <tony@atomide.com>
上级 b2a5124e
...@@ -654,9 +654,7 @@ void __init omap242x_init_mmc(struct omap_mmc_platform_data **mmc_data) ...@@ -654,9 +654,7 @@ void __init omap242x_init_mmc(struct omap_mmc_platform_data **mmc_data)
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
#if defined(CONFIG_HDQ_MASTER_OMAP) || defined(CONFIG_HDQ_MASTER_OMAP_MODULE) #if defined(CONFIG_HDQ_MASTER_OMAP) || defined(CONFIG_HDQ_MASTER_OMAP_MODULE)
#if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_SOC_OMAP3430)
#define OMAP_HDQ_BASE 0x480B2000 #define OMAP_HDQ_BASE 0x480B2000
#endif
static struct resource omap_hdq_resources[] = { static struct resource omap_hdq_resources[] = {
{ {
.start = OMAP_HDQ_BASE, .start = OMAP_HDQ_BASE,
...@@ -679,7 +677,10 @@ static struct platform_device omap_hdq_dev = { ...@@ -679,7 +677,10 @@ static struct platform_device omap_hdq_dev = {
}; };
static inline void omap_hdq_init(void) static inline void omap_hdq_init(void)
{ {
(void) platform_device_register(&omap_hdq_dev); if (cpu_is_omap2420())
return;
platform_device_register(&omap_hdq_dev);
} }
#else #else
static inline void omap_hdq_init(void) {} static inline void omap_hdq_init(void) {}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册