diff options
author | Eric Miao <eric.miao@linaro.org> | 2012-01-12 10:29:01 +0800 |
---|---|---|
committer | Eric Miao <eric.miao@linaro.org> | 2012-01-12 10:29:01 +0800 |
commit | f4602255988c23ed729cb9e999c4caf2853142e6 (patch) | |
tree | 18c65e98323127d5fad5e47cdffa305c1f83335f /include/linux/regulator/driver.h | |
parent | 2cfd89e75ffe516e54c871eca15f55ee5a9520af (diff) | |
parent | 01382574cc0f67e2c9652acacfb141df1eb29f4e (diff) |
Merge branch 'topic/lt-3.2-imx6-audio' into lt-3.2-imx6
* topic/lt-3.2-imx6-audio: (28 commits)
make sgtl5000 work -- need to split to small patch
ENGR00154525 SDMA: SDMA not works when event number bigger than 32
arm/imx6q: add cko1 clock
arm/imx6q: add imx-sgtl5000 device from sabrelite board
fw/imx: add sdma-imx6q-to1.bin.ihex
dts/imx6q: add sdma script
ARM: imx6q-sabrelite: add audmux
ARM: mxc/audmux-v2: add dt support
dma/imx-sdma: let imx6q choose dma driver
dts/imx6q: add ssi
alsa/imx-ssi: rename fsl,ssi-asynchronous-mode to fsl,ssi-synchronous-mode
ASoC: imx-ssi: add device tree probe support
dts/imx6q-sabrelite: add sgtl5000 audio codec
regulator/fixed: set apply_uV 0
dts/imx6q-sabrelite: add 2P5V and 3P3V regulators
regulator: pass device_node to of_get_regulator_init_data()
regulator: If a single voltage is set with device tree then set apply_uV
regulator: Fix regulator_register() API signature in Documentation
regulator: fix label names used in device tree bindings
regulator: Avoid potential NULL dereference in reg_fixed_voltage_probe()
...
Diffstat (limited to 'include/linux/regulator/driver.h')
-rw-r--r-- | include/linux/regulator/driver.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h index 52c89ae32f6..4214b9a9d1c 100644 --- a/include/linux/regulator/driver.h +++ b/include/linux/regulator/driver.h @@ -154,6 +154,7 @@ enum regulator_type { * this type. * * @name: Identifying name for the regulator. + * @supply_name: Identifying the regulator supply * @id: Numerical identifier for the regulator. * @n_voltages: Number of selectors available for ops.list_voltage(). * @ops: Regulator operations table. @@ -163,6 +164,7 @@ enum regulator_type { */ struct regulator_desc { const char *name; + const char *supply_name; int id; unsigned n_voltages; struct regulator_ops *ops; @@ -212,7 +214,7 @@ struct regulator_dev { struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc, struct device *dev, const struct regulator_init_data *init_data, - void *driver_data); + void *driver_data, struct device_node *of_node); void regulator_unregister(struct regulator_dev *rdev); int regulator_notifier_call_chain(struct regulator_dev *rdev, |