* [PATCH v4 0/8] mfd: Add OF device table to I2C drivers that are missing it
@ 2017-04-04 15:30 Javier Martinez Canillas
2017-04-04 15:30 ` [PATCH v4 4/8] ARM: dts: n8x0: Add vendor prefix to retu node Javier Martinez Canillas
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Javier Martinez Canillas @ 2017-04-04 15:30 UTC (permalink / raw)
To: linux-kernel
Cc: Aaro Koskinen, devicetree, Rob Herring, Tony Lindgren, Lee Jones,
Javier Martinez Canillas, Benoît Cousson, Wolfram Sang,
Mark Rutland, linux-omap, Russell King, linux-arm-kernel,
linux-i2c
Hello,
This series add OF device ID tables to mfd I2C drivers whose devices are
either used in Device Tree source files or are listed in binding docs as
a compatible string.
That's done because the plan is to change the I2C core to report proper OF
modaliases instead of always reporting a MODALIAS=i2c:<foo> regardless if
a device was registered via DT or using the legacy platform data mechanism.
So these patches will make sure that mfd I2C drivers modules will continue
to be autoloaded once the I2C core is changed to report proper OF modalias.
Users didn't have a vendor prefix in the used compatible strings, but since
there wasn't a DT binding document for these drivers, it can be said that
were working for mere luck and so this series fixes the users and add a DT
binding doc for the drivers.
Most patches can be applied independently, with the exception of patches
2 to 4 that should be applied in the same tree to keep bisect-ability.
Best regards,
Javier
Changes in v4:
- Use "dt-bindings: mfd:" prefix in subject line (Rob Herring).
- Add information about what functions the device serve (Lee Jones).
- Avoid using MFD in Device Tree (Lee Jones).
- Drop -mfd suffix in compatible string (Lee Jones).
- Avoid using MFD in Device Tree (Lee Jones).
- Use "dt-bindings: mfd:" prefix in subject line (Rob Herring).
- Add information about what functions the device serve (Lee Jones).
Changes in v3:
- Add a vendor prefix to the compatible string (Rob Herring).
- Add a vendor prefix to the compatible string (Rob Herring).
Changes in v2:
- Don't use of_match_ptr() to avoid build warning when CONFIG_OF is disabled.
- Don't use of_match_ptr() to avoid build warning when CONFIG_OF is disabled.
Javier Martinez Canillas (8):
dt-bindings: mfd: Add retu/tahvo ASIC chips bindings
mfd: retu: Drop -mfd suffix from I2C device ID name
mfd: retu: Add OF device ID table
ARM: dts: n8x0: Add vendor prefix to retu node
i2c: i2c-cbus-gpio: Add vendor prefix to retu node in example
dt-bindings: mfd: Add TI tps6105x chip bindings
mfd: tps6105x: Add OF device ID table
ARM: ux500: Add vendor prefix to tps61052 node
.../devicetree/bindings/i2c/i2c-cbus-gpio.txt | 4 ++--
Documentation/devicetree/bindings/mfd/retu.txt | 21 +++++++++++++++++++++
Documentation/devicetree/bindings/mfd/tps6105x.txt | 17 +++++++++++++++++
arch/arm/boot/dts/omap2420-n8x0-common.dtsi | 4 ++--
arch/arm/boot/dts/ste-hrefprev60.dtsi | 2 +-
arch/arm/mach-omap1/board-nokia770.c | 4 ++--
drivers/mfd/retu-mfd.c | 12 ++++++++++--
drivers/mfd/tps6105x.c | 8 ++++++++
8 files changed, 63 insertions(+), 9 deletions(-)
create mode 100644 Documentation/devicetree/bindings/mfd/retu.txt
create mode 100644 Documentation/devicetree/bindings/mfd/tps6105x.txt
--
2.9.3
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v4 2/8] mfd: retu: Drop -mfd suffix from I2C device ID name
[not found] ` <20170404153036.6651-1-javier-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org>
@ 2017-04-04 15:30 ` Javier Martinez Canillas
2017-04-11 13:56 ` Lee Jones
2017-04-04 17:43 ` [PATCH v4 0/8] mfd: Add OF device table to I2C drivers that are missing it Tony Lindgren
1 sibling, 1 reply; 8+ messages in thread
From: Javier Martinez Canillas @ 2017-04-04 15:30 UTC (permalink / raw)
To: linux-kernel-u79uwXL29TY76Z2rM5mHXA
Cc: Aaro Koskinen, devicetree-u79uwXL29TY76Z2rM5mHXA, Rob Herring,
Tony Lindgren, Lee Jones, Javier Martinez Canillas,
Benoît Cousson, Mark Rutland,
linux-omap-u79uwXL29TY76Z2rM5mHXA, Russell King,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
It's not correct to encode the subsystem in the I2C device name, so
drop the -mfd suffix. To maintain bisect-ability, change driver and
platform code / DTS users in the same patch.
Suggested-by: Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Signed-off-by: Javier Martinez Canillas <javier-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org>
---
Changes in v4: None
Changes in v3: None
Changes in v2: None
arch/arm/boot/dts/omap2420-n8x0-common.dtsi | 4 ++--
arch/arm/mach-omap1/board-nokia770.c | 4 ++--
drivers/mfd/retu-mfd.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm/boot/dts/omap2420-n8x0-common.dtsi b/arch/arm/boot/dts/omap2420-n8x0-common.dtsi
index 7e5ffc583c90..1b06430c8013 100644
--- a/arch/arm/boot/dts/omap2420-n8x0-common.dtsi
+++ b/arch/arm/boot/dts/omap2420-n8x0-common.dtsi
@@ -15,8 +15,8 @@
>;
#address-cells = <1>;
#size-cells = <0>;
- retu_mfd: retu@1 {
- compatible = "retu-mfd";
+ retu: retu@1 {
+ compatible = "retu";
interrupt-parent = <&gpio4>;
interrupts = <12 IRQ_TYPE_EDGE_RISING>;
reg = <0x1>;
diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c
index ee8d9f553db4..06243c0b12d2 100644
--- a/arch/arm/mach-omap1/board-nokia770.c
+++ b/arch/arm/mach-omap1/board-nokia770.c
@@ -233,10 +233,10 @@ static struct platform_device nokia770_cbus_device = {
static struct i2c_board_info nokia770_i2c_board_info_2[] __initdata = {
{
- I2C_BOARD_INFO("retu-mfd", 0x01),
+ I2C_BOARD_INFO("retu", 0x01),
},
{
- I2C_BOARD_INFO("tahvo-mfd", 0x02),
+ I2C_BOARD_INFO("tahvo", 0x02),
},
};
diff --git a/drivers/mfd/retu-mfd.c b/drivers/mfd/retu-mfd.c
index d4c114abeb75..53e1d386d2c0 100644
--- a/drivers/mfd/retu-mfd.c
+++ b/drivers/mfd/retu-mfd.c
@@ -302,8 +302,8 @@ static int retu_remove(struct i2c_client *i2c)
}
static const struct i2c_device_id retu_id[] = {
- { "retu-mfd", 0 },
- { "tahvo-mfd", 0 },
+ { "retu", 0 },
+ { "tahvo", 0 },
{ }
};
MODULE_DEVICE_TABLE(i2c, retu_id);
--
2.9.3
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v4 4/8] ARM: dts: n8x0: Add vendor prefix to retu node
2017-04-04 15:30 [PATCH v4 0/8] mfd: Add OF device table to I2C drivers that are missing it Javier Martinez Canillas
@ 2017-04-04 15:30 ` Javier Martinez Canillas
2017-04-04 16:54 ` [PATCH v4 0/8] mfd: Add OF device table to I2C drivers that are missing it Rob Herring
` (2 subsequent siblings)
3 siblings, 0 replies; 8+ messages in thread
From: Javier Martinez Canillas @ 2017-04-04 15:30 UTC (permalink / raw)
To: linux-kernel
Cc: Mark Rutland, devicetree, Aaro Koskinen, Tony Lindgren,
Russell King, Javier Martinez Canillas, Rob Herring,
Benoît Cousson, linux-omap, Lee Jones, linux-arm-kernel
The retu device node doesn't have a vendor prefix
in its compatible string, fix it by adding one.
Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
---
Changes in v4: None
Changes in v3: None
Changes in v2: None
arch/arm/boot/dts/omap2420-n8x0-common.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/omap2420-n8x0-common.dtsi b/arch/arm/boot/dts/omap2420-n8x0-common.dtsi
index 1b06430c8013..91886231e5a8 100644
--- a/arch/arm/boot/dts/omap2420-n8x0-common.dtsi
+++ b/arch/arm/boot/dts/omap2420-n8x0-common.dtsi
@@ -16,7 +16,7 @@
#address-cells = <1>;
#size-cells = <0>;
retu: retu@1 {
- compatible = "retu";
+ compatible = "nokia,retu";
interrupt-parent = <&gpio4>;
interrupts = <12 IRQ_TYPE_EDGE_RISING>;
reg = <0x1>;
--
2.9.3
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v4 0/8] mfd: Add OF device table to I2C drivers that are missing it
2017-04-04 15:30 [PATCH v4 0/8] mfd: Add OF device table to I2C drivers that are missing it Javier Martinez Canillas
2017-04-04 15:30 ` [PATCH v4 4/8] ARM: dts: n8x0: Add vendor prefix to retu node Javier Martinez Canillas
@ 2017-04-04 16:54 ` Rob Herring
2017-04-04 17:38 ` Aaro Koskinen
[not found] ` <20170404153036.6651-1-javier-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org>
3 siblings, 0 replies; 8+ messages in thread
From: Rob Herring @ 2017-04-04 16:54 UTC (permalink / raw)
To: Javier Martinez Canillas
Cc: linux-kernel@vger.kernel.org, Aaro Koskinen,
devicetree@vger.kernel.org, Tony Lindgren, Lee Jones,
Benoît Cousson, Wolfram Sang, Mark Rutland, linux-omap,
Russell King, linux-arm-kernel@lists.infradead.org,
linux-i2c@vger.kernel.org
On Tue, Apr 4, 2017 at 10:30 AM, Javier Martinez Canillas
<javier@osg.samsung.com> wrote:
> Hello,
>
> This series add OF device ID tables to mfd I2C drivers whose devices are
> either used in Device Tree source files or are listed in binding docs as
> a compatible string.
For the series,
Acked-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v4 0/8] mfd: Add OF device table to I2C drivers that are missing it
2017-04-04 15:30 [PATCH v4 0/8] mfd: Add OF device table to I2C drivers that are missing it Javier Martinez Canillas
2017-04-04 15:30 ` [PATCH v4 4/8] ARM: dts: n8x0: Add vendor prefix to retu node Javier Martinez Canillas
2017-04-04 16:54 ` [PATCH v4 0/8] mfd: Add OF device table to I2C drivers that are missing it Rob Herring
@ 2017-04-04 17:38 ` Aaro Koskinen
[not found] ` <20170404153036.6651-1-javier-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org>
3 siblings, 0 replies; 8+ messages in thread
From: Aaro Koskinen @ 2017-04-04 17:38 UTC (permalink / raw)
To: Javier Martinez Canillas
Cc: linux-kernel, devicetree, Rob Herring, Tony Lindgren, Lee Jones,
Benoît Cousson, Wolfram Sang, Mark Rutland, linux-omap,
Russell King, linux-arm-kernel, linux-i2c
Hi,
On Tue, Apr 04, 2017 at 11:30:28AM -0400, Javier Martinez Canillas wrote:
> This series add OF device ID tables to mfd I2C drivers whose devices are
> either used in Device Tree source files or are listed in binding docs as
> a compatible string.
For patches 1-5 you can add:
Acked-by: Aaro Koskinen <aaro.koskinen@iki.fi>
A.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v4 0/8] mfd: Add OF device table to I2C drivers that are missing it
[not found] ` <20170404153036.6651-1-javier-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org>
2017-04-04 15:30 ` [PATCH v4 2/8] mfd: retu: Drop -mfd suffix from I2C device ID name Javier Martinez Canillas
@ 2017-04-04 17:43 ` Tony Lindgren
[not found] ` <20170404174323.GA13234-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
1 sibling, 1 reply; 8+ messages in thread
From: Tony Lindgren @ 2017-04-04 17:43 UTC (permalink / raw)
To: Javier Martinez Canillas
Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA, Aaro Koskinen,
devicetree-u79uwXL29TY76Z2rM5mHXA, Rob Herring, Lee Jones,
Benoît Cousson, Wolfram Sang, Mark Rutland,
linux-omap-u79uwXL29TY76Z2rM5mHXA, Russell King,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-i2c-u79uwXL29TY76Z2rM5mHXA
* Javier Martinez Canillas <javier-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> [170404 08:33]:
> Most patches can be applied independently, with the exception of patches
> 2 to 4 that should be applied in the same tree to keep bisect-ability.
Probably best to merge this all via MFD or i2c:
Acked-by: Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v4 0/8] mfd: Add OF device table to I2C drivers that are missing it
[not found] ` <20170404174323.GA13234-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
@ 2017-04-04 17:46 ` Javier Martinez Canillas
0 siblings, 0 replies; 8+ messages in thread
From: Javier Martinez Canillas @ 2017-04-04 17:46 UTC (permalink / raw)
To: Tony Lindgren
Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA, Aaro Koskinen,
devicetree-u79uwXL29TY76Z2rM5mHXA, Rob Herring, Lee Jones,
Benoît Cousson, Wolfram Sang, Mark Rutland,
linux-omap-u79uwXL29TY76Z2rM5mHXA, Russell King,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-i2c-u79uwXL29TY76Z2rM5mHXA
Hello Tony,
On 04/04/2017 01:43 PM, Tony Lindgren wrote:
> * Javier Martinez Canillas <javier-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> [170404 08:33]:
>> Most patches can be applied independently, with the exception of patches
>> 2 to 4 that should be applied in the same tree to keep bisect-ability.
>
> Probably best to merge this all via MFD or i2c:
>
I would prefer MFD since the changes in that subsystem are the ones that
could cause issues. The changes for I2C is just a update to an example.
> Acked-by: Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
>
Thanks!
Best regards,
--
Javier Martinez Canillas
Open Source Group
Samsung Research America
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v4 2/8] mfd: retu: Drop -mfd suffix from I2C device ID name
2017-04-04 15:30 ` [PATCH v4 2/8] mfd: retu: Drop -mfd suffix from I2C device ID name Javier Martinez Canillas
@ 2017-04-11 13:56 ` Lee Jones
0 siblings, 0 replies; 8+ messages in thread
From: Lee Jones @ 2017-04-11 13:56 UTC (permalink / raw)
To: Javier Martinez Canillas
Cc: linux-kernel, Aaro Koskinen, devicetree, Rob Herring,
Tony Lindgren, Benoît Cousson, Mark Rutland, linux-omap,
Russell King, linux-arm-kernel
On Tue, 04 Apr 2017, Javier Martinez Canillas wrote:
> It's not correct to encode the subsystem in the I2C device name, so
> drop the -mfd suffix. To maintain bisect-ability, change driver and
> platform code / DTS users in the same patch.
>
> Suggested-by: Lee Jones <lee.jones@linaro.org>
> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
> ---
>
> Changes in v4: None
> Changes in v3: None
> Changes in v2: None
>
> arch/arm/boot/dts/omap2420-n8x0-common.dtsi | 4 ++--
> arch/arm/mach-omap1/board-nokia770.c | 4 ++--
> drivers/mfd/retu-mfd.c | 4 ++--
> 3 files changed, 6 insertions(+), 6 deletions(-)
For my own reference:
Acked-for-MFD-by: Lee Jones <lee.jones@linaro.org>
> diff --git a/arch/arm/boot/dts/omap2420-n8x0-common.dtsi b/arch/arm/boot/dts/omap2420-n8x0-common.dtsi
> index 7e5ffc583c90..1b06430c8013 100644
> --- a/arch/arm/boot/dts/omap2420-n8x0-common.dtsi
> +++ b/arch/arm/boot/dts/omap2420-n8x0-common.dtsi
> @@ -15,8 +15,8 @@
> >;
> #address-cells = <1>;
> #size-cells = <0>;
> - retu_mfd: retu@1 {
> - compatible = "retu-mfd";
> + retu: retu@1 {
> + compatible = "retu";
> interrupt-parent = <&gpio4>;
> interrupts = <12 IRQ_TYPE_EDGE_RISING>;
> reg = <0x1>;
> diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c
> index ee8d9f553db4..06243c0b12d2 100644
> --- a/arch/arm/mach-omap1/board-nokia770.c
> +++ b/arch/arm/mach-omap1/board-nokia770.c
> @@ -233,10 +233,10 @@ static struct platform_device nokia770_cbus_device = {
>
> static struct i2c_board_info nokia770_i2c_board_info_2[] __initdata = {
> {
> - I2C_BOARD_INFO("retu-mfd", 0x01),
> + I2C_BOARD_INFO("retu", 0x01),
> },
> {
> - I2C_BOARD_INFO("tahvo-mfd", 0x02),
> + I2C_BOARD_INFO("tahvo", 0x02),
> },
> };
>
> diff --git a/drivers/mfd/retu-mfd.c b/drivers/mfd/retu-mfd.c
> index d4c114abeb75..53e1d386d2c0 100644
> --- a/drivers/mfd/retu-mfd.c
> +++ b/drivers/mfd/retu-mfd.c
> @@ -302,8 +302,8 @@ static int retu_remove(struct i2c_client *i2c)
> }
>
> static const struct i2c_device_id retu_id[] = {
> - { "retu-mfd", 0 },
> - { "tahvo-mfd", 0 },
> + { "retu", 0 },
> + { "tahvo", 0 },
> { }
> };
> MODULE_DEVICE_TABLE(i2c, retu_id);
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2017-04-11 13:56 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-04 15:30 [PATCH v4 0/8] mfd: Add OF device table to I2C drivers that are missing it Javier Martinez Canillas
2017-04-04 15:30 ` [PATCH v4 4/8] ARM: dts: n8x0: Add vendor prefix to retu node Javier Martinez Canillas
2017-04-04 16:54 ` [PATCH v4 0/8] mfd: Add OF device table to I2C drivers that are missing it Rob Herring
2017-04-04 17:38 ` Aaro Koskinen
[not found] ` <20170404153036.6651-1-javier-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org>
2017-04-04 15:30 ` [PATCH v4 2/8] mfd: retu: Drop -mfd suffix from I2C device ID name Javier Martinez Canillas
2017-04-11 13:56 ` Lee Jones
2017-04-04 17:43 ` [PATCH v4 0/8] mfd: Add OF device table to I2C drivers that are missing it Tony Lindgren
[not found] ` <20170404174323.GA13234-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
2017-04-04 17:46 ` Javier Martinez Canillas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox