From: Kevin Hilman <khilman@ti.com>
To: linux-omap@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Subject: [PATCH/RFT 4/8] ARM: OMAP: AM35x: remove redunant cpu_is checks for AM3505
Date: Thu, 26 Apr 2012 16:29:49 -0700 [thread overview]
Message-ID: <1335482993-14035-5-git-send-email-khilman@ti.com> (raw)
In-Reply-To: <1335482993-14035-1-git-send-email-khilman@ti.com>
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
next prev parent reply other threads:[~2012-04-26 23:29 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-26 23:29 [PATCH/RFT 0/8] ARM: OMAP: remove IP checks from SoC family detection Kevin Hilman
2012-04-26 23:29 ` [PATCH/RFT 1/8] ARM: OMAP: remove unused cpu_is macros that depend on specific IP checks Kevin Hilman
2012-04-26 23:29 ` [PATCH/RFT 2/8] ARM: OMAP3: clock data: replace 3503/3517 flag with AM35x flag for UART4 Kevin Hilman
2012-04-26 23:29 ` [PATCH/RFT 3/8] ARM: OMAP3: clock data: treat all AM35x devices the same Kevin Hilman
2012-04-26 23:29 ` Kevin Hilman [this message]
2012-04-26 23:29 ` [PATCH/RFT 5/8] ARM: OMAP: clock: remove unused CK_3505 flag Kevin Hilman
2012-04-30 9:05 ` Jean Pihet
2012-04-30 17:19 ` Kevin Hilman
2012-04-26 23:29 ` [PATCH/RFT 6/8] ARM: OMAP: remove unused cpu_is_omap3505() Kevin Hilman
2012-04-30 9:07 ` Jean Pihet
2012-04-30 9:35 ` Koen Kooi
2012-04-30 17:20 ` Kevin Hilman
2012-04-26 23:29 ` [PATCH/RFT 7/8] ARM: OMAP: remove unused cpu_is_omap3530() Kevin Hilman
2012-04-26 23:29 ` [PATCH/RFT 8/8] ARM: OMAP: AM35xx: convert 3517 detection/flags to AM35xx Kevin Hilman
2012-04-27 22:08 ` [PATCH/RFT 0/8] ARM: OMAP: remove IP checks from SoC family detection Mark A. Greer
2012-04-27 22:25 ` Kevin Hilman
2012-04-28 20:20 ` Derald D. Woods
2012-04-29 9:48 ` Hiremath, Vaibhav
2012-04-30 16:30 ` Mark A. Greer
2012-04-30 16:27 ` Mark A. Greer
2012-04-30 16:25 ` Mark A. Greer
2012-04-30 20:48 ` Kevin Hilman
2012-04-30 23:47 ` Kevin Hilman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1335482993-14035-5-git-send-email-khilman@ti.com \
--to=khilman@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox