From: Javier Martinez Canillas <javier@osg.samsung.com> To: linux-kernel@vger.kernel.org Cc: "Aaro Koskinen" <aaro.koskinen@iki.fi>, devicetree@vger.kernel.org, "Rob Herring" <robh+dt@kernel.org>, "Tony Lindgren" <tony@atomide.com>, "Lee Jones" <lee.jones@linaro.org>, "Javier Martinez Canillas" <javier@osg.samsung.com>, "Benoît Cousson" <bcousson@baylibre.com>, "Mark Rutland" <mark.rutland@arm.com>, linux-omap@vger.kernel.org, "Russell King" <linux@armlinux.org.uk>, linux-arm-kernel@lists.infradead.org Subject: [PATCH v5 2/8] mfd: retu: Drop -mfd suffix from I2C device ID name Date: Wed, 12 Apr 2017 14:27:53 -0300 [thread overview] Message-ID: <20170412172800.23035-3-javier@osg.samsung.com> (raw) In-Reply-To: <20170412172800.23035-1-javier@osg.samsung.com> 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> Acked-by: Rob Herring <robh@kernel.org> Acked-by: Aaro Koskinen <aaro.koskinen@iki.fi> Acked-by: Tony Lindgren <tony@atomide.com> --- Changes in v5: - Add Rob Herring's Acked-by tag. - Add Aaro Koskinen's Acked-by tag. - Add Acked-by: Tony Lindgren <tony@atomide.com>'s Acked-by tag. 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
WARNING: multiple messages have this Message-ID (diff)
From: javier@osg.samsung.com (Javier Martinez Canillas) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v5 2/8] mfd: retu: Drop -mfd suffix from I2C device ID name Date: Wed, 12 Apr 2017 14:27:53 -0300 [thread overview] Message-ID: <20170412172800.23035-3-javier@osg.samsung.com> (raw) In-Reply-To: <20170412172800.23035-1-javier@osg.samsung.com> 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> Acked-by: Rob Herring <robh@kernel.org> Acked-by: Aaro Koskinen <aaro.koskinen@iki.fi> Acked-by: Tony Lindgren <tony@atomide.com> --- Changes in v5: - Add Rob Herring's Acked-by tag. - Add Aaro Koskinen's Acked-by tag. - Add Acked-by: Tony Lindgren <tony@atomide.com>'s Acked-by tag. 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 at 1 { - compatible = "retu-mfd"; + retu: retu at 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
next prev parent reply other threads:[~2017-04-12 17:28 UTC|newest] Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-04-12 17:27 [PATCH v5 0/8] mfd: Add OF device table to I2C drivers that are missing it Javier Martinez Canillas 2017-04-12 17:27 ` Javier Martinez Canillas 2017-04-12 17:27 ` [PATCH v5 1/8] dt-bindings: mfd: Add retu/tahvo ASIC chips bindings Javier Martinez Canillas 2017-04-19 19:39 ` [v5,1/8] " Wolfram Sang 2017-04-19 19:39 ` Wolfram Sang 2017-04-12 17:27 ` Javier Martinez Canillas [this message] 2017-04-12 17:27 ` [PATCH v5 2/8] mfd: retu: Drop -mfd suffix from I2C device ID name Javier Martinez Canillas 2017-04-19 19:40 ` [v5,2/8] " Wolfram Sang 2017-04-19 19:40 ` Wolfram Sang 2017-04-19 19:40 ` Wolfram Sang 2017-04-12 17:27 ` [PATCH v5 3/8] mfd: retu: Add OF device ID table Javier Martinez Canillas 2017-04-12 17:27 ` Javier Martinez Canillas 2017-04-19 19:40 ` [v5,3/8] " Wolfram Sang 2017-04-12 17:27 ` [PATCH v5 4/8] ARM: dts: n8x0: Add vendor prefix to retu node Javier Martinez Canillas 2017-04-12 17:27 ` Javier Martinez Canillas 2017-04-19 19:40 ` [v5,4/8] " Wolfram Sang 2017-04-19 19:40 ` Wolfram Sang 2017-04-12 17:27 ` [PATCH v5 5/8] i2c: i2c-cbus-gpio: Add vendor prefix to retu node in example Javier Martinez Canillas 2017-04-19 18:51 ` Wolfram Sang 2017-04-19 18:51 ` Wolfram Sang 2017-04-19 19:13 ` Javier Martinez Canillas 2017-04-19 19:41 ` Wolfram Sang 2017-04-12 17:27 ` [PATCH v5 6/8] dt-bindings: mfd: Add TI tps6105x chip bindings Javier Martinez Canillas 2017-04-12 17:27 ` [PATCH v5 7/8] mfd: tps6105x: Add OF device ID table Javier Martinez Canillas 2017-04-12 17:27 ` [PATCH v5 8/8] ARM: ux500: Add vendor prefix to tps61052 node Javier Martinez Canillas 2017-04-12 17:27 ` Javier Martinez Canillas 2017-04-12 17:27 ` Javier Martinez Canillas
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20170412172800.23035-3-javier@osg.samsung.com \ --to=javier@osg.samsung.com \ --cc=aaro.koskinen@iki.fi \ --cc=bcousson@baylibre.com \ --cc=devicetree@vger.kernel.org \ --cc=lee.jones@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=linux@armlinux.org.uk \ --cc=mark.rutland@arm.com \ --cc=robh+dt@kernel.org \ --cc=tony@atomide.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.