aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/opp2xxx.h
diff options
context:
space:
mode:
authorAfzal Mohammed <afzal@ti.com>2011-12-13 10:46:43 -0800
committerTony Lindgren <tony@atomide.com>2011-12-13 10:46:43 -0800
commit995411953604e3c973328dda8c7807e45aca0f2b (patch)
tree970f5036a513ce2a087663f38c55c33846bd2bb8 /arch/arm/mach-omap2/opp2xxx.h
parentARM: 7194/1: OMAP: Fix build after a merge between v3.2-rc4 and ARM restart changes (diff)
downloadlinux-dev-995411953604e3c973328dda8c7807e45aca0f2b.tar.xz
linux-dev-995411953604e3c973328dda8c7807e45aca0f2b.zip
ARM: OMAP: am33xx: Update common omap platform files
This patch updates the common platform files with AM335X device support (AM33XX family). The approach taken in this patch is, AM33XX device will be considered as OMAP3 variant, and a separate SoC class created for AM33XX family of devices with a subclass type for AM335X device, which is newly added device in the family. This means, cpu_is_omap34xx(), cpu_is_am33xx() and cpu_is_am335x() checks will return success on AM335X device. A kernel config option CONFIG_SOC_OMAPAM33XX is added under OMAP3 to include support for AM33XX build. Also, cpu_mask and RATE_IN_XXX flags have crossed 8 bit hence struct clksel_rate.flags, struct prcm_config.flags and cpu_mask are changed to u16 from u8. Signed-off-by: Afzal Mohammed <afzal@ti.com> Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com> Cc: Hemant Pedanekar <hemantp@ti.com> [tony@atomide.com: left out CK_AM33XX for now] Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/opp2xxx.h')
-rw-r--r--arch/arm/mach-omap2/opp2xxx.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/opp2xxx.h b/arch/arm/mach-omap2/opp2xxx.h
index 8affc66a92c2..8fae534eb157 100644
--- a/arch/arm/mach-omap2/opp2xxx.h
+++ b/arch/arm/mach-omap2/opp2xxx.h
@@ -51,7 +51,7 @@ struct prcm_config {
unsigned long cm_clksel2_pll; /* dpllx1 or x2 out */
unsigned long cm_clksel_mdm; /* modem dividers 2430 only */
unsigned long base_sdrc_rfr; /* base refresh timing for a set */
- unsigned char flags;
+ unsigned short flags;
};