From b7ea803e55769768d1eff3b32e4f99837fa6ddb5 Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Mon, 4 Apr 2011 15:25:07 -0700 Subject: OMAP3+: VP: cleanup: move VP instance into voltdm, misc. renames - move VP instance struct from vdd_info into struct voltage domain - remove _data suffix from structure name - rename vp_ prefix from vp_common field: accesses are now vp->common - move vp_enabled bool from vdd_info into VP instance - remove remaining references to omap_vdd_info No functional changes. Signed-off-by: Kevin Hilman --- arch/arm/mach-omap2/voltagedomains3xxx_data.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'arch/arm/mach-omap2/voltagedomains3xxx_data.c') diff --git a/arch/arm/mach-omap2/voltagedomains3xxx_data.c b/arch/arm/mach-omap2/voltagedomains3xxx_data.c index ce5a7971addf..35117fcd55cf 100644 --- a/arch/arm/mach-omap2/voltagedomains3xxx_data.c +++ b/arch/arm/mach-omap2/voltagedomains3xxx_data.c @@ -36,18 +36,14 @@ static const struct omap_vfsm_instance omap3_vdd1_vfsm = { .voltsetup_mask = OMAP3430_SETUP_TIME1_MASK, }; -static struct omap_vdd_info omap3_vdd1_info = { - .vp_data = &omap3_vp1_data, -}; +static struct omap_vdd_info omap3_vdd1_info; static const struct omap_vfsm_instance omap3_vdd2_vfsm = { .voltsetup_reg = OMAP3_PRM_VOLTSETUP1_OFFSET, .voltsetup_mask = OMAP3430_SETUP_TIME2_MASK, }; -static struct omap_vdd_info omap3_vdd2_info = { - .vp_data = &omap3_vp2_data, -}; +static struct omap_vdd_info omap3_vdd2_info; static struct voltagedomain omap3_voltdm_mpu = { .name = "mpu_iva", @@ -57,6 +53,7 @@ static struct voltagedomain omap3_voltdm_mpu = { .rmw = omap3_prm_vcvp_rmw, .vc = &omap3_vc_mpu, .vfsm = &omap3_vdd1_vfsm, + .vp = &omap3_vp_mpu, .vdd = &omap3_vdd1_info, }; @@ -68,6 +65,7 @@ static struct voltagedomain omap3_voltdm_core = { .rmw = omap3_prm_vcvp_rmw, .vc = &omap3_vc_core, .vfsm = &omap3_vdd2_vfsm, + .vp = &omap3_vp_core, .vdd = &omap3_vdd2_info, }; -- cgit v1.2.3