diff options
| -rw-r--r-- | drivers/mfd/twl6040.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/mfd/twl6040.c b/drivers/mfd/twl6040.c index 12b314ea48dc..ae26d84b3a59 100644 --- a/drivers/mfd/twl6040.c +++ b/drivers/mfd/twl6040.c | |||
| @@ -441,12 +441,9 @@ int twl6040_set_pll(struct twl6040 *twl6040, int pll_id, | |||
| 441 | TWL6040_HPLLENA; | 441 | TWL6040_HPLLENA; |
| 442 | break; | 442 | break; |
| 443 | case 19200000: | 443 | case 19200000: |
| 444 | /* | 444 | /* PLL enabled, bypass mode */ |
| 445 | * PLL disabled | 445 | hppllctl |= TWL6040_MCLK_19200KHZ | |
| 446 | * (enable PLL if MCLK jitter quality | 446 | TWL6040_HPLLBP | TWL6040_HPLLENA; |
| 447 | * doesn't meet specification) | ||
| 448 | */ | ||
| 449 | hppllctl |= TWL6040_MCLK_19200KHZ; | ||
| 450 | break; | 447 | break; |
| 451 | case 26000000: | 448 | case 26000000: |
| 452 | /* PLL enabled, active mode */ | 449 | /* PLL enabled, active mode */ |
| @@ -454,9 +451,9 @@ int twl6040_set_pll(struct twl6040 *twl6040, int pll_id, | |||
| 454 | TWL6040_HPLLENA; | 451 | TWL6040_HPLLENA; |
| 455 | break; | 452 | break; |
| 456 | case 38400000: | 453 | case 38400000: |
| 457 | /* PLL enabled, active mode */ | 454 | /* PLL enabled, bypass mode */ |
| 458 | hppllctl |= TWL6040_MCLK_38400KHZ | | 455 | hppllctl |= TWL6040_MCLK_38400KHZ | |
| 459 | TWL6040_HPLLENA; | 456 | TWL6040_HPLLBP | TWL6040_HPLLENA; |
| 460 | break; | 457 | break; |
| 461 | default: | 458 | default: |
| 462 | dev_err(twl6040->dev, | 459 | dev_err(twl6040->dev, |