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

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

[Kevin Hilman]

This is a rebased version of this series which is ready for broader
testing.  I'd especially appreciate testing from those of you with
AM35x platforms.

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 by completely removing IP detection from the SoC
family detection (cpu_is_*.)

Applies on top of v3.4-rc4, boot tested on AM3517 EVM.

Kevin

Kevin Hilman (8):
  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()
  ARM: OMAP: AM35xx: convert 3517 detection/flags to AM35xx

 arch/arm/mach-omap2/clock3xxx_data.c          |   22 ++++----------
 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 |    4 +--
 arch/arm/plat-omap/include/plat/cpu.h         |   39 +++++--------------------
 9 files changed, 24 insertions(+), 64 deletions(-)

-- 
1.7.9.2

[PATCH/RFT 1/8] 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.

Acked-by: Vaibhav Hiremath <hvaibhav@ti.com>
Tested-by: Vaibhav Hiremath <hvaibhav@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
---
 arch/arm/plat-omap/include/plat/cpu.h |   15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h
index dc6a86b..41f3e5a 100644
--- a/arch/arm/plat-omap/include/plat/cpu.h
+++ b/arch/arm/plat-omap/include/plat/cpu.h
@@ -291,9 +291,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
@@ -348,9 +345,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
@@ -360,15 +354,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.9.2

[PATCH/RFT 2/8] 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.

Acked-by: Vaibhav Hiremath <hvaibhav@ti.com>
Tested-by: Vaibhav Hiremath <hvaibhav@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
---
 arch/arm/mach-omap2/clock3xxx_data.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c
index f4a626f..dac076a 100644
--- a/arch/arm/mach-omap2/clock3xxx_data.c
+++ b/arch/arm/mach-omap2/clock3xxx_data.c
@@ -3419,7 +3419,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.9.2

[PATCH/RFT 3/8] 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.

Acked-by: Vaibhav Hiremath <hvaibhav@ti.com>
Tested-by: Vaibhav Hiremath <hvaibhav@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
---
 arch/arm/mach-omap2/clock3xxx_data.c |   14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c
index dac076a..23b1e78 100644
--- a/arch/arm/mach-omap2/clock3xxx_data.c
+++ b/arch/arm/mach-omap2/clock3xxx_data.c
@@ -3513,21 +3513,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.9.2

[PATCH/RFT 4/8] 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.

Acked-by: Vaibhav Hiremath <hvaibhav@ti.com>
Tested-by: Vaibhav Hiremath <hvaibhav@ti.com>
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 b0268ea..a8ca655 100644
--- a/arch/arm/mach-omap2/hsmmc.c
+++ b/arch/arm/mach-omap2/hsmmc.c
@@ -355,7 +355,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 |
@@ -365,7 +365,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))
@@ -388,7 +388,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 */
@@ -400,7 +400,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 57db203..98ed4d7 100644
--- a/arch/arm/mach-omap2/voltagedomains3xxx_data.c
+++ b/arch/arm/mach-omap2/voltagedomains3xxx_data.c
@@ -118,7 +118,7 @@ void __init omap3xxx_voltagedomains_init(void)
 	}
 #endif
 
-	if (cpu_is_omap3517() || cpu_is_omap3505())
+	if (cpu_is_omap3517())
 		voltdms = voltagedomains_am35xx;
 	else
 		voltdms = voltagedomains_omap3;
-- 
1.7.9.2

[PATCH/RFT 5/8] 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.

Acked-by: Vaibhav Hiremath <hvaibhav@ti.com>
Tested-by: Vaibhav Hiremath <hvaibhav@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
---
 arch/arm/plat-omap/include/plat/clkdev_omap.h |    3 +--
 1 file changed, 1 insertion(+), 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.9.2

[PATCH/RFT 5/8] ARM: OMAP: clock: remove unused CK_3505 flag

[Jean Pihet]

Hi Kevin,

