diff mbox

ARM: OMAP3: Fix SoC detection of OMAP36/37 Family

Message ID 1484930641-18566-1-git-send-email-aford173@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Adam Ford Jan. 20, 2017, 4:44 p.m. UTC 
From: Adam Ford <aford173@gmail.com>

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>

Comments

Tony Lindgren Jan. 20, 2017, 6:14 p.m. UTC | #1 
* aford173@gmail.com <aford173@gmail.com> [170120 08:45]:
> From: Adam Ford <aford173@gmail.com>
> 
> 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.

AFAIK 3630 is exactly the same as dm3730. Applying into
omap-for-v4.11/fixes-not-urgent thanks.

Regards,

Tony

> Signed-off-by: Adam Ford <aford173@gmail.com>
> 
> diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
> index cc6d9fa..e2274a1 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()) {
> -- 
> 2.7.4
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index cc6d9fa..e2274a1 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()) {