diff options
Diffstat (limited to 'arch/arm/mach-omap2/vc3xxx_data.c')
-rw-r--r-- | arch/arm/mach-omap2/vc3xxx_data.c | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/arch/arm/mach-omap2/vc3xxx_data.c b/arch/arm/mach-omap2/vc3xxx_data.c index f37dc4bc379a..cfe348e1af0e 100644 --- a/arch/arm/mach-omap2/vc3xxx_data.c +++ b/arch/arm/mach-omap2/vc3xxx_data.c | |||
@@ -29,9 +29,7 @@ | |||
29 | * VC data common to 34xx/36xx chips | 29 | * VC data common to 34xx/36xx chips |
30 | * XXX This stuff presumably belongs in the vc3xxx.c or vc.c file. | 30 | * XXX This stuff presumably belongs in the vc3xxx.c or vc.c file. |
31 | */ | 31 | */ |
32 | static struct omap_vc_common_data omap3_vc_common = { | 32 | static struct omap_vc_common omap3_vc_common = { |
33 | .smps_sa_reg = OMAP3_PRM_VC_SMPS_SA_OFFSET, | ||
34 | .smps_volra_reg = OMAP3_PRM_VC_SMPS_VOL_RA_OFFSET, | ||
35 | .bypass_val_reg = OMAP3_PRM_VC_BYPASS_VAL_OFFSET, | 33 | .bypass_val_reg = OMAP3_PRM_VC_BYPASS_VAL_OFFSET, |
36 | .data_shift = OMAP3430_DATA_SHIFT, | 34 | .data_shift = OMAP3430_DATA_SHIFT, |
37 | .slaveaddr_shift = OMAP3430_SLAVEADDR_SHIFT, | 35 | .slaveaddr_shift = OMAP3430_SLAVEADDR_SHIFT, |
@@ -42,22 +40,33 @@ static struct omap_vc_common_data omap3_vc_common = { | |||
42 | .cmd_onlp_shift = OMAP3430_VC_CMD_ONLP_SHIFT, | 40 | .cmd_onlp_shift = OMAP3430_VC_CMD_ONLP_SHIFT, |
43 | .cmd_ret_shift = OMAP3430_VC_CMD_RET_SHIFT, | 41 | .cmd_ret_shift = OMAP3430_VC_CMD_RET_SHIFT, |
44 | .cmd_off_shift = OMAP3430_VC_CMD_OFF_SHIFT, | 42 | .cmd_off_shift = OMAP3430_VC_CMD_OFF_SHIFT, |
43 | .i2c_cfg_hsen_mask = OMAP3430_HSEN_MASK, | ||
44 | .i2c_cfg_reg = OMAP3_PRM_VC_I2C_CFG_OFFSET, | ||
45 | .i2c_mcode_mask = OMAP3430_MCODE_MASK, | ||
45 | }; | 46 | }; |
46 | 47 | ||
47 | struct omap_vc_instance_data omap3_vc1_data = { | 48 | struct omap_vc_channel omap3_vc_mpu = { |
48 | .vc_common = &omap3_vc_common, | 49 | .common = &omap3_vc_common, |
50 | .smps_sa_reg = OMAP3_PRM_VC_SMPS_SA_OFFSET, | ||
51 | .smps_volra_reg = OMAP3_PRM_VC_SMPS_VOL_RA_OFFSET, | ||
52 | .smps_cmdra_reg = OMAP3_PRM_VC_SMPS_CMD_RA_OFFSET, | ||
53 | .cfg_channel_reg = OMAP3_PRM_VC_CH_CONF_OFFSET, | ||
49 | .cmdval_reg = OMAP3_PRM_VC_CMD_VAL_0_OFFSET, | 54 | .cmdval_reg = OMAP3_PRM_VC_CMD_VAL_0_OFFSET, |
50 | .smps_sa_shift = OMAP3430_PRM_VC_SMPS_SA_SA0_SHIFT, | ||
51 | .smps_sa_mask = OMAP3430_PRM_VC_SMPS_SA_SA0_MASK, | 55 | .smps_sa_mask = OMAP3430_PRM_VC_SMPS_SA_SA0_MASK, |
52 | .smps_volra_shift = OMAP3430_VOLRA0_SHIFT, | ||
53 | .smps_volra_mask = OMAP3430_VOLRA0_MASK, | 56 | .smps_volra_mask = OMAP3430_VOLRA0_MASK, |
57 | .smps_cmdra_mask = OMAP3430_CMDRA0_MASK, | ||
58 | .cfg_channel_sa_shift = OMAP3430_PRM_VC_SMPS_SA_SA0_SHIFT, | ||
54 | }; | 59 | }; |
55 | 60 | ||
56 | struct omap_vc_instance_data omap3_vc2_data = { | 61 | struct omap_vc_channel omap3_vc_core = { |
57 | .vc_common = &omap3_vc_common, | 62 | .common = &omap3_vc_common, |
63 | .smps_sa_reg = OMAP3_PRM_VC_SMPS_SA_OFFSET, | ||
64 | .smps_volra_reg = OMAP3_PRM_VC_SMPS_VOL_RA_OFFSET, | ||
65 | .smps_cmdra_reg = OMAP3_PRM_VC_SMPS_CMD_RA_OFFSET, | ||
66 | .cfg_channel_reg = OMAP3_PRM_VC_CH_CONF_OFFSET, | ||
58 | .cmdval_reg = OMAP3_PRM_VC_CMD_VAL_1_OFFSET, | 67 | .cmdval_reg = OMAP3_PRM_VC_CMD_VAL_1_OFFSET, |
59 | .smps_sa_shift = OMAP3430_PRM_VC_SMPS_SA_SA1_SHIFT, | ||
60 | .smps_sa_mask = OMAP3430_PRM_VC_SMPS_SA_SA1_MASK, | 68 | .smps_sa_mask = OMAP3430_PRM_VC_SMPS_SA_SA1_MASK, |
61 | .smps_volra_shift = OMAP3430_VOLRA1_SHIFT, | ||
62 | .smps_volra_mask = OMAP3430_VOLRA1_MASK, | 69 | .smps_volra_mask = OMAP3430_VOLRA1_MASK, |
70 | .smps_cmdra_mask = OMAP3430_CMDRA1_MASK, | ||
71 | .cfg_channel_sa_shift = OMAP3430_PRM_VC_SMPS_SA_SA1_SHIFT, | ||
63 | }; | 72 | }; |