diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-07-05 02:13:04 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-07-05 02:13:04 -0700 |
| commit | ac5b0ea3d00d231dd9cedd45636b29defc368a4c (patch) | |
| tree | 9649d193558e7c662257063a77ab7422379ac45b /arch/arm/mach-omap2/control.h | |
| parent | 3f96a2d90e6923e2dd1e35d2f149a70a4d0f678c (diff) | |
| parent | 8cb8de5d87b75f2ecaa1189079764340ea366c0e (diff) | |
| download | blackbird-op-linux-ac5b0ea3d00d231dd9cedd45636b29defc368a4c.tar.gz blackbird-op-linux-ac5b0ea3d00d231dd9cedd45636b29defc368a4c.zip | |
Merge tag 'omap-devel-f-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into cleanup-part2
Miscellaneous OMAP clock, hwmod, clockdomain, and powerdomain patches
for 3.6. Mostly small infrastructure improvements, and preparation
for OMAP5 and AM33xx code.
Conflicts:
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/plat-omap/include/plat/omap_hwmod.h
Diffstat (limited to 'arch/arm/mach-omap2/control.h')
| -rw-r--r-- | arch/arm/mach-omap2/control.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/control.h b/arch/arm/mach-omap2/control.h index 5baf305386e9..295b39047a71 100644 --- a/arch/arm/mach-omap2/control.h +++ b/arch/arm/mach-omap2/control.h @@ -188,6 +188,7 @@ #define OMAP3630_CONTROL_FUSE_OPP120_VDD1 (OMAP2_CONTROL_GENERAL + 0x0120) #define OMAP3630_CONTROL_FUSE_OPP50_VDD2 (OMAP2_CONTROL_GENERAL + 0x0128) #define OMAP3630_CONTROL_FUSE_OPP100_VDD2 (OMAP2_CONTROL_GENERAL + 0x012C) +#define OMAP3630_CONTROL_CAMERA_PHY_CTRL (OMAP2_CONTROL_GENERAL + 0x02f0) /* OMAP44xx control efuse offsets */ #define OMAP44XX_CONTROL_FUSE_IVA_OPP50 0x22C |
