forked from swarren/WSL2-Linux-Kernel
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'mfd-3.9-1' of git://git.kernel.org/pub/scm/linux/kernel/gi…
…t/sameo/mfd-2.6
Pull MFS updates from Samuel Ortiz:
"This is the MFD pull request for the 3.9 merge window.
No new drivers this time, but a bunch of fairly big cleanups:
- Roger Quadros worked on a OMAP USBHS and TLL platform data
consolidation, OMAP5 support and clock management code cleanup.
- The first step of a major sync for the ab8500 driver from Lee
Jones. In particular, the debugfs and the sysct interfaces got
extended and improved.
- Peter Ujfalusi sent a nice patchset for cleaning and fixing the
twl-core driver, with a much needed module id lookup code
improvement.
- The regular wm5102 and arizona cleanups and fixes from Mark Brown.
- Laxman Dewangan extended the palmas APIs in order to implement the
palmas GPIO and rt drivers.
- Laxman also added DT support for the tps65090 driver.
- The Intel SCH and ICH drivers got a couple fixes from Aaron Sierra
and Darren Hart.
- Linus Walleij patchset for the ab8500 driver allowed ab8500 and
ab9540 based devices to switch to the new abx500 pin-ctrl driver.
- The max8925 now has device tree and irqdomain support thanks to
Qing Xu.
- The recently added rtsx driver got a few cleanups and fixes for a
better card detection code path and now also supports the RTS5227
chipset, thanks to Wei Wang and Roger Tseng."
* tag 'mfd-3.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (109 commits)
mfd: lpc_ich: Use devres API to allocate private data
mfd: lpc_ich: Add Device IDs for Intel Wellsburg PCH
mfd: lpc_sch: Accomodate partial population of the MFD devices
mfd: da9052-i2c: Staticize da9052_i2c_fix()
mfd: syscon: Fix sparse warning
mfd: twl-core: Fix kernel panic on boot
mfd: rtsx: Fix issue that booting OS with SD card inserted
mfd: ab8500: Fix compile error
mfd: Add missing GENERIC_HARDIRQS dependecies
Documentation: Add docs for max8925 dt
mfd: max8925: Add dts
mfd: max8925: Support dt for backlight
mfd: max8925: Fix onkey driver irq base
mfd: max8925: Fix mfd device register failure
mfd: max8925: Add irqdomain for dt
mfd: vexpress: Allow vexpress-sysreg to self-initialise
mfd: rtsx: Support RTS5227
mfd: rtsx: Implement driving adjustment to device-dependent callbacks
mfd: vexpress: Add pseudo-GPIO based LEDs
mfd: ab8500: Rename ab8500 to abx500 for hwmon driver
...- Loading branch information
Showing
68 changed files
with
4,302 additions
and
1,054 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| * Maxim max8925 Power Management IC | ||
|
|
||
| Required parent device properties: | ||
| - compatible : "maxim,max8925" | ||
| - reg : the I2C slave address for the max8925 chip | ||
| - interrupts : IRQ line for the max8925 chip | ||
| - interrupt-controller: describes the max8925 as an interrupt | ||
| controller (has its own domain) | ||
| - #interrupt-cells : should be 1. | ||
| - The cell is the max8925 local IRQ number | ||
|
|
||
| Optional parent device properties: | ||
| - maxim,tsc-irq: there are 2 IRQ lines for max8925, one is indicated in | ||
| interrupts property, the other is indicated here. | ||
|
|
||
| max8925 consists of a large and varied group of sub-devices: | ||
|
|
||
| Device Supply Names Description | ||
| ------ ------------ ----------- | ||
| max8925-onkey : : On key | ||
| max8925-rtc : : RTC | ||
| max8925-regulator : : Regulators | ||
| max8925-backlight : : Backlight | ||
| max8925-touch : : Touchscreen | ||
| max8925-power : : Charger | ||
|
|
||
| Example: | ||
|
|
||
| pmic: max8925@3c { | ||
| compatible = "maxim,max8925"; | ||
| reg = <0x3c>; | ||
| interrupts = <1>; | ||
| interrupt-parent = <&intcmux4>; | ||
| interrupt-controller; | ||
| #interrupt-cells = <1>; | ||
| maxim,tsc-irq = <0>; | ||
|
|
||
| regulators { | ||
| SDV1 { | ||
| regulator-min-microvolt = <637500>; | ||
| regulator-max-microvolt = <1425000>; | ||
| regulator-boot-on; | ||
| regulator-always-on; | ||
| }; | ||
|
|
||
| LDO1 { | ||
| regulator-min-microvolt = <750000>; | ||
| regulator-max-microvolt = <3900000>; | ||
| regulator-boot-on; | ||
| regulator-always-on; | ||
| }; | ||
|
|
||
| }; | ||
| backlight { | ||
| maxim,max8925-dual-string = <0>; | ||
| }; | ||
| charger { | ||
| batt-detect = <0>; | ||
| topoff-threshold = <1>; | ||
| fast-charge = <7>; | ||
| no-temp-support = <0>; | ||
| no-insert-detect = <0>; | ||
| }; | ||
| }; |
18 changes: 18 additions & 0 deletions
18
Documentation/devicetree/bindings/power_supply/max8925_batter.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| max8925-battery bindings | ||
| ~~~~~~~~~~~~~~~~ | ||
|
|
||
| Optional properties : | ||
| - batt-detect: whether support battery detect | ||
| - topoff-threshold: set charging current in topoff mode | ||
| - fast-charge: set charging current in fast mode | ||
| - no-temp-support: whether support temperature protection detect | ||
| - no-insert-detect: whether support insert detect | ||
|
|
||
| Example: | ||
| charger { | ||
| batt-detect = <0>; | ||
| topoff-threshold = <1>; | ||
| fast-charge = <7>; | ||
| no-temp-support = <0>; | ||
| no-insert-detect = <0>; | ||
| }; |
122 changes: 122 additions & 0 deletions
122
Documentation/devicetree/bindings/regulator/tps65090.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| TPS65090 regulators | ||
|
|
||
| Required properties: | ||
| - compatible: "ti,tps65090" | ||
| - reg: I2C slave address | ||
| - interrupts: the interrupt outputs of the controller | ||
| - regulators: A node that houses a sub-node for each regulator within the | ||
| device. Each sub-node is identified using the node's name, with valid | ||
| values listed below. The content of each sub-node is defined by the | ||
| standard binding for regulators; see regulator.txt. | ||
| dcdc[1-3], fet[1-7] and ldo[1-2] respectively. | ||
| - vsys[1-3]-supply: The input supply for DCDC[1-3] respectively. | ||
| - infet[1-7]-supply: The input supply for FET[1-7] respectively. | ||
| - vsys-l[1-2]-supply: The input supply for LDO[1-2] respectively. | ||
|
|
||
| Optional properties: | ||
| - ti,enable-ext-control: This is applicable for DCDC1, DCDC2 and DCDC3. | ||
| If DCDCs are externally controlled then this property should be there. | ||
| - "dcdc-ext-control-gpios: This is applicable for DCDC1, DCDC2 and DCDC3. | ||
| If DCDCs are externally controlled and if it is from GPIO then GPIO | ||
| number should be provided. If it is externally controlled and no GPIO | ||
| entry then driver will just configure this rails as external control | ||
| and will not provide any enable/disable APIs. | ||
|
|
||
| Each regulator is defined using the standard binding for regulators. | ||
|
|
||
| Example: | ||
|
|
||
| tps65090@48 { | ||
| compatible = "ti,tps65090"; | ||
| reg = <0x48>; | ||
| interrupts = <0 88 0x4>; | ||
|
|
||
| vsys1-supply = <&some_reg>; | ||
| vsys2-supply = <&some_reg>; | ||
| vsys3-supply = <&some_reg>; | ||
| infet1-supply = <&some_reg>; | ||
| infet2-supply = <&some_reg>; | ||
| infet3-supply = <&some_reg>; | ||
| infet4-supply = <&some_reg>; | ||
| infet5-supply = <&some_reg>; | ||
| infet6-supply = <&some_reg>; | ||
| infet7-supply = <&some_reg>; | ||
| vsys_l1-supply = <&some_reg>; | ||
| vsys_l2-supply = <&some_reg>; | ||
|
|
||
| regulators { | ||
| dcdc1 { | ||
| regulator-name = "dcdc1"; | ||
| regulator-boot-on; | ||
| regulator-always-on; | ||
| ti,enable-ext-control; | ||
| dcdc-ext-control-gpios = <&gpio 10 0>; | ||
| }; | ||
|
|
||
| dcdc2 { | ||
| regulator-name = "dcdc2"; | ||
| regulator-boot-on; | ||
| regulator-always-on; | ||
| }; | ||
|
|
||
| dcdc3 { | ||
| regulator-name = "dcdc3"; | ||
| regulator-boot-on; | ||
| regulator-always-on; | ||
| }; | ||
|
|
||
| fet1 { | ||
| regulator-name = "fet1"; | ||
| regulator-boot-on; | ||
| regulator-always-on; | ||
| }; | ||
|
|
||
| fet2 { | ||
| regulator-name = "fet2"; | ||
| regulator-boot-on; | ||
| regulator-always-on; | ||
| }; | ||
|
|
||
| fet3 { | ||
| regulator-name = "fet3"; | ||
| regulator-boot-on; | ||
| regulator-always-on; | ||
| }; | ||
|
|
||
| fet4 { | ||
| regulator-name = "fet4"; | ||
| regulator-boot-on; | ||
| regulator-always-on; | ||
| }; | ||
|
|
||
| fet5 { | ||
| regulator-name = "fet5"; | ||
| regulator-boot-on; | ||
| regulator-always-on; | ||
| }; | ||
|
|
||
| fet6 { | ||
| regulator-name = "fet6"; | ||
| regulator-boot-on; | ||
| regulator-always-on; | ||
| }; | ||
|
|
||
| fet7 { | ||
| regulator-name = "fet7"; | ||
| regulator-boot-on; | ||
| regulator-always-on; | ||
| }; | ||
|
|
||
| ldo1 { | ||
| regulator-name = "ldo1"; | ||
| regulator-boot-on; | ||
| regulator-always-on; | ||
| }; | ||
|
|
||
| ldo2 { | ||
| regulator-name = "ldo2"; | ||
| regulator-boot-on; | ||
| regulator-always-on; | ||
| }; | ||
| }; | ||
| }; |
10 changes: 10 additions & 0 deletions
10
Documentation/devicetree/bindings/video/backlight/max8925-backlight.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| 88pm860x-backlight bindings | ||
|
|
||
| Optional properties: | ||
| - maxim,max8925-dual-string: whether support dual string | ||
|
|
||
| Example: | ||
|
|
||
| backlights { | ||
| maxim,max8925-dual-string = <0>; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.