leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm: omap: Fix 'get_device_type()' for OMAP34XX

Browse Source 
Fixes: 00bbe96eba ("arm: omap: Unify get_device_type() function")

The control status register value is embedded in a structure somewhere
in SRAM, with the last refactoring effort. This patch allows OMAP3 EVM
(TMDSEVM3530) to boot again using the known control register base and
offset for 'readl', for the OMAP34XX case.

Signed-off-by: Derald D. Woods <woods.technical@gmail.com>
[trini: Change to if/else, add comment about it.]
Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Derald D. Woods 2017-07-31 07:41:40 -05:00 committed by Tom Rini
parent 5bbc265bec
commit da0227f7d2
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/arm/mach-omap2/sysinfo-common.c
View File

@ -16,6 +16,15 @@
*/
u32 get_device_type(void)
{
#if defined(CONFIG_OMAP34XX)
/*
* On OMAP3 systems we call this early enough that we must just
* use the direct offset for safety.
*/
return (readl(OMAP34XX_CTRL_BASE + 0x2f0) & DEVICE_TYPE_MASK) >>
DEVICE_TYPE_SHIFT;
#else
return (readl((*ctrl)->control_status) & DEVICE_TYPE_MASK) >>
DEVICE_TYPE_SHIFT;
#endif
}