Re: [PATCH 3/3] msm: 8x50: add gpio device configuration.

[Daniel Walker <dwalker@codeaurora.org>]

On Fri, 2010-06-18 at 12:12 -0700, Gregory Bean wrote:
> Add device configuration and board-init for gpio support on the QSD8x50.
> 
> Signed-off-by: Gregory Bean <gbean@codeaurora.org>
> ---
>  arch/arm/mach-msm/board-qsd8x50.c   |   29 +++++++++++++++++++++++++++--
>  arch/arm/mach-msm/devices-qsd8x50.c |   23 +++++++++++++++++++++++
>  2 files changed, 50 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-msm/board-qsd8x50.c b/arch/arm/mach-msm/board-qsd8x50.c
> index e3cc807..9137002 100644
> --- a/arch/arm/mach-msm/board-qsd8x50.c
> +++ b/arch/arm/mach-msm/board-qsd8x50.c
> @@ -40,7 +40,31 @@ static struct msm_gpio uart3_config_data[] = {
>  	{ GPIO_CFG(87, 1, GPIO_OUTPUT,  GPIO_PULL_DOWN, GPIO_2MA), "UART2_Tx"},
>  };
>  
> -static struct platform_device *devices[] __initdata = {
> +/*
> + * Early devices are those which provide a system service which will be
> + * required by one or more of the function calls in qsd8x50_init.
> + * These devices must be probed and online first in order for
> + * the init routine to run successfully.
> + */
> +static struct platform_device *early_devices[] __initdata = {
> +#ifdef CONFIG_GPIOLIB

We can drop the ifdefs I think , cause there's no off state anymore.


> +	&msm_gpio_devices[0],
> +	&msm_gpio_devices[1],
> +	&msm_gpio_devices[2],
> +	&msm_gpio_devices[3],
> +	&msm_gpio_devices[4],
> +	&msm_gpio_devices[5],
> +	&msm_gpio_devices[6],
> +	&msm_gpio_devices[7],
> +#endif
> +};
> +
> +/*
> + * Late devices are those which are dependent upon services initialized
> + * by qsd8x50_init, or which simply have no dependents and can have
> + * their initialization deferred.
> + */
> +static struct platform_device *late_devices[] __initdata = {
>  	&msm_device_uart3,
>  };
>  
> @@ -64,8 +88,9 @@ static void __init qsd8x50_init_irq(void)
>  
>  static void __init qsd8x50_init(void)
>  {
> +	platform_add_devices(early_devices, ARRAY_SIZE(early_devices));
>  	msm8x50_init_uart3();
> -	platform_add_devices(devices, ARRAY_SIZE(devices));
> +	platform_add_devices(late_devices, ARRAY_SIZE(late_devices));
>  }
>  
>  MACHINE_START(QSD8X50_SURF, "QCT QSD8X50 SURF")
> diff --git a/arch/arm/mach-msm/devices-qsd8x50.c b/arch/arm/mach-msm/devices-qsd8x50.c
> index 4d4a507..b9f692e 100644
> --- a/arch/arm/mach-msm/devices-qsd8x50.c
> +++ b/arch/arm/mach-msm/devices-qsd8x50.c
> @@ -90,3 +90,26 @@ struct clk msm_clocks_8x50[] = {
>  
>  unsigned msm_num_clocks_8x50 = ARRAY_SIZE(msm_clocks_8x50);
>  
> +#ifdef CONFIG_GPIOLIB

Any this one.

> +static struct msm7200a_gpio_platform_data gpio_platform_data[] = {
> +	MSM7200A_GPIO_PLATFORM_DATA(0,   0,  15, INT_GPIO_GROUP1),
> +	MSM7200A_GPIO_PLATFORM_DATA(1,  16,  42, INT_GPIO_GROUP2),
> +	MSM7200A_GPIO_PLATFORM_DATA(2,  43,  67, INT_GPIO_GROUP1),
> +	MSM7200A_GPIO_PLATFORM_DATA(3,  68,  94, INT_GPIO_GROUP1),
> +	MSM7200A_GPIO_PLATFORM_DATA(4,  95, 103, INT_GPIO_GROUP1),
> +	MSM7200A_GPIO_PLATFORM_DATA(5, 104, 121, INT_GPIO_GROUP1),
> +	MSM7200A_GPIO_PLATFORM_DATA(6, 122, 152, INT_GPIO_GROUP1),
> +	MSM7200A_GPIO_PLATFORM_DATA(7, 153, 164, INT_GPIO_GROUP1),
> +};
> +
> +struct platform_device msm_gpio_devices[] = {
> +	MSM7200A_GPIO_DEVICE(0, gpio_platform_data),
> +	MSM7200A_GPIO_DEVICE(1, gpio_platform_data),
> +	MSM7200A_GPIO_DEVICE(2, gpio_platform_data),
> +	MSM7200A_GPIO_DEVICE(3, gpio_platform_data),
> +	MSM7200A_GPIO_DEVICE(4, gpio_platform_data),
> +	MSM7200A_GPIO_DEVICE(5, gpio_platform_data),
> +	MSM7200A_GPIO_DEVICE(6, gpio_platform_data),
> +	MSM7200A_GPIO_DEVICE(7, gpio_platform_data),
> +};
> +#endif

-- 
Sent by a consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.