diff options
Diffstat (limited to 'arch/arm/mach-omap2/vc44xx_data.c')
-rw-r--r-- | arch/arm/mach-omap2/vc44xx_data.c | 44 |
1 files changed, 29 insertions, 15 deletions
diff --git a/arch/arm/mach-omap2/vc44xx_data.c b/arch/arm/mach-omap2/vc44xx_data.c index a98da8ddec52..2740a968145e 100644 --- a/arch/arm/mach-omap2/vc44xx_data.c +++ b/arch/arm/mach-omap2/vc44xx_data.c | |||
@@ -30,9 +30,7 @@ | |||
30 | * VC data common to 44xx chips | 30 | * VC data common to 44xx chips |
31 | * XXX This stuff presumably belongs in the vc3xxx.c or vc.c file. | 31 | * XXX This stuff presumably belongs in the vc3xxx.c or vc.c file. |
32 | */ | 32 | */ |
33 | static const struct omap_vc_common_data omap4_vc_common = { | 33 | static const struct omap_vc_common omap4_vc_common = { |
34 | .smps_sa_reg = OMAP4_PRM_VC_SMPS_SA_OFFSET, | ||
35 | .smps_volra_reg = OMAP4_PRM_VC_VAL_SMPS_RA_VOL_OFFSET, | ||
36 | .bypass_val_reg = OMAP4_PRM_VC_VAL_BYPASS_OFFSET, | 34 | .bypass_val_reg = OMAP4_PRM_VC_VAL_BYPASS_OFFSET, |
37 | .data_shift = OMAP4430_DATA_SHIFT, | 35 | .data_shift = OMAP4430_DATA_SHIFT, |
38 | .slaveaddr_shift = OMAP4430_SLAVEADDR_SHIFT, | 36 | .slaveaddr_shift = OMAP4430_SLAVEADDR_SHIFT, |
@@ -43,33 +41,49 @@ static const struct omap_vc_common_data omap4_vc_common = { | |||
43 | .cmd_onlp_shift = OMAP4430_ONLP_SHIFT, | 41 | .cmd_onlp_shift = OMAP4430_ONLP_SHIFT, |
44 | .cmd_ret_shift = OMAP4430_RET_SHIFT, | 42 | .cmd_ret_shift = OMAP4430_RET_SHIFT, |
45 | .cmd_off_shift = OMAP4430_OFF_SHIFT, | 43 | .cmd_off_shift = OMAP4430_OFF_SHIFT, |
44 | .i2c_cfg_reg = OMAP4_PRM_VC_CFG_I2C_MODE_OFFSET, | ||
45 | .i2c_cfg_hsen_mask = OMAP4430_HSMODEEN_MASK, | ||
46 | .i2c_mcode_mask = OMAP4430_HSMCODE_MASK, | ||
46 | }; | 47 | }; |
47 | 48 | ||
48 | /* VC instance data for each controllable voltage line */ | 49 | /* VC instance data for each controllable voltage line */ |
49 | struct omap_vc_instance_data omap4_vc_mpu_data = { | 50 | struct omap_vc_channel omap4_vc_mpu = { |
50 | .vc_common = &omap4_vc_common, | 51 | .flags = OMAP_VC_CHANNEL_DEFAULT | OMAP_VC_CHANNEL_CFG_MUTANT, |
52 | .common = &omap4_vc_common, | ||
53 | .smps_sa_reg = OMAP4_PRM_VC_SMPS_SA_OFFSET, | ||
54 | .smps_volra_reg = OMAP4_PRM_VC_VAL_SMPS_RA_VOL_OFFSET, | ||
55 | .smps_cmdra_reg = OMAP4_PRM_VC_VAL_SMPS_RA_CMD_OFFSET, | ||
56 | .cfg_channel_reg = OMAP4_PRM_VC_CFG_CHANNEL_OFFSET, | ||
51 | .cmdval_reg = OMAP4_PRM_VC_VAL_CMD_VDD_MPU_L_OFFSET, | 57 | .cmdval_reg = OMAP4_PRM_VC_VAL_CMD_VDD_MPU_L_OFFSET, |
52 | .smps_sa_shift = OMAP4430_SA_VDD_MPU_L_PRM_VC_SMPS_SA_SHIFT, | ||
53 | .smps_sa_mask = OMAP4430_SA_VDD_MPU_L_PRM_VC_SMPS_SA_MASK, | 58 | .smps_sa_mask = OMAP4430_SA_VDD_MPU_L_PRM_VC_SMPS_SA_MASK, |
54 | .smps_volra_shift = OMAP4430_VOLRA_VDD_MPU_L_SHIFT, | ||
55 | .smps_volra_mask = OMAP4430_VOLRA_VDD_MPU_L_MASK, | 59 | .smps_volra_mask = OMAP4430_VOLRA_VDD_MPU_L_MASK, |
60 | .smps_cmdra_mask = OMAP4430_CMDRA_VDD_MPU_L_MASK, | ||
61 | .cfg_channel_sa_shift = OMAP4430_SA_VDD_MPU_L_SHIFT, | ||
56 | }; | 62 | }; |
57 | 63 | ||
58 | struct omap_vc_instance_data omap4_vc_iva_data = { | 64 | struct omap_vc_channel omap4_vc_iva = { |
59 | .vc_common = &omap4_vc_common, | 65 | .common = &omap4_vc_common, |
66 | .smps_sa_reg = OMAP4_PRM_VC_SMPS_SA_OFFSET, | ||
67 | .smps_volra_reg = OMAP4_PRM_VC_VAL_SMPS_RA_VOL_OFFSET, | ||
68 | .smps_cmdra_reg = OMAP4_PRM_VC_VAL_SMPS_RA_CMD_OFFSET, | ||
69 | .cfg_channel_reg = OMAP4_PRM_VC_CFG_CHANNEL_OFFSET, | ||
60 | .cmdval_reg = OMAP4_PRM_VC_VAL_CMD_VDD_IVA_L_OFFSET, | 70 | .cmdval_reg = OMAP4_PRM_VC_VAL_CMD_VDD_IVA_L_OFFSET, |
61 | .smps_sa_shift = OMAP4430_SA_VDD_IVA_L_PRM_VC_SMPS_SA_SHIFT, | ||
62 | .smps_sa_mask = OMAP4430_SA_VDD_IVA_L_PRM_VC_SMPS_SA_MASK, | 71 | .smps_sa_mask = OMAP4430_SA_VDD_IVA_L_PRM_VC_SMPS_SA_MASK, |
63 | .smps_volra_shift = OMAP4430_VOLRA_VDD_IVA_L_SHIFT, | ||
64 | .smps_volra_mask = OMAP4430_VOLRA_VDD_IVA_L_MASK, | 72 | .smps_volra_mask = OMAP4430_VOLRA_VDD_IVA_L_MASK, |
73 | .smps_cmdra_mask = OMAP4430_CMDRA_VDD_IVA_L_MASK, | ||
74 | .cfg_channel_sa_shift = OMAP4430_SA_VDD_IVA_L_SHIFT, | ||
65 | }; | 75 | }; |
66 | 76 | ||
67 | struct omap_vc_instance_data omap4_vc_core_data = { | 77 | struct omap_vc_channel omap4_vc_core = { |
68 | .vc_common = &omap4_vc_common, | 78 | .common = &omap4_vc_common, |
79 | .smps_sa_reg = OMAP4_PRM_VC_SMPS_SA_OFFSET, | ||
80 | .smps_volra_reg = OMAP4_PRM_VC_VAL_SMPS_RA_VOL_OFFSET, | ||
81 | .smps_cmdra_reg = OMAP4_PRM_VC_VAL_SMPS_RA_CMD_OFFSET, | ||
82 | .cfg_channel_reg = OMAP4_PRM_VC_CFG_CHANNEL_OFFSET, | ||
69 | .cmdval_reg = OMAP4_PRM_VC_VAL_CMD_VDD_CORE_L_OFFSET, | 83 | .cmdval_reg = OMAP4_PRM_VC_VAL_CMD_VDD_CORE_L_OFFSET, |
70 | .smps_sa_shift = OMAP4430_SA_VDD_CORE_L_0_6_SHIFT, | ||
71 | .smps_sa_mask = OMAP4430_SA_VDD_CORE_L_0_6_MASK, | 84 | .smps_sa_mask = OMAP4430_SA_VDD_CORE_L_0_6_MASK, |
72 | .smps_volra_shift = OMAP4430_VOLRA_VDD_CORE_L_SHIFT, | ||
73 | .smps_volra_mask = OMAP4430_VOLRA_VDD_CORE_L_MASK, | 85 | .smps_volra_mask = OMAP4430_VOLRA_VDD_CORE_L_MASK, |
86 | .smps_cmdra_mask = OMAP4430_CMDRA_VDD_CORE_L_MASK, | ||
87 | .cfg_channel_sa_shift = OMAP4430_SA_VDD_CORE_L_SHIFT, | ||
74 | }; | 88 | }; |
75 | 89 | ||