| Message ID | 201407241554.s6OFsqbW031651@swsrvapps-01.diasemi.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Am Donnerstag, den 24.07.2014, 16:46 +0100 schrieb 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. > > > 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 > > 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 am requesting Acks for the bindings and DTS(I) changes in this patch > specifically the two remaining files r8a7790-lager.dts and r8a7791-koelsch.dts > In a previous reply SHMobile was identified as needing to Ack this patch > before it could proceed. > - http://www.spinics.net/lists/arm-kernel/msg349289.html > - https://lkml.org/lkml/2014/6/11/273 > > If there are problems with this request, can I get a quick explanation in > the reply so I can fix it and move forwards please? > > Please see this thread for latest comments: > http://www.spinics.net/lists/arm-kernel/msg349809.html > > Acked-by the following people so far: > > - 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 +- Acked-by: Philipp Zabel <p.zabel@pengutronix.de> regards Philipp
On Thu, 24 Jul 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. > > > Signed-off-by: Steve Twiss <stwiss.opensource@diasemi.com> Didn't I Ack the MFD parts already?
On 25 July 2014 08:00, Lee Jones wrote: >On Thu, 24 Jul 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. >> >> >> Signed-off-by: Steve Twiss <stwiss.opensource@diasemi.com> > >Didn't I Ack the MFD parts already? > Yes -- certainly. (I should have put them in the main body of the e-mail shouldn't I ..?) I just need the SHMobile responses now. I will try to make contact with those guys this week. I have the following Acks so far. >From: Rob Herring on 21 July 2014 16:43 >I'm okay with this, but it also needs acks from i.MX and SHMobile >folks as it could break out of tree users. > Acked-by: Rob Herring <robh@kernel.org> >From: Shawn Guo on 22 July 2014 02:38 >arch/arm/boot/dts/imx53-smd.dts | 2 +- >arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 2 +- > Acked-by: Shawn Guo <shawn.guo@freescale.com> >From: Lee Jones on 22 July 2014 08:09 >For the MFD changes: > Acked-by: Lee Jones <lee.jones@linaro.org> and >From: Philipp Zabel on 24 July 2014 20:44 > Acked-by: Philipp Zabel <p.zabel@pengutronix.de> Regards, Steve
On Mon, Jul 28, 2014 at 09:53:56AM +0000, Opensource [Steve Twiss] wrote: > On 25 July 2014 08:00, Lee Jones wrote: > > >On Thu, 24 Jul 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. > >> > >> > >> Signed-off-by: Steve Twiss <stwiss.opensource@diasemi.com> > > > >Didn't I Ack the MFD parts already? > > > > Yes -- certainly. > (I should have put them in the main body of the e-mail shouldn't I ..?) > > I just need the SHMobile responses now. > I will try to make contact with those guys this week. Hi Steve, I apologise for not noticing this earlier: I am entirely unsure how I missed it. In principle I am fine with this change so long as it does not introduce any backwards-compatibility problems. In particular removing compatibility strings that may already be in use by DTB blobs in the wild. For SH Mobile it seems that Lager and Koelsch were using "diasemi,da9210" which is unsupported by the driver at this time. So it seems there is no backwards-compatibility problem there. I'm less sure about other aspects of the patch. And I'm also less concerned about them. I do have a slight preference for SH Mobile changes to go through my renesas tree rather than elsewhere (as part of a more global change) principally to try to avoid the possibility of conflicts. The SH Mobile dts files in question are often updated. And for example I notice some fuzz when applying this patch on top of the next-20140729 tag of linux-next. If you were to break out the SH Mobile portion of this patch I would be happy to take it once the driver portion is accepted. That said, I do see that everyone else has acked the change so clearly this is not an issue from their point of view. So I will not complain if you decide not to break the patch up (though please note my warning about possible conflicts). In the case where you do not want to split up the patch: Acked-by: Simon Horman <horms+renesas@verge.net.au> > I have the following Acks so far. > > >From: Rob Herring on 21 July 2014 16:43 > >I'm okay with this, but it also needs acks from i.MX and SHMobile > >folks as it could break out of tree users. > > Acked-by: Rob Herring <robh@kernel.org> > > >From: Shawn Guo on 22 July 2014 02:38 > >arch/arm/boot/dts/imx53-smd.dts | 2 +- > >arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 2 +- > > Acked-by: Shawn Guo <shawn.guo@freescale.com> > > >From: Lee Jones on 22 July 2014 08:09 > >For the MFD changes: > > Acked-by: Lee Jones <lee.jones@linaro.org> > > and > > >From: Philipp Zabel on 24 July 2014 20:44 > > Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
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", }, };