From: Tony Lindgren <tony@atomide.com>
To: aford173@gmail.com
Cc: linux-omap@vger.kernel.org, linux@armlinux.org.uk,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH] ARM: OMAP3: Fix SoC detection of OMAP36/37 Family
Date: Fri, 20 Jan 2017 10:14:07 -0800 [thread overview]
Message-ID: <20170120181407.GC7403@atomide.com> (raw)
In-Reply-To: <1484930641-18566-1-git-send-email-aford173@gmail.com>
* 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
>
WARNING: multiple messages have this Message-ID (diff)
From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: OMAP3: Fix SoC detection of OMAP36/37 Family
Date: Fri, 20 Jan 2017 10:14:07 -0800 [thread overview]
Message-ID: <20170120181407.GC7403@atomide.com> (raw)
In-Reply-To: <1484930641-18566-1-git-send-email-aford173@gmail.com>
* aford173 at 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
>
next prev parent reply other threads:[~2017-01-20 18:14 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-20 16:44 [PATCH] ARM: OMAP3: Fix SoC detection of OMAP36/37 Family aford173
2017-01-20 16:44 ` aford173 at gmail.com
2017-01-20 18:14 ` Tony Lindgren [this message]
2017-01-20 18:14 ` Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170120181407.GC7403@atomide.com \
--to=tony@atomide.com \
--cc=aford173@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux@armlinux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.