diff options
author | Greg Kroah-Hartman | 2012-08-27 16:15:30 +0200 |
---|---|---|
committer | Greg Kroah-Hartman | 2012-08-27 16:15:30 +0200 |
commit | a7bdf7fa33127bf08eb0810698bca607a9462df4 (patch) | |
tree | 2f4be686e49710d10cc4f5ebc2d5f06ae030b9bd /Documentation/devicetree | |
parent | usb: convert USB_QUIRK_RESET_MORPHS to USB_QUIRK_RESET (diff) | |
parent | Linux 3.6-rc3 (diff) | |
download | kernel-qcow2-linux-a7bdf7fa33127bf08eb0810698bca607a9462df4.tar.gz kernel-qcow2-linux-a7bdf7fa33127bf08eb0810698bca607a9462df4.tar.xz kernel-qcow2-linux-a7bdf7fa33127bf08eb0810698bca607a9462df4.zip |
Merge v3.6-rc3 into usb-next
This picks up fixes that we need in this branch for testing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/devicetree')
-rw-r--r-- | Documentation/devicetree/bindings/regulator/tps6586x.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/devicetree/bindings/regulator/tps6586x.txt b/Documentation/devicetree/bindings/regulator/tps6586x.txt index d156e1b5db12..da80c2ae0915 100644 --- a/Documentation/devicetree/bindings/regulator/tps6586x.txt +++ b/Documentation/devicetree/bindings/regulator/tps6586x.txt @@ -9,9 +9,9 @@ Required properties: - regulators: list of regulators provided by this controller, must have property "regulator-compatible" to match their hardware counterparts: sm[0-2], ldo[0-9] and ldo_rtc -- sm0-supply: The input supply for the SM0. -- sm1-supply: The input supply for the SM1. -- sm2-supply: The input supply for the SM2. +- vin-sm0-supply: The input supply for the SM0. +- vin-sm1-supply: The input supply for the SM1. +- vin-sm2-supply: The input supply for the SM2. - vinldo01-supply: The input supply for the LDO1 and LDO2 - vinldo23-supply: The input supply for the LDO2 and LDO3 - vinldo4-supply: The input supply for the LDO4 @@ -30,9 +30,9 @@ Example: #gpio-cells = <2>; gpio-controller; - sm0-supply = <&some_reg>; - sm1-supply = <&some_reg>; - sm2-supply = <&some_reg>; + vin-sm0-supply = <&some_reg>; + vin-sm1-supply = <&some_reg>; + vin-sm2-supply = <&some_reg>; vinldo01-supply = <...>; vinldo23-supply = <...>; vinldo4-supply = <...>; |