The comit 00bbe96ebabb ("arm: omap: Unify get_device_type() function") does not play nice with early errata workarounds and needs some fixes. And because it does not bring any practical improvements anyway (other than increasing the SPL size and introducing more lines of code), it's best to revert it for now.
The second patch in this series improves testing coverage and should prevent similar regressions in the future.
Siarhei Siamashka (2): Revert "arm: omap: Unify get_device_type() function" arm: Exercise v7_arch_cp15_set_acr even without errata fixups
arch/arm/cpu/armv7/start.S | 32 ++++++++++++-------------------- arch/arm/include/asm/arch-am33xx/cpu.h | 6 ++++++ arch/arm/include/asm/arch-am33xx/omap.h | 3 --- arch/arm/include/asm/arch-omap3/omap.h | 3 --- arch/arm/include/asm/arch-omap4/omap.h | 1 + arch/arm/include/asm/arch-omap5/omap.h | 1 + arch/arm/include/asm/omap_common.h | 11 +---------- arch/arm/mach-omap2/Makefile | 1 - arch/arm/mach-omap2/am33xx/Makefile | 2 -- arch/arm/mach-omap2/am33xx/board.c | 3 --- arch/arm/mach-omap2/am33xx/hw_data.c | 19 ------------------- arch/arm/mach-omap2/am33xx/prcm-regs.c | 15 --------------- arch/arm/mach-omap2/am33xx/sys_info.c | 10 ++++++++++ arch/arm/mach-omap2/hwinit-common.c | 9 +++++++++ arch/arm/mach-omap2/omap3/Makefile | 2 -- arch/arm/mach-omap2/omap3/board.c | 7 ------- arch/arm/mach-omap2/omap3/hw_data.c | 19 ------------------- arch/arm/mach-omap2/omap3/prcm-regs.c | 15 --------------- arch/arm/mach-omap2/omap3/sys_info.c | 9 ++++++++- arch/arm/mach-omap2/sysinfo-common.c | 21 --------------------- board/ti/am335x/board.c | 1 - board/ti/am43xx/board.c | 1 - 22 files changed, 48 insertions(+), 143 deletions(-) delete mode 100644 arch/arm/mach-omap2/am33xx/hw_data.c delete mode 100644 arch/arm/mach-omap2/am33xx/prcm-regs.c delete mode 100644 arch/arm/mach-omap2/omap3/hw_data.c delete mode 100644 arch/arm/mach-omap2/omap3/prcm-regs.c delete mode 100644 arch/arm/mach-omap2/sysinfo-common.c