Commit bab07062 authored by Lee Jones's avatar Lee Jones
Browse files

Merge branches 'ib-mfd-clk-4.6', 'ib-mfd-input-iio-4.6',...

Merge branches 'ib-mfd-clk-4.6', 'ib-mfd-input-iio-4.6', 'ib-mfd-regulator-4.6' and 'ib-mfd-regulator-gpio-4.6' into ibs-for-mfd-merged
Loading
Loading
Loading
Loading
+58 −0
Original line number Diff line number Diff line
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 −0
Original line number Diff line number Diff line
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>;
	};
+4 −3
Original line number Diff line number Diff line
@@ -5,11 +5,12 @@ axp152 (X-Powers)
axp202 (X-Powers)
axp209 (X-Powers)
axp221 (X-Powers)
axp223 (X-Powers)

Required properties:
- compatible: "x-powers,axp152", "x-powers,axp202", "x-powers,axp209",
	      "x-powers,axp221"
- reg: The I2C slave address for the AXP chip
	      "x-powers,axp221", "x-powers,axp223"
- reg: The I2C slave address or RSB hardware address for the AXP chip
- interrupt-parent: The parent interrupt controller
- interrupts: SoC NMI / GPIO interrupt connected to the PMIC's IRQ pin
- interrupt-controller: The PMIC has its own internal IRQs
@@ -51,7 +52,7 @@ LDO3 : LDO : ldo3in-supply
LDO4		: LDO		: ldo24in-supply	: shared supply
LDO5		: LDO		: ldo5in-supply

AXP221 regulators, type, and corresponding input supply names:
AXP221/AXP223 regulators, type, and corresponding input supply names:

Regulator	  Type		  Supply Name		  Notes
---------	  ----		  -----------		  -----
+47 −0
Original line number Diff line number Diff line
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>;
			...
		};
	};
+50 −0
Original line number Diff line number Diff line
* TPS65912 Power Management Integrated Circuit bindings

Required properties:
 - compatible		: Should be "ti,tps65912".
 - reg			: Slave address or chip select number (I2C / SPI).
 - interrupt-parent	: 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: dcdc[1-4] and
			    ldo[1-10]. Each child nodes is defined using the
			    standard binding for regulators.

Example:

	pmic: tps65912@2d {
		compatible = "ti,tps65912";
		reg = <0x2d>;
		interrupt-parent = <&gpio1>;
		interrupts = <28 IRQ_TYPE_LEVEL_LOW>;
		interrupt-controller;
		#interrupt-cells = <2>;
		gpio-controller;
		#gpio-cells = <2>;

		regulators {
			dcdc1 {
				regulator-name = "vdd_core";
				regulator-min-microvolt = <912000>;
				regulator-max-microvolt = <1144000>;
				regulator-boot-on;
				regulator-always-on;
			};

			ldo1 {
				regulator-name = "ldo1";
				regulator-min-microvolt = <1900000>;
				regulator-max-microvolt = <1900000>;
			};
		};
	};
Loading