Skip to contentSkip to conversation

am3505/3517: Set the omap chip id to CHIP_IS_AM35XX

PATCH New Raphaël Assénat 1 participant 1 message Jul 4, 2011

Subsystems (5)
Arm (32-bit) Arm sub-architectures OMAP2+ support OMAP clock framework support +1 more subsystems
lore
Share & tools
lore

Raphaël Assénat

author
#0 lore raw

PATCH 2/5 am3505/3517: Set the omap chip id to CHIP_IS_AM35XX

Fix id.c to set CHIP_IS_AM35XX instead of CHIP_IS_OMAP3430ES3_1. Then, in order to enable the same functionalities, we need to add CHIP_IS_AM35XX where CHIP_IS_OMAP3430, was is used in clockdomains2xxx_3xxx_data, omap_hwmod_3xxx_data, powerdomains2xxx_3xxx_data and powerdomains3xxx_data.

Also in omap_hwmod_3xxx_data.c, changes for AM35xx UART4 support:
AM35xx-specific omap_hwmod

Renamed omap3xxx_uart4_hwmod to omap36xx_uart4_hwmod for clarity)

Signed-off-by Raphael Assenat <[email protected]>
arch/arm/mach-omap2/clockdomains2xxx_3xxx_data.c +102 -60
index 13bde95..4f4368d 100644
@@ -71,17 +71,20 @@ static struct clkdm_dep gfx_sgx_wkdeps[] = {
 	},
 	{
 		.clkdm_name = "iva2_clkdm",
-		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 |
+					    CHIP_IS_AM35XX)
 	},
 	{
 		.clkdm_name = "mpu_clkdm",
 		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX |
-					    CHIP_IS_OMAP3430)
+					    CHIP_IS_OMAP3430 |
+					    CHIP_IS_AM35XX)
 	},
 	{
 		.clkdm_name = "wkup_clkdm",
 		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX |
-					    CHIP_IS_OMAP3430)
+					    CHIP_IS_OMAP3430 |
+					    CHIP_IS_AM35XX)
 	},
 	{ NULL },
 };

@@ -208,23 +211,28 @@ static struct clkdm_dep mdm_2430_wkdeps[] = {
 static struct clkdm_dep per_wkdeps[] = {
 	{
 		.clkdm_name = "core_l3_clkdm",
-		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 |
+					    CHIP_IS_AM35XX)
 	},
 	{
 		.clkdm_name = "core_l4_clkdm",
-		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 |
+					    CHIP_IS_AM35XX)
 	},
 	{
 		.clkdm_name = "iva2_clkdm",
-		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 |
+					    CHIP_IS_AM35XX)
 	},
 	{
 		.clkdm_name = "mpu_clkdm",
-		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 |
+					    CHIP_IS_AM35XX)
 	},
 	{
 		.clkdm_name = "wkup_clkdm",
-		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 |
+					    CHIP_IS_AM35XX)
 	},
 	{ NULL },
 };

@@ -233,23 +241,28 @@ static struct clkdm_dep per_wkdeps[] = {
 static struct clkdm_dep usbhost_wkdeps[] = {
 	{
 		.clkdm_name = "core_l3_clkdm",
-		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 |
+					    CHIP_IS_AM35XX)
 	},
 	{
 		.clkdm_name = "core_l4_clkdm",
-		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 |
+					    CHIP_IS_AM35XX)
 	},
 	{
 		.clkdm_name = "iva2_clkdm",
-		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 |
+					    CHIP_IS_AM35XX)
 	},
 	{
 		.clkdm_name = "mpu_clkdm",
-		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 |
+					    CHIP_IS_AM35XX)
 	},
 	{
 		.clkdm_name = "wkup_clkdm",
-		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 |
+					   CHIP_IS_AM35XX)
 	},
 	{ NULL },
 };

