Immutable branch between MFD and some ARM sub-arch maintainers.
-----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:
Коммит
ee64100953
|
@ -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
|
||||
|
|
|
@ -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>;
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -265,7 +265,7 @@
|
|||
};
|
||||
|
||||
pmic: dialog@48 {
|
||||
compatible = "dialog,da9053", "dialog,da9052";
|
||||
compatible = "dlg,da9053", "dlg,da9052";
|
||||
reg = <0x48>;
|
||||
};
|
||||
};
|
||||
|
|
|
@ -83,7 +83,7 @@
|
|||
};
|
||||
|
||||
pmic@58 {
|
||||
compatible = "dialog,da9063";
|
||||
compatible = "dlg,da9063";
|
||||
reg = <0x58>;
|
||||
interrupt-parent = <&gpio4>;
|
||||
interrupts = <17 0x8>; /* active-low GPIO4_17 */
|
||||
|
|
|
@ -374,7 +374,7 @@
|
|||
status = "okay";
|
||||
|
||||
vdd_dvfs: regulator@68 {
|
||||
compatible = "diasemi,da9210";
|
||||
compatible = "dlg,da9210";
|
||||
reg = <0x68>;
|
||||
|
||||
regulator-min-microvolt = <1000000>;
|
||||
|
|
|
@ -419,7 +419,7 @@
|
|||
clock-frequency = <100000>;
|
||||
|
||||
vdd_dvfs: regulator@68 {
|
||||
compatible = "diasemi,da9210";
|
||||
compatible = "dlg,da9210";
|
||||
reg = <0x68>;
|
||||
|
||||
regulator-min-microvolt = <1000000>;
|
||||
|
|
|
@ -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",
|
||||
},
|
||||
};
|
||||
|
|
Загрузка…
Ссылка в новой задаче