3 files changed, 6 insertions, 6 deletions

diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c
index b0268eaffe13..a8ca6556eb1c 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 8d5ed775dd56..bf33b4db8c9d 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 57db2038b23c..98ed4d792b3d 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;