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
Subject: Re: [PATCH 6/6] OMAP2+: id: remove OMAP_REVBITS_* macros
Date: Wed, 14 Sep 2011 15:24:51 +0300 [thread overview]
Message-ID: <4E709D13.1080908@compulab.co.il> (raw)
In-Reply-To: <20110913212806.26161.37867.stgit@dusk>
Hi Paul,
Same problem (as with 3_6) here...
On 09/14/11 00:28, Paul Walmsley wrote:
> The OMAP_REVBITS_* macros are just used as otherwise meaningless
> aliases for the numbers zero through five, so remove these macros.
>
> Signed-off-by: Paul Walmsley <paul@pwsan.com>
> ---
> arch/arm/plat-omap/include/plat/cpu.h | 33 ++++++++++-----------------------
> 1 files changed, 10 insertions(+), 23 deletions(-)
>
> diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h
> index 566975c..0ec90cf 100644
> --- a/arch/arm/plat-omap/include/plat/cpu.h
> +++ b/arch/arm/plat-omap/include/plat/cpu.h
> @@ -60,19 +60,6 @@ struct omap_chip_id {
> unsigned int omap_rev(void);
>
> /*
> - * Define CPU revision bits
> - *
> - * Verbose meaning of the revision bits may be different for a silicon
> - * family. This difference can be handled separately.
> - */
> -#define OMAP_REVBITS_00 0x00
> -#define OMAP_REVBITS_01 0x01
> -#define OMAP_REVBITS_02 0x02
> -#define OMAP_REVBITS_03 0x03
> -#define OMAP_REVBITS_04 0x04
> -#define OMAP_REVBITS_05 0x05
> -
> -/*
> * Get the CPU revision for OMAP devices
> */
> #define GET_OMAP_REVISION() ((omap_rev() >> 8) & 0xff)
> @@ -379,31 +366,31 @@ IS_OMAP_TYPE(3517, 0x3517)
> /* Various silicon revisions for omap2 */
> #define OMAP242X_CLASS 0x24200024
> #define OMAP2420_REV_ES1_0 OMAP242X_CLASS
> -#define OMAP2420_REV_ES2_0 (OMAP242X_CLASS | (OMAP_REVBITS_01 << 8))
> +#define OMAP2420_REV_ES2_0 (OMAP242X_CLASS | (0x1 << 8))
>
> #define OMAP243X_CLASS 0x24300024
> #define OMAP2430_REV_ES1_0 OMAP243X_CLASS
>
> #define OMAP343X_CLASS 0x34300034
> #define OMAP3430_REV_ES1_0 OMAP343X_CLASS
> -#define OMAP3430_REV_ES2_0 (OMAP343X_CLASS | (OMAP_REVBITS_01 << 8))
> -#define OMAP3430_REV_ES2_1 (OMAP343X_CLASS | (OMAP_REVBITS_02 << 8))
> -#define OMAP3430_REV_ES3_0 (OMAP343X_CLASS | (OMAP_REVBITS_03 << 8))
> -#define OMAP3430_REV_ES3_1 (OMAP343X_CLASS | (OMAP_REVBITS_04 << 8))
> -#define OMAP3430_REV_ES3_1_2 (OMAP343X_CLASS | (OMAP_REVBITS_05 << 8))
> +#define OMAP3430_REV_ES2_0 (OMAP343X_CLASS | (0x1 << 8))
> +#define OMAP3430_REV_ES2_1 (OMAP343X_CLASS | (0x2 << 8))
> +#define OMAP3430_REV_ES3_0 (OMAP343X_CLASS | (0x3 << 8))
> +#define OMAP3430_REV_ES3_1 (OMAP343X_CLASS | (0x4 << 8))
> +#define OMAP3430_REV_ES3_1_2 (OMAP343X_CLASS | (0x5 << 8))
>
> #define OMAP363X_CLASS 0x36300034
> #define OMAP3630_REV_ES1_0 OMAP363X_CLASS
> -#define OMAP3630_REV_ES1_1 (OMAP363X_CLASS | (OMAP_REVBITS_01 << 8))
> -#define OMAP3630_REV_ES1_2 (OMAP363X_CLASS | (OMAP_REVBITS_02 << 8))
> +#define OMAP3630_REV_ES1_1 (OMAP363X_CLASS | (0x1 << 8))
> +#define OMAP3630_REV_ES1_2 (OMAP363X_CLASS | (0x2 << 8))
>
> #define OMAP3517_CLASS 0x35170000
> #define OMAP3517_REV_ES1_0 OMAP3517_CLASS
> -#define OMAP3517_REV_ES1_1 (OMAP3517_CLASS | (OMAP_REVBITS_01 << 8))
> +#define OMAP3517_REV_ES1_1 (OMAP3517_CLASS | (0x1 << 8))
>
> #define TI816X_CLASS 0x81600034
> #define TI8168_REV_ES1_0 TI816X_CLASS
> -#define TI8168_REV_ES1_1 (TI816X_CLASS | (OMAP_REVBITS_01 << 8))
> +#define TI8168_REV_ES1_1 (TI816X_CLASS | (0x1 << 8))
>
> #define OMAP443X_CLASS 0x44300044
> #define OMAP4430_REV_ES1_0 (OMAP443X_CLASS | (0x10 << 8))
>
>
> --
> 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
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 [this message]
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=4E709D13.1080908@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 \
/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