[RESEND PATCH V2] devicetree: Dialog Semiconductor consolidate existing vendor prefixes to standardise on 'dlg'

[RESEND PATCH V2] devicetree: Dialog Semiconductor consolidate existing vendor prefixes to standardise on 'dlg'

[Opensource [Steve Twiss]]

From: Steve Twiss <stwiss.opensource@diasemi.com>

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.

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: Steve Twiss <stwiss.opensource@diasemi.com>

---
Checks performed with linux-next/next-20140715/scripts/checkpatch.pl
 trivial-devices.txt       total: 0 errors, 0 warnings, 89 lines checked
 da9210.txt                total: 0 errors, 0 warnings, 21 lines checked
 vendor-prefixes.txt       total: 0 errors, 0 warnings, 149 lines checked
 imx53-smd.dts             total: 0 errors, 2 warnings, 279 lines checked
 imx6qdl-phytec-pfla02.dtsi total: 0 errors, 2 warnings, 357 lines checked
 r8a7790-lager.dts         total: 0 errors, 3 warnings, 403 lines checked
 r8a7791-koelsch.dts       total: 0 errors, 4 warnings, 461 lines checked
 da9055-core.c             total: 0 errors, 0 warnings, 428 lines checked

Hi Lee,

This is a resend according to requests for e-mail reformatting and removal
of '[]' in From: and Signed-off-by: tags. There are no patch alterations
from RFC V2.

I have got the Ack for the two remaining files r8a7790-lager.dts and
r8a7791-koelsch.dts because of the previous request for SHMobile to Ack
their part of the patch.
- http://www.spinics.net/lists/arm-kernel/msg349289.html
- https://lkml.org/lkml/2014/6/11/273

I think this is it. But, if I am missing anything or there are problems, can
I get a quick explanation in the reply so I can fix it and move forwards
please?

In full:
Acked-by the following people so far:

- Simon Horman
  https://lkml.org/lkml/2014/7/29/767

- Rob Herring
  http://www.spinics.net/lists/arm-kernel/msg349289.html

- Lee Jones
  For the MFD changes:
  http://www.spinics.net/lists/arm-kernel/msg349457.html

- Shawn Guo
  arch/arm/boot/dts/imx53-smd.dts                    |  2 +-
  arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi       |  2 +-
  http://www.spinics.net/lists/arm-kernel/msg349398.html

Here is my working for justifying this change:

./arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
	Has the following entry:
	compatible = "dialog,da9063";
	However the DA9063 driver does not support device tree yet so
	it would be safe to rename this.

./arch/arm/boot/dts/imx53-smd.dts
	Has the following entry:
	compatible = "dialog,da9053", "dialog,da9052";
	However, the existing driver files for DA9053 define a different
	compatible string with the "dlg" prefix. See the entries below.
	None of these would have allowed the "dialog" prefix.
	{ .compatible = "dlg,da9052", .data = &da9052_i2c_id[0] },
	{ .compatible = "dlg,da9053-aa", .data = &da9052_i2c_id[1] },
	{ .compatible = "dlg,da9053-ba", .data = &da9052_i2c_id[2] },
	{ .compatible = "dlg,da9053-bb", .data = &da9052_i2c_id[3] },
	{ .compatible = "dlg,da9053-bc", .data = &da9052_i2c_id[4] },
	In this particular case the change for DA9053 did not match up
	with the expected compatibility strings and therefore I have
	retained the more general "dlg,da9053" because I do not know
	which silicon variant (-aa, -ba, -bb, or -bc) is the correct
	one to use.

./devicetree/bindings/i2c/trivial-devices.txt
	Has the following entry:
	dialog,da9053  DA9053: flexible system level PMIC with multicore support
	Instead of depreciating this "dialog" line am just replacing it
	with a "dlg" because the existing driver DA9053 does not support
	the dialog keyword.

./drivers/mfd/da9055-core.c
	Has the following entries for the mfd cells 
		.of_compatible = "dialog,da9055-gpio", etc...
	In this case, the driver does not actually pass in any platform data
	to any of the mfd cells and so they are not actually used
	yet in the driver. Nobody else references this information
	so they can safely be changed.

./devicetree/bindings/regulator/da9210.txt
	Has the following two entries in the binding file:
	- compatible:	must be "diasemi,da9210"
	compatible = "diasemi,da9210";
	However the DA9210 driver does not support device tree.

./arch/arm/boot/dts/r8a7790-lager.dts
./arch/arm/boot/dts/r8a7791-koelsch.dts
	These two files have the following entries:
	compatible = "diasemi,da9210";
	These both reference the "diasemi,da9210" but the device
	driver does not support device tree

The remaining files in the kernel I have found correctly references
the driver files compatibility information and so did not need to
be changed.

./devicetree/bindings/mfd/da9052-i2c.txt
	- compatible : Should be "dlg,da9052", "dlg,da9053-aa",
		 "dlg,da9053-ab", or "dlg,da9053-bb"

./devicetree/bindings/mfd/da9055.txt
	compatible = "dlg,da9055-pmic";

./arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi
	compatible = "dlg,da9053-aa", "dlg,da9052";

./arch/arm/boot/dts/imx53-qsb.dts
	compatible = "dlg,da9053-aa", "dlg,da9052";

./devicetree/bindings/sound/da9055.txt
	- compatible: "dlg,da9055-codec"
	compatible = "dlg,da9055-codec";


This e-mail is in response to the previous threads here:
https://lkml.org/lkml/2014/6/11/262
http://comments.gmane.org/gmane.linux.ports.arm.kernel/341358

Changes since RFC V1
- addition of changes to DTS files referencing "diasemi,da9210"
   arch/arm/boot/dts/r8a7790-lager.dts
   arch/arm/boot/dts/r8a7791-koelsch.dts

Changes to e-mail content (no patch changes) since RFC V2
- reformatted e-mail according to comments
  http://www.spinics.net/lists/arm-kernel/msg349289.html
  http://www.spinics.net/lists/arm-kernel/msg349809.html

This RFC V2 resend does not answer the response to RFC V1
from Mark Brown:
http://www.spinics.net/lists/arm-kernel/msg347615.html

This patch applies against linux-next and next-20140715 

Regards,
Steve Twiss, Dialog Semiconductor Ltd.



 .../devicetree/bindings/i2c/trivial-devices.txt    |    2 +-
 .../devicetree/bindings/regulator/da9210.txt       |    4 +--
 .../devicetree/bindings/vendor-prefixes.txt        |    1 +
 arch/arm/boot/dts/imx53-smd.dts                    |    2 +-
 arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi       |    2 +-
 arch/arm/boot/dts/r8a7790-lager.dts                |    2 +-
 arch/arm/boot/dts/r8a7791-koelsch.dts              |    2 +-
 drivers/mfd/da9055-core.c                          |   26 ++++++++++----------
 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 37803eb..a02b8a1 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 f120f22..3297c53 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 5d27e5a..35a833e 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -37,6 +37,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 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 23486c0..33b9532 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -426,7 +426,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 caf8dcf..b4d920c 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",
 	},
 };
-- 
end-of-patch for RESEND PATCH RFC V2

Re: [RESEND PATCH V2] devicetree: Dialog Semiconductor consolidate existing vendor prefixes to standardise on 'dlg'

[Lee Jones]

On Fri, 22 Aug 2014, Opensource [Steve Twiss] wrote:
> From: Steve Twiss <stwiss.opensource@diasemi.com>
> 
> 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.
> 
> 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: Steve Twiss <stwiss.opensource@diasemi.com>
> 
> ---

[...]

> Hi Lee,
> 
> This is a resend according to requests for e-mail reformatting and removal
> of '[]' in From: and Signed-off-by: tags. There are no patch alterations
> from RFC V2.
> 
> I have got the Ack for the two remaining files r8a7790-lager.dts and
> r8a7791-koelsch.dts because of the previous request for SHMobile to Ack
> their part of the patch.
> - http://www.spinics.net/lists/arm-kernel/msg349289.html
> - https://lkml.org/lkml/2014/6/11/273
> 
> I think this is it. But, if I am missing anything or there are problems, can
> I get a quick explanation in the reply so I can fix it and move forwards
> please?
> 
> In full:
> Acked-by the following people so far:

When you say "so far", does that mean you're missing Acks still?

