diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-24 09:33:14 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-24 09:33:14 -0700 |
commit | 6e50e9f9f4a8277b4d76de417ca77cf3921bd524 (patch) | |
tree | 44604d8eaf87d9283a1aa2715d131790e8b50128 /arch/arm/mach-tegra/board-seaboard.h | |
parent | e264ac8cad5a3f2e717ac68eb300766eef61f568 (diff) | |
parent | 84abf6084704673ae80a2105bf63ece5eee3edd5 (diff) | |
download | blackbird-op-linux-6e50e9f9f4a8277b4d76de417ca77cf3921bd524.tar.gz blackbird-op-linux-6e50e9f9f4a8277b4d76de417ca77cf3921bd524.zip |
Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra
* 'for-linus' of git://android.git.kernel.org/kernel/tegra:
ARM: tegra: harmony: initialize the TPS65862 PMIC
ARM: tegra: update defconfig
ARM: tegra: harmony: update PCI-e initialization sequence
ARM: tegra: trimslice: enable MMC/SD slots
ARM: tegra: enable new drivers in defconfig
ARM: tegra: Add Toshiba AC100 support
ARM: tegra: harmony: Set WM8903 gpio_base
ARM: tegra: harmony: I2C-related portions of audio support
ARM: tegra: harmony: register i2c devices
ARM: tegra: seaboard: register i2c devices
ARM: tegra: harmony: Beginnings of audio support
ARM: tegra: create defines for SD-related GPIO names
ARM: tegra: add devices.c entries for audio
Diffstat (limited to 'arch/arm/mach-tegra/board-seaboard.h')
-rw-r--r-- | arch/arm/mach-tegra/board-seaboard.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/board-seaboard.h b/arch/arm/mach-tegra/board-seaboard.h index a098e3599731..d8415e1a8434 100644 --- a/arch/arm/mach-tegra/board-seaboard.h +++ b/arch/arm/mach-tegra/board-seaboard.h @@ -17,6 +17,9 @@ #ifndef _MACH_TEGRA_BOARD_SEABOARD_H #define _MACH_TEGRA_BOARD_SEABOARD_H +#define TEGRA_GPIO_SD2_CD TEGRA_GPIO_PI5 +#define TEGRA_GPIO_SD2_WP TEGRA_GPIO_PH1 +#define TEGRA_GPIO_SD2_POWER TEGRA_GPIO_PI6 #define TEGRA_GPIO_LIDSWITCH TEGRA_GPIO_PC7 #define TEGRA_GPIO_USB1 TEGRA_GPIO_PD0 #define TEGRA_GPIO_POWERKEY TEGRA_GPIO_PV2 |