Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34107730 authored by Kevin Hilman's avatar Kevin Hilman Committed by Tony Lindgren
Browse files

ARM: OMAP: AM35xx: 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.

Acked-by: default avatarVaibhav Hiremath <hvaibhav@ti.com>
Tested-by: default avatarVaibhav Hiremath <hvaibhav@ti.com>
Tested-by: default avatarMark A. Greer <mgreer@animalcreek.com>
Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 640ec79d

arch/arm/mach-omap2/hsmmc.c

+4 −4
Original line number Diff line number Diff line
@@ -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)

arch/arm/mach-omap2/usb-musb.c

+1 −1
Original line number Diff line number Diff line
@@ -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()) {

arch/arm/mach-omap2/voltagedomains3xxx_data.c

+1 −1
Original line number Diff line number Diff line
@@ -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;