ARM: OMAP2+: Fix ti81xx devtype
Otherwise we get error "Cannot detect omap type!" and many things can fail with following: Unhandled fault: imprecise external abort (0xc06) at 0xc6031fb0 This is because the omap_type is being used to set up th SoC specific functions for omaps. Cc: Brian Hutchinson <b.hutchman@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Родитель
339d095ab2
Коммит
e226ebe95e
|
@ -53,6 +53,7 @@
|
||||||
#define OMAP343X_CONTROL_GENERAL_WKUP 0xa60
|
#define OMAP343X_CONTROL_GENERAL_WKUP 0xa60
|
||||||
|
|
||||||
/* TI81XX spefic control submodules */
|
/* TI81XX spefic control submodules */
|
||||||
|
#define TI81XX_CONTROL_DEVBOOT 0x040
|
||||||
#define TI81XX_CONTROL_DEVCONF 0x600
|
#define TI81XX_CONTROL_DEVCONF 0x600
|
||||||
|
|
||||||
/* Control register offsets - read/write with omap_ctrl_{read,write}{bwl}() */
|
/* Control register offsets - read/write with omap_ctrl_{read,write}{bwl}() */
|
||||||
|
@ -246,6 +247,9 @@
|
||||||
#define OMAP3_PADCONF_SAD2D_MSTANDBY 0x250
|
#define OMAP3_PADCONF_SAD2D_MSTANDBY 0x250
|
||||||
#define OMAP3_PADCONF_SAD2D_IDLEACK 0x254
|
#define OMAP3_PADCONF_SAD2D_IDLEACK 0x254
|
||||||
|
|
||||||
|
/* TI81XX CONTROL_DEVBOOT register offsets */
|
||||||
|
#define TI81XX_CONTROL_STATUS (TI81XX_CONTROL_DEVBOOT + 0x000)
|
||||||
|
|
||||||
/* TI81XX CONTROL_DEVCONF register offsets */
|
/* TI81XX CONTROL_DEVCONF register offsets */
|
||||||
#define TI81XX_CONTROL_DEVICE_ID (TI81XX_CONTROL_DEVCONF + 0x000)
|
#define TI81XX_CONTROL_DEVICE_ID (TI81XX_CONTROL_DEVCONF + 0x000)
|
||||||
|
|
||||||
|
|
|
@ -56,6 +56,8 @@ int omap_type(void)
|
||||||
|
|
||||||
if (cpu_is_omap24xx()) {
|
if (cpu_is_omap24xx()) {
|
||||||
val = omap_ctrl_readl(OMAP24XX_CONTROL_STATUS);
|
val = omap_ctrl_readl(OMAP24XX_CONTROL_STATUS);
|
||||||
|
} else if (cpu_is_ti81xx()) {
|
||||||
|
val = omap_ctrl_readl(TI81XX_CONTROL_STATUS);
|
||||||
} else if (soc_is_am33xx() || soc_is_am43xx()) {
|
} else if (soc_is_am33xx() || soc_is_am43xx()) {
|
||||||
val = omap_ctrl_readl(AM33XX_CONTROL_STATUS);
|
val = omap_ctrl_readl(AM33XX_CONTROL_STATUS);
|
||||||
} else if (cpu_is_omap34xx()) {
|
} else if (cpu_is_omap34xx()) {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче