Browse Source

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>
Steve Twiss 11 years ago
parent
commit
bd597f47ca

+ 1 - 1
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,ds3232		Extremely Accurate I²C RTC with Integrated Crystal and SRAM
 dallas,ds4510		CPU Supervisor with Nonvolatile Memory and Programmable I/O
 dallas,ds4510		CPU Supervisor with Nonvolatile Memory and Programmable I/O
 dallas,ds75		Digital Thermometer and Thermostat
 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,rx8025		High-Stability. I2C-Bus INTERFACE REAL TIME CLOCK MODULE
 epson,rx8581		I2C-BUS INTERFACE REAL TIME CLOCK MODULE
 epson,rx8581		I2C-BUS INTERFACE REAL TIME CLOCK MODULE
 fsl,mag3110		MAG3110: Xtrinsic High Accuracy, 3D Magnetometer
 fsl,mag3110		MAG3110: Xtrinsic High Accuracy, 3D Magnetometer

+ 2 - 2
Documentation/devicetree/bindings/regulator/da9210.txt

@@ -2,7 +2,7 @@
 
 
 Required properties:
 Required properties:
 
 
-- compatible:	must be "diasemi,da9210"
+- compatible:	must be "dlg,da9210"
 - reg:		the i2c slave address of the regulator. It should be 0x68.
 - reg:		the i2c slave address of the regulator. It should be 0x68.
 
 
 Any standard regulator properties can be used to configure the single da9210
 Any standard regulator properties can be used to configure the single da9210
@@ -11,7 +11,7 @@ DCDC.
 Example:
 Example:
 
 
 	da9210@68 {
 	da9210@68 {
-		compatible = "diasemi,da9210";
+		compatible = "dlg,da9210";
 		reg = <0x68>;
 		reg = <0x68>;
 
 
 		regulator-min-microvolt = <900000>;
 		regulator-min-microvolt = <900000>;

+ 1 - 0
Documentation/devicetree/bindings/vendor-prefixes.txt

@@ -38,6 +38,7 @@ dallas	Maxim Integrated Products (formerly Dallas Semiconductor)
 davicom	DAVICOM Semiconductor, Inc.
 davicom	DAVICOM Semiconductor, Inc.
 denx	Denx Software Engineering
 denx	Denx Software Engineering
 digi	Digi International Inc.
 digi	Digi International Inc.
+dlg	Dialog Semiconductor
 dlink	D-Link Corporation
 dlink	D-Link Corporation
 dmo	Data Modul AG
 dmo	Data Modul AG
 ebv	EBV Elektronik
 ebv	EBV Elektronik

+ 1 - 1
arch/arm/boot/dts/imx53-smd.dts

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

+ 1 - 1
arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi

@@ -83,7 +83,7 @@
 	};
 	};
 
 
 	pmic@58 {
 	pmic@58 {
-		compatible = "dialog,da9063";
+		compatible = "dlg,da9063";
 		reg = <0x58>;
 		reg = <0x58>;
 		interrupt-parent = <&gpio4>;
 		interrupt-parent = <&gpio4>;
 		interrupts = <17 0x8>; /* active-low GPIO4_17 */
 		interrupts = <17 0x8>; /* active-low GPIO4_17 */

+ 1 - 1
arch/arm/boot/dts/r8a7790-lager.dts

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

+ 1 - 1
arch/arm/boot/dts/r8a7791-koelsch.dts

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

+ 13 - 13
drivers/mfd/da9055-core.c

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