mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-30 14:19:16 +00:00
Code Issues Releases Wiki Activity

Immutable branch between MFD and some ARM sub-arch maintainers.

Browse source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUAENKAAoJEFGvii+H/HdhBFAQAK3GH6D8Ie7GmIx4IgqgrXOn
 bZi2ZsSRJPMQE5qIIOlVfacOEg329//M2ZPUtYoJsyFFM5aJf+OxIk1TbK+S5c9F
 ybP0TT23RD88UCSzDBpryIfaUHoUaZy+dchzezFsUHNYYg/wt94yRBHGfx5Fmqsk
 doXxlitc5OPbsQ6oRN5znnyxmkwP62NuTlz+hJNSaxi39paUQRLUe44xP9BezbMR
 B0d2wHghkfEkLV1VMwgHek2bqTAb7/aInNnM5JGqjvmvq6M81nHE7FE+trlhmwWT
 1swG3MI8cWr5e8MtuFO3d74+BPbhAjmmJDT4FVffOm7C7Qbs7m/GYEB2FJ4QrZF3
 mIx2ipBCqpQra7+ctk+yX+fH2Ne2Ykd4XJ388JffIdYY4fxi3443GIueKyUhjj2j
 kb0/M5F/K+vA+U4BureR5LtcrBxWFcesxKVr91HdMUB8s1fd1QjL8sPgM7RseNfS
 UHISaXejyaRg0IVnBMlt9albiA5JlvxH3WiuKS3Z69wT/FPkK4MLGJlM2cDlIdAY
 PiyL8dsi/ANCv9rfrc5hWkT/Dzx9vmp7yr+lXuEvgJcDgErYe5awT+OHjP+uXX3K
 RJ2oLDV3pRmbnl3T9KzBn1e0cq9cDkmZjItyk5+oPIrVR37HuHGo0uDL/uDqUoqR
 fO+L5ibUCACkdu+cxl5S
 =T5Jh
 -----END PGP SIGNATURE-----

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

Immutable branch between MFD and some ARM sub-arch maintainers.
This commit is contained in:
Shawn Guo 2014-09-16 10:24:16 +08:00
commit ee64100953
8 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Documentation/devicetree/bindings/i2c/trivial-devices.txt
View file

@ -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

4
Documentation/devicetree/bindings/regulator/da9210.txt
View file

@ -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>;

1
Documentation/devicetree/bindings/vendor-prefixes.txt
View file

@ -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

2
arch/arm/boot/dts/imx53-smd.dts
View file

@ -265,7 +265,7 @@ camera: ov5642@3c {
};
pmic: dialog@48 {
compatible = "dialog,da9053", "dialog,da9052";
compatible = "dlg,da9053", "dlg,da9052";
reg = <0x48>;
};
};

2
arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
View file

@ -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 */

2
arch/arm/boot/dts/r8a7790-lager.dts
View file

@ -374,7 +374,7 @@ &iic3 {
status = "okay";
vdd_dvfs: regulator@68 {
compatible = "diasemi,da9210";
compatible = "dlg,da9210";
reg = <0x68>;
regulator-min-microvolt = <1000000>;

2
arch/arm/boot/dts/r8a7791-koelsch.dts
View file

@ -419,7 +419,7 @@ &i2c6 {
clock-frequency = <100000>;
vdd_dvfs: regulator@68 {
compatible = "diasemi,da9210";
compatible = "dlg,da9210";
reg = <0x68>;
regulator-min-microvolt = <1000000>;

26
drivers/mfd/da9055-core.c
View file

@ -296,73 +296,73 @@ static struct resource da9055_ld05_6_resource = {
static const struct mfd_cell da9055_devs[] = {
{
.of_compatible = "dialog,da9055-gpio",
.of_compatible = "dlg,da9055-gpio",
.name = "da9055-gpio",
},
{
.of_compatible = "dialog,da9055-regulator",
.of_compatible = "dlg,da9055-regulator",
.name = "da9055-regulator",
.id = 1,
},
{
.of_compatible = "dialog,da9055-regulator",
.of_compatible = "dlg,da9055-regulator",
.name = "da9055-regulator",
.id = 2,
},
{
.of_compatible = "dialog,da9055-regulator",
.of_compatible = "dlg,da9055-regulator",
.name = "da9055-regulator",
.id = 3,
},
{
.of_compatible = "dialog,da9055-regulator",
.of_compatible = "dlg,da9055-regulator",
.name = "da9055-regulator",
.id = 4,
},
{
.of_compatible = "dialog,da9055-regulator",
.of_compatible = "dlg,da9055-regulator",
.name = "da9055-regulator",
.id = 5,
},
{
.of_compatible = "dialog,da9055-regulator",
.of_compatible = "dlg,da9055-regulator",
.name = "da9055-regulator",
.id = 6,
},
{
.of_compatible = "dialog,da9055-regulator",
.of_compatible = "dlg,da9055-regulator",
.name = "da9055-regulator",
.id = 7,
.resources = &da9055_ld05_6_resource,
.num_resources = 1,
},
{
.of_compatible = "dialog,da9055-regulator",
.of_compatible = "dlg,da9055-regulator",
.name = "da9055-regulator",
.resources = &da9055_ld05_6_resource,
.num_resources = 1,
.id = 8,
},
{
.of_compatible = "dialog,da9055-onkey",
.of_compatible = "dlg,da9055-onkey",
.name = "da9055-onkey",
.resources = &da9055_onkey_resource,
.num_resources = 1,
},
{
.of_compatible = "dialog,da9055-rtc",
.of_compatible = "dlg,da9055-rtc",
.name = "da9055-rtc",
.resources = da9055_rtc_resource,
.num_resources = ARRAY_SIZE(da9055_rtc_resource),
},
{
.of_compatible = "dialog,da9055-hwmon",
.of_compatible = "dlg,da9055-hwmon",
.name = "da9055-hwmon",
.resources = &da9055_hwmon_resource,
.num_resources = 1,
},
{
.of_compatible = "dialog,da9055-watchdog",
.of_compatible = "dlg,da9055-watchdog",
.name = "da9055-watchdog",
},
};