If you have the full-set I will apply this and send out the necessary
pull-request(s).

[...]

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

RE: [RESEND PATCH V2] devicetree: Dialog Semiconductor consolidate existing vendor prefixes to standardise on 'dlg'

[Opensource [Steve Twiss]]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 2850 bytes --]

On 26 August 2014 10:33 Lee Jones wrote:

> On Fri, 22 Aug 2014, Opensource [Steve Twiss] wrote:
> > From: Steve Twiss <stwiss.opensource@diasemi.com>
> >
> > This patch series updates the device tree vendor prefix for
> > Dialog Semiconductor.
> >

[...]

> > I think this is it. But, if I am missing anything or there are problems, can
> > I get a quick explanation in the reply so I can fix it and move forwards
> > please?
> >
> > In full:
> > Acked-by the following people so far:
> 
> When you say "so far", does that mean you're missing Acks still?

Hi Lee,

Apologies for my "so far" -- that is just my wording.

As I understand it I have all the Acks that are necessary. I am basing my Acks list on
the get_maintainers script output and on a previous request for Renesas and 
Freescale inputs -- which I have also got.
I do not see any mistakes or missing entries from my part.

> 
> If you have the full-set I will apply this and send out the necessary
> pull-request(s).
> 

Yes please.

Regards,
Steve

ps. for reference,  this is my justification for all files in the patch.

./drivers/mfd/da9055-core.c
	Support Opensource <support.opensource@diasemi.com> (supporter:DIALOG SEMICONDUC...)
	Lee Jones <lee.jones@linaro.org> (supporter:MULTIFUNCTION DEV...,commits:3/8=38%)

./Documentation/devicetree/bindings/regulator/da9210.txt.get_maintainer
	Rob Herring <robh+dt@kernel.org> (maintainer:OPEN FIRMWARE AND...)
	S Twiss <stwiss.opensource@diasemi.com> (authored lines:2/21=10%)

./arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi.get_maintainer
	Shawn Guo <shawn.guo@freescale.com> (maintainer:ARM/FREESCALE IMX...,authored lines:276/279=99%,commits:6/7=86%)
	Rob Herring <robh+dt@kernel.org> (maintainer:OPEN FIRMWARE AND...)

./arch/arm/boot/dts/imx53-smd.dts.get_maintainer
	Shawn Guo <shawn.guo@freescale.com> (maintainer:ARM/FREESCALE IMX...,authored lines:276/279=99%,commits:6/7=86%)
	Rob Herring <robh+dt@kernel.org> (maintainer:OPEN FIRMWARE AND...)

./arch/arm/boot/dts/r8a7791-koelsch.dts.get_maintainer
	Simon Horman <horms@verge.net.au> (supporter:ARM/SHMOBILE ARM...,commits:25/26=96%)
	Rob Herring <robh+dt@kernel.org> (maintainer:OPEN FIRMWARE AND...)

./arch/arm/boot/dts/r8a7790-lager.dts.get_maintainer
	Simon Horman <horms@verge.net.au> (supporter:ARM/SHMOBILE ARM...,commits:25/26=96%)
	Rob Herring <robh+dt@kernel.org> (maintainer:OPEN FIRMWARE AND...)

./Documentation/devicetree/bindings/vendor-prefixes.txt.get_maintainer
	Rob Herring <robh+dt@kernel.org> (maintainer:OPEN FIRMWARE AND...,commits:40/78=51%)

./Documentation/devicetree/bindings/i2c/trivial-devices.txt.get_maintainer
	Rob Herring <robh+dt@kernel.org> (maintainer:OPEN FIRMWARE AND...)

ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥

[GIT PULL] MFD: ARM (IMX & R8): Immutable branch for Dialog Semiconductor - vendor prefix consolidation

[Lee Jones]

IMX and R8 sub-arch Maintainers,