On Fri, Apr 27, 2012 at 1:29 AM, Kevin Hilman <khilman@ti.com> wrote:
> This flag is no longer used since clock init all AM35x devices
> is now the same.
>
> Acked-by: Vaibhav Hiremath <hvaibhav@ti.com>
> Tested-by: Vaibhav Hiremath <hvaibhav@ti.com>
> Signed-off-by: Kevin Hilman <khilman@ti.com>
> ---
> ?arch/arm/plat-omap/include/plat/clkdev_omap.h | ? ?3 +--
> ?1 file changed, 1 insertion(+), 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)
If this is the only flag remaining, should it better be renamed to CK_35XX?

> ?#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)
>

Regards,
Jean

>
> --
> 1.7.9.2
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at ?http://vger.kernel.org/majordomo-info.html

[PATCH/RFT 5/8] ARM: OMAP: clock: remove unused CK_3505 flag

[Kevin Hilman]

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

> Hi Kevin,
>
> On Fri, Apr 27, 2012 at 1:29 AM, Kevin Hilman <khilman@ti.com> wrote:
>> This flag is no longer used since clock init all AM35x devices
>> is now the same.
>>
>> Acked-by: Vaibhav Hiremath <hvaibhav@ti.com>
>> Tested-by: Vaibhav Hiremath <hvaibhav@ti.com>
>> Signed-off-by: Kevin Hilman <khilman@ti.com>
>> ---
>> ?arch/arm/plat-omap/include/plat/clkdev_omap.h | ? ?3 +--
>> ?1 file changed, 1 insertion(+), 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)
> If this is the only flag remaining, should it better be renamed to CK_35XX?

That happens later in the series.

Kevin

[PATCH/RFT 6/8] 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.

Acked-by: Vaibhav Hiremath <hvaibhav@ti.com>
Tested-by: Vaibhav Hiremath <hvaibhav@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
---
 arch/arm/plat-omap/include/plat/cpu.h |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h
index 41f3e5a..b34bf6c 100644
--- a/arch/arm/plat-omap/include/plat/cpu.h
+++ b/arch/arm/plat-omap/include/plat/cpu.h
@@ -250,8 +250,7 @@ IS_AM_SUBCLASS(335x, 0x335)
  * cpu_is_omap2423():	True for OMAP2423
  * cpu_is_omap2430():	True for OMAP2430
  * cpu_is_omap3430():	True for OMAP3430
- * 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)
 
@@ -275,7 +274,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
@@ -292,7 +290,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_omap3630()		0
@@ -346,7 +343,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
@@ -356,8 +352,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.9.2

[PATCH/RFT 6/8] ARM: OMAP: remove unused cpu_is_omap3505()

[Jean Pihet]

Kevin,

On Fri, Apr 27, 2012 at 1:29 AM, Kevin Hilman <khilman@ti.com> wrote:
> The 3505 check is now unused and can be removed.
>
> There are no longer any cpu_is_* checks that depend on specific IP
> detection.
>
> Acked-by: Vaibhav Hiremath <hvaibhav@ti.com>
> Tested-by: Vaibhav Hiremath <hvaibhav@ti.com>
> Signed-off-by: Kevin Hilman <khilman@ti.com>
> ---
> ?arch/arm/plat-omap/include/plat/cpu.h | ? ?8 +-------
> ?1 file changed, 1 insertion(+), 7 deletions(-)
>
> diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h
> index 41f3e5a..b34bf6c 100644
> --- a/arch/arm/plat-omap/include/plat/cpu.h
> +++ b/arch/arm/plat-omap/include/plat/cpu.h
> @@ -250,8 +250,7 @@ IS_AM_SUBCLASS(335x, 0x335)
> ?* cpu_is_omap2423(): ?True for OMAP2423
> ?* cpu_is_omap2430(): ?True for OMAP2430
> ?* cpu_is_omap3430(): ?True for OMAP3430
> - * cpu_is_omap3505(): ?True for OMAP3505
> - * cpu_is_omap3517(): ?True for OMAP3517
> + * cpu_is_omap3517(): ?True for AM35x: OMAP3517, OMAP3505
Is cpu_is_omap35xx() a better name for it?

