-
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-for-linus-4.6' of git://git.kernel.org/pub/scm/linux/k…
…ernel/git/lee/mfd Pull MFD updates from Lee Jones: "New Drivers: - Freescale Touch Screen ADC - X-Powers AXP PMIC with RSB - TI TPS65086 Power Management IC (PMIC) New Device Support: - Supply device PCI IDs for Intel Broxton Fix-ups: - Move to clkdev_create() API; intel_quark_i2c_gpio - Complete re-write of TI's TPS65912 Power Management IC (PMIC) - Remove unnecessary function argument; axp20x - Separate out bus related code; axp20x - Coding Style changes; axp20x - Allow more drivers to be compiled as modules - Work around false positive 'used uninitialised' warning; db8500-prcmu Bug Fixes: - Remove do_div(); fsl-imx25-gcq - Fix driver init when built-in; tps65010 - Fix clock-unregister leak; intel-lpss" * tag 'mfd-for-linus-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (53 commits) mfd: intel-lpss: Pass I2C configuration via properties on BXT mfd: imx6sx: Add PCIe register definitions for iomuxc gpr mfd: ipaq-micro: Use __maybe_unused to hide pm functions mfd: max77686: Add max77802 to I2C device ID table mfd: max77686: Export OF module alias information mfd: max77686: Allow driver to be built as a module mfd: stmpe: Add the proper PWM resources mfd: tps65090: Set regmap config reg counts properly mfd: syscon: Return ENOTSUPP instead of ENOSYS when disabled mfd: as3711: Set regmap config reg counts properly mfd: rc5t583: Set regmap config reg counts properly gpio: tps65086: Add GPO driver for the TPS65086 PMIC mfd: mt6397: Add platform device ID table mfd: da9063: Fix missing volatile registers in the core regmap_range volatile lists mfd: mt6397: Add MT6323 support to MT6397 driver mfd: mt6397: Add support for different Slave types mfd: mt6397: int_con and int_status may vary in location dt-bindings: mfd: Add bindings for the MediaTek MT6323 PMIC mfd: da9062: Fix missing volatile registers in the core regmap_range volatile lists mfd: Add documentation for ACT8945A DT bindings ...
- Loading branch information
Showing
58 changed files
with
3,256 additions
and
277 deletions.
There are no files selected for viewing
58 changes: 58 additions & 0 deletions
58
Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.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,58 @@ | ||
| Freescale i.MX25 ADC GCQ device | ||
|
|
||
| This is a generic conversion queue device that can convert any of the | ||
| analog inputs using the ADC unit of the i.MX25. | ||
|
|
||
| Required properties: | ||
| - compatible: Should be "fsl,imx25-gcq". | ||
| - reg: Should be the register range of the module. | ||
| - interrupts: Should be the interrupt number of the module. | ||
| Typically this is <1>. | ||
| - interrupt-parent: phandle to the tsadc module of the i.MX25. | ||
| - #address-cells: Should be <1> (setting for the subnodes) | ||
| - #size-cells: Should be <0> (setting for the subnodes) | ||
|
|
||
| Optional properties: | ||
| - vref-ext-supply: The regulator supplying the ADC reference voltage. | ||
| Required when at least one subnode uses the this reference. | ||
| - vref-xp-supply: The regulator supplying the ADC reference voltage on pin XP. | ||
| Required when at least one subnode uses this reference. | ||
| - vref-yp-supply: The regulator supplying the ADC reference voltage on pin YP. | ||
| Required when at least one subnode uses this reference. | ||
|
|
||
| Sub-nodes: | ||
| Optionally you can define subnodes which define the reference voltage | ||
| for the analog inputs. | ||
|
|
||
| Required properties for subnodes: | ||
| - reg: Should be the number of the analog input. | ||
| 0: xp | ||
| 1: yp | ||
| 2: xn | ||
| 3: yn | ||
| 4: wiper | ||
| 5: inaux0 | ||
| 6: inaux1 | ||
| 7: inaux2 | ||
| Optional properties for subnodes: | ||
| - fsl,adc-refp: specifies the positive reference input as defined in | ||
| <dt-bindings/iio/adc/fsl-imx25-gcq.h> | ||
| - fsl,adc-refn: specifies the negative reference input as defined in | ||
| <dt-bindings/iio/adc/fsl-imx25-gcq.h> | ||
|
|
||
| Example: | ||
|
|
||
| adc: adc@50030800 { | ||
| compatible = "fsl,imx25-gcq"; | ||
| reg = <0x50030800 0x60>; | ||
| interrupt-parent = <&tscadc>; | ||
| interrupts = <1>; | ||
| #address-cells = <1>; | ||
| #size-cells = <0>; | ||
|
|
||
| inaux@5 { | ||
| reg = <5>; | ||
| fsl,adc-refp = <MX25_ADC_REFP_INT>; | ||
| fsl,adc-refn = <MX25_ADC_REFN_NGND>; | ||
| }; | ||
| }; |
35 changes: 35 additions & 0 deletions
35
Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.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,35 @@ | ||
| Freescale mx25 TS conversion queue module | ||
|
|
||
| mx25 touchscreen conversion queue module which controls the ADC unit of the | ||
| mx25 for attached touchscreens. | ||
|
|
||
| Required properties: | ||
| - compatible: Should be "fsl,imx25-tcq". | ||
| - reg: Memory range of the device. | ||
| - interrupts: Should be the interrupt number associated with this module within | ||
| the tscadc unit (<0>). | ||
| - interrupt-parent: Should be a phandle to the tscadc unit. | ||
| - fsl,wires: Should be '<4>' or '<5>' | ||
|
|
||
| Optional properties: | ||
| - fsl,pen-debounce-ns: Pen debounce time in nanoseconds. | ||
| - fsl,pen-threshold: Pen-down threshold for the touchscreen. This is a value | ||
| between 1 and 4096. It is the ratio between the internal reference voltage | ||
| and the measured voltage after the plate was precharged. Resistence between | ||
| plates and therefore the voltage decreases with pressure so that a smaller | ||
| value is equivalent to a higher pressure. | ||
| - fsl,settling-time-ns: Settling time in nanoseconds. The settling time is before | ||
| the actual touch detection to wait for an even charge distribution in the | ||
| plate. | ||
|
|
||
| This device includes two conversion queues which can be added as subnodes. | ||
| The first queue is for the touchscreen, the second for general purpose ADC. | ||
|
|
||
| Example: | ||
| tsc: tcq@50030400 { | ||
| compatible = "fsl,imx25-tcq"; | ||
| reg = <0x50030400 0x60>; | ||
| interrupt-parent = <&tscadc>; | ||
| interrupts = <0>; | ||
| fsl,wires = <4>; | ||
| }; |
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,76 @@ | ||
| Device-Tree bindings for Active-semi ACT8945A MFD driver | ||
|
|
||
| Required properties: | ||
| - compatible: "active-semi,act8945a". | ||
| - reg: the I2C slave address for the ACT8945A chip | ||
|
|
||
| The chip exposes two subdevices: | ||
| - a regulators: see ../regulator/act8945a-regulator.txt | ||
| - a charger: see ../power/act8945a-charger.txt | ||
|
|
||
| Example: | ||
| pmic@5b { | ||
| compatible = "active-semi,act8945a"; | ||
| reg = <0x5b>; | ||
| status = "okay"; | ||
|
|
||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&pinctrl_charger_chglev>; | ||
| active-semi,chglev-gpio = <&pioA 12 GPIO_ACTIVE_HIGH>; | ||
| active-semi,input-voltage-threshold-microvolt = <6600>; | ||
| active-semi,precondition-timeout = <40>; | ||
| active-semi,total-timeout = <3>; | ||
|
|
||
| active-semi,vsel-high; | ||
|
|
||
| regulators { | ||
| vdd_1v35_reg: REG_DCDC1 { | ||
| regulator-name = "VDD_1V35"; | ||
| regulator-min-microvolt = <1350000>; | ||
| regulator-max-microvolt = <1350000>; | ||
| regulator-always-on; | ||
| }; | ||
|
|
||
| vdd_1v2_reg: REG_DCDC2 { | ||
| regulator-name = "VDD_1V2"; | ||
| regulator-min-microvolt = <1100000>; | ||
| regulator-max-microvolt = <1300000>; | ||
| regulator-always-on; | ||
| }; | ||
|
|
||
| vdd_3v3_reg: REG_DCDC3 { | ||
| regulator-name = "VDD_3V3"; | ||
| regulator-min-microvolt = <3300000>; | ||
| regulator-max-microvolt = <3300000>; | ||
| regulator-always-on; | ||
| }; | ||
|
|
||
| vdd_fuse_reg: REG_LDO1 { | ||
| regulator-name = "VDD_FUSE"; | ||
| regulator-min-microvolt = <2500000>; | ||
| regulator-max-microvolt = <2500000>; | ||
| regulator-always-on; | ||
| }; | ||
|
|
||
| vdd_3v3_lp_reg: REG_LDO2 { | ||
| regulator-name = "VDD_3V3_LP"; | ||
| regulator-min-microvolt = <3300000>; | ||
| regulator-max-microvolt = <3300000>; | ||
| regulator-always-on; | ||
| }; | ||
|
|
||
| vdd_led_reg: REG_LDO3 { | ||
| regulator-name = "VDD_LED"; | ||
| regulator-min-microvolt = <3300000>; | ||
| regulator-max-microvolt = <3300000>; | ||
| regulator-always-on; | ||
| }; | ||
|
|
||
| vdd_sdhc_1v8_reg: REG_LDO4 { | ||
| regulator-name = "VDD_SDHC_1V8"; | ||
| regulator-min-microvolt = <1800000>; | ||
| regulator-max-microvolt = <1800000>; | ||
| regulator-always-on; | ||
| }; | ||
| }; | ||
| }; |
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
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,47 @@ | ||
| Freescale MX25 ADC/TSC MultiFunction Device (MFD) | ||
|
|
||
| This device combines two general purpose conversion queues one used for general | ||
| ADC and the other used for touchscreens. | ||
|
|
||
| Required properties: | ||
| - compatible: Should be "fsl,imx25-tsadc". | ||
| - reg: Start address and size of the memory area of | ||
| the device | ||
| - interrupts: Interrupt for this device | ||
| (See: ../interrupt-controller/interrupts.txt) | ||
| - clocks: An 'ipg' clock (See: ../clock/clock-bindings.txt) | ||
| - interrupt-controller: This device is an interrupt controller. It | ||
| controls the interrupts of both | ||
| conversion queues. | ||
| - #interrupt-cells: Should be '<1>'. | ||
| - #address-cells: Should be '<1>'. | ||
| - #size-cells: Should be '<1>'. | ||
|
|
||
| This device includes two conversion queues which can be added as subnodes. | ||
| The first queue is for the touchscreen, the second for general purpose ADC. | ||
|
|
||
| Example: | ||
| tscadc: tscadc@50030000 { | ||
| compatible = "fsl,imx25-tsadc"; | ||
| reg = <0x50030000 0xc>; | ||
| interrupts = <46>; | ||
| clocks = <&clks 119>; | ||
| clock-names = "ipg"; | ||
| interrupt-controller; | ||
| #interrupt-cells = <1>; | ||
| #address-cells = <1>; | ||
| #size-cells = <1>; | ||
| ranges; | ||
|
|
||
| tsc: tcq@50030400 { | ||
| compatible = "fsl,imx25-tcq"; | ||
| reg = <0x50030400 0x60>; | ||
| ... | ||
| }; | ||
|
|
||
| adc: gcq@50030800 { | ||
| compatible = "fsl,imx25-gcq"; | ||
| reg = <0x50030800 0x60>; | ||
| ... | ||
| }; | ||
| }; |
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
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,55 @@ | ||
| * TPS65086 Power Management Integrated Circuit (PMIC) bindings | ||
|
|
||
| Required properties: | ||
| - compatible : Should be "ti,tps65086". | ||
| - reg : I2C slave address. | ||
| - interrupt-parent : Phandle to the parent interrupt controller. | ||
| - interrupts : The interrupt line the device is connected to. | ||
| - interrupt-controller : Marks the device node as an interrupt controller. | ||
| - #interrupt-cells : The number of cells to describe an IRQ, should be 2. | ||
| The first cell is the IRQ number. | ||
| The second cell is the flags, encoded as trigger | ||
| masks from ../interrupt-controller/interrupts.txt. | ||
| - gpio-controller : Marks the device node as a GPIO Controller. | ||
| - #gpio-cells : Should be two. The first cell is the pin number and | ||
| the second cell is used to specify flags. | ||
| See ../gpio/gpio.txt for more information. | ||
| - regulators: : List of child nodes that specify the regulator | ||
| initialization data. Child nodes must be named | ||
| after their hardware counterparts: buck[1-6], | ||
| ldoa[1-3], swa1, swb[1-2], and vtt. Each child | ||
| node is defined using the standard binding for | ||
| regulators and the optional regulator properties | ||
| defined below. | ||
|
|
||
| Optional regulator properties: | ||
| - ti,regulator-step-size-25mv : This is applicable for buck[1,2,6], set this | ||
| if the regulator is factory set with a 25mv | ||
| step voltage mapping. | ||
| - ti,regulator-decay : This is applicable for buck[1-6], set this if | ||
| the output needs to decay, default is for | ||
| the output to slew down. | ||
|
|
||
| Example: | ||
|
|
||
| pmic: tps65086@5e { | ||
| compatible = "ti,tps65086"; | ||
| reg = <0x5e>; | ||
| interrupt-parent = <&gpio1>; | ||
| interrupts = <28 IRQ_TYPE_LEVEL_LOW>; | ||
| interrupt-controller; | ||
| #interrupt-cells = <2>; | ||
| gpio-controller; | ||
| #gpio-cells = <2>; | ||
|
|
||
| regulators { | ||
| buck1 { | ||
| regulator-name = "vcc1"; | ||
| regulator-min-microvolt = <1600000>; | ||
| regulator-max-microvolt = <1600000>; | ||
| regulator-boot-on; | ||
| ti,regulator-decay; | ||
| ti,regulator-step-size-25mv; | ||
| }; | ||
| }; | ||
| }; |
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
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.