aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-ux500/board-mop500.c
diff options
context:
space:
mode:
authorPer Persson <per.xb.persson@stericsson.com>2010-07-02 13:14:25 +0200
committerJohn Rigby <john.rigby@linaro.org>2010-09-02 22:45:50 -0600
commit48d5fa309fc3a106e531528867406d6a3adb3059 (patch)
tree5af714f69b41159cc9dfd4d055c6e6fce20bddfc /arch/arm/mach-ux500/board-mop500.c
parent862ec7d2196b8072487f0a70cc9e56eea3fc8b7b (diff)
downloadlinux-2.6.34-ux500-48d5fa309fc3a106e531528867406d6a3adb3059.tar.gz
HDMI and AV8100: new features
* HDMI api, including EDID, CEC, INFOFRAME, audio coniguration, aes key handling, event support. * Automatic detection and handling of av8100 chip version 1 and 2. * Support for av8100/mcde hw trig method using I2SDAT3 (menuconfig). ST Ericsson Change-Id: WP264235 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/2120 Reviewed-by: Dan JOHANSSON <dan.johansson@stericsson.com> Tested-by: Per PERSSON <per.xb.persson@stericsson.com> Reviewed-by: Marcel TUNNISSEN <marcel.tuennissen@stericsson.com> Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> Change-Id: Ic205e046988fff7a5d49ae3091559d1fd76768d2 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/2841
Diffstat (limited to 'arch/arm/mach-ux500/board-mop500.c')
-rwxr-xr-xarch/arm/mach-ux500/board-mop500.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index 18fb1f853cf..ce173ed335e 100755
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -49,7 +49,6 @@ int href_v1_board;
#define MOP500_PLATFORM_ID 0
#define HREF_PLATFORM_ID 1
-/*#define AV8100_HW_TE_I2SDAT3*/ /* REVIEW/TODO: remove? */
int platform_id = MOP500_PLATFORM_ID;
/* we have equally similar boards with very minimal
@@ -113,8 +112,13 @@ static struct gpio_altfun_data gpio_altfun_table[] = {
"mcde tvout"),
__GPIO_ALT(GPIO_ALT_LCD_PANELB, 150, 150, 0, NMK_GPIO_ALT_B,
"mcde tvout"),
+#ifdef CONFIG_AV8100_HWTRIG_I2SDAT3
+ __GPIO_ALT(GPIO_ALT_LCD_PANELA, 69, 69, 0, NMK_GPIO_ALT_A,
+ "mcde tvout"),
+#else
__GPIO_ALT(GPIO_ALT_LCD_PANELA, 68, 68, 0, NMK_GPIO_ALT_A,
"mcde tvout"),
+#endif /* CONFIG_AV8100_HWTRIG_I2SDAT3 */
__GPIO_ALT(GPIO_ALT_MMIO_INIT_BOARD, 141, 142, 0, NMK_GPIO_ALT_B,
"mmio"),
__GPIO_ALT(GPIO_ALT_MMIO_CAM_SET_I2C, 8, 9, 0, NMK_GPIO_ALT_A, "mmio"),