Regards,
Jean

> ?*/
> ?#define GET_OMAP_TYPE ?((omap_rev() >> 16) & 0xffff)
>
> @@ -275,7 +274,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
> @@ -292,7 +290,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_omap3630() ? ? ? ? ? ? ?0
> @@ -346,7 +343,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
> @@ -356,8 +352,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.9.2
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at ?http://vger.kernel.org/majordomo-info.html

[PATCH/RFT 6/8] ARM: OMAP: remove unused cpu_is_omap3505()

[Koen Kooi]

Op 30 apr. 2012, om 11:07 heeft Jean Pihet het volgende geschreven:

> Kevin,
> 
> On Fri, Apr 27, 2012 at 1:29 AM, Kevin Hilman <khilman@ti.com> wrote:
>> The 3505 check is now unused and can be removed.
>> 
>> There are no longer any cpu_is_* checks that depend on specific IP
>> detection.
>> 
>> Acked-by: Vaibhav Hiremath <hvaibhav@ti.com>
>> Tested-by: Vaibhav Hiremath <hvaibhav@ti.com>
>> Signed-off-by: Kevin Hilman <khilman@ti.com>
>> ---
>>  arch/arm/plat-omap/include/plat/cpu.h |    8 +-------
>>  1 file changed, 1 insertion(+), 7 deletions(-)
>> 
>> diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h
>> index 41f3e5a..b34bf6c 100644
>> --- a/arch/arm/plat-omap/include/plat/cpu.h
>> +++ b/arch/arm/plat-omap/include/plat/cpu.h
>> @@ -250,8 +250,7 @@ IS_AM_SUBCLASS(335x, 0x335)
>>  * cpu_is_omap2423():  True for OMAP2423
>>  * cpu_is_omap2430():  True for OMAP2430
>>  * cpu_is_omap3430():  True for OMAP3430
>> - * cpu_is_omap3505():  True for OMAP3505
>> - * cpu_is_omap3517():  True for OMAP3517
>> + * cpu_is_omap3517():  True for AM35x: OMAP3517, OMAP3505
> Is cpu_is_omap35xx() a better name for it?

