diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-28 19:59:55 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-28 19:59:55 -0700 |
commit | 8785eb1e7ca0292c04007fc7768e1599e0c6cef3 (patch) | |
tree | 8016acc3d90f4af72940ce3b85beaeb25fe8326d /include | |
parent | a6f80fb7b5986fda663d94079d3bba0937a6b6ff (diff) | |
parent | 8b24599e72c9aee1ea1187e29cb9c5de9f449cce (diff) | |
download | linux-3.10-8785eb1e7ca0292c04007fc7768e1599e0c6cef3.tar.gz linux-3.10-8785eb1e7ca0292c04007fc7768e1599e0c6cef3.tar.bz2 linux-3.10-8785eb1e7ca0292c04007fc7768e1599e0c6cef3.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:
davinci: da850/omap-l138 evm: account for DEFDCDC{2,3} being tied high
regulator: tps6507x: allow driver to use DEFDCDC{2,3}_HIGH register
wm8350-regulator: fix wm8350_register_regulator error handling
ab3100: fix off-by-one value range checking for voltage selector
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/regulator/tps6507x.h | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/include/linux/regulator/tps6507x.h b/include/linux/regulator/tps6507x.h new file mode 100644 index 00000000000..4892f591bab --- /dev/null +++ b/include/linux/regulator/tps6507x.h @@ -0,0 +1,32 @@ +/* + * tps6507x.h -- Voltage regulation for the Texas Instruments TPS6507X + * + * Copyright (C) 2010 Texas Instruments, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef REGULATOR_TPS6507X +#define REGULATOR_TPS6507X + +/** + * tps6507x_reg_platform_data - platform data for tps6507x + * @defdcdc_default: Defines whether DCDC high or the low register controls + * output voltage by default. Valid for DCDC2 and DCDC3 outputs only. + */ +struct tps6507x_reg_platform_data { + bool defdcdc_default; +}; + +#endif |