summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/soc.h
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2015-01-14 17:37:16 -0800
committerTony Lindgren <tony@atomide.com>2015-01-14 17:37:16 -0800
commitc27964b5d2f3c36b0160d6d26f79f2d4730c440b (patch)
treec26967c376bdf7ad2cca0b594bc47ef23e03e9fd /arch/arm/mach-omap2/soc.h
parente226ebe95e7afb79ff24c53f9984b8acad13cc81 (diff)
downloadlinux-c27964b5d2f3c36b0160d6d26f79f2d4730c440b.tar.gz
linux-c27964b5d2f3c36b0160d6d26f79f2d4730c440b.tar.bz2
linux-c27964b5d2f3c36b0160d6d26f79f2d4730c440b.zip
ARM: OMAP2+: Fix ti81xx class type
Otherwise it will return true for cpu_is_omap34xx() which we don't want for the clocks and hwmod. It's closer to am33xx for the clocks and hwmod than to the omap34xx. We also want to be able to detect 814x and 816x separately as at least the clocks are different with 814x using a apll and 816x using a fapll for the source clocks. Note that we can also remove omap3xxx_clk_init() call as it's wrong and ti81xx are booting in device tree only mode. Cc: Brian Hutchinson <b.hutchman@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/soc.h')
-rw-r--r--arch/arm/mach-omap2/soc.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/soc.h b/arch/arm/mach-omap2/soc.h
index c1a3b4416311..f97654d11ea5 100644
--- a/arch/arm/mach-omap2/soc.h
+++ b/arch/arm/mach-omap2/soc.h
@@ -423,13 +423,13 @@ IS_OMAP_TYPE(3430, 0x3430)
#define OMAP3630_REV_ES1_1 (OMAP363X_CLASS | (0x1 << 8))
#define OMAP3630_REV_ES1_2 (OMAP363X_CLASS | (0x2 << 8))
-#define TI816X_CLASS 0x81600034
+#define TI816X_CLASS 0x81600081
#define TI8168_REV_ES1_0 TI816X_CLASS
#define TI8168_REV_ES1_1 (TI816X_CLASS | (0x1 << 8))
#define TI8168_REV_ES2_0 (TI816X_CLASS | (0x2 << 8))
#define TI8168_REV_ES2_1 (TI816X_CLASS | (0x3 << 8))
-#define TI814X_CLASS 0x81400034
+#define TI814X_CLASS 0x81400081
#define TI8148_REV_ES1_0 TI814X_CLASS
#define TI8148_REV_ES2_0 (TI814X_CLASS | (0x1 << 8))
#define TI8148_REV_ES2_1 (TI814X_CLASS | (0x2 << 8))