No, since 3530 is the same as 3430 :(

regards,

Koen

[PATCH/RFT 6/8] ARM: OMAP: remove unused cpu_is_omap3505()

[Kevin Hilman]

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

> Kevin,
>
> On Fri, Apr 27, 2012 at 1:29 AM, Kevin Hilman <khilman@ti.com> wrote:
>> The 3505 check is now unused and can be removed.
>>
>> There are no longer any cpu_is_* checks that depend on specific IP
>> detection.
>>
>> Acked-by: Vaibhav Hiremath <hvaibhav@ti.com>
>> Tested-by: Vaibhav Hiremath <hvaibhav@ti.com>
>> Signed-off-by: Kevin Hilman <khilman@ti.com>
>> ---
>> ?arch/arm/plat-omap/include/plat/cpu.h | ? ?8 +-------
>> ?1 file changed, 1 insertion(+), 7 deletions(-)
>>
>> diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h
>> index 41f3e5a..b34bf6c 100644
>> --- a/arch/arm/plat-omap/include/plat/cpu.h
>> +++ b/arch/arm/plat-omap/include/plat/cpu.h
>> @@ -250,8 +250,7 @@ IS_AM_SUBCLASS(335x, 0x335)
>> ?* cpu_is_omap2423(): ?True for OMAP2423
>> ?* cpu_is_omap2430(): ?True for OMAP2430
>> ?* cpu_is_omap3430(): ?True for OMAP3430
>> - * cpu_is_omap3505(): ?True for OMAP3505
>> - * cpu_is_omap3517(): ?True for OMAP3517
>> + * cpu_is_omap3517(): ?True for AM35x: OMAP3517, OMAP3505
> Is cpu_is_omap35xx() a better name for it?

Later in the series, it is renamed to cpu_is_am35xx().

Kevin

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

[Kevin Hilman]

The cpu_is_omap3530() macro is unused, remove.

Acked-by: Vaibhav Hiremath <hvaibhav@ti.com>
Tested-by: Vaibhav Hiremath <hvaibhav@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
---
 arch/arm/plat-omap/include/plat/cpu.h |    3 ---
 1 file changed, 3 deletions(-)

diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h
index b34bf6c..d584ac7 100644
--- a/arch/arm/plat-omap/include/plat/cpu.h
+++ b/arch/arm/plat-omap/include/plat/cpu.h
@@ -289,7 +289,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_omap3630()		0
@@ -342,7 +341,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
@@ -350,7 +348,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.9.2

[PATCH/RFT 8/8] 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.

Acked-by: Vaibhav Hiremath <hvaibhav@ti.com>
Tested-by: Vaibhav Hiremath <hvaibhav@ti.com>
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 23b1e78..7b00240 100644
--- a/arch/arm/mach-omap2/clock3xxx_data.c
+++ b/arch/arm/mach-omap2/clock3xxx_data.c
@@ -3294,8 +3294,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),
@@ -3513,9 +3513,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 a8ca655..9454347 100644
--- a/arch/arm/mach-omap2/hsmmc.c
+++ b/arch/arm/mach-omap2/hsmmc.c
@@ -355,7 +355,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 |
@@ -365,7 +365,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))
@@ -388,7 +388,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 */
@@ -400,7 +400,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 0e79b7b..d2913e2 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -185,8 +185,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";
@@ -352,13 +351,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 db86ce9..c92df30 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -3711,7 +3711,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 b7ea468..fb0a0a6 100644
--- a/arch/arm/mach-omap2/powerdomains3xxx_data.c
+++ b/arch/arm/mach-omap2/powerdomains3xxx_data.c
@@ -311,7 +311,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 98ed4d7..f796624 100644
--- a/arch/arm/mach-omap2/voltagedomains3xxx_data.c
+++ b/arch/arm/mach-omap2/voltagedomains3xxx_data.c
@@ -118,7 +118,7 @@ void __init omap3xxx_voltagedomains_init(void)
 	}
 #endif
 
-	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 d584ac7..d9df396 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
@@ -250,7 +252,6 @@ IS_AM_SUBCLASS(335x, 0x335)
  * cpu_is_omap2423():	True for OMAP2423
  * cpu_is_omap2430():	True for OMAP2430
  * cpu_is_omap3430():	True for OMAP3430
- * cpu_is_omap3517():	True for AM35x: OMAP3517, OMAP3505
  */
 #define GET_OMAP_TYPE	((omap_rev() >> 16) & 0xffff)
 
@@ -274,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(3517, 0x3517)
 
 #define cpu_is_omap310()		0
 #define cpu_is_omap730()		0
@@ -289,7 +289,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_omap3630()		0
 
@@ -341,19 +340,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
@@ -396,9 +395,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.9.2

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

[Mark A. Greer]

On Thu, Apr 26, 2012 at 04:29:45PM -0700, Kevin Hilman wrote:

Hi Kevin.

> This is a rebased version of this series which is ready for broader
> testing.  I'd especially appreciate testing from those of you with
> AM35x platforms.
> 
> 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 by completely removing IP detection from the SoC
> family detection (cpu_is_*.)
> 
> Applies on top of v3.4-rc4, boot tested on AM3517 EVM.

Your series applied and booted without issue until the point that
pm_idle is called.  At that point it hung because its doing a wfi
and not getting an interrupt to wake up back up.  That's expected
behaviour so your patches are good (IMHO) but I need to finish and
submit a new version of my patches to fix that issue.

I tested using an nfs-mounted and mmc-mounted rootfs (and
CONFIG_TI_DAVINCI_EMAC=y).

Mark

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

[Kevin Hilman]

