omap3: 3630: update is_chip variable (f18af0a8) · Commits · 戴 / test

3630 is getting treated like next rev of 3430 omap_chip.oc variable has to be updated for 3630 version Otherwise the Core power domain is not getting registered. This gets used in the registration of power domains in: "arch/arm/mach-omap2/powerdomains34xx.h" core_34xx_es3_1_pwrdm OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES3_1) Core power doman will get registered for 3630 only when .oc is populated correctly. Tested on Zoom3(3630) board Signed-off-by:

Vikram Pandita <vikram.pandita@ti.com> Acked-by:

Alexander Shishkin <virtuoso@slind.org> Acked-by:

Ari Kauppi <kauppi@papupata.org> Acked-by:

Nishanth Menon <nm@ti.com> Signed-off-by:

Tony Lindgren <tony@atomide.com>

arch/arm/mach-omap2/id.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -359,6 +359,8 @@ void __init omap2_check_revision(void)
		omap_chip.oc \|= CHIP_IS_OMAP3430ES3_0;
		else if (omap_rev() == OMAP3430_REV_ES3_1)
		omap_chip.oc \|= CHIP_IS_OMAP3430ES3_1;
		else if (omap_rev() == OMAP3630_REV_ES1_0)
		omap_chip.oc \|= CHIP_IS_OMAP3630ES1;
		} else {
		pr_err("Uninitialized omap_chip, please fix!\n");
		}

arch/arm/plat-omap/include/plat/cpu.h

+5 −2

Original line number	Diff line number	Diff line
		@@ -454,6 +454,7 @@ IS_OMAP_TYPE(3430, 0x3430)
		#define CHIP_IS_OMAP3430ES2 (1 << 4)
		#define CHIP_IS_OMAP3430ES3_0 (1 << 5)
		#define CHIP_IS_OMAP3430ES3_1 (1 << 6)
		#define CHIP_IS_OMAP3630ES1 (1 << 7)

		#define CHIP_IS_OMAP24XX (CHIP_IS_OMAP2420 \| CHIP_IS_OMAP2430)

		@@ -465,8 +466,10 @@ IS_OMAP_TYPE(3430, 0x3430)
		*/
		#define CHIP_GE_OMAP3430ES2 (CHIP_IS_OMAP3430ES2 \| \
		CHIP_IS_OMAP3430ES3_0 \| \
		CHIP_IS_OMAP3430ES3_1)
		#define CHIP_GE_OMAP3430ES3_1 (CHIP_IS_OMAP3430ES3_1)
		CHIP_IS_OMAP3430ES3_1 \| \
		CHIP_IS_OMAP3630ES1)
		#define CHIP_GE_OMAP3430ES3_1 (CHIP_IS_OMAP3430ES3_1 \| \
		CHIP_IS_OMAP3630ES1)


		int omap_chip_is(struct omap_chip_id oci);

Admin message