diff options
| author | Olof Johansson <olof@lixom.net> | 2012-03-08 00:02:47 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-03-08 00:02:47 +0100 |
| commit | 269f6a93f6851b68848e67816a14a2ebf8a48c6b (patch) | |
| tree | 34ea976a0d72c52c4b4b5d577a6d97c6c3712ea9 /arch/arm/mach-omap2/control.h | |
| parent | Merge branch 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | ARM: OMAP3+: PM: VP: fix integer truncation error (diff) | |
| download | linux-269f6a93f6851b68848e67816a14a2ebf8a48c6b.tar.xz linux-269f6a93f6851b68848e67816a14a2ebf8a48c6b.zip | |
Merge branch 'fixes-non-critical-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical
* 'fixes-non-critical-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP3+: PM: VP: fix integer truncation error
ARM: OMAP2+: PM: fix wakeupgen warning when hotplug disabled
ARM: OMAP2+: PM: fix section mismatch with omap2_init_processor_devices()
ARM: OMAP2: Fix section warning for n8x0 when CONFIG_MMC_OMAP is not set
ARM: OMAP2+: Fix omap24xx_io_desc warning if SoC subtypes are not selected
ARM: OMAP1: Fix section mismatch for omap1_init_early()
ARM: OMAP1: Fix typo in lcd_dma.c
ARM: OMAP: mailbox: trivial whitespace fix
ARM: OMAP: Remove definition cpu_is_omap4430()
ARM: OMAP2+: included some headers twice
ARM: OMAP: clock.c: included linux/debugfs.h twice
ARM: OMAP: don't build hwspinlock in vain
ARM: OMAP2+: ads7846_init: put gpio_pendown into pdata if it's provided
ARM: omap: pandora: fix usbhs platform data
ARM: OMAP: sram: Add am33xx SRAM support (minimal)
ARM: OMAP2+: id: Add am33xx SoC type detection
ARM: OMAP2+: GPMC: Export gpmc_enable_hwecc and gpmc_calculate_ecc
ARM: OMAP: dmtimer: fix missing content/correction in low-power mode support
Diffstat (limited to 'arch/arm/mach-omap2/control.h')
| -rw-r--r-- | arch/arm/mach-omap2/control.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/control.h b/arch/arm/mach-omap2/control.h index 0ba68d3764bc..96c4bcc0a75c 100644 --- a/arch/arm/mach-omap2/control.h +++ b/arch/arm/mach-omap2/control.h @@ -339,6 +339,11 @@ #define AM35XX_VPFE_PCLK_SW_RST BIT(4) /* + * CONTROL AM33XX STATUS register + */ +#define AM33XX_CONTROL_STATUS 0x040 + +/* * CONTROL OMAP STATUS register to identify OMAP3 features */ #define OMAP3_CONTROL_OMAP_STATUS 0x044c |