[PATCH 0/7] ARM: OMAP: remove IP checks from SoC family detection

[PATCH 0/7] ARM: OMAP: remove IP checks from SoC family detection

[Kevin Hilman]

Currently, our SoC detection is based on SoC family detection
(using die ID) and the presence of specific IP blocks (or feature.)

This series begins the separation of the SoC family detection and
specific IP detection.

Applies on top of Tony's current master branch and so far, it has only
been compile tested using omap2plus_defconfig.

Kevin


Kevin Hilman (7):
  ARM: OMAP: remove unused cpu_is macros that depend on specific IP
    checks
  ARM: OMAP3: clock data: replace 3503/3517 flag with AM35x flag for
    UART4
  ARM: OMAP3: clock data: treat all AM35x devices the same
  ARM: OMAP: AM35x: remove redunant cpu_is checks for AM3505
  ARM: OMAP: clock: remove unused CK_3505 flag
  ARM: OMAP: remove unused cpu_is_omap3505()
  ARM: OMAP: remove unused cpu_is_omap3530()

 arch/arm/mach-omap2/clock3xxx_data.c          |   16 +-------------
 arch/arm/mach-omap2/hsmmc.c                   |    8 +++---
 arch/arm/mach-omap2/usb-musb.c                |    2 +-
 arch/arm/mach-omap2/voltagedomains3xxx_data.c |    2 +-
 arch/arm/plat-omap/include/plat/clkdev_omap.h |    3 +-
 arch/arm/plat-omap/include/plat/cpu.h         |   26 +------------------------
 6 files changed, 10 insertions(+), 47 deletions(-)

-- 
1.7.8.2

[RFC/PATCH 1/7] ARM: OMAP: remove unused cpu_is macros that depend on specific IP checks

[Kevin Hilman]

The cpu_is_omap35* macros for 3503, 3515, 3525) are unused.

Remove them in order to start removing IP detection from SoC family
detection.

Signed-off-by: Kevin Hilman <khilman@ti.com>
---
 arch/arm/plat-omap/include/plat/cpu.h |   15 ---------------
 1 files changed, 0 insertions(+), 15 deletions(-)

diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h
index 428ccb1..bcad3dc 100644
--- a/arch/arm/plat-omap/include/plat/cpu.h
+++ b/arch/arm/plat-omap/include/plat/cpu.h
@@ -292,9 +292,6 @@ IS_OMAP_TYPE(3517, 0x3517)
 #define cpu_is_omap2422()		0
 #define cpu_is_omap2423()		0
 #define cpu_is_omap2430()		0
-#define cpu_is_omap3503()		0
-#define cpu_is_omap3515()		0
-#define cpu_is_omap3525()		0
 #define cpu_is_omap3530()		0
 #define cpu_is_omap3505()		0
 #define cpu_is_omap3517()		0
@@ -350,9 +347,6 @@ IS_OMAP_TYPE(3517, 0x3517)
 
 #if defined(CONFIG_ARCH_OMAP3)
 # undef cpu_is_omap3430
-# undef cpu_is_omap3503
-# undef cpu_is_omap3515
-# undef cpu_is_omap3525
 # undef cpu_is_omap3530
 # undef cpu_is_omap3505
 # undef cpu_is_omap3517
@@ -362,15 +356,6 @@ IS_OMAP_TYPE(3517, 0x3517)
 # undef cpu_is_am33xx
 # undef cpu_is_am335x
 # define cpu_is_omap3430()		is_omap3430()
-# define cpu_is_omap3503()		(cpu_is_omap3430() &&		\
-						(!omap3_has_iva()) &&	\
-						(!omap3_has_sgx()))
-# define cpu_is_omap3515()		(cpu_is_omap3430() &&		\
-						(!omap3_has_iva()) &&	\
-						(omap3_has_sgx()))
-# define cpu_is_omap3525()		(cpu_is_omap3430() &&		\
-						(!omap3_has_sgx()) &&	\
-						(omap3_has_iva()))
 # define cpu_is_omap3530()		(cpu_is_omap3430())
 # define cpu_is_omap3517()		is_omap3517()
 # define cpu_is_omap3505()		(cpu_is_omap3517() &&		\
-- 
1.7.8.2

[RFC/PATCH 2/7] ARM: OMAP3: clock data: replace 3503/3517 flag with AM35x flag for UART4

[Kevin Hilman]

The AM35x UART4 is common to all AM35x devices, so use CK_AM35XX instead
of (CK_3505 | CK_3517), which is equivalent.

Signed-off-by: Kevin Hilman <khilman@ti.com>
---
 arch/arm/mach-omap2/clock3xxx_data.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c
