Message ID | 201408221446.s7MEkNVF001775@swsrvapps-01.diasemi.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
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). [...]
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...)
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
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
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(-) > >
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
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", }, };