* [PATCH] i2c: rcar: fixup rcar type naming
@ 2013-10-04 6:36 Kuninori Morimoto
[not found] ` <87ob75zgn2.wl%kuninori.morimoto.gx-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>
2013-10-31 12:02 ` [PATCH] " Wolfram Sang
0 siblings, 2 replies; 6+ messages in thread
From: Kuninori Morimoto @ 2013-10-04 6:36 UTC (permalink / raw)
To: Wolfram Sang; +Cc: Simon, Linux-SH, Linux-I2C, Kuninori Morimoto
b720423a2627f045133bec39a31fe2bc0dab86f3
(i2c: rcar: add rcar-H2 support)
added R-Car H2 support on i2c-rcar.
But the added i2c type naming was H1/H2,
instead of Gen1/Gen2 (Generation 1/2)
Gen1/Gen2 is better naming on this driver.
This patch exchanges rcar_i2c_id_table[],
but it still can keep compatible, since still there is no user
for i2c-rcar_h1/h2 at this point.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
drivers/i2c/busses/i2c-rcar.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c
index 8603f5e..2c2fd7c 100644
--- a/drivers/i2c/busses/i2c-rcar.c
+++ b/drivers/i2c/busses/i2c-rcar.c
@@ -103,8 +103,8 @@ enum {
#define ID_NACK (1 << 4)
enum rcar_i2c_type {
- I2C_RCAR_H1,
- I2C_RCAR_H2,
+ I2C_RCAR_GEN1,
+ I2C_RCAR_GEN2,
};
struct rcar_i2c_priv {
@@ -240,10 +240,10 @@ static int rcar_i2c_clock_calculate(struct rcar_i2c_priv *priv,
}
switch (priv->devtype) {
- case I2C_RCAR_H1:
+ case I2C_RCAR_GEN1:
cdf_width = 2;
break;
- case I2C_RCAR_H2:
+ case I2C_RCAR_GEN2:
cdf_width = 3;
break;
default:
@@ -640,10 +640,10 @@ static const struct i2c_algorithm rcar_i2c_algo = {
};
static const struct of_device_id rcar_i2c_dt_ids[] = {
- { .compatible = "renesas,i2c-rcar", .data = (void *)I2C_RCAR_H1 },
- { .compatible = "renesas,i2c-r8a7778", .data = (void *)I2C_RCAR_H1 },
- { .compatible = "renesas,i2c-r8a7779", .data = (void *)I2C_RCAR_H1 },
- { .compatible = "renesas,i2c-r8a7790", .data = (void *)I2C_RCAR_H2 },
+ { .compatible = "renesas,i2c-rcar", .data = (void *)I2C_RCAR_GEN1 },
+ { .compatible = "renesas,i2c-r8a7778", .data = (void *)I2C_RCAR_GEN1 },
+ { .compatible = "renesas,i2c-r8a7779", .data = (void *)I2C_RCAR_GEN1 },
+ { .compatible = "renesas,i2c-r8a7790", .data = (void *)I2C_RCAR_GEN2 },
{},
};
MODULE_DEVICE_TABLE(of, rcar_i2c_dt_ids);
@@ -731,9 +731,9 @@ static int rcar_i2c_remove(struct platform_device *pdev)
}
static struct platform_device_id rcar_i2c_id_table[] = {
- { "i2c-rcar", I2C_RCAR_H1 },
- { "i2c-rcar_h1", I2C_RCAR_H1 },
- { "i2c-rcar_h2", I2C_RCAR_H2 },
+ { "i2c-rcar", I2C_RCAR_GEN1 },
+ { "i2c-rcar_gen1", I2C_RCAR_GEN1 },
+ { "i2c-rcar_gen2", I2C_RCAR_GEN2 },
{},
};
MODULE_DEVICE_TABLE(platform, rcar_i2c_id_table);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH resend] i2c: rcar: fixup rcar type naming
[not found] ` <87ob75zgn2.wl%kuninori.morimoto.gx-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>
@ 2013-10-21 8:04 ` Kuninori Morimoto
[not found] ` <87ppqzaw37.wl%kuninori.morimoto.gx-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>
0 siblings, 1 reply; 6+ messages in thread
From: Kuninori Morimoto @ 2013-10-21 8:04 UTC (permalink / raw)
To: Wolfram Sang; +Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA, Kuninori Morimoto, Simon
b720423a2627f045133bec39a31fe2bc0dab86f3
(i2c: rcar: add rcar-H2 support)
added R-Car H2 support on i2c-rcar.
The R-Car I2C type is based on SoC generation
(Gen1 = E1/M1/H1, Gen2 = E2/M2/H2),
but added naming was H1/H2 instead of Gen1/Gen2.
Gen1/Gen2 is better naming on this driver.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>
---
resend
- exchanged Wolfram's email address
drivers/i2c/busses/i2c-rcar.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c
index 8603f5e..2c2fd7c 100644
--- a/drivers/i2c/busses/i2c-rcar.c
+++ b/drivers/i2c/busses/i2c-rcar.c
@@ -103,8 +103,8 @@ enum {
#define ID_NACK (1 << 4)
enum rcar_i2c_type {
- I2C_RCAR_H1,
- I2C_RCAR_H2,
+ I2C_RCAR_GEN1,
+ I2C_RCAR_GEN2,
};
struct rcar_i2c_priv {
@@ -240,10 +240,10 @@ static int rcar_i2c_clock_calculate(struct rcar_i2c_priv *priv,
}
switch (priv->devtype) {
- case I2C_RCAR_H1:
+ case I2C_RCAR_GEN1:
cdf_width = 2;
break;
- case I2C_RCAR_H2:
+ case I2C_RCAR_GEN2:
cdf_width = 3;
break;
default:
@@ -640,10 +640,10 @@ static const struct i2c_algorithm rcar_i2c_algo = {
};
static const struct of_device_id rcar_i2c_dt_ids[] = {
- { .compatible = "renesas,i2c-rcar", .data = (void *)I2C_RCAR_H1 },
- { .compatible = "renesas,i2c-r8a7778", .data = (void *)I2C_RCAR_H1 },
- { .compatible = "renesas,i2c-r8a7779", .data = (void *)I2C_RCAR_H1 },
- { .compatible = "renesas,i2c-r8a7790", .data = (void *)I2C_RCAR_H2 },
+ { .compatible = "renesas,i2c-rcar", .data = (void *)I2C_RCAR_GEN1 },
+ { .compatible = "renesas,i2c-r8a7778", .data = (void *)I2C_RCAR_GEN1 },
+ { .compatible = "renesas,i2c-r8a7779", .data = (void *)I2C_RCAR_GEN1 },
+ { .compatible = "renesas,i2c-r8a7790", .data = (void *)I2C_RCAR_GEN2 },
{},
};
MODULE_DEVICE_TABLE(of, rcar_i2c_dt_ids);
@@ -731,9 +731,9 @@ static int rcar_i2c_remove(struct platform_device *pdev)
}
static struct platform_device_id rcar_i2c_id_table[] = {
- { "i2c-rcar", I2C_RCAR_H1 },
- { "i2c-rcar_h1", I2C_RCAR_H1 },
- { "i2c-rcar_h2", I2C_RCAR_H2 },
+ { "i2c-rcar", I2C_RCAR_GEN1 },
+ { "i2c-rcar_gen1", I2C_RCAR_GEN1 },
+ { "i2c-rcar_gen2", I2C_RCAR_GEN2 },
{},
};
MODULE_DEVICE_TABLE(platform, rcar_i2c_id_table);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH resend] i2c: rcar: fixup rcar type naming
[not found] ` <87ppqzaw37.wl%kuninori.morimoto.gx-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>
@ 2013-10-29 5:48 ` Simon Horman
2013-10-30 16:11 ` Wolfram Sang
1 sibling, 0 replies; 6+ messages in thread
From: Simon Horman @ 2013-10-29 5:48 UTC (permalink / raw)
To: Kuninori Morimoto
Cc: Wolfram Sang, linux-i2c-u79uwXL29TY76Z2rM5mHXA, Kuninori Morimoto
On Mon, Oct 21, 2013 at 01:04:32AM -0700, Kuninori Morimoto wrote:
> b720423a2627f045133bec39a31fe2bc0dab86f3
> (i2c: rcar: add rcar-H2 support)
> added R-Car H2 support on i2c-rcar.
>
> The R-Car I2C type is based on SoC generation
> (Gen1 = E1/M1/H1, Gen2 = E2/M2/H2),
> but added naming was H1/H2 instead of Gen1/Gen2.
> Gen1/Gen2 is better naming on this driver.
>
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>
Thanks Morimoto-san, this looks good to me.
Acked-by: Simon Horman <horms+renesas-/R6kz+dDXgpPR4JQBCEnsQ@public.gmane.org>
Wolfram, please consider applying this change.
> ---
> resend
> - exchanged Wolfram's email address
>
> drivers/i2c/busses/i2c-rcar.c | 22 +++++++++++-----------
> 1 file changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c
> index 8603f5e..2c2fd7c 100644
> --- a/drivers/i2c/busses/i2c-rcar.c
> +++ b/drivers/i2c/busses/i2c-rcar.c
> @@ -103,8 +103,8 @@ enum {
> #define ID_NACK (1 << 4)
>
> enum rcar_i2c_type {
> - I2C_RCAR_H1,
> - I2C_RCAR_H2,
> + I2C_RCAR_GEN1,
> + I2C_RCAR_GEN2,
> };
>
> struct rcar_i2c_priv {
> @@ -240,10 +240,10 @@ static int rcar_i2c_clock_calculate(struct rcar_i2c_priv *priv,
> }
>
> switch (priv->devtype) {
> - case I2C_RCAR_H1:
> + case I2C_RCAR_GEN1:
> cdf_width = 2;
> break;
> - case I2C_RCAR_H2:
> + case I2C_RCAR_GEN2:
> cdf_width = 3;
> break;
> default:
> @@ -640,10 +640,10 @@ static const struct i2c_algorithm rcar_i2c_algo = {
> };
>
> static const struct of_device_id rcar_i2c_dt_ids[] = {
> - { .compatible = "renesas,i2c-rcar", .data = (void *)I2C_RCAR_H1 },
> - { .compatible = "renesas,i2c-r8a7778", .data = (void *)I2C_RCAR_H1 },
> - { .compatible = "renesas,i2c-r8a7779", .data = (void *)I2C_RCAR_H1 },
> - { .compatible = "renesas,i2c-r8a7790", .data = (void *)I2C_RCAR_H2 },
> + { .compatible = "renesas,i2c-rcar", .data = (void *)I2C_RCAR_GEN1 },
> + { .compatible = "renesas,i2c-r8a7778", .data = (void *)I2C_RCAR_GEN1 },
> + { .compatible = "renesas,i2c-r8a7779", .data = (void *)I2C_RCAR_GEN1 },
> + { .compatible = "renesas,i2c-r8a7790", .data = (void *)I2C_RCAR_GEN2 },
> {},
> };
> MODULE_DEVICE_TABLE(of, rcar_i2c_dt_ids);
> @@ -731,9 +731,9 @@ static int rcar_i2c_remove(struct platform_device *pdev)
> }
>
> static struct platform_device_id rcar_i2c_id_table[] = {
> - { "i2c-rcar", I2C_RCAR_H1 },
> - { "i2c-rcar_h1", I2C_RCAR_H1 },
> - { "i2c-rcar_h2", I2C_RCAR_H2 },
> + { "i2c-rcar", I2C_RCAR_GEN1 },
> + { "i2c-rcar_gen1", I2C_RCAR_GEN1 },
> + { "i2c-rcar_gen2", I2C_RCAR_GEN2 },
> {},
> };
> MODULE_DEVICE_TABLE(platform, rcar_i2c_id_table);
> --
> 1.7.9.5
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH resend] i2c: rcar: fixup rcar type naming
[not found] ` <87ppqzaw37.wl%kuninori.morimoto.gx-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>
2013-10-29 5:48 ` Simon Horman
@ 2013-10-30 16:11 ` Wolfram Sang
2013-10-31 1:11 ` Kuninori Morimoto
1 sibling, 1 reply; 6+ messages in thread
From: Wolfram Sang @ 2013-10-30 16:11 UTC (permalink / raw)
To: Kuninori Morimoto
Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA, Kuninori Morimoto, Simon
[-- Attachment #1: Type: text/plain, Size: 1046 bytes --]
On Mon, Oct 21, 2013 at 01:04:32AM -0700, Kuninori Morimoto wrote:
> b720423a2627f045133bec39a31fe2bc0dab86f3
> (i2c: rcar: add rcar-H2 support)
> added R-Car H2 support on i2c-rcar.
>
> The R-Car I2C type is based on SoC generation
> (Gen1 = E1/M1/H1, Gen2 = E2/M2/H2),
> but added naming was H1/H2 instead of Gen1/Gen2.
> Gen1/Gen2 is better naming on this driver.
I'd prefer to not change the code, but rather add comments after the
enum types saying this enum applies to the whole generation... Drivers
often start with specific naming. And while things turn out to be more
generic later, IMO it is not worth to keep the naming in sync with
ip-core namings.
> static struct platform_device_id rcar_i2c_id_table[] = {
> - { "i2c-rcar", I2C_RCAR_H1 },
> - { "i2c-rcar_h1", I2C_RCAR_H1 },
> - { "i2c-rcar_h2", I2C_RCAR_H2 },
> + { "i2c-rcar", I2C_RCAR_GEN1 },
> + { "i2c-rcar_gen1", I2C_RCAR_GEN1 },
> + { "i2c-rcar_gen2", I2C_RCAR_GEN2 },
> {},
Renaming the platform_device_ids will cause regressions, too!
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH resend] i2c: rcar: fixup rcar type naming
2013-10-30 16:11 ` Wolfram Sang
@ 2013-10-31 1:11 ` Kuninori Morimoto
0 siblings, 0 replies; 6+ messages in thread
From: Kuninori Morimoto @ 2013-10-31 1:11 UTC (permalink / raw)
To: Wolfram Sang; +Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA, Kuninori Morimoto, Simon
Hi Wolfram
Thank you for your review
> > static struct platform_device_id rcar_i2c_id_table[] = {
> > - { "i2c-rcar", I2C_RCAR_H1 },
> > - { "i2c-rcar_h1", I2C_RCAR_H1 },
> > - { "i2c-rcar_h2", I2C_RCAR_H2 },
> > + { "i2c-rcar", I2C_RCAR_GEN1 },
> > + { "i2c-rcar_gen1", I2C_RCAR_GEN1 },
> > + { "i2c-rcar_gen2", I2C_RCAR_GEN2 },
> > {},
>
> Renaming the platform_device_ids will cause regressions, too!
The user who is using this driver is using "i2c-rcar" only at this point.
"i2c-rcar_h1/i2c-rcar_h2" user will appear. but not exist now.
So, I think it can keep compatible.
Best regards
---
Kuninori Morimoto
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] i2c: rcar: fixup rcar type naming
2013-10-04 6:36 [PATCH] i2c: rcar: fixup rcar type naming Kuninori Morimoto
[not found] ` <87ob75zgn2.wl%kuninori.morimoto.gx-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>
@ 2013-10-31 12:02 ` Wolfram Sang
1 sibling, 0 replies; 6+ messages in thread
From: Wolfram Sang @ 2013-10-31 12:02 UTC (permalink / raw)
To: Kuninori Morimoto
Cc: Wolfram Sang, Simon, Linux-SH, Linux-I2C, Kuninori Morimoto
[-- Attachment #1: Type: text/plain, Size: 619 bytes --]
On Thu, Oct 03, 2013 at 11:36:52PM -0700, Kuninori Morimoto wrote:
> b720423a2627f045133bec39a31fe2bc0dab86f3
> (i2c: rcar: add rcar-H2 support)
> added R-Car H2 support on i2c-rcar.
> But the added i2c type naming was H1/H2,
> instead of Gen1/Gen2 (Generation 1/2)
> Gen1/Gen2 is better naming on this driver.
>
> This patch exchanges rcar_i2c_id_table[],
> but it still can keep compatible, since still there is no user
> for i2c-rcar_h1/h2 at this point.
>
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
OK, since the driver is relatively new: Applied to for-next, thanks!
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-10-31 12:02 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-04 6:36 [PATCH] i2c: rcar: fixup rcar type naming Kuninori Morimoto
[not found] ` <87ob75zgn2.wl%kuninori.morimoto.gx-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>
2013-10-21 8:04 ` [PATCH resend] " Kuninori Morimoto
[not found] ` <87ppqzaw37.wl%kuninori.morimoto.gx-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>
2013-10-29 5:48 ` Simon Horman
2013-10-30 16:11 ` Wolfram Sang
2013-10-31 1:11 ` Kuninori Morimoto
2013-10-31 12:02 ` [PATCH] " Wolfram Sang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).