diff options
| author | Nishanth Menon <nm@ti.com> | 2011-06-06 11:57:53 -0700 |
|---|---|---|
| committer | Nishanth Menon <nm@ti.com> | 2011-06-13 16:44:13 -0500 |
| commit | 46197dcc66990ec7d5187517435f4e87013c722f (patch) | |
| tree | 3e35280016c3cf0503231bffd5502e02c7596745 /arch/arm/mach-omap2/vc.c | |
| parent | 0a09dac1d942bc4465572a84609526f5a32a6d2e (diff) | |
| download | kernel_samsung_tuna-46197dcc66990ec7d5187517435f4e87013c722f.zip kernel_samsung_tuna-46197dcc66990ec7d5187517435f4e87013c722f.tar.gz kernel_samsung_tuna-46197dcc66990ec7d5187517435f4e87013c722f.tar.bz2 | |
OMAP3+: VC: fix mutant channel handling
"OMAP3+: PM: VC: handle mutant channel config for OMAP4 MPU channel"
handles the mutant channel flags, however since vc_cfg_bits is static
file wide variable, it makes better sense to update this based on
the specific channel using mutant or not. else if we have a initial
registration of mutant channel definition, all other channels will
end up using the mutant definition.
Signed-off-by: Nishanth Menon <nm@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/vc.c')
| -rw-r--r-- | arch/arm/mach-omap2/vc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/vc.c b/arch/arm/mach-omap2/vc.c index c8deac9..aa9f0bc 100644 --- a/arch/arm/mach-omap2/vc.c +++ b/arch/arm/mach-omap2/vc.c @@ -53,7 +53,7 @@ static struct omap_vc_channel_cfg vc_mutant_channel_cfg = { .cmd = BIT(1), }; -static struct omap_vc_channel_cfg *vc_cfg_bits = &vc_default_channel_cfg; +static struct omap_vc_channel_cfg *vc_cfg_bits; #define CFG_CHANNEL_MASK 0x1f /** @@ -300,6 +300,8 @@ void __init omap_vc_init_channel(struct voltagedomain *voltdm) vc->cfg_channel = 0; if (vc->flags & OMAP_VC_CHANNEL_CFG_MUTANT) vc_cfg_bits = &vc_mutant_channel_cfg; + else + vc_cfg_bits = &vc_default_channel_cfg; /* get PMIC/board specific settings */ vc->i2c_slave_addr = voltdm->pmic->i2c_slave_addr; |