[PATCH 07/11] [ARM] pxa/balloon3: Machine file cleanup

Jonathan McDowell noodles at earth.li
Thu Aug 5 19:25:06 EDT 2010


On Wed, Aug 04, 2010 at 01:22:09PM +0200, Marek Vasut wrote:
> Modularize components of the Balloon3 board.

NAK.

That's not what a large portion of this patch does. You have put all of
the pin definitions into balloon3_pin_config and negated the work that
was done to ensure that a single kernel could run on different variants
of the balloon3. If a feature isn't configured on the board you
shouldn't configure the MFPs for that feature.

> Signed-off-by: Marek Vasut <marek.vasut at gmail.com>
> ---
>  arch/arm/mach-pxa/balloon3.c |  354 +++++++++++++++++++++++++++---------------
>  1 files changed, 231 insertions(+), 123 deletions(-)
> 
> diff --git a/arch/arm/mach-pxa/balloon3.c b/arch/arm/mach-pxa/balloon3.c
> index 8adb87a..572525c 100644
> --- a/arch/arm/mach-pxa/balloon3.c
> +++ b/arch/arm/mach-pxa/balloon3.c
> @@ -22,6 +22,7 @@
>  #include <linux/fb.h>
>  #include <linux/gpio.h>
>  #include <linux/ioport.h>
> +#include <linux/ucb1400.h>
>  #include <linux/mtd/mtd.h>
>  #include <linux/mtd/partitions.h>
>  #include <linux/types.h>
> @@ -61,35 +62,136 @@ static unsigned long balloon3_pin_config[] __initdata = {
>  	GPIO44_BTUART_CTS,
>  	GPIO45_BTUART_RTS,
>  
> -	/* Wakeup GPIO */
> +	/* Reset, configured as GPIO wakeup source */
>  	GPIO1_GPIO | WAKEUP_ON_EDGE_BOTH,
>  
> -	/* NAND & IDLE LED GPIOs */
> -	GPIO9_GPIO,
> -	GPIO10_GPIO,
> -};
> +	/* LEDs */
> +	GPIO9_GPIO,	/* NAND activity LED */
> +	GPIO10_GPIO,	/* Heartbeat LED */
>  
> -/******************************************************************************
> - * Audio and Touchscreen
> - ******************************************************************************/
> -static unsigned long balloon3_ac97_pin_config[] = {
> +	/* AC97 */
>  	GPIO28_AC97_BITCLK,
>  	GPIO29_AC97_SDATA_IN_0,
>  	GPIO30_AC97_SDATA_OUT,
>  	GPIO31_AC97_SYNC,
>  	GPIO113_AC97_nRESET,
> +	GPIO95_GPIO,
> +
> +	/* MMC */
> +	GPIO32_MMC_CLK,
> +	GPIO92_MMC_DAT_0,
> +	GPIO109_MMC_DAT_1,
> +	GPIO110_MMC_DAT_2,
> +	GPIO111_MMC_DAT_3,
> +	GPIO112_MMC_CMD,
> +
> +	/* USB Host */
> +	GPIO88_USBH1_PWR,
> +	GPIO89_USBH1_PEN,
>  };
>  


J.

-- 
     I am afraid of the dark.      |  .''`.  Debian GNU/Linux Developer
                                   | : :' :  Happy to accept PGP signed
                                   | `. `'   or encrypted mail - RSA
                                   |   `-    key on the keyservers.



More information about the linux-arm-kernel mailing list