diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-08 02:05:49 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-08 02:05:49 +0400 |
| commit | abaaf3e12c74ef39c8ba185c485f63274264cb0f (patch) | |
| tree | 72851a2095cadb38473c1460a31942403daa2e4b /include | |
| parent | 71ea4efe4fc3319ab577be00d1bbcb76d3ffaf63 (diff) | |
| parent | 2bd05db718cf452fe235c7c08083b2e60f787f3a (diff) | |
| download | linux-abaaf3e12c74ef39c8ba185c485f63274264cb0f.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
mfd: Avoid twl6040-codec PLL reconfiguration when not needed
mfd: Store twl6040-codec mclk configuration
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mfd/twl6040.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mfd/twl6040.h b/include/linux/mfd/twl6040.h index 2463c2619596..9bc9ac651dad 100644 --- a/include/linux/mfd/twl6040.h +++ b/include/linux/mfd/twl6040.h @@ -187,8 +187,10 @@ struct twl6040 { int rev; u8 vibra_ctrl_cache[2]; + /* PLL configuration */ int pll; unsigned int sysclk; + unsigned int mclk; unsigned int irq; unsigned int irq_base; |