* [PATCH V2] ARM: shmobile: r8a7790: Fix I2C controller names
@ 2013-12-27 10:58 Valentine Barshak
2014-01-06 5:26 ` Simon Horman
2014-01-08 4:20 ` Simon Horman
0 siblings, 2 replies; 3+ messages in thread
From: Valentine Barshak @ 2013-12-27 10:58 UTC (permalink / raw)
To: linux-sh
This fixes the issue introduced by the following commit:
b448c904f5058b6c "ARM: shmobile: r8a7790: add I2C support"
The R8A7790 is an R-Car Gen2 SoC. The clock division factor
(CDF) width is 3 bits on Gen2 as opposed to 2 bits on Gen1.
Fix the device names for R8A7790 SoC to make the R-Car I2C
driver configure the hardware properly.
Changes in V2:
* rebased on top of the latest branch;
* capitalized ARM in the subject line;
* noted the commit that caused the issue in the log.
Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
arch/arm/mach-shmobile/clock-r8a7790.c | 8 ++++----
arch/arm/mach-shmobile/setup-r8a7790.c | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c
index c5c60ec..f44987a 100644
--- a/arch/arm/mach-shmobile/clock-r8a7790.c
+++ b/arch/arm/mach-shmobile/clock-r8a7790.c
@@ -292,13 +292,13 @@ static struct clk_lookup lookups[] = {
CLKDEV_DEV_ID("sh-sci.8", &mstp_clks[MSTP717]),
CLKDEV_DEV_ID("sh-sci.9", &mstp_clks[MSTP716]),
CLKDEV_DEV_ID("e6508000.i2c", &mstp_clks[MSTP931]),
- CLKDEV_DEV_ID("i2c-rcar.0", &mstp_clks[MSTP931]),
+ CLKDEV_DEV_ID("i2c-rcar_gen2.0", &mstp_clks[MSTP931]),
CLKDEV_DEV_ID("e6518000.i2c", &mstp_clks[MSTP930]),
- CLKDEV_DEV_ID("i2c-rcar.1", &mstp_clks[MSTP930]),
+ CLKDEV_DEV_ID("i2c-rcar_gen2.1", &mstp_clks[MSTP930]),
CLKDEV_DEV_ID("e6530000.i2c", &mstp_clks[MSTP929]),
- CLKDEV_DEV_ID("i2c-rcar.2", &mstp_clks[MSTP929]),
+ CLKDEV_DEV_ID("i2c-rcar_gen2.2", &mstp_clks[MSTP929]),
CLKDEV_DEV_ID("e6540000.i2c", &mstp_clks[MSTP928]),
- CLKDEV_DEV_ID("i2c-rcar.3", &mstp_clks[MSTP928]),
+ CLKDEV_DEV_ID("i2c-rcar_gen2.3", &mstp_clks[MSTP928]),
CLKDEV_DEV_ID("r8a7790-ether", &mstp_clks[MSTP813]),
CLKDEV_DEV_ID("e61f0000.thermal", &mstp_clks[MSTP522]),
CLKDEV_DEV_ID("rcar_thermal", &mstp_clks[MSTP522]),
diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c
index 7800cec..6ab37aa 100644
--- a/arch/arm/mach-shmobile/setup-r8a7790.c
+++ b/arch/arm/mach-shmobile/setup-r8a7790.c
@@ -85,7 +85,7 @@ static struct resource i2c_resources[] __initdata = {
#define r8a7790_register_i2c(idx) \
platform_device_register_simple( \
- "i2c-rcar", idx, \
+ "i2c-rcar_gen2", idx, \
i2c_resources + (2 * idx), 2); \
void __init r8a7790_pinmux_init(void)
--
1.8.3.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH V2] ARM: shmobile: r8a7790: Fix I2C controller names
2013-12-27 10:58 [PATCH V2] ARM: shmobile: r8a7790: Fix I2C controller names Valentine Barshak
@ 2014-01-06 5:26 ` Simon Horman
2014-01-08 4:20 ` Simon Horman
1 sibling, 0 replies; 3+ messages in thread
From: Simon Horman @ 2014-01-06 5:26 UTC (permalink / raw)
To: linux-sh
On Fri, Dec 27, 2013 at 02:58:08PM +0400, Valentine Barshak wrote:
> This fixes the issue introduced by the following commit:
> b448c904f5058b6c "ARM: shmobile: r8a7790: add I2C support"
>
> The R8A7790 is an R-Car Gen2 SoC. The clock division factor
> (CDF) width is 3 bits on Gen2 as opposed to 2 bits on Gen1.
> Fix the device names for R8A7790 SoC to make the R-Car I2C
> driver configure the hardware properly.
>
> Changes in V2:
> * rebased on top of the latest branch;
> * capitalized ARM in the subject line;
> * noted the commit that caused the issue in the log.
>
> Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
> Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Thanks, I will queue this up.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH V2] ARM: shmobile: r8a7790: Fix I2C controller names
2013-12-27 10:58 [PATCH V2] ARM: shmobile: r8a7790: Fix I2C controller names Valentine Barshak
2014-01-06 5:26 ` Simon Horman
@ 2014-01-08 4:20 ` Simon Horman
1 sibling, 0 replies; 3+ messages in thread
From: Simon Horman @ 2014-01-08 4:20 UTC (permalink / raw)
To: linux-sh
On Fri, Dec 27, 2013 at 02:58:08PM +0400, Valentine Barshak wrote:
> This fixes the issue introduced by the following commit:
> b448c904f5058b6c "ARM: shmobile: r8a7790: add I2C support"
>
> The R8A7790 is an R-Car Gen2 SoC. The clock division factor
> (CDF) width is 3 bits on Gen2 as opposed to 2 bits on Gen1.
> Fix the device names for R8A7790 SoC to make the R-Car I2C
> driver configure the hardware properly.
>
> Changes in V2:
> * rebased on top of the latest branch;
> * capitalized ARM in the subject line;
> * noted the commit that caused the issue in the log.
>
> Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
> Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> ---
> arch/arm/mach-shmobile/clock-r8a7790.c | 8 ++++----
> arch/arm/mach-shmobile/setup-r8a7790.c | 2 +-
> 2 files changed, 5 insertions(+), 5 deletions(-)
Thanks, I have queued this up.
>
> diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c
> index c5c60ec..f44987a 100644
> --- a/arch/arm/mach-shmobile/clock-r8a7790.c
> +++ b/arch/arm/mach-shmobile/clock-r8a7790.c
> @@ -292,13 +292,13 @@ static struct clk_lookup lookups[] = {
> CLKDEV_DEV_ID("sh-sci.8", &mstp_clks[MSTP717]),
> CLKDEV_DEV_ID("sh-sci.9", &mstp_clks[MSTP716]),
> CLKDEV_DEV_ID("e6508000.i2c", &mstp_clks[MSTP931]),
> - CLKDEV_DEV_ID("i2c-rcar.0", &mstp_clks[MSTP931]),
> + CLKDEV_DEV_ID("i2c-rcar_gen2.0", &mstp_clks[MSTP931]),
> CLKDEV_DEV_ID("e6518000.i2c", &mstp_clks[MSTP930]),
> - CLKDEV_DEV_ID("i2c-rcar.1", &mstp_clks[MSTP930]),
> + CLKDEV_DEV_ID("i2c-rcar_gen2.1", &mstp_clks[MSTP930]),
> CLKDEV_DEV_ID("e6530000.i2c", &mstp_clks[MSTP929]),
> - CLKDEV_DEV_ID("i2c-rcar.2", &mstp_clks[MSTP929]),
> + CLKDEV_DEV_ID("i2c-rcar_gen2.2", &mstp_clks[MSTP929]),
> CLKDEV_DEV_ID("e6540000.i2c", &mstp_clks[MSTP928]),
> - CLKDEV_DEV_ID("i2c-rcar.3", &mstp_clks[MSTP928]),
> + CLKDEV_DEV_ID("i2c-rcar_gen2.3", &mstp_clks[MSTP928]),
> CLKDEV_DEV_ID("r8a7790-ether", &mstp_clks[MSTP813]),
> CLKDEV_DEV_ID("e61f0000.thermal", &mstp_clks[MSTP522]),
> CLKDEV_DEV_ID("rcar_thermal", &mstp_clks[MSTP522]),
> diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c
> index 7800cec..6ab37aa 100644
> --- a/arch/arm/mach-shmobile/setup-r8a7790.c
> +++ b/arch/arm/mach-shmobile/setup-r8a7790.c
> @@ -85,7 +85,7 @@ static struct resource i2c_resources[] __initdata = {
>
> #define r8a7790_register_i2c(idx) \
> platform_device_register_simple( \
> - "i2c-rcar", idx, \
> + "i2c-rcar_gen2", idx, \
> i2c_resources + (2 * idx), 2); \
>
> void __init r8a7790_pinmux_init(void)
> --
> 1.8.3.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-01-08 4:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-27 10:58 [PATCH V2] ARM: shmobile: r8a7790: Fix I2C controller names Valentine Barshak
2014-01-06 5:26 ` Simon Horman
2014-01-08 4:20 ` Simon Horman
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).