Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

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

Shawn Guo ee641009 69e273c0

+21 -20
+1 -1
Documentation/devicetree/bindings/i2c/trivial-devices.txt
··· 44 44 dallas,ds3232 Extremely Accurate I²C RTC with Integrated Crystal and SRAM 45 45 dallas,ds4510 CPU Supervisor with Nonvolatile Memory and Programmable I/O 46 46 dallas,ds75 Digital Thermometer and Thermostat 47 - dialog,da9053 DA9053: flexible system level PMIC with multicore support 47 + dlg,da9053 DA9053: flexible system level PMIC with multicore support 48 48 epson,rx8025 High-Stability. I2C-Bus INTERFACE REAL TIME CLOCK MODULE 49 49 epson,rx8581 I2C-BUS INTERFACE REAL TIME CLOCK MODULE 50 50 fsl,mag3110 MAG3110: Xtrinsic High Accuracy, 3D Magnetometer
+2 -2
Documentation/devicetree/bindings/regulator/da9210.txt
··· 2 2 3 3 Required properties: 4 4 5 - - compatible: must be "diasemi,da9210" 5 + - compatible: must be "dlg,da9210" 6 6 - reg: the i2c slave address of the regulator. It should be 0x68. 7 7 8 8 Any standard regulator properties can be used to configure the single da9210 ··· 11 11 Example: 12 12 13 13 da9210@68 { 14 - compatible = "diasemi,da9210"; 14 + compatible = "dlg,da9210"; 15 15 reg = <0x68>; 16 16 17 17 regulator-min-microvolt = <900000>;
+1
Documentation/devicetree/bindings/vendor-prefixes.txt
··· 38 38 davicom DAVICOM Semiconductor, Inc. 39 39 denx Denx Software Engineering 40 40 digi Digi International Inc. 41 + dlg Dialog Semiconductor 41 42 dlink D-Link Corporation 42 43 dmo Data Modul AG 43 44 ebv EBV Elektronik
+1 -1
arch/arm/boot/dts/imx53-smd.dts
··· 265 265 }; 266 266 267 267 pmic: dialog@48 { 268 - compatible = "dialog,da9053", "dialog,da9052"; 268 + compatible = "dlg,da9053", "dlg,da9052"; 269 269 reg = <0x48>; 270 270 }; 271 271 };
+1 -1
arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
··· 83 83 }; 84 84 85 85 pmic@58 { 86 - compatible = "dialog,da9063"; 86 + compatible = "dlg,da9063"; 87 87 reg = <0x58>; 88 88 interrupt-parent = <&gpio4>; 89 89 interrupts = <17 0x8>; /* active-low GPIO4_17 */
+1 -1
arch/arm/boot/dts/r8a7790-lager.dts
··· 374 374 status = "okay"; 375 375 376 376 vdd_dvfs: regulator@68 { 377 - compatible = "diasemi,da9210"; 377 + compatible = "dlg,da9210"; 378 378 reg = <0x68>; 379 379 380 380 regulator-min-microvolt = <1000000>;
+1 -1
arch/arm/boot/dts/r8a7791-koelsch.dts
··· 419 419 clock-frequency = <100000>; 420 420 421 421 vdd_dvfs: regulator@68 { 422 - compatible = "diasemi,da9210"; 422 + compatible = "dlg,da9210"; 423 423 reg = <0x68>; 424 424 425 425 regulator-min-microvolt = <1000000>;
+13 -13
drivers/mfd/da9055-core.c
··· 296 296 297 297 static const struct mfd_cell da9055_devs[] = { 298 298 { 299 - .of_compatible = "dialog,da9055-gpio", 299 + .of_compatible = "dlg,da9055-gpio", 300 300 .name = "da9055-gpio", 301 301 }, 302 302 { 303 - .of_compatible = "dialog,da9055-regulator", 303 + .of_compatible = "dlg,da9055-regulator", 304 304 .name = "da9055-regulator", 305 305 .id = 1, 306 306 }, 307 307 { 308 - .of_compatible = "dialog,da9055-regulator", 308 + .of_compatible = "dlg,da9055-regulator", 309 309 .name = "da9055-regulator", 310 310 .id = 2, 311 311 }, 312 312 { 313 - .of_compatible = "dialog,da9055-regulator", 313 + .of_compatible = "dlg,da9055-regulator", 314 314 .name = "da9055-regulator", 315 315 .id = 3, 316 316 }, 317 317 { 318 - .of_compatible = "dialog,da9055-regulator", 318 + .of_compatible = "dlg,da9055-regulator", 319 319 .name = "da9055-regulator", 320 320 .id = 4, 321 321 }, 322 322 { 323 - .of_compatible = "dialog,da9055-regulator", 323 + .of_compatible = "dlg,da9055-regulator", 324 324 .name = "da9055-regulator", 325 325 .id = 5, 326 326 }, 327 327 { 328 - .of_compatible = "dialog,da9055-regulator", 328 + .of_compatible = "dlg,da9055-regulator", 329 329 .name = "da9055-regulator", 330 330 .id = 6, 331 331 }, 332 332 { 333 - .of_compatible = "dialog,da9055-regulator", 333 + .of_compatible = "dlg,da9055-regulator", 334 334 .name = "da9055-regulator", 335 335 .id = 7, 336 336 .resources = &da9055_ld05_6_resource, 337 337 .num_resources = 1, 338 338 }, 339 339 { 340 - .of_compatible = "dialog,da9055-regulator", 340 + .of_compatible = "dlg,da9055-regulator", 341 341 .name = "da9055-regulator", 342 342 .resources = &da9055_ld05_6_resource, 343 343 .num_resources = 1, 344 344 .id = 8, 345 345 }, 346 346 { 347 - .of_compatible = "dialog,da9055-onkey", 347 + .of_compatible = "dlg,da9055-onkey", 348 348 .name = "da9055-onkey", 349 349 .resources = &da9055_onkey_resource, 350 350 .num_resources = 1, 351 351 }, 352 352 { 353 - .of_compatible = "dialog,da9055-rtc", 353 + .of_compatible = "dlg,da9055-rtc", 354 354 .name = "da9055-rtc", 355 355 .resources = da9055_rtc_resource, 356 356 .num_resources = ARRAY_SIZE(da9055_rtc_resource), 357 357 }, 358 358 { 359 - .of_compatible = "dialog,da9055-hwmon", 359 + .of_compatible = "dlg,da9055-hwmon", 360 360 .name = "da9055-hwmon", 361 361 .resources = &da9055_hwmon_resource, 362 362 .num_resources = 1, 363 363 }, 364 364 { 365 - .of_compatible = "dialog,da9055-watchdog", 365 + .of_compatible = "dlg,da9055-watchdog", 366 366 .name = "da9055-watchdog", 367 367 }, 368 368 };