diff options
| author | Lily Zhang <r58066@freescale.com> | 2010-10-15 16:40:03 +0800 |
|---|---|---|
| committer | Lily Zhang <r58066@freescale.com> | 2010-10-15 16:53:44 +0800 |
| commit | af4f50aef99a5d30ccc612e406515ff87ed5a2be (patch) | |
| tree | 9dc32f1c7192f882681231b315404d1f8f26be91 /drivers/mxc | |
| parent | f6b55e9492db231b1442eb468aaf8ac0a0d352a2 (diff) | |
ENGR00132653 MLB: add regulator check
Add regulator check in MLB driver.
Signed-off-by: Lily Zhang <r58066@freescale.com>
Diffstat (limited to 'drivers/mxc')
| -rw-r--r-- | drivers/mxc/mlb/mxc_mlb.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/mxc/mlb/mxc_mlb.c b/drivers/mxc/mlb/mxc_mlb.c index 1364f27c6d6d..48c160a77922 100644 --- a/drivers/mxc/mlb/mxc_mlb.c +++ b/drivers/mxc/mlb/mxc_mlb.c @@ -939,11 +939,15 @@ static int __devinit mxc_mlb_probe(struct platform_device *pdev) /* enable GPIO */ gpio_mlb_active(); - /* power on MLB */ - reg_nvcc = regulator_get(&pdev->dev, plat_data->reg_nvcc); - /* set MAX LDO6 for NVCC to 2.5V */ - regulator_set_voltage(reg_nvcc, 2500000, 2500000); - regulator_enable(reg_nvcc); + if (plat_data->reg_nvcc) { + /* power on MLB */ + reg_nvcc = regulator_get(&pdev->dev, plat_data->reg_nvcc); + if (!IS_ERR(reg_nvcc)) { + /* set MAX LDO6 for NVCC to 2.5V */ + regulator_set_voltage(reg_nvcc, 2500000, 2500000); + regulator_enable(reg_nvcc); + } + } /* enable clock */ mlb_clk = clk_get(&pdev->dev, plat_data->mlb_clk); |