"Mark A. Greer" <mgreer@animalcreek.com> writes:

> On Thu, Apr 26, 2012 at 04:29:45PM -0700, Kevin Hilman wrote:
>
> Hi Kevin.
>
>> This is a rebased version of this series which is ready for broader
>> testing.  I'd especially appreciate testing from those of you with
>> AM35x platforms.
>> 
>> 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 by completely removing IP detection from the SoC
>> family detection (cpu_is_*.)
>> 
>> Applies on top of v3.4-rc4, boot tested on AM3517 EVM.
>
> Your series applied and booted without issue until the point that
> pm_idle is called.  At that point it hung because its doing a wfi
> and not getting an interrupt to wake up back up.  That's expected
> behaviour so your patches are good (IMHO) but I need to finish and
> submit a new version of my patches to fix that issue.

For the benefit of others wanting to test this:

You have to use 'nohlt' on the cmdline on AM35x in order to avoid WFI
and the wakeup problems that are still being worked on.

Kevin

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

[Mark A. Greer]

On Fri, Apr 27, 2012 at 03:25:38PM -0700, Kevin Hilman wrote:
> "Mark A. Greer" <mgreer@animalcreek.com> writes:
> 
> > On Thu, Apr 26, 2012 at 04:29:45PM -0700, Kevin Hilman wrote:
> >
> > Hi Kevin.
> >
> >> This is a rebased version of this series which is ready for broader
> >> testing.  I'd especially appreciate testing from those of you with
> >> AM35x platforms.
> >> 
> >> 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 by completely removing IP detection from the SoC
> >> family detection (cpu_is_*.)
> >> 
> >> Applies on top of v3.4-rc4, boot tested on AM3517 EVM.
> >
> > Your series applied and booted without issue until the point that
> > pm_idle is called.  At that point it hung because its doing a wfi
> > and not getting an interrupt to wake up back up.  That's expected
> > behaviour so your patches are good (IMHO) but I need to finish and
> > submit a new version of my patches to fix that issue.
> 
> For the benefit of others wanting to test this:
> 
> You have to use 'nohlt' on the cmdline on AM35x in order to avoid WFI
> and the wakeup problems that are still being worked on.

Oops, yes.  I meant to add that and say that my am3517evm boots fine
with your patches and 'nohlt' on the cmdline.  I'm using omap2plus_defconfig
with CONFIG_TI_DAVINCI_EMAC enabled.

Mark
--

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

[Kevin Hilman]

"Mark A. Greer" <mgreer@animalcreek.com> writes:

> On Fri, Apr 27, 2012 at 03:25:38PM -0700, Kevin Hilman wrote:
>> "Mark A. Greer" <mgreer@animalcreek.com> writes:
>> 
>> > On Thu, Apr 26, 2012 at 04:29:45PM -0700, Kevin Hilman wrote:
>> >
>> > Hi Kevin.
>> >
>> >> This is a rebased version of this series which is ready for broader
>> >> testing.  I'd especially appreciate testing from those of you with
>> >> AM35x platforms.
>> >> 
>> >> 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 by completely removing IP detection from the SoC
>> >> family detection (cpu_is_*.)
>> >> 
>> >> Applies on top of v3.4-rc4, boot tested on AM3517 EVM.
>> >
>> > Your series applied and booted without issue until the point that
>> > pm_idle is called.  At that point it hung because its doing a wfi
>> > and not getting an interrupt to wake up back up.  That's expected
>> > behaviour so your patches are good (IMHO) but I need to finish and
>> > submit a new version of my patches to fix that issue.
>> 
>> For the benefit of others wanting to test this:
>> 
>> You have to use 'nohlt' on the cmdline on AM35x in order to avoid WFI
>> and the wakeup problems that are still being worked on.
>
> Oops, yes.  I meant to add that and say that my am3517evm boots fine
> with your patches and 'nohlt' on the cmdline.  I'm using omap2plus_defconfig
> with CONFIG_TI_DAVINCI_EMAC enabled.

