Commit ee641009 authored by Shawn Guo's avatar Shawn Guo
Browse files

Merge tag 'ib-mfd-arm-v3.18' into imx/dt 

Immutable branch between MFD and some ARM sub-arch maintainers.
parents 69e273c0 bd597f47

Documentation/devicetree/bindings/i2c/trivial-devices.txt

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ dallas,ds1775 Tiny Digital Thermometer and Thermostat 
dallas,ds3232		Extremely Accurate I²C RTC with Integrated Crystal and SRAM

dallas,ds4510		CPU Supervisor with Nonvolatile Memory and Programmable I/O

dallas,ds75		Digital Thermometer and Thermostat

dialog,da9053		DA9053: flexible system level PMIC with multicore support

dlg,da9053		DA9053: flexible system level PMIC with multicore support

epson,rx8025		High-Stability. I2C-Bus INTERFACE REAL TIME CLOCK MODULE

epson,rx8581		I2C-BUS INTERFACE REAL TIME CLOCK MODULE

fsl,mag3110		MAG3110: Xtrinsic High Accuracy, 3D Magnetometer

Documentation/devicetree/bindings/regulator/da9210.txt

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


Required properties:



- compatible:	must be "diasemi,da9210"

- compatible:	must be "dlg,da9210"

- reg:		the i2c slave address of the regulator. It should be 0x68.



Any standard regulator properties can be used to configure the single da9210
@@ -11,7 +11,7 @@ DCDC. 
Example:



	da9210@68 {

		compatible = "diasemi,da9210";

		compatible = "dlg,da9210";

		reg = <0x68>;



		regulator-min-microvolt = <900000>;

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ dallas Maxim Integrated Products (formerly Dallas Semiconductor) 
davicom	DAVICOM Semiconductor, Inc.

denx	Denx Software Engineering

digi	Digi International Inc.

dlg	Dialog Semiconductor

dlink	D-Link Corporation

dmo	Data Modul AG

ebv	EBV Elektronik

arch/arm/boot/dts/imx53-smd.dts

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ camera: ov5642@3c { 
	};



	pmic: dialog@48 {

		compatible = "dialog,da9053", "dialog,da9052";

		compatible = "dlg,da9053", "dlg,da9052";

		reg = <0x48>;

	};

};

arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ eeprom@50 { 
	};



	pmic@58 {

		compatible = "dialog,da9063";

		compatible = "dlg,da9063";

		reg = <0x58>;

		interrupt-parent = <&gpio4>;

		interrupts = <17 0x8>; /* active-low GPIO4_17 */