[PATCH 1/2] davinci: DA850/OMAP-L138: eliminate static function declaration

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH 1/2] davinci: DA850/OMAP-L138: eliminate static function declaration

Kevin Hilman
Sudhakar Rajashekhara <[hidden email]> writes:

> Eliminate the static function declaration by rearranging
> data in da850/omap-l138 board file.
>
> Signed-off-by: Sudhakar Rajashekhara <[hidden email]>

Sudhakar,

Can you redo this series on top of Sekhar's 5-patch series that starts
with "davinci: DA830/OMAP-L137 EVM: use runtime detection for UI
card".  The two series are moving/changing the same code.

Kevin


> ---
>  arch/arm/mach-davinci/board-da850-evm.c |  103 +++++++++++++++----------------
>  1 files changed, 51 insertions(+), 52 deletions(-)
>
> diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
> index 23e2024..e04f775 100644
> --- a/arch/arm/mach-davinci/board-da850-evm.c
> +++ b/arch/arm/mach-davinci/board-da850-evm.c
> @@ -145,8 +145,58 @@ static struct platform_device da850_evm_nandflash_device = {
>   .resource = da850_evm_nandflash_resource,
>  };
>  
> +static struct platform_device *da850_evm_devices[] __initdata = {
> + &da850_evm_nandflash_device,
> + &da850_evm_norflash_device,
> +};
> +
> +#define DA8XX_AEMIF_CE2CFG_OFFSET 0x10
> +#define DA8XX_AEMIF_ASIZE_16BIT 0x1
> +
> +static void __init da850_evm_init_nor(void)
> +{
> + void __iomem *aemif_addr;
> +
> + aemif_addr = ioremap(DA8XX_AEMIF_CTL_BASE, SZ_32K);
> +
> + /* Configure data bus width of CS2 to 16 bit */
> + writel(readl(aemif_addr + DA8XX_AEMIF_CE2CFG_OFFSET) |
> + DA8XX_AEMIF_ASIZE_16BIT,
> + aemif_addr + DA8XX_AEMIF_CE2CFG_OFFSET);
> +
> + iounmap(aemif_addr);
> +}
> +
>  static u32 ui_card_detected;
> -static void da850_evm_setup_nor_nand(void);
> +
> +#if defined(CONFIG_MMC_DAVINCI) || \
> +    defined(CONFIG_MMC_DAVINCI_MODULE)
> +#define HAS_MMC 1
> +#else
> +#define HAS_MMC 0
> +#endif
> +
> +static void da850_evm_setup_nor_nand(void)
> +{
> + int ret = 0;
> +
> + if (ui_card_detected & !HAS_MMC) {
> + ret = da8xx_pinmux_setup(da850_nand_pins);
> + if (ret)
> + pr_warning("da850_evm_init: nand mux setup failed: "
> + "%d\n", ret);
> +
> + ret = da8xx_pinmux_setup(da850_nor_pins);
> + if (ret)
> + pr_warning("da850_evm_init: nor mux setup failed: %d\n",
> + ret);
> +
> + da850_evm_init_nor();
> +
> + platform_add_devices(da850_evm_devices,
> + ARRAY_SIZE(da850_evm_devices));
> + }
> +}
>  
>  static int da850_evm_ui_expander_setup(struct i2c_client *client, unsigned gpio,
>   unsigned ngpio, void *c)
> @@ -240,11 +290,6 @@ static struct davinci_uart_config da850_evm_uart_config __initdata = {
>   .enabled_uarts = 0x7,
>  };
>  
> -static struct platform_device *da850_evm_devices[] __initdata = {
> - &da850_evm_nandflash_device,
> - &da850_evm_norflash_device,
> -};
> -
>  /* davinci da850 evm audio machine driver */
>  static u8 da850_iis_serializer_direction[] = {
>   INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE,
> @@ -315,23 +360,6 @@ static int da850_lcd_hw_init(void)
>   return 0;
>  }
>  
> -#define DA8XX_AEMIF_CE2CFG_OFFSET 0x10
> -#define DA8XX_AEMIF_ASIZE_16BIT 0x1
> -
> -static void __init da850_evm_init_nor(void)
> -{
> - void __iomem *aemif_addr;
> -
> - aemif_addr = ioremap(DA8XX_AEMIF_CTL_BASE, SZ_32K);
> -
> - /* Configure data bus width of CS2 to 16 bit */
> - writel(readl(aemif_addr + DA8XX_AEMIF_CE2CFG_OFFSET) |
> - DA8XX_AEMIF_ASIZE_16BIT,
> - aemif_addr + DA8XX_AEMIF_CE2CFG_OFFSET);
> -
> - iounmap(aemif_addr);
> -}
> -
>  /* TPS65070 voltage regulator support */
>  
>  /* 3.3V */
> @@ -479,35 +507,6 @@ static int __init pmic_tps65070_init(void)
>   ARRAY_SIZE(da850evm_tps65070_info));
>  }
>  
> -#if defined(CONFIG_MMC_DAVINCI) || \
> -    defined(CONFIG_MMC_DAVINCI_MODULE)
> -#define HAS_MMC 1
> -#else
> -#define HAS_MMC 0
> -#endif
> -
> -static void da850_evm_setup_nor_nand(void)
> -{
> - int ret = 0;
> -
> - if (ui_card_detected & !HAS_MMC) {
> - ret = da8xx_pinmux_setup(da850_nand_pins);
> - if (ret)
> - pr_warning("da850_evm_init: nand mux setup failed: "
> - "%d\n", ret);
> -
> - ret = da8xx_pinmux_setup(da850_nor_pins);
> - if (ret)
> - pr_warning("da850_evm_init: nor mux setup failed: %d\n",
> - ret);
> -
> - da850_evm_init_nor();
> -
> - platform_add_devices(da850_evm_devices,
> - ARRAY_SIZE(da850_evm_devices));
> - }
> -}
> -
>  static const short da850_evm_lcdc_pins[] = {
>   DA850_GPIO2_8, DA850_GPIO2_15,
>   -1
> --
> 1.5.6
>
> _______________________________________________
> Davinci-linux-open-source mailing list
> [hidden email]
> http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source

Reply | Threaded
Open this post in threaded view
|

[PATCH 1/2] davinci: DA850/OMAP-L138: eliminate static function declaration

Sudhakar Rajashekhara
On Tue, Nov 03, 2009 at 00:57:01, Kevin Hilman wrote:

> Sudhakar Rajashekhara <[hidden email]> writes:
>
> > Eliminate the static function declaration by rearranging
> > data in da850/omap-l138 board file.
> >
> > Signed-off-by: Sudhakar Rajashekhara <[hidden email]>
>
> Sudhakar,
>
> Can you redo this series on top of Sekhar's 5-patch series that starts
> with "davinci: DA830/OMAP-L137 EVM: use runtime detection for UI
> card".  The two series are moving/changing the same code.
>

Sure. I noticed one more warning during compilation. I'll fix that
as well in my next version.

Sudhakar