diff options
| author | Adam Ford <aford173@gmail.com> | 2017-01-20 17:44:01 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2017-01-20 19:13:06 +0100 |
| commit | 631af44c10f9430163296626c6134db16a4f51fb (patch) | |
| tree | a6182a2a268246fa693c70b637d1758b2feadec5 /arch/arm/mach-omap2/id.c | |
| parent | ARM: OMAP5: Add HWMOD_SWSUP_SIDLE_ACT flag for UART (diff) | |
| download | linux-631af44c10f9430163296626c6134db16a4f51fb.tar.xz linux-631af44c10f9430163296626c6134db16a4f51fb.zip | |
ARM: OMAP3: Fix SoC detection of OMAP36/37 Family
The OMAP36/37 families are similar, but there are a few features sections
that can help identify some of them. Let's add checks for 3630/3730,
OMAP3621, DM3725, OMAP3615/DM3715, OMAP3611, and AM3703 all based on
features similar to what was done for the OMAP34xx/35xx series
The checkpatch flags some warnings for braces, but I kept the coding style
to match the adjacent code for consistency.
I don't have an OMAP36xx to test, but this was tested on both a DM3730 and
AM3703.
Signed-off-by: Adam Ford <aford173@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/id.c')
| -rw-r--r-- | arch/arm/mach-omap2/id.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index cc6d9fa60924..e2274a162b74 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c @@ -223,7 +223,15 @@ static void __init omap3_cpuinfo(void) * and CPU class bits. */ if (soc_is_omap3630()) { - cpu_name = "OMAP3630"; + if (omap3_has_iva() && omap3_has_sgx()) { + cpu_name = (omap3_has_isp()) ? "OMAP3630/DM3730" : "OMAP3621"; + } else if (omap3_has_iva()) { + cpu_name = "DM3725"; + } else if (omap3_has_sgx()) { + cpu_name = "OMAP3615/AM3715"; + } else { + cpu_name = (omap3_has_isp()) ? "AM3703" : "OMAP3611"; + } } else if (soc_is_am35xx()) { cpu_name = (omap3_has_sgx()) ? "AM3517" : "AM3505"; } else if (soc_is_ti816x()) { |