@@ -258,23 +271,28 @@ static struct clkdm_dep usbhost_wkdeps[] = {
 static struct clkdm_dep mpu_3xxx_wkdeps[] = {
 	{
 		.clkdm_name = "core_l3_clkdm",
-		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 |
+					    CHIP_IS_AM35XX)
 	},
 	{
 		.clkdm_name = "core_l4_clkdm",
-		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 |
+					    CHIP_IS_AM35XX)
 	},
 	{
 		.clkdm_name = "iva2_clkdm",
-		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 |
+					    CHIP_IS_AM35XX)
 	},
 	{
 		.clkdm_name = "dss_clkdm",
-		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 |
+					    CHIP_IS_AM35XX)
 	},
 	{
 		.clkdm_name = "per_clkdm",
-		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 |
+					    CHIP_IS_AM35XX)
 	},
 	{ NULL },
 };

@@ -283,27 +301,33 @@ static struct clkdm_dep mpu_3xxx_wkdeps[] = {
 static struct clkdm_dep iva2_wkdeps[] = {
 	{
 		.clkdm_name = "core_l3_clkdm",
-		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 |
+					    CHIP_IS_AM35XX)
 	},
 	{
 		.clkdm_name = "core_l4_clkdm",
-		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 |
+					    CHIP_IS_AM35XX)
 	},
 	{
 		.clkdm_name = "mpu_clkdm",
-		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 |
+					    CHIP_IS_AM35XX)
 	},
 	{
 		.clkdm_name = "wkup_clkdm",
-		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 |
+					    CHIP_IS_AM35XX)
 	},
 	{
 		.clkdm_name = "dss_clkdm",
-		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 |
+					    CHIP_IS_AM35XX)
 	},
 	{
 		.clkdm_name = "per_clkdm",
-		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 |
+					    CHIP_IS_AM35XX)
 	},
 	{ NULL },
 };

@@ -313,15 +337,18 @@ static struct clkdm_dep iva2_wkdeps[] = {
 static struct clkdm_dep cam_wkdeps[] = {
 	{
 		.clkdm_name = "iva2_clkdm",
-		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 |
+					    CHIP_IS_AM35XX)
 	},
 	{
 		.clkdm_name = "mpu_clkdm",
-		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 |
+					    CHIP_IS_AM35XX)
 	},
 	{
 		.clkdm_name = "wkup_clkdm",
-		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 |
+					    CHIP_IS_AM35XX)
 	},
 	{ NULL },
 };

@@ -330,15 +357,18 @@ static struct clkdm_dep cam_wkdeps[] = {
 static struct clkdm_dep dss_wkdeps[] = {
 	{
 		.clkdm_name = "iva2_clkdm",
-		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 |
+					    CHIP_IS_AM35XX)
 	},
 	{
 		.clkdm_name = "mpu_clkdm",
-		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 |
+					    CHIP_IS_AM35XX)
 	},
 	{
 		.clkdm_name = "wkup_clkdm",
-		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 |
+					    CHIP_IS_AM35XX)
 	},
 	{ NULL },
 };

@@ -347,7 +377,8 @@ static struct clkdm_dep dss_wkdeps[] = {
 static struct clkdm_dep neon_wkdeps[] = {
 	{
 		.clkdm_name = "mpu_clkdm",
-		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 |
+					    CHIP_IS_AM35XX)
 	},
 	{ NULL },
 };

@@ -359,11 +390,13 @@ static struct clkdm_dep neon_wkdeps[] = {
 static struct clkdm_dep dss_sleepdeps[] = {
 	{
 		.clkdm_name = "mpu_clkdm",
-		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 |
+					    CHIP_IS_AM35XX)
 	},
 	{
 		.clkdm_name = "iva2_clkdm",
-		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 |
+					    CHIP_IS_AM35XX)
 	},
 	{ NULL },
 };

@@ -372,11 +405,13 @@ static struct clkdm_dep dss_sleepdeps[] = {
 static struct clkdm_dep per_sleepdeps[] = {
 	{
 		.clkdm_name = "mpu_clkdm",
-		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 |
+					    CHIP_IS_AM35XX)
 	},
 	{
 		.clkdm_name = "iva2_clkdm",
-		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 |
+					    CHIP_IS_AM35XX)
 	},
 	{ NULL },
 };

