Re: [PATCH] ARM: OMAP: Fix warnings in devices.c for 2430sdp config

[tony@atomide.com]

* Tony Lindgren <tony@atomide.com> [070320 14:06]:
> * Syed Mohammed, Khasim <x0khasim@ti.com> [070320 12:42]:
> > Tony,
> > 
> > Keypad and MMC are different from that on 2420 SDP as such. Keypad is
> > based on TWL4030 Keypad controller and MMC is HSMMC controller. It might
> > take some time to send a patch. 
> > 
> > I am actually working on the Keypad one, will post a patch soon.
> 
> OK, how about this patch instead then? It assumes that wdt and rng
> are the same.
> 
> Regards,
> 
> Tony

> ARM:OMAP: Fix compile warnings for 2430
> 
> Some 2430 devices are different and not yet done.
> 
> Signed-off-by: Tony Lindgren <tony@atomide.com>
> 
> --- a/arch/arm/plat-omap/devices.c
> +++ b/arch/arm/plat-omap/devices.c
> @@ -157,6 +157,10 @@ static inline void omap_init_i2c(void) {}
>  
>  static void omap_init_kp(void)
>  {
> +	/* REVISIT: 2430 keypad is on TWL4030 */
> +	if (cpu_is_omap2430())
> +		return;
> +
>  	if (machine_is_omap_h2() || machine_is_omap_h3()) {
>  		omap_cfg_reg(F18_1610_KBC0);
>  		omap_cfg_reg(D20_1610_KBC1);
> @@ -283,6 +287,10 @@ static void __init omap_init_mmc(void)
>  	const struct omap_mmc_config	*mmc_conf;
>  	const struct omap_mmc_conf	*mmc;
>  
> +	/* REVISIT: 2430 has HS MMC */
> +	if (cpu_is_omap2430())
> +		return;
> +
>  	/* NOTE:  assumes MMC was never (wrongly) enabled */
>  	mmc_conf = omap_get_config(OMAP_TAG_MMC, struct omap_mmc_config);
>  	if (!mmc_conf)
> @@ -495,10 +503,6 @@ static inline void omap_init_rng(void) {}
>   */
>  static int __init omap_init_devices(void)
>  {
> -/*
> - * Need to enable relevant once for 2430 SDP
> - */
> -#ifndef CONFIG_MACH_OMAP_2430SDP
>  	/* please keep these calls, and their implementations above,
>  	 * in alphabetical order so they're easier to sort through.
>  	 */
> @@ -508,7 +512,6 @@ static int __init omap_init_devices(void)
>  	omap_init_uwire();
>  	omap_init_wdt();
>  	omap_init_rng();
> -#endif
>  	omap_init_i2c();
>  	return 0;
>  }

Pushed.

Tony