Thanks for testing,  will add a Tested-by from you.

Kevin

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

[Kevin Hilman]

Kevin Hilman <khilman@ti.com> writes:

> This is a rebased version of this series which is ready for broader
> testing.  I'd especially appreciate testing from those of you with
> AM35x platforms.
>
> 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 by completely removing IP detection from the SoC
> family detection (cpu_is_*.)

FYI... in order to avoid cross-tree dependencies going upstream, I split
this series up into two seprate series, and just posted them.  One for
just clocks for Paul[1]:

   [PATCH 0/3] ARM: OMAP3: clock: cleanup AM35xx clock flags

and another for converting most of the users of cpu_is_omap35*[2]:

   [PATCH 0/2] ARM: OMAP3: cleanup AM35xx SoC detection

Once these are merged, I have one more patch[3] (which depends on both of
the above branches) that will remove all the now unused cpu_is_omap35x*
defintions and the last remaining user in the clock code.

Kevin


[1] http://marc.info/?l=linux-omap&m=133582867311326&w=2
[2] http://marc.info/?l=linux-omap&m=133582910911447&w=2

[3]
>From 88f5523f65d9f6c6a075c363922d2cd250d2cb42 Mon Sep 17 00:00:00 2001
From: Kevin Hilman <khilman@ti.com>
Date: Wed, 4 Jan 2012 15:33:17 -0800
Subject: [PATCH] ARM: OMAP: SoC detection: remove unused cpu_is macros

Remove multiple unused cpu_is_omap35xx macros.

In particular, the cpu_is_omap35* macros for 3503, 3515, 3525 are removed
because they are using omap_has_* feature checks and we want to
remove specific feature detection from SoC family detection.

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

Acked-by: Vaibhav Hiremath <hvaibhav@ti.com>
Tested-by: Vaibhav Hiremath <hvaibhav@ti.com>
Tested-by: Mark A. Greer <mgreer@animalcreek.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
---
 arch/arm/mach-omap2/clock3xxx_data.c  |    2 +-
 arch/arm/plat-omap/include/plat/cpu.h |   33 ---------------------------------
 2 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c
index 9f48f84..31d38c7 100644
--- a/arch/arm/mach-omap2/clock3xxx_data.c
+++ b/arch/arm/mach-omap2/clock3xxx_data.c
@@ -3513,7 +3513,7 @@ 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_AM35XX;
 	} else if (cpu_is_omap3630()) {
diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h
index 7b0d8ef..2877fc2 100644
--- a/arch/arm/plat-omap/include/plat/cpu.h
+++ b/arch/arm/plat-omap/include/plat/cpu.h
@@ -252,8 +252,6 @@ IS_AM_SUBCLASS(335x, 0x335)
  * cpu_is_omap2423():	True for OMAP2423
  * cpu_is_omap2430():	True for OMAP2430
  * cpu_is_omap3430():	True for OMAP3430
- * cpu_is_omap3505():	True for OMAP3505
- * cpu_is_omap3517():	True for OMAP3517
  */
 #define GET_OMAP_TYPE	((omap_rev() >> 16) & 0xffff)
 
@@ -277,8 +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
 #define cpu_is_omap730()		0
@@ -293,12 +289,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
 #define cpu_is_omap3430()		0
 #define cpu_is_omap3630()		0
 
@@ -350,12 +340,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
 # undef cpu_is_ti81xx
 # undef cpu_is_ti816x
 # undef cpu_is_ti814x
@@ -363,19 +347,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() &&		\
-						!omap3_has_sgx())
 # undef cpu_is_omap3630
 # define cpu_is_omap3630()		is_omap363x()
 # define cpu_is_ti81xx()		is_ti81xx()
@@ -424,10 +395,6 @@ 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 TI816X_CLASS		0x81600034
 #define TI8168_REV_ES1_0	TI816X_CLASS
 #define TI8168_REV_ES1_1	(TI816X_CLASS | (0x1 << 8))
-- 
1.7.9.2