index d75e5f6..e09e506 100644
--- a/arch/arm/mach-omap2/clock3xxx_data.c
+++ b/arch/arm/mach-omap2/clock3xxx_data.c
@@ -3411,7 +3411,7 @@ static struct omap_clk omap3xxx_clks[] = {
 	CLK(NULL,	"per_48m_fck",	&per_48m_fck,	CK_3XXX),
 	CLK(NULL,	"uart3_fck",	&uart3_fck,	CK_3XXX),
 	CLK(NULL,	"uart4_fck",	&uart4_fck,	CK_36XX),
-	CLK(NULL,	"uart4_fck",	&uart4_fck_am35xx, CK_3505 | CK_3517),
+	CLK(NULL,	"uart4_fck",	&uart4_fck_am35xx, CK_AM35XX),
 	CLK(NULL,	"gpt2_fck",	&gpt2_fck,	CK_3XXX),
 	CLK(NULL,	"gpt3_fck",	&gpt3_fck,	CK_3XXX),
 	CLK(NULL,	"gpt4_fck",	&gpt4_fck,	CK_3XXX),
-- 
1.7.8.2

[RFC/PATCH 3/7] ARM: OMAP3: clock data: treat all AM35x devices the same

[Kevin Hilman]

The init for 3505/3517 specific clocks depends on the ordering of
cpu_is checks, is error prone and confusing (there are 2 separate
checks for cpu_is_omap3505()).

Remove the 3505-specific checking since CK_3505 flag is not used, and
treat all AM35x clocks the same.

This means that the SGX clock (the only AM35x clkdev not currently
flagged for 3505) will now be registered on 3505, but that is
harmless.  That can be cleaned up when the clkdev nodes are removed in
favor of them being registered by hwmod.

Signed-off-by: Kevin Hilman <khilman@ti.com>
---
 arch/arm/mach-omap2/clock3xxx_data.c |   14 +-------------
 1 files changed, 1 insertions(+), 13 deletions(-)

diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c
index e09e506..26fb4d9 100644
--- a/arch/arm/mach-omap2/clock3xxx_data.c
+++ b/arch/arm/mach-omap2/clock3xxx_data.c
@@ -3505,21 +3505,9 @@ int __init omap3xxx_clk_init(void)
 	struct omap_clk *c;
 	u32 cpu_clkflg = 0;
 
-	/*
-	 * 3505 must be tested before 3517, since 3517 returns true
-	 * for both AM3517 chips and AM3517 family chips, which
-	 * includes 3505.  Unfortunately there's no obvious family
-	 * test for 3517/3505 :-(
-	 */
-	if (cpu_is_omap3505()) {
-		cpu_mask = RATE_IN_34XX;
-		cpu_clkflg = CK_3505;
-	} else if (cpu_is_omap3517()) {
+	if (cpu_is_omap3517()) {
 		cpu_mask = RATE_IN_34XX;
 		cpu_clkflg = CK_3517;
-	} else if (cpu_is_omap3505()) {
-		cpu_mask = RATE_IN_34XX;
-		cpu_clkflg = CK_3505;
 	} else if (cpu_is_omap3630()) {
 		cpu_mask = (RATE_IN_34XX | RATE_IN_36XX);
 		cpu_clkflg = CK_36XX;
-- 
1.7.8.2

Re: [RFC/PATCH 3/7] ARM: OMAP3: clock data: treat all AM35x devices the same

[Jean Pihet]

Hi Kevin,

On Thu, Jan 5, 2012 at 2:16 AM, Kevin Hilman <khilman@ti.com> wrote:
> The init for 3505/3517 specific clocks depends on the ordering of
> cpu_is checks, is error prone and confusing (there are 2 separate
> checks for cpu_is_omap3505()).
>
> Remove the 3505-specific checking since CK_3505 flag is not used, and
> treat all AM35x clocks the same.
Since the only remaining check is for omap3517 and from this comment
it should be better to use a generic check, e.g. cpu_is_omap35xx().

>
> This means that the SGX clock (the only AM35x clkdev not currently
> flagged for 3505) will now be registered on 3505, but that is
> harmless.  That can be cleaned up when the clkdev nodes are removed in
> favor of them being registered by hwmod.
>
> Signed-off-by: Kevin Hilman <khilman@ti.com>
> ---
>  arch/arm/mach-omap2/clock3xxx_data.c |   14 +-------------
>  1 files changed, 1 insertions(+), 13 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c
> index e09e506..26fb4d9 100644
> --- a/arch/arm/mach-omap2/clock3xxx_data.c
> +++ b/arch/arm/mach-omap2/clock3xxx_data.c
> @@ -3505,21 +3505,9 @@ int __init omap3xxx_clk_init(void)
>        struct omap_clk *c;
>        u32 cpu_clkflg = 0;
>
> -       /*
> -        * 3505 must be tested before 3517, since 3517 returns true
> -        * for both AM3517 chips and AM3517 family chips, which
> -        * includes 3505.  Unfortunately there's no obvious family
> -        * test for 3517/3505 :-(
> -        */
> -       if (cpu_is_omap3505()) {
> -               cpu_mask = RATE_IN_34XX;
> -               cpu_clkflg = CK_3505;
> -       } else if (cpu_is_omap3517()) {
> +       if (cpu_is_omap3517()) {
This is rather confusing if it applies to other omap35xx variants.
cpu_is_omap35xx() is better.

What do you think?

Regards,
Jean
--
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

Re: [RFC/PATCH 3/7] ARM: OMAP3: clock data: treat all AM35x devices the same

[Kevin Hilman]

Jean Pihet <jean.pihet@newoldbits.com> writes:

> Hi Kevin,
>
> On Thu, Jan 5, 2012 at 2:16 AM, Kevin Hilman <khilman@ti.com> wrote:
>> The init for 3505/3517 specific clocks depends on the ordering of
>> cpu_is checks, is error prone and confusing (there are 2 separate
>> checks for cpu_is_omap3505()).
>>
>> Remove the 3505-specific checking since CK_3505 flag is not used, and
>> treat all AM35x clocks the same.
> Since the only remaining check is for omap3517 and from this comment
> it should be better to use a generic check, e.g. cpu_is_omap35xx().

Yes, or probably AM35xx.

>> This means that the SGX clock (the only AM35x clkdev not currently
>> flagged for 3505) will now be registered on 3505, but that is
>> harmless.  That can be cleaned up when the clkdev nodes are removed in
>> favor of them being registered by hwmod.
>>
>> Signed-off-by: Kevin Hilman <khilman@ti.com>
>> ---
>>  arch/arm/mach-omap2/clock3xxx_data.c |   14 +-------------
>>  1 files changed, 1 insertions(+), 13 deletions(-)
>>
>> diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c
>> index e09e506..26fb4d9 100644
>> --- a/arch/arm/mach-omap2/clock3xxx_data.c
>> +++ b/arch/arm/mach-omap2/clock3xxx_data.c
>> @@ -3505,21 +3505,9 @@ int __init omap3xxx_clk_init(void)
>>        struct omap_clk *c;
>>        u32 cpu_clkflg = 0;
>>
>> -       /*
>> -        * 3505 must be tested before 3517, since 3517 returns true
>> -        * for both AM3517 chips and AM3517 family chips, which
>> -        * includes 3505.  Unfortunately there's no obvious family
>> -        * test for 3517/3505 :-(
>> -        */
>> -       if (cpu_is_omap3505()) {
>> -               cpu_mask = RATE_IN_34XX;
>> -               cpu_clkflg = CK_3505;
>> -       } else if (cpu_is_omap3517()) {
>> +       if (cpu_is_omap3517()) {
> This is rather confusing if it applies to other omap35xx variants.
> cpu_is_omap35xx() is better.
>
> What do you think?

Agreed, and am working on a patch that changes this to cpu_is_am35xx(),
but didn't have time to get it out yet.

Kevin
--
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

RE: [RFC/PATCH 3/7] ARM: OMAP3: clock data: treat all AM35x devices the same

[Hiremath, Vaibhav]

> -----Original Message-----
> From: Hilman, Kevin
> Sent: Thursday, January 05, 2012 6:47 AM
> To: linux-omap@vger.kernel.org
> Cc: Paul Walmsley; Hiremath, Vaibhav
> Subject: [RFC/PATCH 3/7] ARM: OMAP3: clock data: treat all AM35x devices
> the same
> 
> The init for 3505/3517 specific clocks depends on the ordering of
> cpu_is checks, is error prone and confusing (there are 2 separate
> checks for cpu_is_omap3505()).
> 
> Remove the 3505-specific checking since CK_3505 flag is not used, and
> treat all AM35x clocks the same.
> 
> This means that the SGX clock (the only AM35x clkdev not currently
> flagged for 3505) will now be registered on 3505, but that is
> harmless.  That can be cleaned up when the clkdev nodes are removed in
> favor of them being registered by hwmod.
> 
[Hiremath, Vaibhav] How do you think we can use hwmod here?
Currently hwmod is also dependent on cpu_is_xxxx to register respective modules.

I completely understand and agree to the fact that there may not be any harm
due to this, but this means, iva will be always registered for 3505 devices.

Thanks,
Vaibhav

> Signed-off-by: Kevin Hilman <khilman@ti.com>
> ---
>  arch/arm/mach-omap2/clock3xxx_data.c |   14 +-------------
>  1 files changed, 1 insertions(+), 13 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-
> omap2/clock3xxx_data.c
> index e09e506..26fb4d9 100644
> --- a/arch/arm/mach-omap2/clock3xxx_data.c
> +++ b/arch/arm/mach-omap2/clock3xxx_data.c
> @@ -3505,21 +3505,9 @@ int __init omap3xxx_clk_init(void)
>  	struct omap_clk *c;
>  	u32 cpu_clkflg = 0;
> 
> -	/*
> -	 * 3505 must be tested before 3517, since 3517 returns true
> -	 * for both AM3517 chips and AM3517 family chips, which
> -	 * includes 3505.  Unfortunately there's no obvious family
> -	 * test for 3517/3505 :-(
> -	 */
> -	if (cpu_is_omap3505()) {
> -		cpu_mask = RATE_IN_34XX;
> -		cpu_clkflg = CK_3505;
> -	} else if (cpu_is_omap3517()) {
> +	if (cpu_is_omap3517()) {
>  		cpu_mask = RATE_IN_34XX;
>  		cpu_clkflg = CK_3517;
> -	} else if (cpu_is_omap3505()) {
> -		cpu_mask = RATE_IN_34XX;
> -		cpu_clkflg = CK_3505;
>  	} else if (cpu_is_omap3630()) {
>  		cpu_mask = (RATE_IN_34XX | RATE_IN_36XX);
>  		cpu_clkflg = CK_36XX;
> --
> 1.7.8.2

Re: [RFC/PATCH 3/7] ARM: OMAP3: clock data: treat all AM35x devices the same

[Kevin Hilman]

"Hiremath, Vaibhav" <hvaibhav@ti.com> writes:

>> -----Original Message-----
>> From: Hilman, Kevin
>> Sent: Thursday, January 05, 2012 6:47 AM
>> To: linux-omap@vger.kernel.org
>> Cc: Paul Walmsley; Hiremath, Vaibhav
>> Subject: [RFC/PATCH 3/7] ARM: OMAP3: clock data: treat all AM35x devices
>> the same
>> 
>> The init for 3505/3517 specific clocks depends on the ordering of
>> cpu_is checks, is error prone and confusing (there are 2 separate
>> checks for cpu_is_omap3505()).
>> 
>> Remove the 3505-specific checking since CK_3505 flag is not used, and
>> treat all AM35x clocks the same.
>> 
>> This means that the SGX clock (the only AM35x clkdev not currently
>> flagged for 3505) will now be registered on 3505, but that is
>> harmless.  That can be cleaned up when the clkdev nodes are removed in
>> favor of them being registered by hwmod.
>> 
> [Hiremath, Vaibhav] How do you think we can use hwmod here?

I haven't thought in detail about the exact fix for this, but it
shouldn't be difficult. For example, it could be as simple as creating
some more per-family hwmod lists of optional hwmods.  Then, during init,
register them based on the feature flag.

Longer term, it may be that we handle this using DT, but I'm not sure we
will use DT to describe that level of SoC detail.

> Currently hwmod is also dependent on cpu_is_xxxx to register respective modules.

In mainline it is only done by CPU family (revision), not using cpu_is*

> I completely understand and agree to the fact that there may not be any harm
> due to this, but this means, iva will be always registered for 3505 devices.

Correct for today, but not difficult to remedy by fixing up the hwmod init.

Kevin

RE: [RFC/PATCH 3/7] ARM: OMAP3: clock data: treat all AM35x devices the same

[Hiremath, Vaibhav]

> -----Original Message-----
> From: Hilman, Kevin
> Sent: Friday, January 06, 2012 5:34 AM
> To: Hiremath, Vaibhav
> Cc: linux-omap@vger.kernel.org; Paul Walmsley
> Subject: Re: [RFC/PATCH 3/7] ARM: OMAP3: clock data: treat all AM35x
> devices the same
> 
> "Hiremath, Vaibhav" <hvaibhav@ti.com> writes:
> 
> >> -----Original Message-----
> >> From: Hilman, Kevin
> >> Sent: Thursday, January 05, 2012 6:47 AM
> >> To: linux-omap@vger.kernel.org
> >> Cc: Paul Walmsley; Hiremath, Vaibhav
> >> Subject: [RFC/PATCH 3/7] ARM: OMAP3: clock data: treat all AM35x
> devices
> >> the same
> >>
> >> The init for 3505/3517 specific clocks depends on the ordering of
> >> cpu_is checks, is error prone and confusing (there are 2 separate
> >> checks for cpu_is_omap3505()).
> >>
> >> Remove the 3505-specific checking since CK_3505 flag is not used, and
> >> treat all AM35x clocks the same.
> >>
> >> This means that the SGX clock (the only AM35x clkdev not currently
> >> flagged for 3505) will now be registered on 3505, but that is
> >> harmless.  That can be cleaned up when the clkdev nodes are removed in
> >> favor of them being registered by hwmod.
> >>
> > [Hiremath, Vaibhav] How do you think we can use hwmod here?
> 
> I haven't thought in detail about the exact fix for this, but it
> shouldn't be difficult. For example, it could be as simple as creating
> some more per-family hwmod lists of optional hwmods.  Then, during init,
> register them based on the feature flag.
> 
> Longer term, it may be that we handle this using DT, but I'm not sure we
> will use DT to describe that level of SoC detail.
> 
> > Currently hwmod is also dependent on cpu_is_xxxx to register respective
> modules.
> 
> In mainline it is only done by CPU family (revision), not using cpu_is*
> 
Yeah, I missed this point (was referring different code base).

Thanks,
Vaibhav

> > I completely understand and agree to the fact that there may not be any
> harm
> > due to this, but this means, iva will be always registered for 3505
> devices.
> 
> Correct for today, but not difficult to remedy by fixing up the hwmod init.
> 
> Kevin

[RFC/PATCH 4/7] ARM: OMAP: AM35x: remove redunant cpu_is checks for AM3505

[Kevin Hilman]

There are several checks for AM35x devices done using

      if (cpu_is_omap3517() || cpu_is_omap3505())

However, since the 3505 is just a 3517 without an SGX, the 3505 check
is redundant because cpu_is_omap3517() will always be true whenever
cpu_is_omap3505() is true.  From <plat/cpu.h>:

 #define cpu_is_omap3505() (cpu_is_omap3517() && !omap3_has_sgx())

Therefore, remove the redunant 3505 checks.  This helps move towards
removal of SoC detection that depends on specific IP detection.

Signed-off-by: Kevin Hilman <khilman@ti.com>
---
 arch/arm/mach-omap2/hsmmc.c                   |    8 ++++----
 arch/arm/mach-omap2/usb-musb.c                |    2 +-
 arch/arm/mach-omap2/voltagedomains3xxx_data.c |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c
index bd844af..c49a91d 100644
--- a/arch/arm/mach-omap2/hsmmc.c
+++ b/arch/arm/mach-omap2/hsmmc.c
@@ -353,7 +353,7 @@ static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c,
 	 *
 	 * temporary HACK: ocr_mask instead of fixed supply
 	 */
-	if (cpu_is_omap3505() || cpu_is_omap3517())
+	if (cpu_is_omap3517())
 		mmc->slots[0].ocr_mask = MMC_VDD_165_195 |
 					 MMC_VDD_26_27 |
 					 MMC_VDD_27_28 |
@@ -363,7 +363,7 @@ static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c,
 	else
 		mmc->slots[0].ocr_mask = c->ocr_mask;
 
-	if (!cpu_is_omap3517() && !cpu_is_omap3505())
+	if (!cpu_is_omap3517())
 		mmc->slots[0].features |= HSMMC_HAS_PBIAS;
 
 	if (cpu_is_omap44xx() && (omap_rev() > OMAP4430_REV_ES1_0))
@@ -386,7 +386,7 @@ static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c,
 			}
 		}
 
-		if (cpu_is_omap3517() || cpu_is_omap3505())
+		if (cpu_is_omap3517())
 			mmc->slots[0].set_power = nop_mmc_set_power;
 
 		/* OMAP3630 HSMMC1 supports only 4-bit */
@@ -398,7 +398,7 @@ static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c,
 		}
 		break;
 	case 2:
-		if (cpu_is_omap3517() || cpu_is_omap3505())
+		if (cpu_is_omap3517())
 			mmc->slots[0].set_power = am35x_hsmmc2_set_power;
 
 		if (c->ext_clock)
diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c
index 8d5ed77..bf33b4d 100644
--- a/arch/arm/mach-omap2/usb-musb.c
+++ b/arch/arm/mach-omap2/usb-musb.c
@@ -90,7 +90,7 @@ void __init usb_musb_init(struct omap_musb_board_data *musb_board_data)
 	musb_plat.mode = board_data->mode;
 	musb_plat.extvbus = board_data->extvbus;
 
-	if (cpu_is_omap3517() || cpu_is_omap3505()) {
+	if (cpu_is_omap3517()) {
 		oh_name = "am35x_otg_hs";
 		name = "musb-am35x";
 	} else if (cpu_is_ti81xx()) {
diff --git a/arch/arm/mach-omap2/voltagedomains3xxx_data.c b/arch/arm/mach-omap2/voltagedomains3xxx_data.c
index c005e2f..bdb82f1 100644
--- a/arch/arm/mach-omap2/voltagedomains3xxx_data.c
+++ b/arch/arm/mach-omap2/voltagedomains3xxx_data.c
@@ -116,7 +116,7 @@ void __init omap3xxx_voltagedomains_init(void)
 		omap3_voltdm_core.volt_data = omap34xx_vddcore_volt_data;
 	}
 
-	if (cpu_is_omap3517() || cpu_is_omap3505())
+	if (cpu_is_omap3517())
 		voltdms = voltagedomains_am35xx;
 	else
 		voltdms = voltagedomains_omap3;
-- 
1.7.8.2

RE: [RFC/PATCH 4/7] ARM: OMAP: AM35x: remove redunant cpu_is checks for AM3505

[Hiremath, Vaibhav]

> -----Original Message-----
> From: Hilman, Kevin
> Sent: Thursday, January 05, 2012 6:47 AM
> To: linux-omap@vger.kernel.org
> Cc: Paul Walmsley; Hiremath, Vaibhav
> Subject: [RFC/PATCH 4/7] ARM: OMAP: AM35x: remove redunant cpu_is checks
> for AM3505
> 
> There are several checks for AM35x devices done using
> 
>       if (cpu_is_omap3517() || cpu_is_omap3505())
> 
> However, since the 3505 is just a 3517 without an SGX, the 3505 check
> is redundant because cpu_is_omap3517() will always be true whenever
> cpu_is_omap3505() is true.  From <plat/cpu.h>:
> 
>  #define cpu_is_omap3505() (cpu_is_omap3517() && !omap3_has_sgx())
> 
> Therefore, remove the redunant 3505 checks.  This helps move towards
> removal of SoC detection that depends on specific IP detection.
> 
I think this make complete sense and right candidate for upstream.

Thanks,
Vaibhav


> Signed-off-by: Kevin Hilman <khilman@ti.com>
> ---
>  arch/arm/mach-omap2/hsmmc.c                   |    8 ++++----
>  arch/arm/mach-omap2/usb-musb.c                |    2 +-
>  arch/arm/mach-omap2/voltagedomains3xxx_data.c |    2 +-
>  3 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c
> index bd844af..c49a91d 100644
> --- a/arch/arm/mach-omap2/hsmmc.c
> +++ b/arch/arm/mach-omap2/hsmmc.c
> @@ -353,7 +353,7 @@ static int __init omap_hsmmc_pdata_init(struct
> omap2_hsmmc_info *c,
>  	 *
>  	 * temporary HACK: ocr_mask instead of fixed supply
>  	 */
> -	if (cpu_is_omap3505() || cpu_is_omap3517())
> +	if (cpu_is_omap3517())
>  		mmc->slots[0].ocr_mask = MMC_VDD_165_195 |
>  					 MMC_VDD_26_27 |
>  					 MMC_VDD_27_28 |
> @@ -363,7 +363,7 @@ static int __init omap_hsmmc_pdata_init(struct
> omap2_hsmmc_info *c,
>  	else
>  		mmc->slots[0].ocr_mask = c->ocr_mask;
> 
> -	if (!cpu_is_omap3517() && !cpu_is_omap3505())
> +	if (!cpu_is_omap3517())
>  		mmc->slots[0].features |= HSMMC_HAS_PBIAS;
> 
>  	if (cpu_is_omap44xx() && (omap_rev() > OMAP4430_REV_ES1_0))
> @@ -386,7 +386,7 @@ static int __init omap_hsmmc_pdata_init(struct
> omap2_hsmmc_info *c,
>  			}
>  		}
> 
> -		if (cpu_is_omap3517() || cpu_is_omap3505())
> +		if (cpu_is_omap3517())
>  			mmc->slots[0].set_power = nop_mmc_set_power;
> 
>  		/* OMAP3630 HSMMC1 supports only 4-bit */
> @@ -398,7 +398,7 @@ static int __init omap_hsmmc_pdata_init(struct
> omap2_hsmmc_info *c,
>  		}
>  		break;
>  	case 2:
> -		if (cpu_is_omap3517() || cpu_is_omap3505())
> +		if (cpu_is_omap3517())
>  			mmc->slots[0].set_power = am35x_hsmmc2_set_power;
> 
>  		if (c->ext_clock)
> diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-
> musb.c
> index 8d5ed77..bf33b4d 100644
> --- a/arch/arm/mach-omap2/usb-musb.c
> +++ b/arch/arm/mach-omap2/usb-musb.c
> @@ -90,7 +90,7 @@ void __init usb_musb_init(struct omap_musb_board_data
> *musb_board_data)
>  	musb_plat.mode = board_data->mode;
>  	musb_plat.extvbus = board_data->extvbus;
> 
> -	if (cpu_is_omap3517() || cpu_is_omap3505()) {
> +	if (cpu_is_omap3517()) {
>  		oh_name = "am35x_otg_hs";
>  		name = "musb-am35x";
>  	} else if (cpu_is_ti81xx()) {
> diff --git a/arch/arm/mach-omap2/voltagedomains3xxx_data.c
> b/arch/arm/mach-omap2/voltagedomains3xxx_data.c
> index c005e2f..bdb82f1 100644
> --- a/arch/arm/mach-omap2/voltagedomains3xxx_data.c
> +++ b/arch/arm/mach-omap2/voltagedomains3xxx_data.c
> @@ -116,7 +116,7 @@ void __init omap3xxx_voltagedomains_init(void)
>  		omap3_voltdm_core.volt_data = omap34xx_vddcore_volt_data;
>  	}
> 
> -	if (cpu_is_omap3517() || cpu_is_omap3505())
> +	if (cpu_is_omap3517())
>  		voltdms = voltagedomains_am35xx;
>  	else
>  		voltdms = voltagedomains_omap3;
> --
> 1.7.8.2

[RFC/PATCH 5/7] ARM: OMAP: clock: remove unused CK_3505 flag

[Kevin Hilman]

This flag is no longer used since clock init all AM35x devices
is now the same.

Signed-off-by: Kevin Hilman <khilman@ti.com>
---
 arch/arm/plat-omap/include/plat/clkdev_omap.h |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/arch/arm/plat-omap/include/plat/clkdev_omap.h b/arch/arm/plat-omap/include/plat/clkdev_omap.h
index b299b8d..45afa4d 100644
--- a/arch/arm/plat-omap/include/plat/clkdev_omap.h
+++ b/arch/arm/plat-omap/include/plat/clkdev_omap.h
@@ -34,7 +34,6 @@ struct omap_clk {
 #define CK_243X		(1 << 5)	/* 243x, 253x */
 #define CK_3430ES1	(1 << 6)	/* 34xxES1 only */
 #define CK_3430ES2PLUS	(1 << 7)	/* 34xxES2, ES3, non-Sitara 35xx only */
-#define CK_3505		(1 << 8)
 #define CK_3517		(1 << 9)
 #define CK_36XX		(1 << 10)	/* 36xx/37xx-specific clocks */
 #define CK_443X		(1 << 11)
@@ -44,7 +43,7 @@ struct omap_clk {
 
 
 #define CK_34XX		(CK_3430ES1 | CK_3430ES2PLUS)
-#define CK_AM35XX	(CK_3505 | CK_3517)	/* all Sitara AM35xx */
+#define CK_AM35XX	CK_3517		/* all Sitara AM35xx */
 #define CK_3XXX		(CK_34XX | CK_AM35XX | CK_36XX)
 
 
-- 
1.7.8.2

RE: [RFC/PATCH 5/7] ARM: OMAP: clock: remove unused CK_3505 flag

[Hiremath, Vaibhav]

> -----Original Message-----
> From: Hilman, Kevin
> Sent: Thursday, January 05, 2012 6:47 AM
> To: linux-omap@vger.kernel.org
> Cc: Paul Walmsley; Hiremath, Vaibhav
> Subject: [RFC/PATCH 5/7] ARM: OMAP: clock: remove unused CK_3505 flag
> 
> This flag is no longer used since clock init all AM35x devices
> is now the same.
> 
This can be merged with 

ARM: OMAP3: clock data: replace 3503/3517 flag with AM35x flag for UART4

Thanks,
Vaibhav

> Signed-off-by: Kevin Hilman <khilman@ti.com>
> ---
>  arch/arm/plat-omap/include/plat/clkdev_omap.h |    3 +--
>  1 files changed, 1 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/plat-omap/include/plat/clkdev_omap.h
> b/arch/arm/plat-omap/include/plat/clkdev_omap.h
> index b299b8d..45afa4d 100644
> --- a/arch/arm/plat-omap/include/plat/clkdev_omap.h
> +++ b/arch/arm/plat-omap/include/plat/clkdev_omap.h
> @@ -34,7 +34,6 @@ struct omap_clk {
>  #define CK_243X		(1 << 5)	/* 243x, 253x */
>  #define CK_3430ES1	(1 << 6)	/* 34xxES1 only */
>  #define CK_3430ES2PLUS	(1 << 7)	/* 34xxES2, ES3, non-Sitara 35xx only
> */
> -#define CK_3505		(1 << 8)
>  #define CK_3517		(1 << 9)
>  #define CK_36XX		(1 << 10)	/* 36xx/37xx-specific clocks */
>  #define CK_443X		(1 << 11)
> @@ -44,7 +43,7 @@ struct omap_clk {
> 
> 
>  #define CK_34XX		(CK_3430ES1 | CK_3430ES2PLUS)
> -#define CK_AM35XX	(CK_3505 | CK_3517)	/* all Sitara AM35xx */
> +#define CK_AM35XX	CK_3517		/* all Sitara AM35xx */
>  #define CK_3XXX		(CK_34XX | CK_AM35XX | CK_36XX)
> 
> 
> --
> 1.7.8.2

[RFC/PATCH 6/7] ARM: OMAP: remove unused cpu_is_omap3505()

[Kevin Hilman]

The 3505 check is now unused and can be removed.

There are no longer any cpu_is_* checks that depend on specific IP
detection.

Signed-off-by: Kevin Hilman <khilman@ti.com>
---
 arch/arm/plat-omap/include/plat/cpu.h |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h
index bcad3dc..8d858c2 100644
--- a/arch/arm/plat-omap/include/plat/cpu.h
+++ b/arch/arm/plat-omap/include/plat/cpu.h
@@ -251,8 +251,7 @@ IS_AM_SUBCLASS(335x, 0x335)
  * cpu_is_omap2430():	True for OMAP2430
  * cpu_is_omap3430():	True for OMAP3430
  * cpu_is_omap4430():	True for OMAP4430
- * cpu_is_omap3505():	True for OMAP3505
- * cpu_is_omap3517():	True for OMAP3517
+ * cpu_is_omap3517():	True for AM35x: OMAP3517, OMAP3505
  */
 #define GET_OMAP_TYPE	((omap_rev() >> 16) & 0xffff)
 
@@ -276,7 +275,6 @@ IS_OMAP_TYPE(2422, 0x2422)
 IS_OMAP_TYPE(2423, 0x2423)
 IS_OMAP_TYPE(2430, 0x2430)
 IS_OMAP_TYPE(3430, 0x3430)
-IS_OMAP_TYPE(3505, 0x3517)
 IS_OMAP_TYPE(3517, 0x3517)
 
 #define cpu_is_omap310()		0
@@ -293,7 +291,6 @@ IS_OMAP_TYPE(3517, 0x3517)
 #define cpu_is_omap2423()		0
 #define cpu_is_omap2430()		0
 #define cpu_is_omap3530()		0
-#define cpu_is_omap3505()		0
 #define cpu_is_omap3517()		0
 #define cpu_is_omap3430()		0
 #define cpu_is_omap4430()		0
@@ -348,7 +345,6 @@ IS_OMAP_TYPE(3517, 0x3517)
 #if defined(CONFIG_ARCH_OMAP3)
 # undef cpu_is_omap3430
 # undef cpu_is_omap3530
-# undef cpu_is_omap3505
 # undef cpu_is_omap3517
 # undef cpu_is_ti81xx
 # undef cpu_is_ti816x
@@ -358,8 +354,6 @@ IS_OMAP_TYPE(3517, 0x3517)
 # define cpu_is_omap3430()		is_omap3430()
 # define cpu_is_omap3530()		(cpu_is_omap3430())
 # define cpu_is_omap3517()		is_omap3517()
-# define cpu_is_omap3505()		(cpu_is_omap3517() &&		\
-						!omap3_has_sgx())
 # undef cpu_is_omap3630
 # define cpu_is_omap3630()		is_omap363x()
 # define cpu_is_ti81xx()		is_ti81xx()
-- 
1.7.8.2

[RFC/PATCH 7/7] ARM: OMAP: remove unused cpu_is_omap3530()

[Kevin Hilman]

The cpu_is_omap3530() macro is unused, remove.

Signed-off-by: Kevin Hilman <khilman@ti.com>
---
 arch/arm/plat-omap/include/plat/cpu.h |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h
index 8d858c2..2c8e5ab 100644
--- a/arch/arm/plat-omap/include/plat/cpu.h
+++ b/arch/arm/plat-omap/include/plat/cpu.h
@@ -290,7 +290,6 @@ IS_OMAP_TYPE(3517, 0x3517)
 #define cpu_is_omap2422()		0
 #define cpu_is_omap2423()		0
 #define cpu_is_omap2430()		0
-#define cpu_is_omap3530()		0
 #define cpu_is_omap3517()		0
 #define cpu_is_omap3430()		0
 #define cpu_is_omap4430()		0
@@ -344,7 +343,6 @@ IS_OMAP_TYPE(3517, 0x3517)
 
 #if defined(CONFIG_ARCH_OMAP3)
 # undef cpu_is_omap3430
-# undef cpu_is_omap3530
 # undef cpu_is_omap3517
 # undef cpu_is_ti81xx
 # undef cpu_is_ti816x
@@ -352,7 +350,6 @@ IS_OMAP_TYPE(3517, 0x3517)
 # undef cpu_is_am33xx
 # undef cpu_is_am335x
 # define cpu_is_omap3430()		is_omap3430()
-# define cpu_is_omap3530()		(cpu_is_omap3430())
 # define cpu_is_omap3517()		is_omap3517()
 # undef cpu_is_omap3630
 # define cpu_is_omap3630()		is_omap363x()
-- 
1.7.8.2

RE: [RFC/PATCH 7/7] ARM: OMAP: remove unused cpu_is_omap3530()

[Hiremath, Vaibhav]

> -----Original Message-----
> From: Hilman, Kevin
> Sent: Thursday, January 05, 2012 6:47 AM
> To: linux-omap@vger.kernel.org
> Cc: Paul Walmsley; Hiremath, Vaibhav
> Subject: [RFC/PATCH 7/7] ARM: OMAP: remove unused cpu_is_omap3530()
> 
> The cpu_is_omap3530() macro is unused, remove.
> 
This also make sense, since 3530 is exactly same as 3430 and even we don't 
use cpu_is_omap3530 anywhere. 

This can also be submitted to the list independently.

Thanks,
Vaibhav

> Signed-off-by: Kevin Hilman <khilman@ti.com>
> ---
>  arch/arm/plat-omap/include/plat/cpu.h |    3 ---
>  1 files changed, 0 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-
> omap/include/plat/cpu.h
> index 8d858c2..2c8e5ab 100644
> --- a/arch/arm/plat-omap/include/plat/cpu.h
> +++ b/arch/arm/plat-omap/include/plat/cpu.h
> @@ -290,7 +290,6 @@ IS_OMAP_TYPE(3517, 0x3517)
>  #define cpu_is_omap2422()		0
>  #define cpu_is_omap2423()		0
>  #define cpu_is_omap2430()		0
> -#define cpu_is_omap3530()		0
>  #define cpu_is_omap3517()		0
>  #define cpu_is_omap3430()		0
>  #define cpu_is_omap4430()		0
> @@ -344,7 +343,6 @@ IS_OMAP_TYPE(3517, 0x3517)
> 
>  #if defined(CONFIG_ARCH_OMAP3)
>  # undef cpu_is_omap3430
> -# undef cpu_is_omap3530
>  # undef cpu_is_omap3517
>  # undef cpu_is_ti81xx
>  # undef cpu_is_ti816x
> @@ -352,7 +350,6 @@ IS_OMAP_TYPE(3517, 0x3517)
>  # undef cpu_is_am33xx
>  # undef cpu_is_am335x
>  # define cpu_is_omap3430()		is_omap3430()
> -# define cpu_is_omap3530()		(cpu_is_omap3430())
>  # define cpu_is_omap3517()		is_omap3517()
>  # undef cpu_is_omap3630
>  # define cpu_is_omap3630()		is_omap363x()
> --
> 1.7.8.2

RE: [PATCH 0/7] ARM: OMAP: remove IP checks from SoC family detection

[Hiremath, Vaibhav]

> -----Original Message-----
> From: Hilman, Kevin
> Sent: Thursday, January 05, 2012 6:47 AM
> To: linux-omap@vger.kernel.org
> Cc: Paul Walmsley; Hiremath, Vaibhav
> Subject: [PATCH 0/7] ARM: OMAP: remove IP checks from SoC family detection
> 
> Currently, our SoC detection is based on SoC family detection
> (using die ID) and the presence of specific IP blocks (or feature.)
> 
> This series begins the separation of the SoC family detection and
> specific IP detection.
> 
> Applies on top of Tony's current master branch and so far, it has only
> been compile tested using omap2plus_defconfig.
> 
I tested it on OMAP3EVM (AM37x) and AM3517EVM as well and it is booting up
for me.

Feel free to add my acked and/or tested by.


Just FYI, not related to the patch series at all, but I am getting into some issues with ramdisk mounting (which was working earlier, not sure). Probably I have to create fresh image and try...

Thanks,
Vaibhav

> Kevin
> 
> 
> Kevin Hilman (7):
>   ARM: OMAP: remove unused cpu_is macros that depend on specific IP
>     checks
>   ARM: OMAP3: clock data: replace 3503/3517 flag with AM35x flag for
>     UART4
>   ARM: OMAP3: clock data: treat all AM35x devices the same
>   ARM: OMAP: AM35x: remove redunant cpu_is checks for AM3505
>   ARM: OMAP: clock: remove unused CK_3505 flag
>   ARM: OMAP: remove unused cpu_is_omap3505()
>   ARM: OMAP: remove unused cpu_is_omap3530()
> 
>  arch/arm/mach-omap2/clock3xxx_data.c          |   16 +-------------
>  arch/arm/mach-omap2/hsmmc.c                   |    8 +++---
>  arch/arm/mach-omap2/usb-musb.c                |    2 +-
>  arch/arm/mach-omap2/voltagedomains3xxx_data.c |    2 +-
>  arch/arm/plat-omap/include/plat/clkdev_omap.h |    3 +-
>  arch/arm/plat-omap/include/plat/cpu.h         |   26 +-------------------
> -----
>  6 files changed, 10 insertions(+), 47 deletions(-)
> 
> --
> 1.7.8.2

Re: [PATCH 0/7] ARM: OMAP: remove IP checks from SoC family detection

[Kevin Hilman]

"Hiremath, Vaibhav" <hvaibhav@ti.com> writes:

>> Currently, our SoC detection is based on SoC family detection
>> (using die ID) and the presence of specific IP blocks (or feature.)
>> 
>> This series begins the separation of the SoC family detection and
>> specific IP detection.
>> 
>> Applies on top of Tony's current master branch and so far, it has only
>> been compile tested using omap2plus_defconfig.
>> 
> I tested it on OMAP3EVM (AM37x) and AM3517EVM as well and it is booting up
> for me.
>
> Feel free to add my acked and/or tested by.

Great, thanks for testing!

Can you also test with the patch 8 that I just sent?   It boot tests
fine on my AM3517 EVM, but didn't do any other tests.

Thanks,

Kevin

RE: [PATCH 0/7] ARM: OMAP: remove IP checks from SoC family detection

[Hiremath, Vaibhav]

> -----Original Message-----
> From: Hilman, Kevin
> Sent: Saturday, January 07, 2012 12:25 AM
> To: Hiremath, Vaibhav
> Cc: linux-omap@vger.kernel.org; Paul Walmsley
> Subject: Re: [PATCH 0/7] ARM: OMAP: remove IP checks from SoC family
> detection
> 
> "Hiremath, Vaibhav" <hvaibhav@ti.com> writes:
> 
> >> Currently, our SoC detection is based on SoC family detection
> >> (using die ID) and the presence of specific IP blocks (or feature.)
> >>
> >> This series begins the separation of the SoC family detection and
> >> specific IP detection.
> >>
> >> Applies on top of Tony's current master branch and so far, it has only
> >> been compile tested using omap2plus_defconfig.
> >>
> > I tested it on OMAP3EVM (AM37x) and AM3517EVM as well and it is booting
> up
> > for me.
> >
> > Feel free to add my acked and/or tested by.
> 
> Great, thanks for testing!
> 
> Can you also test with the patch 8 that I just sent?   It boot tests
> fine on my AM3517 EVM, but didn't do any other tests.
> 
Yes Kevin,

I have also boot tested it at my end on both AM3517EVM and OMAP3EVM (AM37x)
And it boots up fine for me as well.

Thanks,
Vaibhav



> Thanks,
> 
> Kevin

[RFC/PATCH 8/7] ARM: OMAP: AM35xx: convert 3517 detection/flags to AM35xx

[Kevin Hilman]

Currently cpu_is_omap3517() actually detects any device in the AM35x
family (3517 and no-SGX version 3505.)  To make it more clear what is
being detected, convert the names from 3517 to AM35xx.

For the same reason, replace the CK_3517 flag used in the clock data
to CK_AM35XX.

Signed-off-by: Kevin Hilman <khilman@ti.com>
---
 arch/arm/mach-omap2/clock3xxx_data.c          |    8 ++++----
 arch/arm/mach-omap2/hsmmc.c                   |    8 ++++----
 arch/arm/mach-omap2/id.c                      |    7 +++----
 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c    |    2 +-
 arch/arm/mach-omap2/powerdomains3xxx_data.c   |    2 +-
 arch/arm/mach-omap2/usb-musb.c                |    2 +-
 arch/arm/mach-omap2/voltagedomains3xxx_data.c |    2 +-
 arch/arm/plat-omap/include/plat/clkdev_omap.h |    3 +--
 arch/arm/plat-omap/include/plat/cpu.h         |   15 +++++++--------
 9 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c
index 26fb4d9..745df5f 100644
--- a/arch/arm/mach-omap2/clock3xxx_data.c
+++ b/arch/arm/mach-omap2/clock3xxx_data.c
@@ -3286,8 +3286,8 @@ static struct omap_clk omap3xxx_clks[] = {
 	CLK(NULL,	"gfx_l3_ick",	&gfx_l3_ick,	CK_3430ES1),
 	CLK(NULL,	"gfx_cg1_ck",	&gfx_cg1_ck,	CK_3430ES1),
 	CLK(NULL,	"gfx_cg2_ck",	&gfx_cg2_ck,	CK_3430ES1),
-	CLK(NULL,	"sgx_fck",	&sgx_fck,	CK_3430ES2PLUS | CK_3517 | CK_36XX),
-	CLK(NULL,	"sgx_ick",	&sgx_ick,	CK_3430ES2PLUS | CK_3517 | CK_36XX),
+	CLK(NULL,	"sgx_fck",	&sgx_fck,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
+	CLK(NULL,	"sgx_ick",	&sgx_ick,	CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
 	CLK(NULL,	"d2d_26m_fck",	&d2d_26m_fck,	CK_3430ES1),
 	CLK(NULL,	"modem_fck",	&modem_fck,	CK_34XX | CK_36XX),
 	CLK(NULL,	"sad2d_ick",	&sad2d_ick,	CK_34XX | CK_36XX),
@@ -3505,9 +3505,9 @@ int __init omap3xxx_clk_init(void)
 	struct omap_clk *c;
 	u32 cpu_clkflg = 0;
 
-	if (cpu_is_omap3517()) {
+	if (cpu_is_am35xx()) {
 		cpu_mask = RATE_IN_34XX;
-		cpu_clkflg = CK_3517;
+		cpu_clkflg = CK_AM35XX;
 	} else if (cpu_is_omap3630()) {
 		cpu_mask = (RATE_IN_34XX | RATE_IN_36XX);
 		cpu_clkflg = CK_36XX;
diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c
index c49a91d..70dbe6a 100644
--- a/arch/arm/mach-omap2/hsmmc.c
+++ b/arch/arm/mach-omap2/hsmmc.c
@@ -353,7 +353,7 @@ static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c,
 	 *
 	 * temporary HACK: ocr_mask instead of fixed supply
 	 */
-	if (cpu_is_omap3517())
+	if (cpu_is_am35xx())
 		mmc->slots[0].ocr_mask = MMC_VDD_165_195 |
 					 MMC_VDD_26_27 |
 					 MMC_VDD_27_28 |
@@ -363,7 +363,7 @@ static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c,
 	else
 		mmc->slots[0].ocr_mask = c->ocr_mask;
 
-	if (!cpu_is_omap3517())
+	if (!cpu_is_am35xx())
 		mmc->slots[0].features |= HSMMC_HAS_PBIAS;
 
 	if (cpu_is_omap44xx() && (omap_rev() > OMAP4430_REV_ES1_0))
@@ -386,7 +386,7 @@ static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c,
 			}
 		}
 
-		if (cpu_is_omap3517())
+		if (cpu_is_am35xx())
 			mmc->slots[0].set_power = nop_mmc_set_power;
 
 		/* OMAP3630 HSMMC1 supports only 4-bit */
@@ -398,7 +398,7 @@ static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c,
 		}
 		break;
 	case 2:
-		if (cpu_is_omap3517())
+		if (cpu_is_am35xx())
 			mmc->slots[0].set_power = am35x_hsmmc2_set_power;
 
 		if (c->ext_clock)
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index 92e4d55..325e12e 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -183,8 +183,7 @@ static void __init omap3_cpuinfo(void)
 	 */
 	if (cpu_is_omap3630()) {
 		cpu_name = "OMAP3630";
-	} else if (cpu_is_omap3517()) {
-		/* AM35xx devices */
+	} else if (cpu_is_am35xx()) {
 		cpu_name = (omap3_has_sgx()) ? "AM3517" : "AM3505";
 	} else if (cpu_is_ti816x()) {
 		cpu_name = "TI816X";
@@ -350,13 +349,13 @@ void __init omap3xxx_check_revision(void)
 		 */
 		switch (rev) {
 		case 0:
-			omap_revision = OMAP3517_REV_ES1_0;
+			omap_revision = AM35XX_REV_ES1_0;
 			cpu_rev = "1.0";
 			break;
 		case 1:
 		/* FALLTHROUGH */
 		default:
-			omap_revision = OMAP3517_REV_ES1_1;
+			omap_revision = AM35XX_REV_ES1_1;
 			cpu_rev = "1.1";
 		}
 		break;
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index 5324e8d..06627dd 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -3664,7 +3664,7 @@ int __init omap3xxx_hwmod_init(void)
 	    rev == OMAP3430_REV_ES2_1 || rev == OMAP3430_REV_ES3_0 ||
 	    rev == OMAP3430_REV_ES3_1 || rev == OMAP3430_REV_ES3_1_2) {
 		h = omap34xx_hwmods;
-	} else if (rev == OMAP3517_REV_ES1_0 || rev == OMAP3517_REV_ES1_1) {
+	} else if (rev == AM35XX_REV_ES1_0 || rev == AM35XX_REV_ES1_1) {
 		h = am35xx_hwmods;
 	} else if (rev == OMAP3630_REV_ES1_0 || rev == OMAP3630_REV_ES1_1 ||
 		   rev == OMAP3630_REV_ES1_2) {
diff --git a/arch/arm/mach-omap2/powerdomains3xxx_data.c b/arch/arm/mach-omap2/powerdomains3xxx_data.c
index 8ef26da..6360736 100644
--- a/arch/arm/mach-omap2/powerdomains3xxx_data.c
+++ b/arch/arm/mach-omap2/powerdomains3xxx_data.c
@@ -310,7 +310,7 @@ void __init omap3xxx_powerdomains_init(void)
 		 rev == OMAP3430_REV_ES3_0 || rev == OMAP3630_REV_ES1_0)
 		pwrdm_register_pwrdms(powerdomains_omap3430es2_es3_0);
 	else if (rev == OMAP3430_REV_ES3_1 || rev == OMAP3430_REV_ES3_1_2 ||
-		 rev == OMAP3517_REV_ES1_0 || rev == OMAP3517_REV_ES1_1 ||
+		 rev == AM35XX_REV_ES1_0 || rev == AM35XX_REV_ES1_1 ||
 		 rev == OMAP3630_REV_ES1_1 || rev == OMAP3630_REV_ES1_2)
 		pwrdm_register_pwrdms(powerdomains_omap3430es3_1plus);
 	else
diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c
index bf33b4d..ae07060 100644
--- a/arch/arm/mach-omap2/usb-musb.c
+++ b/arch/arm/mach-omap2/usb-musb.c
@@ -90,7 +90,7 @@ void __init usb_musb_init(struct omap_musb_board_data *musb_board_data)
 	musb_plat.mode = board_data->mode;
 	musb_plat.extvbus = board_data->extvbus;
 
-	if (cpu_is_omap3517()) {
+	if (cpu_is_am35xx()) {
 		oh_name = "am35x_otg_hs";
 		name = "musb-am35x";
 	} else if (cpu_is_ti81xx()) {
diff --git a/arch/arm/mach-omap2/voltagedomains3xxx_data.c b/arch/arm/mach-omap2/voltagedomains3xxx_data.c
index bdb82f1..ea98939 100644
--- a/arch/arm/mach-omap2/voltagedomains3xxx_data.c
+++ b/arch/arm/mach-omap2/voltagedomains3xxx_data.c
@@ -116,7 +116,7 @@ void __init omap3xxx_voltagedomains_init(void)
 		omap3_voltdm_core.volt_data = omap34xx_vddcore_volt_data;
 	}
 
-	if (cpu_is_omap3517())
+	if (cpu_is_am35xx())
 		voltdms = voltagedomains_am35xx;
 	else
 		voltdms = voltagedomains_omap3;
diff --git a/arch/arm/plat-omap/include/plat/clkdev_omap.h b/arch/arm/plat-omap/include/plat/clkdev_omap.h
index 45afa4d..d0ed8c4 100644
--- a/arch/arm/plat-omap/include/plat/clkdev_omap.h
+++ b/arch/arm/plat-omap/include/plat/clkdev_omap.h
@@ -34,7 +34,7 @@ struct omap_clk {
 #define CK_243X		(1 << 5)	/* 243x, 253x */
 #define CK_3430ES1	(1 << 6)	/* 34xxES1 only */
 #define CK_3430ES2PLUS	(1 << 7)	/* 34xxES2, ES3, non-Sitara 35xx only */
-#define CK_3517		(1 << 9)
+#define CK_AM35XX	(1 << 9)	/* Sitara AM35xx */
 #define CK_36XX		(1 << 10)	/* 36xx/37xx-specific clocks */
 #define CK_443X		(1 << 11)
 #define CK_TI816X	(1 << 12)
@@ -43,7 +43,6 @@ struct omap_clk {
 
 
 #define CK_34XX		(CK_3430ES1 | CK_3430ES2PLUS)
-#define CK_AM35XX	CK_3517		/* all Sitara AM35xx */
 #define CK_3XXX		(CK_34XX | CK_AM35XX | CK_36XX)
 
 
diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h
index 2c8e5ab..43b3283 100644
--- a/arch/arm/plat-omap/include/plat/cpu.h
+++ b/arch/arm/plat-omap/include/plat/cpu.h
@@ -121,6 +121,7 @@ IS_OMAP_CLASS(16xx, 0x16)
 IS_OMAP_CLASS(24xx, 0x24)
 IS_OMAP_CLASS(34xx, 0x34)
 IS_OMAP_CLASS(44xx, 0x44)
+IS_AM_CLASS(35xx, 0x35)
 IS_AM_CLASS(33xx, 0x33)
 
 IS_TI_CLASS(81xx, 0x81)
@@ -148,6 +149,7 @@ IS_AM_SUBCLASS(335x, 0x335)
 #define cpu_is_ti81xx()			0
 #define cpu_is_ti816x()			0
 #define cpu_is_ti814x()			0
+#define cpu_is_am35xx()			0
 #define cpu_is_am33xx()			0
 #define cpu_is_am335x()			0
 #define cpu_is_omap44xx()		0
@@ -251,7 +253,6 @@ IS_AM_SUBCLASS(335x, 0x335)
  * cpu_is_omap2430():	True for OMAP2430
  * cpu_is_omap3430():	True for OMAP3430
  * cpu_is_omap4430():	True for OMAP4430
- * cpu_is_omap3517():	True for AM35x: OMAP3517, OMAP3505
  */
 #define GET_OMAP_TYPE	((omap_rev() >> 16) & 0xffff)
 
@@ -275,7 +276,6 @@ IS_OMAP_TYPE(2422, 0x2422)
 IS_OMAP_TYPE(2423, 0x2423)
 IS_OMAP_TYPE(2430, 0x2430)
 IS_OMAP_TYPE(3430, 0x3430)
-IS_OMAP_TYPE(3517, 0x3517)
 
 #define cpu_is_omap310()		0
 #define cpu_is_omap730()		0
@@ -290,7 +290,6 @@ IS_OMAP_TYPE(3517, 0x3517)
 #define cpu_is_omap2422()		0
 #define cpu_is_omap2423()		0
 #define cpu_is_omap2430()		0
-#define cpu_is_omap3517()		0
 #define cpu_is_omap3430()		0
 #define cpu_is_omap4430()		0
 #define cpu_is_omap3630()		0
@@ -343,19 +342,19 @@ IS_OMAP_TYPE(3517, 0x3517)
 
 #if defined(CONFIG_ARCH_OMAP3)
 # undef cpu_is_omap3430
-# undef cpu_is_omap3517
 # undef cpu_is_ti81xx
 # undef cpu_is_ti816x
 # undef cpu_is_ti814x
+# undef cpu_is_am35xx
 # undef cpu_is_am33xx
 # undef cpu_is_am335x
 # define cpu_is_omap3430()		is_omap3430()
-# define cpu_is_omap3517()		is_omap3517()
 # undef cpu_is_omap3630
 # define cpu_is_omap3630()		is_omap363x()
 # define cpu_is_ti81xx()		is_ti81xx()
 # define cpu_is_ti816x()		is_ti816x()
 # define cpu_is_ti814x()		is_ti814x()
+# define cpu_is_am35xx()		is_am35xx()
 # define cpu_is_am33xx()		is_am33xx()
 # define cpu_is_am335x()		is_am335x()
 #endif
@@ -398,9 +397,9 @@ IS_OMAP_TYPE(3517, 0x3517)
 #define OMAP3630_REV_ES1_1	(OMAP363X_CLASS | (0x1 << 8))
 #define OMAP3630_REV_ES1_2	(OMAP363X_CLASS | (0x2 << 8))
 
-#define OMAP3517_CLASS		0x35170034
-#define OMAP3517_REV_ES1_0	OMAP3517_CLASS
-#define OMAP3517_REV_ES1_1	(OMAP3517_CLASS | (0x1 << 8))
+#define AM35XX_CLASS		0x35170034
+#define AM35XX_REV_ES1_0	AM35XX_CLASS
+#define AM35XX_REV_ES1_1	(AM35XX_CLASS | (0x1 << 8))
 
 #define TI816X_CLASS		0x81600034
 #define TI8168_REV_ES1_0	TI816X_CLASS
-- 
1.7.8.2

RE: [RFC/PATCH 8/7] ARM: OMAP: AM35xx: convert 3517 detection/flags to AM35xx

[Hiremath, Vaibhav]

> -----Original Message-----
> From: Hilman, Kevin
> Sent: Saturday, January 07, 2012 12:24 AM
> To: linux-omap@vger.kernel.org
> Cc: Paul Walmsley; Hiremath, Vaibhav
> Subject: [RFC/PATCH 8/7] ARM: OMAP: AM35xx: convert 3517 detection/flags
> to AM35xx
> 
> Currently cpu_is_omap3517() actually detects any device in the AM35x
> family (3517 and no-SGX version 3505.)  To make it more clear what is
> being detected, convert the names from 3517 to AM35xx.
> 
> For the same reason, replace the CK_3517 flag used in the clock data
> to CK_AM35XX.
> 
> Signed-off-by: Kevin Hilman <khilman@ti.com>
> ---
>  arch/arm/mach-omap2/clock3xxx_data.c          |    8 ++++----
>  arch/arm/mach-omap2/hsmmc.c                   |    8 ++++----
>  arch/arm/mach-omap2/id.c                      |    7 +++----
>  arch/arm/mach-omap2/omap_hwmod_3xxx_data.c    |    2 +-
>  arch/arm/mach-omap2/powerdomains3xxx_data.c   |    2 +-
>  arch/arm/mach-omap2/usb-musb.c                |    2 +-
>  arch/arm/mach-omap2/voltagedomains3xxx_data.c |    2 +-
>  arch/arm/plat-omap/include/plat/clkdev_omap.h |    3 +--
>  arch/arm/plat-omap/include/plat/cpu.h         |   15 +++++++--------
>  9 files changed, 23 insertions(+), 26 deletions(-)
> 
Is this also right time to change Makefile and Kconfig files???
Change in board/mach-types/Makefile/Kconfig files will bring
consistency across...

Thanks,
Vaibhav

> diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-
> omap2/clock3xxx_data.c
> index 26fb4d9..745df5f 100644
> --- a/arch/arm/mach-omap2/clock3xxx_data.c
> +++ b/arch/arm/mach-omap2/clock3xxx_data.c
> @@ -3286,8 +3286,8 @@ static struct omap_clk omap3xxx_clks[] = {
>  	CLK(NULL,	"gfx_l3_ick",	&gfx_l3_ick,	CK_3430ES1),
>  	CLK(NULL,	"gfx_cg1_ck",	&gfx_cg1_ck,	CK_3430ES1),
>  	CLK(NULL,	"gfx_cg2_ck",	&gfx_cg2_ck,	CK_3430ES1),
> -	CLK(NULL,	"sgx_fck",	&sgx_fck,	CK_3430ES2PLUS | CK_3517 |
> CK_36XX),
> -	CLK(NULL,	"sgx_ick",	&sgx_ick,	CK_3430ES2PLUS | CK_3517 |
> CK_36XX),
> +	CLK(NULL,	"sgx_fck",	&sgx_fck,	CK_3430ES2PLUS | CK_AM35XX |
> CK_36XX),
> +	CLK(NULL,	"sgx_ick",	&sgx_ick,	CK_3430ES2PLUS | CK_AM35XX |
> CK_36XX),
>  	CLK(NULL,	"d2d_26m_fck",	&d2d_26m_fck,	CK_3430ES1),
>  	CLK(NULL,	"modem_fck",	&modem_fck,	CK_34XX | CK_36XX),
>  	CLK(NULL,	"sad2d_ick",	&sad2d_ick,	CK_34XX | CK_36XX),
> @@ -3505,9 +3505,9 @@ int __init omap3xxx_clk_init(void)
>  	struct omap_clk *c;
>  	u32 cpu_clkflg = 0;
> 
> -	if (cpu_is_omap3517()) {
> +	if (cpu_is_am35xx()) {
>  		cpu_mask = RATE_IN_34XX;
> -		cpu_clkflg = CK_3517;
> +		cpu_clkflg = CK_AM35XX;
>  	} else if (cpu_is_omap3630()) {
>  		cpu_mask = (RATE_IN_34XX | RATE_IN_36XX);
>  		cpu_clkflg = CK_36XX;
> diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c
> index c49a91d..70dbe6a 100644
> --- a/arch/arm/mach-omap2/hsmmc.c
> +++ b/arch/arm/mach-omap2/hsmmc.c
> @@ -353,7 +353,7 @@ static int __init omap_hsmmc_pdata_init(struct
> omap2_hsmmc_info *c,
>  	 *
>  	 * temporary HACK: ocr_mask instead of fixed supply
>  	 */
> -	if (cpu_is_omap3517())
> +	if (cpu_is_am35xx())
>  		mmc->slots[0].ocr_mask = MMC_VDD_165_195 |
>  					 MMC_VDD_26_27 |
>  					 MMC_VDD_27_28 |
> @@ -363,7 +363,7 @@ static int __init omap_hsmmc_pdata_init(struct
> omap2_hsmmc_info *c,
>  	else
>  		mmc->slots[0].ocr_mask = c->ocr_mask;
> 
> -	if (!cpu_is_omap3517())
> +	if (!cpu_is_am35xx())
>  		mmc->slots[0].features |= HSMMC_HAS_PBIAS;
> 
>  	if (cpu_is_omap44xx() && (omap_rev() > OMAP4430_REV_ES1_0))
> @@ -386,7 +386,7 @@ static int __init omap_hsmmc_pdata_init(struct
> omap2_hsmmc_info *c,
>  			}
>  		}
> 
> -		if (cpu_is_omap3517())
> +		if (cpu_is_am35xx())
>  			mmc->slots[0].set_power = nop_mmc_set_power;
> 
>  		/* OMAP3630 HSMMC1 supports only 4-bit */
> @@ -398,7 +398,7 @@ static int __init omap_hsmmc_pdata_init(struct
> omap2_hsmmc_info *c,
>  		}
>  		break;
>  	case 2:
> -		if (cpu_is_omap3517())
> +		if (cpu_is_am35xx())
>  			mmc->slots[0].set_power = am35x_hsmmc2_set_power;
> 
>  		if (c->ext_clock)
> diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
> index 92e4d55..325e12e 100644
> --- a/arch/arm/mach-omap2/id.c
> +++ b/arch/arm/mach-omap2/id.c
> @@ -183,8 +183,7 @@ static void __init omap3_cpuinfo(void)
>  	 */
>  	if (cpu_is_omap3630()) {
>  		cpu_name = "OMAP3630";
> -	} else if (cpu_is_omap3517()) {
> -		/* AM35xx devices */
> +	} else if (cpu_is_am35xx()) {
>  		cpu_name = (omap3_has_sgx()) ? "AM3517" : "AM3505";
>  	} else if (cpu_is_ti816x()) {
>  		cpu_name = "TI816X";
> @@ -350,13 +349,13 @@ void __init omap3xxx_check_revision(void)
>  		 */
>  		switch (rev) {
>  		case 0:
> -			omap_revision = OMAP3517_REV_ES1_0;
> +			omap_revision = AM35XX_REV_ES1_0;
>  			cpu_rev = "1.0";
>  			break;
>  		case 1:
>  		/* FALLTHROUGH */
>  		default:
> -			omap_revision = OMAP3517_REV_ES1_1;
> +			omap_revision = AM35XX_REV_ES1_1;
>  			cpu_rev = "1.1";
>  		}
>  		break;
> diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-
> omap2/omap_hwmod_3xxx_data.c
> index 5324e8d..06627dd 100644
> --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
> +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
> @@ -3664,7 +3664,7 @@ int __init omap3xxx_hwmod_init(void)
>  	    rev == OMAP3430_REV_ES2_1 || rev == OMAP3430_REV_ES3_0 ||
>  	    rev == OMAP3430_REV_ES3_1 || rev == OMAP3430_REV_ES3_1_2) {
>  		h = omap34xx_hwmods;
> -	} else if (rev == OMAP3517_REV_ES1_0 || rev == OMAP3517_REV_ES1_1) {
> +	} else if (rev == AM35XX_REV_ES1_0 || rev == AM35XX_REV_ES1_1) {
>  		h = am35xx_hwmods;
>  	} else if (rev == OMAP3630_REV_ES1_0 || rev == OMAP3630_REV_ES1_1 ||
>  		   rev == OMAP3630_REV_ES1_2) {
> diff --git a/arch/arm/mach-omap2/powerdomains3xxx_data.c b/arch/arm/mach-
> omap2/powerdomains3xxx_data.c
> index 8ef26da..6360736 100644
> --- a/arch/arm/mach-omap2/powerdomains3xxx_data.c
> +++ b/arch/arm/mach-omap2/powerdomains3xxx_data.c
> @@ -310,7 +310,7 @@ void __init omap3xxx_powerdomains_init(void)
>  		 rev == OMAP3430_REV_ES3_0 || rev == OMAP3630_REV_ES1_0)
>  		pwrdm_register_pwrdms(powerdomains_omap3430es2_es3_0);
>  	else if (rev == OMAP3430_REV_ES3_1 || rev == OMAP3430_REV_ES3_1_2 ||
> -		 rev == OMAP3517_REV_ES1_0 || rev == OMAP3517_REV_ES1_1 ||
> +		 rev == AM35XX_REV_ES1_0 || rev == AM35XX_REV_ES1_1 ||
>  		 rev == OMAP3630_REV_ES1_1 || rev == OMAP3630_REV_ES1_2)
>  		pwrdm_register_pwrdms(powerdomains_omap3430es3_1plus);
>  	else
> diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-
> musb.c
> index bf33b4d..ae07060 100644
> --- a/arch/arm/mach-omap2/usb-musb.c
> +++ b/arch/arm/mach-omap2/usb-musb.c
> @@ -90,7 +90,7 @@ void __init usb_musb_init(struct omap_musb_board_data
> *musb_board_data)
>  	musb_plat.mode = board_data->mode;
>  	musb_plat.extvbus = board_data->extvbus;
> 
> -	if (cpu_is_omap3517()) {
> +	if (cpu_is_am35xx()) {
>  		oh_name = "am35x_otg_hs";
>  		name = "musb-am35x";
>  	} else if (cpu_is_ti81xx()) {
> diff --git a/arch/arm/mach-omap2/voltagedomains3xxx_data.c
> b/arch/arm/mach-omap2/voltagedomains3xxx_data.c
> index bdb82f1..ea98939 100644
> --- a/arch/arm/mach-omap2/voltagedomains3xxx_data.c
> +++ b/arch/arm/mach-omap2/voltagedomains3xxx_data.c
> @@ -116,7 +116,7 @@ void __init omap3xxx_voltagedomains_init(void)
>  		omap3_voltdm_core.volt_data = omap34xx_vddcore_volt_data;
>  	}
> 
> -	if (cpu_is_omap3517())
> +	if (cpu_is_am35xx())
>  		voltdms = voltagedomains_am35xx;
>  	else
>  		voltdms = voltagedomains_omap3;
> diff --git a/arch/arm/plat-omap/include/plat/clkdev_omap.h
> b/arch/arm/plat-omap/include/plat/clkdev_omap.h
> index 45afa4d..d0ed8c4 100644
> --- a/arch/arm/plat-omap/include/plat/clkdev_omap.h
> +++ b/arch/arm/plat-omap/include/plat/clkdev_omap.h
> @@ -34,7 +34,7 @@ struct omap_clk {
>  #define CK_243X		(1 << 5)	/* 243x, 253x */
>  #define CK_3430ES1	(1 << 6)	/* 34xxES1 only */
>  #define CK_3430ES2PLUS	(1 << 7)	/* 34xxES2, ES3, non-Sitara 35xx only
> */
> -#define CK_3517		(1 << 9)
> +#define CK_AM35XX	(1 << 9)	/* Sitara AM35xx */
>  #define CK_36XX		(1 << 10)	/* 36xx/37xx-specific clocks */
>  #define CK_443X		(1 << 11)
>  #define CK_TI816X	(1 << 12)
> @@ -43,7 +43,6 @@ struct omap_clk {
> 
> 
>  #define CK_34XX		(CK_3430ES1 | CK_3430ES2PLUS)
> -#define CK_AM35XX	CK_3517		/* all Sitara AM35xx */
>  #define CK_3XXX		(CK_34XX | CK_AM35XX | CK_36XX)
> 
> 
> diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-
> omap/include/plat/cpu.h
> index 2c8e5ab..43b3283 100644
> --- a/arch/arm/plat-omap/include/plat/cpu.h
> +++ b/arch/arm/plat-omap/include/plat/cpu.h
> @@ -121,6 +121,7 @@ IS_OMAP_CLASS(16xx, 0x16)
>  IS_OMAP_CLASS(24xx, 0x24)
>  IS_OMAP_CLASS(34xx, 0x34)
>  IS_OMAP_CLASS(44xx, 0x44)
> +IS_AM_CLASS(35xx, 0x35)
>  IS_AM_CLASS(33xx, 0x33)
> 
>  IS_TI_CLASS(81xx, 0x81)
> @@ -148,6 +149,7 @@ IS_AM_SUBCLASS(335x, 0x335)
>  #define cpu_is_ti81xx()			0
>  #define cpu_is_ti816x()			0
>  #define cpu_is_ti814x()			0
> +#define cpu_is_am35xx()			0
>  #define cpu_is_am33xx()			0
>  #define cpu_is_am335x()			0
>  #define cpu_is_omap44xx()		0
> @@ -251,7 +253,6 @@ IS_AM_SUBCLASS(335x, 0x335)
>   * cpu_is_omap2430():	True for OMAP2430
>   * cpu_is_omap3430():	True for OMAP3430
>   * cpu_is_omap4430():	True for OMAP4430
> - * cpu_is_omap3517():	True for AM35x: OMAP3517, OMAP3505
>   */
>  #define GET_OMAP_TYPE	((omap_rev() >> 16) & 0xffff)
> 
> @@ -275,7 +276,6 @@ IS_OMAP_TYPE(2422, 0x2422)
>  IS_OMAP_TYPE(2423, 0x2423)
>  IS_OMAP_TYPE(2430, 0x2430)
>  IS_OMAP_TYPE(3430, 0x3430)
> -IS_OMAP_TYPE(3517, 0x3517)
> 
>  #define cpu_is_omap310()		0
>  #define cpu_is_omap730()		0
> @@ -290,7 +290,6 @@ IS_OMAP_TYPE(3517, 0x3517)
>  #define cpu_is_omap2422()		0
>  #define cpu_is_omap2423()		0
>  #define cpu_is_omap2430()		0
> -#define cpu_is_omap3517()		0
>  #define cpu_is_omap3430()		0
>  #define cpu_is_omap4430()		0
>  #define cpu_is_omap3630()		0
> @@ -343,19 +342,19 @@ IS_OMAP_TYPE(3517, 0x3517)
> 
>  #if defined(CONFIG_ARCH_OMAP3)
>  # undef cpu_is_omap3430
> -# undef cpu_is_omap3517
>  # undef cpu_is_ti81xx
>  # undef cpu_is_ti816x
>  # undef cpu_is_ti814x
> +# undef cpu_is_am35xx
>  # undef cpu_is_am33xx
>  # undef cpu_is_am335x
>  # define cpu_is_omap3430()		is_omap3430()
> -# define cpu_is_omap3517()		is_omap3517()
>  # undef cpu_is_omap3630
>  # define cpu_is_omap3630()		is_omap363x()
>  # define cpu_is_ti81xx()		is_ti81xx()
>  # define cpu_is_ti816x()		is_ti816x()
>  # define cpu_is_ti814x()		is_ti814x()
> +# define cpu_is_am35xx()		is_am35xx()
>  # define cpu_is_am33xx()		is_am33xx()
>  # define cpu_is_am335x()		is_am335x()
>  #endif
> @@ -398,9 +397,9 @@ IS_OMAP_TYPE(3517, 0x3517)
>  #define OMAP3630_REV_ES1_1	(OMAP363X_CLASS | (0x1 << 8))
>  #define OMAP3630_REV_ES1_2	(OMAP363X_CLASS | (0x2 << 8))
> 
> -#define OMAP3517_CLASS		0x35170034
> -#define OMAP3517_REV_ES1_0	OMAP3517_CLASS
> -#define OMAP3517_REV_ES1_1	(OMAP3517_CLASS | (0x1 << 8))
> +#define AM35XX_CLASS		0x35170034
> +#define AM35XX_REV_ES1_0	AM35XX_CLASS
> +#define AM35XX_REV_ES1_1	(AM35XX_CLASS | (0x1 << 8))
> 
>  #define TI816X_CLASS		0x81600034
>  #define TI8168_REV_ES1_0	TI816X_CLASS
> --
> 1.7.8.2

Re: [RFC/PATCH 8/7] ARM: OMAP: AM35xx: convert 3517 detection/flags to AM35xx

[Kevin Hilman]

"Hiremath, Vaibhav" <hvaibhav@ti.com> writes:

>> -----Original Message-----
>> From: Hilman, Kevin
>> Sent: Saturday, January 07, 2012 12:24 AM
>> To: linux-omap@vger.kernel.org
>> Cc: Paul Walmsley; Hiremath, Vaibhav
>> Subject: [RFC/PATCH 8/7] ARM: OMAP: AM35xx: convert 3517 detection/flags
>> to AM35xx
>> 
>> Currently cpu_is_omap3517() actually detects any device in the AM35x
>> family (3517 and no-SGX version 3505.)  To make it more clear what is
>> being detected, convert the names from 3517 to AM35xx.
>> 
>> For the same reason, replace the CK_3517 flag used in the clock data
>> to CK_AM35XX.
>> 
>> Signed-off-by: Kevin Hilman <khilman@ti.com>
>> ---
>>  arch/arm/mach-omap2/clock3xxx_data.c          |    8 ++++----
>>  arch/arm/mach-omap2/hsmmc.c                   |    8 ++++----
>>  arch/arm/mach-omap2/id.c                      |    7 +++----
>>  arch/arm/mach-omap2/omap_hwmod_3xxx_data.c    |    2 +-
>>  arch/arm/mach-omap2/powerdomains3xxx_data.c   |    2 +-
>>  arch/arm/mach-omap2/usb-musb.c                |    2 +-
>>  arch/arm/mach-omap2/voltagedomains3xxx_data.c |    2 +-
>>  arch/arm/plat-omap/include/plat/clkdev_omap.h |    3 +--
>>  arch/arm/plat-omap/include/plat/cpu.h         |   15 +++++++--------
>>  9 files changed, 23 insertions(+), 26 deletions(-)
>> 
> Is this also right time to change Makefile and Kconfig files???
> Change in board/mach-types/Makefile/Kconfig files will bring
> consistency across...

Probably, yes.  Although Tony might thing that is too much churn.

Feel free to spin up a patch and I'll add it to this series and we'll
see what Tony thinks.

Kevin

RE: [RFC/PATCH 8/7] ARM: OMAP: AM35xx: convert 3517 detection/flags to AM35xx

[Hiremath, Vaibhav]

On Tue, Jan 10, 2012 at 04:36:15, Hilman, Kevin wrote:
> "Hiremath, Vaibhav" <hvaibhav@ti.com> writes:
> 
> >> -----Original Message-----
> >> From: Hilman, Kevin
> >> Sent: Saturday, January 07, 2012 12:24 AM
> >> To: linux-omap@vger.kernel.org
> >> Cc: Paul Walmsley; Hiremath, Vaibhav
> >> Subject: [RFC/PATCH 8/7] ARM: OMAP: AM35xx: convert 3517 detection/flags
> >> to AM35xx
> >> 
> >> Currently cpu_is_omap3517() actually detects any device in the AM35x
> >> family (3517 and no-SGX version 3505.)  To make it more clear what is
> >> being detected, convert the names from 3517 to AM35xx.
> >> 
> >> For the same reason, replace the CK_3517 flag used in the clock data
> >> to CK_AM35XX.
> >> 
> >> Signed-off-by: Kevin Hilman <khilman@ti.com>
> >> ---
> >>  arch/arm/mach-omap2/clock3xxx_data.c          |    8 ++++----
> >>  arch/arm/mach-omap2/hsmmc.c                   |    8 ++++----
> >>  arch/arm/mach-omap2/id.c                      |    7 +++----
> >>  arch/arm/mach-omap2/omap_hwmod_3xxx_data.c    |    2 +-
> >>  arch/arm/mach-omap2/powerdomains3xxx_data.c   |    2 +-
> >>  arch/arm/mach-omap2/usb-musb.c                |    2 +-
> >>  arch/arm/mach-omap2/voltagedomains3xxx_data.c |    2 +-
> >>  arch/arm/plat-omap/include/plat/clkdev_omap.h |    3 +--
> >>  arch/arm/plat-omap/include/plat/cpu.h         |   15 +++++++--------
> >>  9 files changed, 23 insertions(+), 26 deletions(-)
> >> 
> > Is this also right time to change Makefile and Kconfig files???
> > Change in board/mach-types/Makefile/Kconfig files will bring
> > consistency across...
> 
> Probably, yes.  Although Tony might thing that is too much churn.
> 
> Feel free to spin up a patch and I'll add it to this series and we'll
> see what Tony thinks.
> 
Will submit the patch for this (Will be my first thing for tomorrow morning).

Thanks,
Vaibhav

> Kevin
> 

RE: [RFC/PATCH 8/7] ARM: OMAP: AM35xx: convert 3517 detection/flags to AM35xx

[Hiremath, Vaibhav]

On Tue, Jan 10, 2012 at 04:36:15, Hilman, Kevin wrote:
> "Hiremath, Vaibhav" <hvaibhav@ti.com> writes:
> 
> >> -----Original Message-----
> >> From: Hilman, Kevin
> >> Sent: Saturday, January 07, 2012 12:24 AM
> >> To: linux-omap@vger.kernel.org
> >> Cc: Paul Walmsley; Hiremath, Vaibhav
> >> Subject: [RFC/PATCH 8/7] ARM: OMAP: AM35xx: convert 3517 detection/flags
> >> to AM35xx
> >> 
> >> Currently cpu_is_omap3517() actually detects any device in the AM35x
> >> family (3517 and no-SGX version 3505.)  To make it more clear what is
> >> being detected, convert the names from 3517 to AM35xx.
> >> 
> >> For the same reason, replace the CK_3517 flag used in the clock data
> >> to CK_AM35XX.
> >> 
> >> Signed-off-by: Kevin Hilman <khilman@ti.com>
> >> ---
> >>  arch/arm/mach-omap2/clock3xxx_data.c          |    8 ++++----
> >>  arch/arm/mach-omap2/hsmmc.c                   |    8 ++++----
> >>  arch/arm/mach-omap2/id.c                      |    7 +++----
> >>  arch/arm/mach-omap2/omap_hwmod_3xxx_data.c    |    2 +-
> >>  arch/arm/mach-omap2/powerdomains3xxx_data.c   |    2 +-
> >>  arch/arm/mach-omap2/usb-musb.c                |    2 +-
> >>  arch/arm/mach-omap2/voltagedomains3xxx_data.c |    2 +-
> >>  arch/arm/plat-omap/include/plat/clkdev_omap.h |    3 +--
> >>  arch/arm/plat-omap/include/plat/cpu.h         |   15 +++++++--------
> >>  9 files changed, 23 insertions(+), 26 deletions(-)
> >> 
> > Is this also right time to change Makefile and Kconfig files???
> > Change in board/mach-types/Makefile/Kconfig files will bring
> > consistency across...
> 
> Probably, yes.  Although Tony might thing that is too much churn.
> 
> Feel free to spin up a patch and I'll add it to this series and we'll
> see what Tony thinks.
> 
Kevin,

I think with DT migration whole board-xxxx.c is going to get merged
together; so we can stay with this as of now.

Lets wait for Tony's feedback on this, then creating patch is trivial.

Thanks,
Vaibhav

> Kevin
>