diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-11-12 15:28:39 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-11-12 15:28:39 +0100 |
| commit | f987e832a9e79d2ce8009a5ea9c7b677624b3b30 (patch) | |
| tree | 0dd09a5e6b4c60ee0a9916907dfc2cda83f3e496 /arch/arm/mach-tegra/board-enterprise.h | |
| parent | f737b7f46a72c099cf8ac88baff02fbf61b1a47c (diff) | |
| parent | fc993d9bc48f772133d8cd156c67c296477db070 (diff) | |
Merge branch 'l4t/l4t-r16-r2' into colibri
Conflicts:
arch/arm/mach-tegra/tegra3_usb_phy.c
arch/arm/mach-tegra/usb_phy.c
drivers/usb/gadget/tegra_udc.c
drivers/usb/otg/Makefile
drivers/video/tegra/fb.c
sound/soc/tegra/tegra_pcm.c
Diffstat (limited to 'arch/arm/mach-tegra/board-enterprise.h')
| -rw-r--r-- | arch/arm/mach-tegra/board-enterprise.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-enterprise.h b/arch/arm/mach-tegra/board-enterprise.h index 3c6d149abdff..ae488dfb4618 100644 --- a/arch/arm/mach-tegra/board-enterprise.h +++ b/arch/arm/mach-tegra/board-enterprise.h @@ -1,7 +1,7 @@ /* * arch/arm/mach-tegra/board-enterprise.h * - * Copyright (c) 2011, NVIDIA Corporation. + * Copyright (c) 2012, NVIDIA Corporation. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,6 +28,7 @@ /* Processor Board ID */ #define BOARD_E1205 0x0C05 #define BOARD_E1197 0x0B61 +#define BOARD_E1239 0x0C27 #define SKU_BATTERY_SUPPORT 0x1 /* Board Fab version */ @@ -93,6 +94,11 @@ void enterprise_bpc_mgmt_init(void); #define ENT_TPS80031_IRQ_BASE TEGRA_NR_IRQS #define ENT_TPS80031_IRQ_END (ENT_TPS80031_IRQ_BASE + TPS80031_INT_NR) +/* AIC326X IRQs */ +/* Assuming TPS is the PMIC on Ent */ +#define AIC3262_CODEC_IRQ_BASE ENT_TPS80031_IRQ_END +#define AIC3262_CODEC_IRQ_END (AIC3262_CODEC_IRQ_BASE + 6) + /*****************Camera GPIOs ******************/ #define CAM_CSI_MUX_SEL_GPIO TEGRA_GPIO_PM3 #define CAM_CSI_MUX_SEL_REAR 1 @@ -113,7 +119,10 @@ void enterprise_bpc_mgmt_init(void); /* Audio-related GPIOs */ #define TEGRA_GPIO_HP_DET TEGRA_GPIO_PW3 +#define TEGRA_GPIO_CODEC_RST TEGRA_GPIO_PX0 +/* UART port which is used by bluetooth*/ +#define BLUETOOTH_UART_DEV_NAME "/dev/ttyHS2" /* Baseband GPIO addresses */ #define GPIO_BB_RESET TEGRA_GPIO_PE1 @@ -159,6 +168,7 @@ enum tegra_bb_type { }; /* Indicate the pwm of backlight, DC pwm or external pwm3. */ +/* External pwm is used for TAI (E1239) but do not set this compiler switch */ #define IS_EXTERNAL_PWM 0 #endif /*_MACH_TEGRA_BOARD_ENTERPRISE_H */ |