diff options
| author | Shawn Guo <shawn.guo@freescale.com> | 2014-09-16 02:24:16 (GMT) |
|---|---|---|
| committer | Shawn Guo <shawn.guo@freescale.com> | 2014-09-16 02:24:16 (GMT) |
| commit | ee64100953e9657532cef5f7bdace3f8cc691c29 (patch) | |
| tree | a3481ced173b126071fb5558a1738758b98dcd70 /arch | |
| parent | 69e273c0b0a3c337a521d083374c918dc52c666f (diff) | |
| parent | bd597f47ca4bf7a522a0298a95c7f9b2f0a75b9e (diff) | |
| download | linux-ee64100953e9657532cef5f7bdace3f8cc691c29.tar.xz | |
Merge tag 'ib-mfd-arm-v3.18' into imx/dt
Immutable branch between MFD and some ARM sub-arch maintainers.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/imx53-smd.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/r8a7790-lager.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/r8a7791-koelsch.dts | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/imx53-smd.dts b/arch/arm/boot/dts/imx53-smd.dts index 5ec1590..1d32557 100644 --- a/arch/arm/boot/dts/imx53-smd.dts +++ b/arch/arm/boot/dts/imx53-smd.dts @@ -265,7 +265,7 @@ }; pmic: dialog@48 { - compatible = "dialog,da9053", "dialog,da9052"; + compatible = "dlg,da9053", "dlg,da9052"; reg = <0x48>; }; }; diff --git a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi index 2694aa8..0e50bb0 100644 --- a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi +++ b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi @@ -83,7 +83,7 @@ }; pmic@58 { - compatible = "dialog,da9063"; + compatible = "dlg,da9063"; reg = <0x58>; interrupt-parent = <&gpio4>; interrupts = <17 0x8>; /* active-low GPIO4_17 */ diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts index 856b423..e3db105 100644 --- a/arch/arm/boot/dts/r8a7790-lager.dts +++ b/arch/arm/boot/dts/r8a7790-lager.dts @@ -374,7 +374,7 @@ status = "okay"; vdd_dvfs: regulator@68 { - compatible = "diasemi,da9210"; + compatible = "dlg,da9210"; reg = <0x68>; regulator-min-microvolt = <1000000>; diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts index be59014..be29711 100644 --- a/arch/arm/boot/dts/r8a7791-koelsch.dts +++ b/arch/arm/boot/dts/r8a7791-koelsch.dts @@ -419,7 +419,7 @@ clock-frequency = <100000>; vdd_dvfs: regulator@68 { - compatible = "diasemi,da9210"; + compatible = "dlg,da9210"; reg = <0x68>; regulator-min-microvolt = <1000000>; |