Commit 8e25ad96 authored by Kevin Hilman's avatar Kevin Hilman Committed by Tony Lindgren
Browse files

OMAP2/3: Add omap_type() for determining GP/EMU/HS 



The omap_type() function is added and returns the DEVICETYPE field of
the CONTROL_STATUS register.  The result can be used for conditional
code based on whether device is GP (general purpose), EMU or
HS (high security). Also move the type defines so omap1 code
compile does not require ifdefs for sections using these defines.

This code is needed for the following fix to set the SRAM
size correctly for HS omaps.  Also at least PM and watchdog
code will need this function.

Signed-off-by: default avatarKevin Hilman <khilman@ti.deeprootsystems.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 091a58af

arch/arm/mach-omap2/id.c

+22 −0
Original line number Diff line number Diff line
@@ -48,6 +48,28 @@ int omap_chip_is(struct omap_chip_id oci) 
}

EXPORT_SYMBOL(omap_chip_is);



int omap_type(void)

{

	u32 val = 0;



	if (cpu_is_omap24xx())

		val = omap_ctrl_readl(OMAP24XX_CONTROL_STATUS);

	else if (cpu_is_omap34xx())

		val = omap_ctrl_readl(OMAP343X_CONTROL_STATUS);

	else {

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

		goto out;

	}



	val &= OMAP2_DEVICETYPE_MASK;

	val >>= 8;



out:

	return val;

}

EXPORT_SYMBOL(omap_type);





/*----------------------------------------------------------------------------*/



#define OMAP_TAP_IDCODE		0x0204

arch/arm/plat-omap/include/mach/cpu.h

+11 −11
Original line number Diff line number Diff line
@@ -30,6 +30,17 @@ 
#ifndef __ASM_ARCH_OMAP_CPU_H

#define __ASM_ARCH_OMAP_CPU_H



/*

 * Omap device type i.e. EMU/HS/TST/GP/BAD

 */

#define OMAP2_DEVICE_TYPE_TEST		0

#define OMAP2_DEVICE_TYPE_EMU		1

#define OMAP2_DEVICE_TYPE_SEC		2

#define OMAP2_DEVICE_TYPE_GP		3

#define OMAP2_DEVICE_TYPE_BAD		4



int omap_type(void);



struct omap_chip_id {

	u8 oc;

	u8 type;
@@ -424,17 +435,6 @@ IS_OMAP_TYPE(3430, 0x3430) 




int omap_chip_is(struct omap_chip_id oci);

int omap_type(void);



/*

 * Macro to detect device type i.e. EMU/HS/TST/GP/BAD

 */

#define OMAP2_DEVICE_TYPE_TEST		0

#define OMAP2_DEVICE_TYPE_EMU		1

#define OMAP2_DEVICE_TYPE_SEC		2

#define OMAP2_DEVICE_TYPE_GP		3

#define OMAP2_DEVICE_TYPE_BAD		4



void omap2_check_revision(void);



#endif    /* defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) */

CRA Git | Maintained and supported by SUSTech CRA and CCSE