From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 21 Oct 2011 14:46:26 +0000 (+0200)
Subject: Merge branch 'depends/rmk/gpio' into next/board
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=335332770c68649ffeaf5dc2b58d9cd40041e295;p=linux-edison.git

Merge branch 'depends/rmk/gpio' into next/board

Conflicts:
	arch/arm/mach-at91/board-usb-a9260.c
	arch/arm/mach-at91/board-usb-a9263.c
	arch/arm/mach-tegra/board-paz00.h
	arch/arm/mach-tegra/board-seaboard.h
---

335332770c68649ffeaf5dc2b58d9cd40041e295
diff --cc arch/arm/mach-at91/board-usb-a926x.c
index 260260b8199,5bd735787d6..5852d3d9890
--- a/arch/arm/mach-at91/board-usb-a926x.c
+++ b/arch/arm/mach-at91/board-usb-a926x.c
@@@ -28,8 -28,7 +28,9 @@@
  #include <linux/platform_device.h>
  #include <linux/spi/spi.h>
  #include <linux/gpio_keys.h>
++#include <linux/gpio.h>
  #include <linux/input.h>
 +#include <linux/spi/mmc_spi.h>
  
  #include <asm/setup.h>
  #include <asm/mach-types.h>
diff --cc arch/arm/mach-mmp/gplugd.c
index 98e25d9aaab,ef738deb20b..32776f3739f
--- a/arch/arm/mach-mmp/gplugd.c
+++ b/arch/arm/mach-mmp/gplugd.c
@@@ -13,9 -14,9 +14,8 @@@
  #include <asm/mach/arch.h>
  #include <asm/mach-types.h>
  
- #include <mach/gpio.h>
  #include <mach/pxa168.h>
  #include <mach/mfp-pxa168.h>
 -#include <mach/mfp-gplugd.h>
  
  #include "common.h"
  
diff --cc arch/arm/mach-tegra/board-paz00.c
index d161590c99c,ea2f79c9879..ac809b6e3de
--- a/arch/arm/mach-tegra/board-paz00.c
+++ b/arch/arm/mach-tegra/board-paz00.c
@@@ -26,7 -26,6 +26,8 @@@
  #include <linux/pda_power.h>
  #include <linux/io.h>
  #include <linux/i2c.h>
++#include <linux/gpio.h>
 +#include <linux/rfkill-gpio.h>
  
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>
@@@ -36,7 -35,7 +37,6 @@@
  #include <mach/iomap.h>
  #include <mach/irqs.h>
  #include <mach/sdhci.h>
--#include <mach/gpio.h>
  
  #include "board.h"
  #include "board-paz00.h"
diff --cc arch/arm/mach-tegra/board-paz00.h
index 86057c3fb9a,42ce8639b90..8aff06eb58c
--- a/arch/arm/mach-tegra/board-paz00.h
+++ b/arch/arm/mach-tegra/board-paz00.h
@@@ -17,19 -17,13 +17,21 @@@
  #ifndef _MACH_TEGRA_BOARD_PAZ00_H
  #define _MACH_TEGRA_BOARD_PAZ00_H
  
+ #include <mach/gpio-tegra.h>
+ 
 +/* SDCARD */
- #define TEGRA_GPIO_SD1_CD	TEGRA_GPIO_PV5
- #define TEGRA_GPIO_SD1_WP	TEGRA_GPIO_PH1
- #define TEGRA_GPIO_SD1_POWER	TEGRA_GPIO_PT3
+ #define TEGRA_GPIO_SD1_CD		TEGRA_GPIO_PV5
+ #define TEGRA_GPIO_SD1_WP		TEGRA_GPIO_PH1
+ #define TEGRA_GPIO_SD1_POWER		TEGRA_GPIO_PT3
 +
 +/* ULPI */
- #define TEGRA_ULPI_RST		TEGRA_GPIO_PV0
+ #define TEGRA_ULPI_RST			TEGRA_GPIO_PV0
  
 +/* WIFI */
- #define TEGRA_WIFI_PWRN		TEGRA_GPIO_PK5
- #define TEGRA_WIFI_RST		TEGRA_GPIO_PD1
- #define TEGRA_WIFI_LED		TEGRA_GPIO_PD0
++#define TEGRA_WIFI_PWRN			TEGRA_GPIO_PK5
++#define TEGRA_WIFI_RST			TEGRA_GPIO_PD1
++#define TEGRA_WIFI_LED			TEGRA_GPIO_PD0
 +
  void paz00_pinmux_init(void);
  
  #endif
diff --cc arch/arm/mach-tegra/board-seaboard.h
index d06c3342e2c,15b6c57361b..4c45d4ca3c4
--- a/arch/arm/mach-tegra/board-seaboard.h
+++ b/arch/arm/mach-tegra/board-seaboard.h
@@@ -17,9 -17,8 +17,11 @@@
  #ifndef _MACH_TEGRA_BOARD_SEABOARD_H
  #define _MACH_TEGRA_BOARD_SEABOARD_H
  
+ #include <mach/gpio-tegra.h>
+ 
 +#define SEABOARD_GPIO_TPS6586X(_x_)	(TEGRA_NR_GPIOS + (_x_))
 +#define SEABOARD_GPIO_WM8903(_x_)	(SEABOARD_GPIO_TPS6586X(4) + (_x_))
 +
  #define TEGRA_GPIO_SD2_CD		TEGRA_GPIO_PI5
  #define TEGRA_GPIO_SD2_WP		TEGRA_GPIO_PH1
  #define TEGRA_GPIO_SD2_POWER		TEGRA_GPIO_PI6
diff --cc arch/arm/mach-tegra/board-trimslice.c
index 91875b97556,89a6d2adc1d..c3aff9fdffd
--- a/arch/arm/mach-tegra/board-trimslice.c
+++ b/arch/arm/mach-tegra/board-trimslice.c
@@@ -32,7 -32,7 +32,6 @@@
  
  #include <mach/iomap.h>
  #include <mach/sdhci.h>
--#include <mach/gpio.h>
  
  #include "board.h"
  #include "clock.h"