diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 22:55:48 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 22:55:48 +0100 |
| commit | f4ebf1d1f8d10b703493e76300605e8be2f21bf5 (patch) | |
| tree | 128a3df4169021c975ccb08cac73298872a15db4 /arch/arm/plat-omap | |
| parent | Linux 3.2-rc5 (diff) | |
| parent | Merge branch 'hwmod_data_devel_3.3' of git://git.pwsan.com/linux-2.6 into hwmod (diff) | |
| download | linux-f4ebf1d1f8d10b703493e76300605e8be2f21bf5.tar.xz linux-f4ebf1d1f8d10b703493e76300605e8be2f21bf5.zip | |
Merge branch 'hwmod' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into omap/hwmod
Diffstat (limited to 'arch/arm/plat-omap')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/irqs.h | 2 | ||||
| -rw-r--r-- | arch/arm/plat-omap/include/plat/serial.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/include/plat/irqs.h b/arch/arm/plat-omap/include/plat/irqs.h index 30e10719b774..6e5d3a0cb9d5 100644 --- a/arch/arm/plat-omap/include/plat/irqs.h +++ b/arch/arm/plat-omap/include/plat/irqs.h @@ -357,7 +357,7 @@ #define INT_35XX_EMAC_C0_TX_PULSE_IRQ 69 #define INT_35XX_EMAC_C0_MISC_PULSE_IRQ 70 #define INT_35XX_USBOTG_IRQ 71 -#define INT_35XX_UART4 84 +#define INT_35XX_UART4_IRQ 84 #define INT_35XX_CCDC_VD0_IRQ 88 #define INT_35XX_CCDC_VD1_IRQ 92 #define INT_35XX_CCDC_VD2_IRQ 93 diff --git a/arch/arm/plat-omap/include/plat/serial.h b/arch/arm/plat-omap/include/plat/serial.h index 1ab9fd6abe6d..865a2ba7ffa8 100644 --- a/arch/arm/plat-omap/include/plat/serial.h +++ b/arch/arm/plat-omap/include/plat/serial.h @@ -44,6 +44,7 @@ #define OMAP3_UART2_BASE OMAP2_UART2_BASE #define OMAP3_UART3_BASE 0x49020000 #define OMAP3_UART4_BASE 0x49042000 /* Only on 36xx */ +#define OMAP3_UART4_AM35XX_BASE 0x4809E000 /* Only on AM35xx */ /* OMAP4 serial ports */ #define OMAP4_UART1_BASE OMAP2_UART1_BASE |