From: Igor Grinberg <grinberg@compulab.co.il>
To: Paul Walmsley <paul@pwsan.com>
Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
Sanjeev Premi <premi@ti.com>
Subject: Re: [PATCH 3/6] OMAP3: id: use explicit omap_revision codes for 3505/3517 ES levels
Date: Wed, 14 Sep 2011 15:23:59 +0300 [thread overview]
Message-ID: <4E709CDF.8080703@compulab.co.il> (raw)
In-Reply-To: <20110913212803.26161.31753.stgit@dusk>
Hi Paul,
This patch does not apply, after the v2 of 1_6, see below:
On 09/14/11 00:28, Paul Walmsley wrote:
> Use explicit revision codes for OMAP/AM 3505/3517 ES levels, as the rest
> of the OMAP2+ SoCs do in mach-omap2/cpu.c.
>
> Signed-off-by: Paul Walmsley <paul@pwsan.com>
> Cc: Sanjeev Premi <premi@ti.com>
> ---
> arch/arm/mach-omap2/id.c | 10 +++++++++-
> arch/arm/plat-omap/include/plat/cpu.h | 3 ++-
> 2 files changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
> index 46bc2f9..6810c52 100644
> --- a/arch/arm/mach-omap2/id.c
> +++ b/arch/arm/mach-omap2/id.c
> @@ -312,7 +312,15 @@ static void __init omap3_check_revision(void)
> *
> * REVISIT: AM3505/AM3517 should have their own CHIP_IS
> */
> - omap_revision = OMAP3517_REV(rev);
> + switch (rev) {
> + case 0:
> + omap_revision = OMAP3517_REV_ES1_0;
> + break;
> + case 1:
> + /* FALLTHROUGH */
> + default:
> + omap_revision = OMAP3517_REV_ES1_1;
> + }
> omap_chip.oc |= CHIP_IS_OMAP3430ES3_1;
> break;
> case 0xb891:
> diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h
> index b6bd8f7..566975c 100644
> --- a/arch/arm/plat-omap/include/plat/cpu.h
> +++ b/arch/arm/plat-omap/include/plat/cpu.h
> @@ -398,7 +398,8 @@ IS_OMAP_TYPE(3517, 0x3517)
> #define OMAP3630_REV_ES1_2 (OMAP363X_CLASS | (OMAP_REVBITS_02 << 8))
>
> #define OMAP3517_CLASS 0x35170000
After applying the v2 of 1_6, the above value should be 0x35170034
> -#define OMAP3517_REV(v) (OMAP3517_CLASS | (v << 8))
> +#define OMAP3517_REV_ES1_0 OMAP3517_CLASS
> +#define OMAP3517_REV_ES1_1 (OMAP3517_CLASS | (OMAP_REVBITS_01 << 8))
>
> #define TI816X_CLASS 0x81600034
> #define TI8168_REV_ES1_0 TI816X_CLASS
>
>
> --
> 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
>
--
Regards,
Igor.
next prev parent reply other threads:[~2011-09-14 12:24 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-13 21:28 [PATCH 0/6] OMAP2+: id: cleanup for 3.2 Paul Walmsley
2011-09-13 21:28 ` [PATCH 1/6] OMAP3: id: remove identification codes that only correspond to marketing names Paul Walmsley
2011-09-14 11:39 ` [PATCH v2 " Paul Walmsley
2011-09-13 21:28 ` [PATCH 2/6] OMAP3: id: remove useless strcpy()s Paul Walmsley
2011-09-13 21:28 ` [PATCH 3/6] OMAP3: id: use explicit omap_revision codes for 3505/3517 ES levels Paul Walmsley
2011-09-14 12:23 ` Igor Grinberg [this message]
2011-09-13 21:28 ` [PATCH 4/6] OMAP3: id: add fallthrough warning; fix some CodingStyle issues Paul Walmsley
2011-09-13 21:28 ` [PATCH 5/6] OMAP3: id: remove duplicate code for testing SoC ES level Paul Walmsley
2011-09-13 21:28 ` [PATCH 6/6] OMAP2+: id: remove OMAP_REVBITS_* macros Paul Walmsley
2011-09-14 12:24 ` Igor Grinberg
2011-09-14 12:29 ` Paul Walmsley
2011-09-14 12:51 ` Igor Grinberg
2011-09-14 13:10 ` Paul Walmsley
2011-09-14 13:30 ` Igor Grinberg
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=4E709CDF.8080703@compulab.co.il \
--to=grinberg@compulab.co.il \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=paul@pwsan.com \
--cc=premi@ti.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox