FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-02-11 22:37:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Vaibhav Hiremath <hvaibhav@ti.com>
Reviewed-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Vaibhav Hiremath 2013-05-17 15:43:41 +05:30 committed by Tony Lindgren
parent c3ed359c66
commit 7bcad17015
4 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-omap2/control.h
View File

@ -366,6 +366,10 @@
#define AM33XX_PWMSS1_TBCLKEN_SHIFT 1 #define AM33XX_PWMSS1_TBCLKEN_SHIFT 1
#define AM33XX_PWMSS2_TBCLKEN_SHIFT 2 #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 */ /* CONTROL OMAP STATUS register to identify OMAP3 features */
#define OMAP3_CONTROL_OMAP_STATUS 0x044c #define OMAP3_CONTROL_OMAP_STATUS 0x044c

13
arch/arm/mach-omap2/id.c
View File

@ -304,6 +304,19 @@ void __init ti81xx_check_features(void)
omap3_cpuinfo(); 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) void __init omap3xxx_check_revision(void)
{ {
const char *cpu_rev; const char *cpu_rev;

2
arch/arm/mach-omap2/io.c
View File

@ -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_prm(AM33XX_L4_WK_IO_ADDRESS(AM33XX_PRCM_BASE));
omap2_set_globals_cm(AM33XX_L4_WK_IO_ADDRESS(AM33XX_PRCM_BASE), NULL); omap2_set_globals_cm(AM33XX_L4_WK_IO_ADDRESS(AM33XX_PRCM_BASE), NULL);
omap3xxx_check_revision(); omap3xxx_check_revision();
ti81xx_check_features(); am33xx_check_features();
am33xx_voltagedomains_init(); am33xx_voltagedomains_init();
am33xx_powerdomains_init(); am33xx_powerdomains_init();
am33xx_clockdomains_init(); am33xx_clockdomains_init();

1
arch/arm/mach-omap2/soc.h
View File

@ -449,6 +449,7 @@ void omap4xxx_check_revision(void);
void omap5xxx_check_revision(void); void omap5xxx_check_revision(void);
void omap3xxx_check_features(void); void omap3xxx_check_features(void);
void ti81xx_check_features(void); void ti81xx_check_features(void);
void am33xx_check_features(void);
void omap4xxx_check_features(void); void omap4xxx_check_features(void);
/* /*