Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (59 commits) rtc: max8925: Add function to work as wakeup source mfd: Add pm ops to max8925 mfd: Convert aat2870 to dev_pm_ops mfd: Still check other interrupts if we get a wm831x touchscreen IRQ mfd: Introduce missing kfree in 88pm860x probe routine mfd: Add S5M series configuration mfd: Add s5m series irq driver mfd: Add S5M core driver mfd: Improve mc13xxx dt binding document mfd: Fix stmpe section mismatch mfd: Fix stmpe build warning mfd: Fix STMPE I2c build failure mfd: Constify aat2870-core i2c_device_id table gpio: Add support for stmpe variant 801 mfd: Add support for stmpe variant 801 mfd: Add support for stmpe variant 610 mfd: Add support for STMPE SPI interface mfd: Separate out STMPE controller and interface specific code misc: Remove max8997-muic sysfs attributes mfd: Remove unused wm831x_irq_data_to_mask_reg() ... Fix up trivial conflict in drivers/leds/Kconfig due to addition of LEDS_MAX8997 and LEDS_TCA6507 next to each other.
This commit is contained in:
Linus Torvalds
78
Documentation/devicetree/bindings/mfd/mc13xxx.txt
Normal file
78
Documentation/devicetree/bindings/mfd/mc13xxx.txt
Normal file
@ -0,0 +1,78 @@
|
||||
* Freescale MC13783/MC13892 Power Management Integrated Circuit (PMIC)
|
||||
|
||||
Required properties:
|
||||
- compatible : Should be "fsl,mc13783" or "fsl,mc13892"
|
||||
|
||||
Optional properties:
|
||||
- fsl,mc13xxx-uses-adc : Indicate the ADC is being used
|
||||
- fsl,mc13xxx-uses-codec : Indicate the Audio Codec is being used
|
||||
- fsl,mc13xxx-uses-rtc : Indicate the RTC is being used
|
||||
- fsl,mc13xxx-uses-touch : Indicate the touchscreen controller is being used
|
||||
|
||||
Sub-nodes:
|
||||
- regulators : Contain the regulator nodes. The MC13892 regulators are
|
||||
bound using their names as listed below with their registers and bits
|
||||
for enabling.
|
||||
|
||||
vcoincell : regulator VCOINCELL (register 13, bit 23)
|
||||
sw1 : regulator SW1 (register 24, bit 0)
|
||||
sw2 : regulator SW2 (register 25, bit 0)
|
||||
sw3 : regulator SW3 (register 26, bit 0)
|
||||
sw4 : regulator SW4 (register 27, bit 0)
|
||||
swbst : regulator SWBST (register 29, bit 20)
|
||||
vgen1 : regulator VGEN1 (register 32, bit 0)
|
||||
viohi : regulator VIOHI (register 32, bit 3)
|
||||
vdig : regulator VDIG (register 32, bit 9)
|
||||
vgen2 : regulator VGEN2 (register 32, bit 12)
|
||||
vpll : regulator VPLL (register 32, bit 15)
|
||||
vusb2 : regulator VUSB2 (register 32, bit 18)
|
||||
vgen3 : regulator VGEN3 (register 33, bit 0)
|
||||
vcam : regulator VCAM (register 33, bit 6)
|
||||
vvideo : regulator VVIDEO (register 33, bit 12)
|
||||
vaudio : regulator VAUDIO (register 33, bit 15)
|
||||
vsd : regulator VSD (register 33, bit 18)
|
||||
gpo1 : regulator GPO1 (register 34, bit 6)
|
||||
gpo2 : regulator GPO2 (register 34, bit 8)
|
||||
gpo3 : regulator GPO3 (register 34, bit 10)
|
||||
gpo4 : regulator GPO4 (register 34, bit 12)
|
||||
pwgt1spi : regulator PWGT1SPI (register 34, bit 15)
|
||||
pwgt2spi : regulator PWGT2SPI (register 34, bit 16)
|
||||
vusb : regulator VUSB (register 50, bit 3)
|
||||
|
||||
The bindings details of individual regulator device can be found in:
|
||||
Documentation/devicetree/bindings/regulator/regulator.txt
|
||||
|
||||
Examples:
|
||||
|
||||
ecspi@70010000 { /* ECSPI1 */
|
||||
fsl,spi-num-chipselects = <2>;
|
||||
cs-gpios = <&gpio3 24 0>, /* GPIO4_24 */
|
||||
<&gpio3 25 0>; /* GPIO4_25 */
|
||||
status = "okay";
|
||||
|
||||
pmic: mc13892@0 {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
compatible = "fsl,mc13892";
|
||||
spi-max-frequency = <6000000>;
|
||||
reg = <0>;
|
||||
interrupt-parent = <&gpio0>;
|
||||
interrupts = <8>;
|
||||
|
||||
regulators {
|
||||
sw1_reg: mc13892__sw1 {
|
||||
regulator-min-microvolt = <600000>;
|
||||
regulator-max-microvolt = <1375000>;
|
||||
regulator-boot-on;
|
||||
regulator-always-on;
|
||||
};
|
||||
|
||||
sw2_reg: mc13892__sw2 {
|
||||
regulator-min-microvolt = <900000>;
|
||||
regulator-max-microvolt = <1850000>;
|
||||
regulator-boot-on;
|
||||
regulator-always-on;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
47
Documentation/devicetree/bindings/mfd/twl-familly.txt
Normal file
47
Documentation/devicetree/bindings/mfd/twl-familly.txt
Normal file
@ -0,0 +1,47 @@
|
||||
Texas Instruments TWL family
|
||||
|
||||
The TWLs are Integrated Power Management Chips.
|
||||
Some version might contain much more analog function like
|
||||
USB transceiver or Audio amplifier.
|
||||
These chips are connected to an i2c bus.
|
||||
|
||||
|
||||
Required properties:
|
||||
- compatible : Must be "ti,twl4030";
|
||||
For Integrated power-management/audio CODEC device used in OMAP3
|
||||
based boards
|
||||
- compatible : Must be "ti,twl6030";
|
||||
For Integrated power-management used in OMAP4 based boards
|
||||
- interrupts : This i2c device has an IRQ line connected to the main SoC
|
||||
- interrupt-controller : Since the twl support several interrupts internally,
|
||||
it is considered as an interrupt controller cascaded to the SoC one.
|
||||
- #interrupt-cells = <1>;
|
||||
- interrupt-parent : The parent interrupt controller.
|
||||
|
||||
Optional node:
|
||||
- Child nodes contain in the twl. The twl family is made of several variants
|
||||
that support a different number of features.
|
||||
The children nodes will thus depend of the capability of the variant.
|
||||
|
||||
|
||||
Example:
|
||||
/*
|
||||
* Integrated Power Management Chip
|
||||
* http://www.ti.com/lit/ds/symlink/twl6030.pdf
|
||||
*/
|
||||
twl@48 {
|
||||
compatible = "ti,twl6030";
|
||||
reg = <0x48>;
|
||||
interrupts = <39>; /* IRQ_SYS_1N cascaded to gic */
|
||||
interrupt-controller;
|
||||
#interrupt-cells = <1>;
|
||||
interrupt-parent = <&gic>;
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
||||
twl_rtc {
|
||||
compatible = "ti,twl_rtc";
|
||||
interrupts = <11>;
|
||||
reg = <0>;
|
||||
};
|
||||
};
|
||||
Reference in New Issue
Block a user