Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 737daa03 authored by Santosh Shilimkar's avatar Santosh Shilimkar Committed by Tony Lindgren
Browse files

omap4: Fix omap_type() for omap4 



This patch fixes the omap_type function to detect whether the device
is GP or HS

Signed-off-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Reviewed-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
Reviewed-by: default avatarPaul Walmsley <paul@pwsan.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 35c0dc38

arch/arm/mach-omap2/id.c

+2 −0
Original line number Diff line number Diff line
@@ -57,6 +57,8 @@ int omap_type(void) 
		val = omap_ctrl_readl(OMAP24XX_CONTROL_STATUS);

	} else if (cpu_is_omap34xx()) {

		val = omap_ctrl_readl(OMAP343X_CONTROL_STATUS);

	} else if (cpu_is_omap44xx()) {

		val = omap_ctrl_readl(OMAP44XX_CONTROL_STATUS);

	} else {

		pr_err("Cannot detect omap type!\n");

		goto out;

arch/arm/plat-omap/include/plat/control.h

+3 −0
Original line number Diff line number Diff line
@@ -204,6 +204,9 @@ 
#define OMAP3_PADCONF_SAD2D_MSTANDBY   0x250

#define OMAP3_PADCONF_SAD2D_IDLEACK    0x254



/* 44xx control status register offset */

#define OMAP44XX_CONTROL_STATUS		0x2c4



/*

 * REVISIT: This list of registers is not comprehensive - there are more

 * that should be added.