@@ -385,11 +420,13 @@ static struct clkdm_dep per_sleepdeps[] = {
 static struct clkdm_dep usbhost_sleepdeps[] = {
 	{
 		.clkdm_name = "mpu_clkdm",
-		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 |
+					    CHIP_IS_AM35XX)
 	},
 	{
 		.clkdm_name = "iva2_clkdm",
-		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 |
+					    CHIP_IS_AM35XX)
 	},
 	{ NULL },
 };

@@ -398,7 +435,8 @@ static struct clkdm_dep usbhost_sleepdeps[] = {
 static struct clkdm_dep cam_sleepdeps[] = {
 	{
 		.clkdm_name = "mpu_clkdm",
-		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 |
+					    CHIP_IS_AM35XX)
 	},
 	{ NULL },
 };

@@ -412,7 +450,8 @@ static struct clkdm_dep cam_sleepdeps[] = {
 static struct clkdm_dep gfx_sgx_sleepdeps[] = {
 	{
 		.clkdm_name = "mpu_clkdm",
-		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 |
+					    CHIP_IS_AM35XX)
 	},
 	{ NULL },
 };

@@ -434,19 +473,22 @@ static struct clockdomain wkup_clkdm = {
 	.name		= "wkup_clkdm",
 	.pwrdm		= { .name = "wkup_pwrdm" },
 	.dep_bit	= OMAP_EN_WKUP_SHIFT,
-	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP24XX | CHIP_IS_OMAP3430),
+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP24XX | CHIP_IS_OMAP3430 |
+					 CHIP_IS_AM35XX),
 };
 
 static struct clockdomain prm_clkdm = {
 	.name		= "prm_clkdm",
 	.pwrdm		= { .name = "wkup_pwrdm" },
-	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP24XX | CHIP_IS_OMAP3430),
+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP24XX | CHIP_IS_OMAP3430 |
+					 CHIP_IS_AM35XX)
 };
 
 static struct clockdomain cm_clkdm = {
 	.name		= "cm_clkdm",
 	.pwrdm		= { .name = "core_pwrdm" },
-	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP24XX | CHIP_IS_OMAP3430),
+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP24XX | CHIP_IS_OMAP3430 |
+					 CHIP_IS_AM35XX)
 };
 
 /*

@@ -619,7 +661,7 @@ static struct clockdomain mpu_3xxx_clkdm = {
 	.dep_bit	= OMAP3430_EN_MPU_SHIFT,
 	.wkdep_srcs	= mpu_3xxx_wkdeps,
 	.clktrctrl_mask = OMAP3430_CLKTRCTRL_MPU_MASK,
-	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430 | CHIP_IS_AM35XX),
 };
 
 static struct clockdomain neon_clkdm = {

@@ -628,7 +670,7 @@ static struct clockdomain neon_clkdm = {
 	.flags		= CLKDM_CAN_HWSUP_SWSUP,
 	.wkdep_srcs	= neon_wkdeps,
 	.clktrctrl_mask = OMAP3430_CLKTRCTRL_NEON_MASK,
-	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430 | CHIP_IS_AM35XX),
 };
 
 static struct clockdomain iva2_clkdm = {

@@ -638,7 +680,7 @@ static struct clockdomain iva2_clkdm = {
 	.dep_bit	= OMAP3430_PM_WKDEP_MPU_EN_IVA2_SHIFT,
 	.wkdep_srcs	= iva2_wkdeps,
 	.clktrctrl_mask = OMAP3430_CLKTRCTRL_IVA2_MASK,
-	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430 | CHIP_IS_AM35XX),
 };
 
 static struct clockdomain gfx_3430es1_clkdm = {

@@ -673,7 +715,7 @@ static struct clockdomain d2d_clkdm = {
 	.pwrdm		= { .name = "core_pwrdm" },
 	.flags		= CLKDM_CAN_HWSUP_SWSUP,
 	.clktrctrl_mask = OMAP3430ES1_CLKTRCTRL_D2D_MASK,
-	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430 | CHIP_IS_AM35XX),
 };
 
 /*

@@ -687,7 +729,7 @@ static struct clockdomain core_l3_3xxx_clkdm = {
 	.flags		= CLKDM_CAN_HWSUP,
 	.dep_bit	= OMAP3430_EN_CORE_SHIFT,
 	.clktrctrl_mask = OMAP3430_CLKTRCTRL_L3_MASK,
-	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430 | CHIP_IS_AM35XX),
 };
 
 /*

@@ -701,7 +743,7 @@ static struct clockdomain core_l4_3xxx_clkdm = {
 	.flags		= CLKDM_CAN_HWSUP,
 	.dep_bit	= OMAP3430_EN_CORE_SHIFT,
 	.clktrctrl_mask = OMAP3430_CLKTRCTRL_L4_MASK,
-	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430 | CHIP_IS_AM35XX),
 };
 
 /* Another case of bit name collisions between several registers: EN_DSS */

