aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLokesh Vutla2013-03-21 06:30:34 -0500
committerLokesh Vutla2013-05-29 04:34:26 -0500
commiteaed79285b1b893277e93bcfef0a4bd31fe7edcd (patch)
tree41417dbaefcb5a7e5b6e2903764ad51050ff8ccc
parenta39a6b09f645f095fcf76968d21244ad800426ff (diff)
downloadu-boot-eaed79285b1b893277e93bcfef0a4bd31fe7edcd.tar.gz
u-boot-eaed79285b1b893277e93bcfef0a4bd31fe7edcd.tar.xz
u-boot-eaed79285b1b893277e93bcfef0a4bd31fe7edcd.zip
ARM: DRA7xx: Add control id code for DRA7xx
The registers that are used for device identification are changed from OMAP5 to DRA7xx. Using the correct registers for DRA7xx. Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
-rw-r--r--arch/arm/include/asm/arch-omap5/clocks.h11
-rw-r--r--arch/arm/include/asm/arch-omap5/omap.h3
2 files changed, 11 insertions, 3 deletions
diff --git a/arch/arm/include/asm/arch-omap5/clocks.h b/arch/arm/include/asm/arch-omap5/clocks.h
index 6673a025f5..ca75f6333f 100644
--- a/arch/arm/include/asm/arch-omap5/clocks.h
+++ b/arch/arm/include/asm/arch-omap5/clocks.h
@@ -239,4 +239,15 @@
239 * into microsec and passing the value. 239 * into microsec and passing the value.
240 */ 240 */
241#define CONFIG_DEFAULT_OMAP_RESET_TIME_MAX_USEC 31219 241#define CONFIG_DEFAULT_OMAP_RESET_TIME_MAX_USEC 31219
242
243/* CONTROL ID CODE */
244#define CONTROL_CORE_ID_CODE 0x4A002204
245#define CONTROL_WKUP_ID_CODE 0x4AE0C204
246
247#ifdef CONFIG_DRA7XX
248#define CONTROL_ID_CODE CONTROL_WKUP_ID_CODE
249#else
250#define CONTROL_ID_CODE CONTROL_CORE_ID_CODE
251#endif
252
242#endif /* _CLOCKS_OMAP5_H_ */ 253#endif /* _CLOCKS_OMAP5_H_ */
diff --git a/arch/arm/include/asm/arch-omap5/omap.h b/arch/arm/include/asm/arch-omap5/omap.h
index 6dfedf42a6..df8222aaf5 100644
--- a/arch/arm/include/asm/arch-omap5/omap.h
+++ b/arch/arm/include/asm/arch-omap5/omap.h
@@ -44,9 +44,6 @@
44#define DRAM_ADDR_SPACE_START OMAP54XX_DRAM_ADDR_SPACE_START 44#define DRAM_ADDR_SPACE_START OMAP54XX_DRAM_ADDR_SPACE_START
45#define DRAM_ADDR_SPACE_END OMAP54XX_DRAM_ADDR_SPACE_END 45#define DRAM_ADDR_SPACE_END OMAP54XX_DRAM_ADDR_SPACE_END
46 46
47/* CONTROL_ID_CODE */
48#define CONTROL_ID_CODE 0x4A002204
49
50/* To be verified */ 47/* To be verified */
51#define OMAP5430_CONTROL_ID_CODE_ES1_0 0x0B94202F 48#define OMAP5430_CONTROL_ID_CODE_ES1_0 0x0B94202F
52#define OMAP5430_CONTROL_ID_CODE_ES2_0 0x1B94202F 49#define OMAP5430_CONTROL_ID_CODE_ES2_0 0x1B94202F