The following changes since commit 52addcf9d6669fa439387610bc65c92fa0980cef:

  Linux 3.17-rc2 (2014-08-25 15:36:20 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git tags/ib-mfd-arm-v3.18

for you to fetch changes up to bd597f47ca4bf7a522a0298a95c7f9b2f0a75b9e:

  devicetree: Dialog Semiconductor consolidate existing vendor prefixes to standardise on 'dlg' (2014-08-29 09:26:29 +0100)

----------------------------------------------------------------
Immutable branch between MFD and some ARM sub-arch maintainers.
----------------------------------------------------------------
Steve Twiss (1):
      devicetree: Dialog Semiconductor consolidate existing vendor prefixes to standardise on 'dlg'

 .../devicetree/bindings/i2c/trivial-devices.txt    |  2 +-
 .../devicetree/bindings/regulator/da9210.txt       |  4 ++--
 .../devicetree/bindings/vendor-prefixes.txt        |  1 +
 arch/arm/boot/dts/imx53-smd.dts                    |  2 +-
 arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi       |  2 +-
 arch/arm/boot/dts/r8a7790-lager.dts                |  2 +-
 arch/arm/boot/dts/r8a7791-koelsch.dts              |  2 +-
 drivers/mfd/da9055-core.c                          | 26 +++++++++++-----------
 8 files changed, 21 insertions(+), 20 deletions(-)

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

RE: [GIT PULL] MFD: ARM (IMX & R8): Immutable branch for Dialog Semiconductor - vendor prefix consolidation

[Opensource [Steve Twiss]]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 887 bytes --]

On 29 August 2014 10:14, Lee Jones wrote

> Subject: [GIT PULL] MFD: ARM (IMX & R8): Immutable branch for Dialog
> Semiconductor - vendor prefix consolidation
> 
> IMX and R8 sub-arch Maintainers,
> 
> The following changes since commit
> 52addcf9d6669fa439387610bc65c92fa0980cef:
> 
>   Linux 3.17-rc2 (2014-08-25 15:36:20 -0700)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git tags/ib-mfd-arm-
> v3.18
> 
> for you to fetch changes up to bd597f47ca4bf7a522a0298a95c7f9b2f0a75b9e:
> 
>   devicetree: Dialog Semiconductor consolidate existing vendor prefixes to
> standardise on 'dlg' (2014-08-29 09:26:29 +0100)
> 

[...]

Thank you for doing this.
Regards,
Steve
ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥

Re: [GIT PULL] MFD: ARM (IMX & R8): Immutable branch for Dialog Semiconductor - vendor prefix consolidation

[Shawn Guo]

Hi Lee,

On Fri, Aug 29, 2014 at 10:13:59AM +0100, Lee Jones wrote:
> IMX and R8 sub-arch Maintainers,
> 
> The following changes since commit 52addcf9d6669fa439387610bc65c92fa0980cef:
> 
>   Linux 3.17-rc2 (2014-08-25 15:36:20 -0700)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git tags/ib-mfd-arm-v3.18
> 
> for you to fetch changes up to bd597f47ca4bf7a522a0298a95c7f9b2f0a75b9e:
> 
>   devicetree: Dialog Semiconductor consolidate existing vendor prefixes to standardise on 'dlg' (2014-08-29 09:26:29 +0100)
> 
> ----------------------------------------------------------------
> Immutable branch between MFD and some ARM sub-arch maintainers.

I assume that I need to pull it into my tree only when it turns out
there are merge conflicts, but otherwise it can just go through your
tree, right?

Shawn

> ----------------------------------------------------------------
> Steve Twiss (1):
>       devicetree: Dialog Semiconductor consolidate existing vendor prefixes to standardise on 'dlg'
> 
>  .../devicetree/bindings/i2c/trivial-devices.txt    |  2 +-
>  .../devicetree/bindings/regulator/da9210.txt       |  4 ++--
>  .../devicetree/bindings/vendor-prefixes.txt        |  1 +
>  arch/arm/boot/dts/imx53-smd.dts                    |  2 +-
>  arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi       |  2 +-
>  arch/arm/boot/dts/r8a7790-lager.dts                |  2 +-
>  arch/arm/boot/dts/r8a7791-koelsch.dts              |  2 +-
>  drivers/mfd/da9055-core.c                          | 26 +++++++++++-----------
>  8 files changed, 21 insertions(+), 20 deletions(-)
> 
> -- 
> Lee Jones
> Linaro STMicroelectronics Landing Team Lead
> Linaro.org │ Open source software for ARM SoCs
> Follow Linaro: Facebook | Twitter | Blog