@@ -713,7 +755,7 @@ static struct clockdomain dss_3xxx_clkdm = {
 	.wkdep_srcs	= dss_wkdeps,
 	.sleepdep_srcs	= dss_sleepdeps,
 	.clktrctrl_mask = OMAP3430_CLKTRCTRL_DSS_MASK,
-	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430 | CHIP_IS_AM35XX),
 };
 
 static struct clockdomain cam_clkdm = {

@@ -723,7 +765,7 @@ static struct clockdomain cam_clkdm = {
 	.wkdep_srcs	= cam_wkdeps,
 	.sleepdep_srcs	= cam_sleepdeps,
 	.clktrctrl_mask = OMAP3430_CLKTRCTRL_CAM_MASK,
-	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430 | CHIP_IS_AM35XX),
 };
 
 static struct clockdomain usbhost_clkdm = {

@@ -733,7 +775,7 @@ static struct clockdomain usbhost_clkdm = {
 	.wkdep_srcs	= usbhost_wkdeps,
 	.sleepdep_srcs	= usbhost_sleepdeps,
 	.clktrctrl_mask = OMAP3430ES2_CLKTRCTRL_USBHOST_MASK,
-	.omap_chip	= OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES2),
+	.omap_chip	= OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES2 | CHIP_IS_AM35XX),
 };
 
 static struct clockdomain per_clkdm = {

@@ -744,7 +786,7 @@ static struct clockdomain per_clkdm = {
 	.wkdep_srcs	= per_wkdeps,
 	.sleepdep_srcs	= per_sleepdeps,
 	.clktrctrl_mask = OMAP3430_CLKTRCTRL_PER_MASK,
-	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430 | CHIP_IS_AM35XX),
 };
 
 /*

@@ -756,37 +798,37 @@ static struct clockdomain emu_clkdm = {
 	.pwrdm		= { .name = "emu_pwrdm" },
 	.flags		= /* CLKDM_CAN_ENABLE_AUTO |  */CLKDM_CAN_SWSUP,
 	.clktrctrl_mask = OMAP3430_CLKTRCTRL_EMU_MASK,
-	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430 | CHIP_IS_AM35XX),
 };
 
 static struct clockdomain dpll1_clkdm = {
 	.name		= "dpll1_clkdm",
 	.pwrdm		= { .name = "dpll1_pwrdm" },
-	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430 | CHIP_IS_AM35XX),
 };
 
 static struct clockdomain dpll2_clkdm = {
 	.name		= "dpll2_clkdm",
 	.pwrdm		= { .name = "dpll2_pwrdm" },
-	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430 | CHIP_IS_AM35XX),
 };
 
 static struct clockdomain dpll3_clkdm = {
 	.name		= "dpll3_clkdm",
 	.pwrdm		= { .name = "dpll3_pwrdm" },
-	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430 | CHIP_IS_AM35XX),
 };
 
 static struct clockdomain dpll4_clkdm = {
 	.name		= "dpll4_clkdm",
 	.pwrdm		= { .name = "dpll4_pwrdm" },
-	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430 | CHIP_IS_AM35XX),
 };
 
 static struct clockdomain dpll5_clkdm = {
 	.name		= "dpll5_clkdm",
 	.pwrdm		= { .name = "dpll5_pwrdm" },
-	.omap_chip	= OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES2),
+	.omap_chip	= OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES2 | CHIP_IS_AM35XX),
 };
 
 #endif   /* CONFIG_ARCH_OMAP3 */

