diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-18 12:05:48 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-18 12:05:48 -0500 |
commit | 5c2770079fb9b8c5bfb7113d9e76de66e77a0e24 (patch) | |
tree | c6b330ce5d8a00edfef2c4cc2a8ac1213fbb86f6 /Documentation | |
parent | 9a8b2aa534f23a61a57385309667e42e96941116 (diff) | |
parent | 0a65fbf64dad890d9dd60ab1dc0ebdb9fb0a9e33 (diff) |
Merge tag 'mfd-for-linus-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
Pull MFD updates from Lee Jones:
"Changes to existing drivers:
- fixr platform device collision; da9052, wm8994-core
- regmap configuration amendments; tps65218
- fix runtime PM deadlock; rtsx_usb
- remove unused/superfluous code; db8500-prcmu, omap-usb-host
- enable watchdog timer; lpc_sch
- add start/stop RX URBs helpers; dln2
- remove platform device (DT only); max77686, max77802
- support suspend and resume; dln2
- add Device Tree support; da9063
- extra error checking; intel_soc_pmic
- const'ify all the things; 88pm860x, hi6421-pmic, intel_soc_pmic,
max77686, lm3533, retu, pcf50633,
davinci_voicecodec, smsc-ece1099,
tps65218, mc13xxx, tps65217, twl-core,
twl6040
New drivers/supported devices:
- new driver for Richtek RT5033
- new driver for DA9150 Charger and FuelGauge
- new driver for Qualcomm Resource Power Manager (RPM)
- add support for the ir-clk into sun6i-prcm
- add support for FuelGauge into axp20x"
* tag 'mfd-for-linus-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (32 commits)
mfd: intel_soc_pmic: Add missing error check for devm_kzalloc
mfd: rtsx_usb: Defer autosuspend while card exists
mfd: devicetree: Add bindings for DA9063
mfd: da9063: Add device tree support
regulator: qcom-rpm: Add missing state flag in call to RPM
mfd: qcom-rpm: Driver for the Qualcomm RPM
mfd: devicetree: bindings: Add Qualcomm RPM DT binding
mfd: max77686/802: Remove support for board files
mfd: omap-usb-host: Remove some unused functions
mfd: twl6040: Constify struct regmap_config and reg_default array
mfd: twl-core: Constify struct regmap_config and reg_default array
mfd: tps65217: Constify struct regmap_config
mfd: mc13xxx: i2c/spi: Constify struct regmap_config
mfd: tps65218: Constify struct regmap_config
mfd: smsc-ece1099: Constify struct regmap_config
mfd: davinci_voicecodec: Constify struct regmap_config
mfd: pcf50633: Constify struct regmap_config
mfd: retu: Constify struct regmap_config
mfd: lm3533: Constify struct regmap_config
mfd: max77686: Constify struct regmap_config
...
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/mfd/da9063.txt | 93 | ||||
-rw-r--r-- | Documentation/devicetree/bindings/mfd/qcom-rpm.txt | 70 |
2 files changed, 163 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/mfd/da9063.txt b/Documentation/devicetree/bindings/mfd/da9063.txt new file mode 100644 index 000000000000..42c6fa6f1c9a --- /dev/null +++ b/Documentation/devicetree/bindings/mfd/da9063.txt | |||
@@ -0,0 +1,93 @@ | |||
1 | * Dialog DA9063 Power Management Integrated Circuit (PMIC) | ||
2 | |||
3 | DA9093 consists of a large and varied group of sub-devices (I2C Only): | ||
4 | |||
5 | Device Supply Names Description | ||
6 | ------ ------------ ----------- | ||
7 | da9063-regulator : : LDOs & BUCKs | ||
8 | da9063-rtc : : Real-Time Clock | ||
9 | da9063-watchdog : : Watchdog | ||
10 | |||
11 | ====== | ||
12 | |||
13 | Required properties: | ||
14 | |||
15 | - compatible : Should be "dlg,da9063" | ||
16 | - reg : Specifies the I2C slave address (this defaults to 0x58 but it can be | ||
17 | modified to match the chip's OTP settings). | ||
18 | - interrupt-parent : Specifies the reference to the interrupt controller for | ||
19 | the DA9063. | ||
20 | - interrupts : IRQ line information. | ||
21 | - interrupt-controller | ||
22 | |||
23 | Sub-nodes: | ||
24 | |||
25 | - regulators : This node defines the settings for the LDOs and BUCKs. The | ||
26 | DA9063 regulators are bound using their names listed below: | ||
27 | |||
28 | bcore1 : BUCK CORE1 | ||
29 | bcore2 : BUCK CORE2 | ||
30 | bpro : BUCK PRO | ||
31 | bmem : BUCK MEM | ||
32 | bio : BUCK IO | ||
33 | bperi : BUCK PERI | ||
34 | ldo1 : LDO_1 | ||
35 | ldo2 : LDO_2 | ||
36 | ldo3 : LDO_3 | ||
37 | ldo4 : LDO_4 | ||
38 | ldo5 : LDO_5 | ||
39 | ldo6 : LDO_6 | ||
40 | ldo7 : LDO_7 | ||
41 | ldo8 : LDO_8 | ||
42 | ldo9 : LDO_9 | ||
43 | ldo10 : LDO_10 | ||
44 | ldo11 : LDO_11 | ||
45 | |||
46 | The component follows the standard regulator framework and the bindings | ||
47 | details of individual regulator device can be found in: | ||
48 | Documentation/devicetree/bindings/regulator/regulator.txt | ||
49 | |||
50 | - rtc : This node defines settings for the Real-Time Clock associated with | ||
51 | the DA9063. There are currently no entries in this binding, however | ||
52 | compatible = "dlg,da9063-rtc" should be added if a node is created. | ||
53 | |||
54 | - watchdog : This node defines settings for the Watchdog timer associated | ||
55 | with the DA9063. There are currently no entries in this binding, however | ||
56 | compatible = "dlg,da9063-watchdog" should be added if a node is created. | ||
57 | |||
58 | |||
59 | Example: | ||
60 | |||
61 | pmic0: da9063@58 { | ||
62 | compatible = "dlg,da9063" | ||
63 | reg = <0x58>; | ||
64 | interrupt-parent = <&gpio6>; | ||
65 | interrupts = <11 IRQ_TYPE_LEVEL_LOW>; | ||
66 | interrupt-controller; | ||
67 | |||
68 | rtc { | ||
69 | compatible = "dlg,da9063-rtc"; | ||
70 | }; | ||
71 | |||
72 | wdt { | ||
73 | compatible = "dlg,da9063-watchdog"; | ||
74 | }; | ||
75 | |||
76 | regulators { | ||
77 | DA9063_BCORE1: bcore1 { | ||
78 | regulator-name = "BCORE1"; | ||
79 | regulator-min-microvolt = <300000>; | ||
80 | regulator-max-microvolt = <1570000>; | ||
81 | regulator-min-microamp = <500000>; | ||
82 | regulator-max-microamp = <2000000>; | ||
83 | regulator-boot-on; | ||
84 | }; | ||
85 | DA9063_LDO11: ldo11 { | ||
86 | regulator-name = "LDO_11"; | ||
87 | regulator-min-microvolt = <900000>; | ||
88 | regulator-max-microvolt = <3600000>; | ||
89 | regulator-boot-on; | ||
90 | }; | ||
91 | }; | ||
92 | }; | ||
93 | |||
diff --git a/Documentation/devicetree/bindings/mfd/qcom-rpm.txt b/Documentation/devicetree/bindings/mfd/qcom-rpm.txt new file mode 100644 index 000000000000..85e31980017a --- /dev/null +++ b/Documentation/devicetree/bindings/mfd/qcom-rpm.txt | |||
@@ -0,0 +1,70 @@ | |||
1 | Qualcomm Resource Power Manager (RPM) | ||
2 | |||
3 | This driver is used to interface with the Resource Power Manager (RPM) found in | ||
4 | various Qualcomm platforms. The RPM allows each component in the system to vote | ||
5 | for state of the system resources, such as clocks, regulators and bus | ||
6 | frequencies. | ||
7 | |||
8 | - compatible: | ||
9 | Usage: required | ||
10 | Value type: <string> | ||
11 | Definition: must be one of: | ||
12 | "qcom,rpm-apq8064" | ||
13 | "qcom,rpm-msm8660" | ||
14 | "qcom,rpm-msm8960" | ||
15 | |||
16 | - reg: | ||
17 | Usage: required | ||
18 | Value type: <prop-encoded-array> | ||
19 | Definition: base address and size of the RPM's message ram | ||
20 | |||
21 | - interrupts: | ||
22 | Usage: required | ||
23 | Value type: <prop-encoded-array> | ||
24 | Definition: three entries specifying the RPM's: | ||
25 | 1. acknowledgement interrupt | ||
26 | 2. error interrupt | ||
27 | 3. wakeup interrupt | ||
28 | |||
29 | - interrupt-names: | ||
30 | Usage: required | ||
31 | Value type: <string-array> | ||
32 | Definition: must be the three strings "ack", "err" and "wakeup", in order | ||
33 | |||
34 | - #address-cells: | ||
35 | Usage: required | ||
36 | Value type: <u32> | ||
37 | Definition: must be 1 | ||
38 | |||
39 | - #size-cells: | ||
40 | Usage: required | ||
41 | Value type: <u32> | ||
42 | Definition: must be 0 | ||
43 | |||
44 | - qcom,ipc: | ||
45 | Usage: required | ||
46 | Value type: <prop-encoded-array> | ||
47 | |||
48 | Definition: three entries specifying the outgoing ipc bit used for | ||
49 | signaling the RPM: | ||
50 | - phandle to a syscon node representing the apcs registers | ||
51 | - u32 representing offset to the register within the syscon | ||
52 | - u32 representing the ipc bit within the register | ||
53 | |||
54 | |||
55 | = EXAMPLE | ||
56 | |||
57 | #include <dt-bindings/mfd/qcom-rpm.h> | ||
58 | |||
59 | rpm@108000 { | ||
60 | compatible = "qcom,rpm-msm8960"; | ||
61 | reg = <0x108000 0x1000>; | ||
62 | qcom,ipc = <&apcs 0x8 2>; | ||
63 | |||
64 | interrupts = <0 19 0>, <0 21 0>, <0 22 0>; | ||
65 | interrupt-names = "ack", "err", "wakeup"; | ||
66 | |||
67 | #address-cells = <1>; | ||
68 | #size-cells = <0>; | ||
69 | }; | ||
70 | |||