Re: [GIT PULL] MFD: ARM (IMX & R8): Immutable branch for Dialog Semiconductor - vendor prefix consolidation

[Lee Jones]

On Mon, 01 Sep 2014, Shawn Guo wrote:
> On Fri, Aug 29, 2014 at 10:13:59AM +0100, Lee Jones wrote:
> > IMX and R8 sub-arch Maintainers,
> > 
> > The following changes since commit 52addcf9d6669fa439387610bc65c92fa0980cef:
> > 
> >   Linux 3.17-rc2 (2014-08-25 15:36:20 -0700)
> > 
> > are available in the git repository at:
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git tags/ib-mfd-arm-v3.18
> > 
> > for you to fetch changes up to bd597f47ca4bf7a522a0298a95c7f9b2f0a75b9e:
> > 
> >   devicetree: Dialog Semiconductor consolidate existing vendor prefixes to standardise on 'dlg' (2014-08-29 09:26:29 +0100)
> > 
> > ----------------------------------------------------------------
> > Immutable branch between MFD and some ARM sub-arch maintainers.
> 
> I assume that I need to pull it into my tree only when it turns out
> there are merge conflicts, but otherwise it can just go through your
> tree, right?

If someone realises there's a conflict the chances are we've already
hacked someone off.  If the first person to realise is Linus during
the merge-window, you'd have to go to the effort of re-spinning your
pull-request.  Something else you'd probably like to avoid.

I would suggest for each affected Maintainer to pull this in.

> > ----------------------------------------------------------------
> > Steve Twiss (1):
> >       devicetree: Dialog Semiconductor consolidate existing vendor prefixes to standardise on 'dlg'
> > 
> >  .../devicetree/bindings/i2c/trivial-devices.txt    |  2 +-
> >  .../devicetree/bindings/regulator/da9210.txt       |  4 ++--
> >  .../devicetree/bindings/vendor-prefixes.txt        |  1 +
> >  arch/arm/boot/dts/imx53-smd.dts                    |  2 +-
> >  arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi       |  2 +-
> >  arch/arm/boot/dts/r8a7790-lager.dts                |  2 +-
> >  arch/arm/boot/dts/r8a7791-koelsch.dts              |  2 +-
> >  drivers/mfd/da9055-core.c                          | 26 +++++++++++-----------
> >  8 files changed, 21 insertions(+), 20 deletions(-)
> > 

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [GIT PULL] MFD: ARM (IMX & R8): Immutable branch for Dialog Semiconductor - vendor prefix consolidation

[Shawn Guo]

On Mon, Sep 01, 2014 at 02:38:54PM +0100, Lee Jones wrote:
> On Mon, 01 Sep 2014, Shawn Guo wrote:
> > On Fri, Aug 29, 2014 at 10:13:59AM +0100, Lee Jones wrote:
> > > IMX and R8 sub-arch Maintainers,
> > > 
> > > The following changes since commit 52addcf9d6669fa439387610bc65c92fa0980cef:
> > > 
> > >   Linux 3.17-rc2 (2014-08-25 15:36:20 -0700)
> > > 
> > > are available in the git repository at:
> > > 
> > >   git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git tags/ib-mfd-arm-v3.18
> > > 
> > > for you to fetch changes up to bd597f47ca4bf7a522a0298a95c7f9b2f0a75b9e:
> > > 
> > >   devicetree: Dialog Semiconductor consolidate existing vendor prefixes to standardise on 'dlg' (2014-08-29 09:26:29 +0100)
> > > 
> > > ----------------------------------------------------------------
> > > Immutable branch between MFD and some ARM sub-arch maintainers.
> > 
> > I assume that I need to pull it into my tree only when it turns out
> > there are merge conflicts, but otherwise it can just go through your
> > tree, right?
> 
> If someone realises there's a conflict the chances are we've already
> hacked someone off.  If the first person to realise is Linus during
> the merge-window, you'd have to go to the effort of re-spinning your
> pull-request.  Something else you'd probably like to avoid.

I think if there is a conflict, linux-next will firstly report.  But,
yes, pulling it in is the safest.
> 
> I would suggest for each affected Maintainer to pull this in.

Pulled it into imx/dt branch, thanks.

Shawn