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

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

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.

This adds a new soc_is_am35xx() which duplicates the cpu_is_omap3517().
In order to avoid cross-tree dependencies with clock-tree changes,
cpu_is_omap3517() is left until the clock changes are merged,
at which point cpu_is_omap3517() will be completely removed.

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>
[tony@atomide.com: change to use soc_is_omap instead]
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 34107730

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_omap3517())

	if (soc_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 (!soc_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 (soc_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 (soc_is_am35xx())

			mmc->slots[0].set_power = am35x_hsmmc2_set_power;



		if (c->ext_clock)

arch/arm/mach-omap2/id.c

+3 −4
Original line number Diff line number Diff line
@@ -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 (soc_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;

arch/arm/mach-omap2/omap_hwmod_3xxx_data.c

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

	} 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_hwmod_ocp_ifs;

	} else if (rev == OMAP3630_REV_ES1_0 || rev == OMAP3630_REV_ES1_1 ||

		   rev == OMAP3630_REV_ES1_2) {

arch/arm/mach-omap2/powerdomains3xxx_data.c

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

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()) {

	if (soc_is_am35xx()) {

		oh_name = "am35x_otg_hs";

		name = "musb-am35x";

	} else if (cpu_is_ti81xx()) {