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

Commit 7bcad170 authored by Vaibhav Hiremath's avatar Vaibhav Hiremath Committed by Tony Lindgren
Browse files

ARM: OMAP3+: am33xx id: Add new am33xx specific function to check dev_feature 



Layout of DEV_FEATURE register (offset = 0x604) is different
between TI81xx and AM33xx device, so create separate function
which will check for features available on specific AM33xx SoC
and set the flags accordingly.

Signed-off-by: default avatarVaibhav Hiremath <hvaibhav@ti.com>
Reviewed-by: default avatarKevin Hilman <khilman@linaro.org>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent c3ed359c

arch/arm/mach-omap2/control.h

+4 −0
Original line number Diff line number Diff line
@@ -366,6 +366,10 @@ 
#define AM33XX_PWMSS1_TBCLKEN_SHIFT			1

#define AM33XX_PWMSS2_TBCLKEN_SHIFT			2



/* DEV Feature register to identify AM33XX features */

#define AM33XX_DEV_FEATURE		0x604

#define AM33XX_SGX_MASK			BIT(29)



/* CONTROL OMAP STATUS register to identify OMAP3 features */

#define OMAP3_CONTROL_OMAP_STATUS	0x044c

arch/arm/mach-omap2/id.c

+13 −0
Original line number Diff line number Diff line
@@ -304,6 +304,19 @@ void __init ti81xx_check_features(void) 
	omap3_cpuinfo();

}



void __init am33xx_check_features(void)

{

	u32 status;



	omap_features = OMAP3_HAS_NEON;



	status = omap_ctrl_readl(AM33XX_DEV_FEATURE);

	if (status & AM33XX_SGX_MASK)

		omap_features |= OMAP3_HAS_SGX;



	omap3_cpuinfo();

}



void __init omap3xxx_check_revision(void)

{

	const char *cpu_rev;

arch/arm/mach-omap2/io.c

+1 −1
Original line number Diff line number Diff line
@@ -576,7 +576,7 @@ void __init am33xx_init_early(void) 
	omap2_set_globals_prm(AM33XX_L4_WK_IO_ADDRESS(AM33XX_PRCM_BASE));

	omap2_set_globals_cm(AM33XX_L4_WK_IO_ADDRESS(AM33XX_PRCM_BASE), NULL);

	omap3xxx_check_revision();

	ti81xx_check_features();

	am33xx_check_features();

	am33xx_voltagedomains_init();

	am33xx_powerdomains_init();

	am33xx_clockdomains_init();

arch/arm/mach-omap2/soc.h

+1 −0
Original line number Diff line number Diff line
@@ -449,6 +449,7 @@ void omap4xxx_check_revision(void); 
void omap5xxx_check_revision(void);

void omap3xxx_check_features(void);

void ti81xx_check_features(void);

void am33xx_check_features(void);

void omap4xxx_check_features(void);



/*