devicetree: Dialog Semiconductor consolidate existing vendor prefixes to standardise on 'dlg'

This patch series updates the device tree vendor prefix for
Dialog Semiconductor.

Various methods are currently used throughout the kernel: 'diasemi',
'dialog' and 'dlg'. Others have also been suggested.

This patch set aims to consolidate the usage of the vendor prefix to
use a common standard. The prefix 'dlg' is used.

Signed-off-by: Steve Twiss <stwiss.opensource@diasemi.com>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Rob Herring <robh@kernel.org>
Acked-by: Lee Jones <lee.jones@linaro.org>
Acked-by: Shawn Guo <shawn.guo@freescale.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

8 files changed, 21 insertions, 20 deletions

diff --git a/Documentation/devicetree/bindings/i2c/trivial-devices.txt b/Documentation/devicetree/bindings/i2c/trivial-devices.txt
index 6af570ec53b4..5af3d9df6ecb 100644
--- a/Documentation/devicetree/bindings/i2c/trivial-devices.txt
+++ b/Documentation/devicetree/bindings/i2c/trivial-devices.txt
@@ -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
diff --git a/Documentation/devicetree/bindings/regulator/da9210.txt b/Documentation/devicetree/bindings/regulator/da9210.txt
index f120f229d67d..3297c53cb915 100644
--- a/Documentation/devicetree/bindings/regulator/da9210.txt
+++ b/Documentation/devicetree/bindings/regulator/da9210.txt
@@ -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>;
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index ac7269f90764..f4318d7be35c 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -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
diff --git a/arch/arm/boot/dts/imx53-smd.dts b/arch/arm/boot/dts/imx53-smd.dts
index 5ec1590ff7bc..1d325576bcc0 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 2694aa84e187..0e50bb0a6b94 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 856b4236b674..e3db1056d002 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 be59014474b2..be29711ff319 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>;
diff --git a/drivers/mfd/da9055-core.c b/drivers/mfd/da9055-core.c
index caf8dcffd0ad..b4d920c1ead1 100644
--- a/drivers/mfd/da9055-core.c
+++ b/drivers/mfd/da9055-core.c
@@ -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",
         },
 };