@@ -798,11 +840,11 @@ static struct clockdomain dpll5_clkdm = {
 static struct clkdm_autodep clkdm_autodeps[] = {
 	{
 		.clkdm	   = { .name = "mpu_clkdm" },
-		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 | CHIP_IS_AM35XX)
 	},
 	{
 		.clkdm	   = { .name = "iva2_clkdm" },
-		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430)
+		.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 | CHIP_IS_AM35XX)
 	},
 	{
 		.clkdm	   = { .name = NULL },
arch/arm/mach-omap2/id.c +2 -2
index 2537090..53e1996 100644
@@ -284,10 +284,10 @@ static void __init omap3_check_revision(void)
 		 * Set the device to be OMAP3505 here. Actual device
 		 * is identified later based on the features.
 		 *
-		 * REVISIT: AM3505/AM3517 should have their own CHIP_IS
+		 * REVISIT: Should AM3505/AM3517 have independant CHIP_IS?
 		 */
 		omap_revision = OMAP3505_REV(rev);
-		omap_chip.oc |= CHIP_IS_OMAP3430ES3_1;
+		omap_chip.oc = CHIP_IS_AM35XX; 
 		break;
 	case 0xb891:
 		/* Handle 36xx devices */
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +112 -54

482 lines not on this page · raw message

arch/arm/mach-omap2/powerdomains2xxx_3xxx_data.c +1 -1
index 4210c33..2083f2c 100644
@@ -75,6 +75,6 @@ struct powerdomain gfx_omap2_pwrdm = {
 struct powerdomain wkup_omap2_pwrdm = {
 	.name		= "wkup_pwrdm",
 	.prcm_offs	= WKUP_MOD,
-	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP24XX | CHIP_IS_OMAP3430),
+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP24XX | CHIP_IS_OMAP3430 | CHIP_IS_AM35XX),
 	.pwrsts		= PWRSTS_ON,
 };
arch/arm/mach-omap2/powerdomains3xxx_data.c +14 -14
index 469a920..9a94482 100644
@@ -36,7 +36,7 @@
 static struct powerdomain iva2_pwrdm = {
 	.name		  = "iva2_pwrdm",
 	.prcm_offs	  = OMAP3430_IVA2_MOD,
-	.omap_chip	  = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
+	.omap_chip	  = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 | CHIP_IS_AM35XX),
 	.pwrsts		  = PWRSTS_OFF_RET_ON,
 	.pwrsts_logic_ret = PWRSTS_OFF_RET,
 	.banks		  = 4,

@@ -57,7 +57,7 @@ static struct powerdomain iva2_pwrdm = {
 static struct powerdomain mpu_3xxx_pwrdm = {
 	.name		  = "mpu_pwrdm",
 	.prcm_offs	  = MPU_MOD,
-	.omap_chip	  = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
+	.omap_chip	  = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 | CHIP_IS_AM35XX),
 	.pwrsts		  = PWRSTS_OFF_RET_ON,
 	.pwrsts_logic_ret = PWRSTS_OFF_RET,
 	.flags		  = PWRDM_HAS_MPU_QUIRK,

@@ -104,7 +104,7 @@ static struct powerdomain core_3xxx_es3_1_pwrdm = {
 	.name		  = "core_pwrdm",
 	.prcm_offs	  = CORE_MOD,
 	.omap_chip	  = OMAP_CHIP_INIT(CHIP_IS_OMAP3430ES3_1 |
-					  CHIP_GE_OMAP3630ES1_1),
+					  CHIP_GE_OMAP3630ES1_1 | CHIP_IS_AM35XX),
 	.pwrsts		  = PWRSTS_OFF_RET_ON,
 	.pwrsts_logic_ret = PWRSTS_OFF_RET,
 	/*

@@ -125,7 +125,7 @@ static struct powerdomain core_3xxx_es3_1_pwrdm = {
 
 static struct powerdomain dss_pwrdm = {
 	.name		  = "dss_pwrdm",
-	.omap_chip	  = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
+	.omap_chip	  = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 | CHIP_IS_AM35XX),
 	.prcm_offs	  = OMAP3430_DSS_MOD,
 	.pwrsts		  = PWRSTS_OFF_RET_ON,
 	.pwrsts_logic_ret = PWRSTS_RET,

@@ -161,7 +161,7 @@ static struct powerdomain sgx_pwrdm = {
 
 static struct powerdomain cam_pwrdm = {
 	.name		  = "cam_pwrdm",
-	.omap_chip	  = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
+	.omap_chip	  = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 | CHIP_IS_AM35XX),
 	.prcm_offs	  = OMAP3430_CAM_MOD,
 	.pwrsts		  = PWRSTS_OFF_RET_ON,
 	.pwrsts_logic_ret = PWRSTS_RET,

@@ -177,7 +177,7 @@ static struct powerdomain cam_pwrdm = {
 static struct powerdomain per_pwrdm = {
 	.name		  = "per_pwrdm",
 	.prcm_offs	  = OMAP3430_PER_MOD,
-	.omap_chip	  = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
+	.omap_chip	  = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 | CHIP_IS_AM35XX),
 	.pwrsts		  = PWRSTS_OFF_RET_ON,
 	.pwrsts_logic_ret = PWRSTS_OFF_RET,
 	.banks		  = 1,

@@ -192,13 +192,13 @@ static struct powerdomain per_pwrdm = {
 static struct powerdomain emu_pwrdm = {
 	.name		= "emu_pwrdm",
 	.prcm_offs	= OMAP3430_EMU_MOD,
-	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430 | CHIP_IS_AM35XX),
 };
 
 static struct powerdomain neon_pwrdm = {
 	.name		  = "neon_pwrdm",
 	.prcm_offs	  = OMAP3430_NEON_MOD,
-	.omap_chip	  = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
+	.omap_chip	  = OMAP_CHIP_INIT(CHIP_IS_OMAP3430 | CHIP_IS_AM35XX),
 	.pwrsts		  = PWRSTS_OFF_RET_ON,
 	.pwrsts_logic_ret = PWRSTS_RET,
 };

@@ -206,7 +206,7 @@ static struct powerdomain neon_pwrdm = {
 static struct powerdomain usbhost_pwrdm = {
 	.name		  = "usbhost_pwrdm",
 	.prcm_offs	  = OMAP3430ES2_USBHOST_MOD,
-	.omap_chip	  = OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES2),
+	.omap_chip	  = OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES2 | CHIP_IS_AM35XX),
 	.pwrsts		  = PWRSTS_OFF_RET_ON,
 	.pwrsts_logic_ret = PWRSTS_RET,
 	/*

@@ -228,31 +228,31 @@ static struct powerdomain usbhost_pwrdm = {
 static struct powerdomain dpll1_pwrdm = {
 	.name		= "dpll1_pwrdm",
 	.prcm_offs	= MPU_MOD,
-	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430 | CHIP_IS_AM35XX),
 };
 
 static struct powerdomain dpll2_pwrdm = {
 	.name		= "dpll2_pwrdm",
 	.prcm_offs	= OMAP3430_IVA2_MOD,
-	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430 | CHIP_IS_AM35XX),
 };
 
 static struct powerdomain dpll3_pwrdm = {
 	.name		= "dpll3_pwrdm",
 	.prcm_offs	= PLL_MOD,
-	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430 | CHIP_IS_AM35XX),
 };
 
 static struct powerdomain dpll4_pwrdm = {
 	.name		= "dpll4_pwrdm",
 	.prcm_offs	= PLL_MOD,
-	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
+	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430 | CHIP_IS_AM35XX),
 };
 
 static struct powerdomain dpll5_pwrdm = {
 	.name		= "dpll5_pwrdm",
 	.prcm_offs	= PLL_MOD,
-	.omap_chip	= OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES2),
+	.omap_chip	= OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES2 | CHIP_IS_AM35XX),
 };
 
 /* As powerdomains are added or removed above, this list must also be changed */