* [PATCH v5 06/15] ARM: shmobile: r8a7790: Switch to new style CMT device
@ 2014-04-23 11:15 Laurent Pinchart
2014-05-11 11:46 ` Simon Horman
2014-05-12 12:40 ` Laurent Pinchart
0 siblings, 2 replies; 3+ messages in thread
From: Laurent Pinchart @ 2014-04-23 11:15 UTC (permalink / raw)
To: linux-sh
The CMT (Compare Match Timer) driver implements a new style of platform
data that handles the timer as a single device with multiple channel.
Switch from the old-style platform data to the new-style platform data.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
arch/arm/mach-shmobile/board-lager-reference.c | 2 +-
arch/arm/mach-shmobile/clock-r8a7790.c | 2 +-
arch/arm/mach-shmobile/setup-r8a7790.c | 17 +++++++----------
3 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/arch/arm/mach-shmobile/board-lager-reference.c b/arch/arm/mach-shmobile/board-lager-reference.c
index 440aac3..d9f146c 100644
--- a/arch/arm/mach-shmobile/board-lager-reference.c
+++ b/arch/arm/mach-shmobile/board-lager-reference.c
@@ -97,7 +97,7 @@ static void __init lager_add_standard_devices(void)
const char *con_id;
const char *dev_id;
} clk_names[] = {
- { "cmt0", NULL, "sh_cmt.0" },
+ { "cmt0", "fck", "sh-cmt-48-gen2.0" },
{ "scifa0", NULL, "sh-sci.0" },
{ "scifa1", NULL, "sh-sci.1" },
{ "scifb0", NULL, "sh-sci.2" },
diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c
index 3f93503..411302e 100644
--- a/arch/arm/mach-shmobile/clock-r8a7790.c
+++ b/arch/arm/mach-shmobile/clock-r8a7790.c
@@ -361,7 +361,6 @@ static struct clk_lookup lookups[] = {
CLKDEV_DEV_ID("sh_mobile_sdhi.2", &mstp_clks[MSTP312]),
CLKDEV_DEV_ID("sh_mobile_sdhi.3", &mstp_clks[MSTP311]),
CLKDEV_DEV_ID("sh_mmcif.1", &mstp_clks[MSTP305]),
- CLKDEV_DEV_ID("sh_cmt.0", &mstp_clks[MSTP124]),
CLKDEV_DEV_ID("qspi.0", &mstp_clks[MSTP917]),
CLKDEV_DEV_ID("renesas_usbhs", &mstp_clks[MSTP704]),
CLKDEV_DEV_ID("pci-rcar-gen2.0", &mstp_clks[MSTP703]),
@@ -371,6 +370,7 @@ static struct clk_lookup lookups[] = {
CLKDEV_DEV_ID("sata-r8a7790.1", &mstp_clks[MSTP814]),
/* ICK */
+ CLKDEV_ICK_ID("fck", "sh-cmt-48-gen2.0", &mstp_clks[MSTP124]),
CLKDEV_ICK_ID("usbhs", "usb_phy_rcar_gen2", &mstp_clks[MSTP704]),
CLKDEV_ICK_ID("lvds.0", "rcar-du-r8a7790", &mstp_clks[MSTP726]),
CLKDEV_ICK_ID("lvds.1", "rcar-du-r8a7790", &mstp_clks[MSTP725]),
diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c
index c4616f0..87327f3 100644
--- a/arch/arm/mach-shmobile/setup-r8a7790.c
+++ b/arch/arm/mach-shmobile/setup-r8a7790.c
@@ -269,20 +269,17 @@ static const struct resource thermal_resources[] __initconst = {
thermal_resources, \
ARRAY_SIZE(thermal_resources))
-static const struct sh_timer_config cmt00_platform_data __initconst = {
- .name = "CMT00",
- .timer_bit = 0,
- .clockevent_rating = 80,
+static struct sh_timer_config cmt0_platform_data = {
+ .channels_mask = 0x60,
};
-static const struct resource cmt00_resources[] __initconst = {
- DEFINE_RES_MEM(0xffca0510, 0x0c),
- DEFINE_RES_MEM(0xffca0500, 0x04),
- DEFINE_RES_IRQ(gic_spi(142)), /* CMT0_0 */
+static struct resource cmt0_resources[] = {
+ DEFINE_RES_MEM(0xffca0000, 0x1004),
+ DEFINE_RES_IRQ(gic_spi(142)),
};
#define r8a7790_register_cmt(idx) \
- platform_device_register_resndata(&platform_bus, "sh_cmt", \
+ platform_device_register_resndata(&platform_bus, "sh-cmt-48-gen2", \
idx, cmt##idx##_resources, \
ARRAY_SIZE(cmt##idx##_resources), \
&cmt##idx##_platform_data, \
@@ -300,7 +297,7 @@ void __init r8a7790_add_dt_devices(void)
r8a7790_register_scif(7);
r8a7790_register_scif(8);
r8a7790_register_scif(9);
- r8a7790_register_cmt(00);
+ r8a7790_register_cmt(0);
}
void __init r8a7790_add_standard_devices(void)
--
1.8.3.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v5 06/15] ARM: shmobile: r8a7790: Switch to new style CMT device
2014-04-23 11:15 [PATCH v5 06/15] ARM: shmobile: r8a7790: Switch to new style CMT device Laurent Pinchart
@ 2014-05-11 11:46 ` Simon Horman
2014-05-12 12:40 ` Laurent Pinchart
1 sibling, 0 replies; 3+ messages in thread
From: Simon Horman @ 2014-05-11 11:46 UTC (permalink / raw)
To: linux-sh
On Wed, Apr 23, 2014 at 01:15:13PM +0200, Laurent Pinchart wrote:
> The CMT (Compare Match Timer) driver implements a new style of platform
> data that handles the timer as a single device with multiple channel.
> Switch from the old-style platform data to the new-style platform data.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Hi Laurent,
I have queued up the following after updating the
board-lager-reference.c portion of the patch to use clk_name.
Please check to see that what I have is correct.
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
ARM: shmobile: r8a7790: Switch to new style CMT device
The CMT (Compare Match Timer) driver implements a new style of platform
data that handles the timer as a single device with multiple channel.
Switch from the old-style platform data to the new-style platform data.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
[horms+renesas@verge.net.au resolved conflict: use clk_names]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/board-lager-reference.c | 2 +-
arch/arm/mach-shmobile/clock-r8a7790.c | 2 +-
arch/arm/mach-shmobile/setup-r8a7790.c | 17 +++++++----------
3 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/arch/arm/mach-shmobile/board-lager-reference.c b/arch/arm/mach-shmobile/board-lager-reference.c
index 1eb48cf..1bca2748 100644
--- a/arch/arm/mach-shmobile/board-lager-reference.c
+++ b/arch/arm/mach-shmobile/board-lager-reference.c
@@ -90,7 +90,7 @@ static void __init lager_add_du_device(void)
* devices until they get moved to DT.
*/
static const struct clk_name clk_names[] __initconst = {
- { "cmt0", NULL, "sh_cmt.0" },
+ { "cmt0", "fck", "sh-cmt-48-gen2.0" },
{ "scifa0", NULL, "sh-sci.0" },
{ "scifa1", NULL, "sh-sci.1" },
{ "scifb0", NULL, "sh-sci.2" },
diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c
index a936ae7..296a057 100644
--- a/arch/arm/mach-shmobile/clock-r8a7790.c
+++ b/arch/arm/mach-shmobile/clock-r8a7790.c
@@ -357,7 +357,6 @@ static struct clk_lookup lookups[] = {
CLKDEV_DEV_ID("sh_mobile_sdhi.2", &mstp_clks[MSTP312]),
CLKDEV_DEV_ID("sh_mobile_sdhi.3", &mstp_clks[MSTP311]),
CLKDEV_DEV_ID("sh_mmcif.1", &mstp_clks[MSTP305]),
- CLKDEV_DEV_ID("sh_cmt.0", &mstp_clks[MSTP124]),
CLKDEV_DEV_ID("qspi.0", &mstp_clks[MSTP917]),
CLKDEV_DEV_ID("renesas_usbhs", &mstp_clks[MSTP704]),
CLKDEV_DEV_ID("pci-rcar-gen2.0", &mstp_clks[MSTP703]),
@@ -367,6 +366,7 @@ static struct clk_lookup lookups[] = {
CLKDEV_DEV_ID("sata-r8a7790.1", &mstp_clks[MSTP814]),
/* ICK */
+ CLKDEV_ICK_ID("fck", "sh-cmt-48-gen2.0", &mstp_clks[MSTP124]),
CLKDEV_ICK_ID("usbhs", "usb_phy_rcar_gen2", &mstp_clks[MSTP704]),
CLKDEV_ICK_ID("lvds.0", "rcar-du-r8a7790", &mstp_clks[MSTP726]),
CLKDEV_ICK_ID("lvds.1", "rcar-du-r8a7790", &mstp_clks[MSTP725]),
diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c
index c4616f0..87327f3 100644
--- a/arch/arm/mach-shmobile/setup-r8a7790.c
+++ b/arch/arm/mach-shmobile/setup-r8a7790.c
@@ -269,20 +269,17 @@ static const struct resource thermal_resources[] __initconst = {
thermal_resources, \
ARRAY_SIZE(thermal_resources))
-static const struct sh_timer_config cmt00_platform_data __initconst = {
- .name = "CMT00",
- .timer_bit = 0,
- .clockevent_rating = 80,
+static struct sh_timer_config cmt0_platform_data = {
+ .channels_mask = 0x60,
};
-static const struct resource cmt00_resources[] __initconst = {
- DEFINE_RES_MEM(0xffca0510, 0x0c),
- DEFINE_RES_MEM(0xffca0500, 0x04),
- DEFINE_RES_IRQ(gic_spi(142)), /* CMT0_0 */
+static struct resource cmt0_resources[] = {
+ DEFINE_RES_MEM(0xffca0000, 0x1004),
+ DEFINE_RES_IRQ(gic_spi(142)),
};
#define r8a7790_register_cmt(idx) \
- platform_device_register_resndata(&platform_bus, "sh_cmt", \
+ platform_device_register_resndata(&platform_bus, "sh-cmt-48-gen2", \
idx, cmt##idx##_resources, \
ARRAY_SIZE(cmt##idx##_resources), \
&cmt##idx##_platform_data, \
@@ -300,7 +297,7 @@ void __init r8a7790_add_dt_devices(void)
r8a7790_register_scif(7);
r8a7790_register_scif(8);
r8a7790_register_scif(9);
- r8a7790_register_cmt(00);
+ r8a7790_register_cmt(0);
}
void __init r8a7790_add_standard_devices(void)
--
1.8.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v5 06/15] ARM: shmobile: r8a7790: Switch to new style CMT device
2014-04-23 11:15 [PATCH v5 06/15] ARM: shmobile: r8a7790: Switch to new style CMT device Laurent Pinchart
2014-05-11 11:46 ` Simon Horman
@ 2014-05-12 12:40 ` Laurent Pinchart
1 sibling, 0 replies; 3+ messages in thread
From: Laurent Pinchart @ 2014-05-12 12:40 UTC (permalink / raw)
To: linux-sh
Hi Simon,
On Sunday 11 May 2014 20:46:54 Simon Horman wrote:
> On Wed, Apr 23, 2014 at 01:15:13PM +0200, Laurent Pinchart wrote:
> > The CMT (Compare Match Timer) driver implements a new style of platform
> > data that handles the timer as a single device with multiple channel.
> > Switch from the old-style platform data to the new-style platform data.
> >
> > Signed-off-by: Laurent Pinchart
> > <laurent.pinchart+renesas@ideasonboard.com>
>
> Hi Laurent,
>
> I have queued up the following after updating the
> board-lager-reference.c portion of the patch to use clk_name.
>
> Please check to see that what I have is correct.
>
>
> From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
>
> ARM: shmobile: r8a7790: Switch to new style CMT device
>
> The CMT (Compare Match Timer) driver implements a new style of platform
> data that handles the timer as a single device with multiple channel.
> Switch from the old-style platform data to the new-style platform data.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> [horms+renesas@verge.net.au resolved conflict: use clk_names]
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
This looks good to me, thank you.
> ---
> arch/arm/mach-shmobile/board-lager-reference.c | 2 +-
> arch/arm/mach-shmobile/clock-r8a7790.c | 2 +-
> arch/arm/mach-shmobile/setup-r8a7790.c | 17 +++++++----------
> 3 files changed, 9 insertions(+), 12 deletions(-)
>
> diff --git a/arch/arm/mach-shmobile/board-lager-reference.c
> b/arch/arm/mach-shmobile/board-lager-reference.c index 1eb48cf..1bca2748
> 100644
> --- a/arch/arm/mach-shmobile/board-lager-reference.c
> +++ b/arch/arm/mach-shmobile/board-lager-reference.c
> @@ -90,7 +90,7 @@ static void __init lager_add_du_device(void)
> * devices until they get moved to DT.
> */
> static const struct clk_name clk_names[] __initconst = {
> - { "cmt0", NULL, "sh_cmt.0" },
> + { "cmt0", "fck", "sh-cmt-48-gen2.0" },
> { "scifa0", NULL, "sh-sci.0" },
> { "scifa1", NULL, "sh-sci.1" },
> { "scifb0", NULL, "sh-sci.2" },
> diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c
> b/arch/arm/mach-shmobile/clock-r8a7790.c index a936ae7..296a057 100644
> --- a/arch/arm/mach-shmobile/clock-r8a7790.c
> +++ b/arch/arm/mach-shmobile/clock-r8a7790.c
> @@ -357,7 +357,6 @@ static struct clk_lookup lookups[] = {
> CLKDEV_DEV_ID("sh_mobile_sdhi.2", &mstp_clks[MSTP312]),
> CLKDEV_DEV_ID("sh_mobile_sdhi.3", &mstp_clks[MSTP311]),
> CLKDEV_DEV_ID("sh_mmcif.1", &mstp_clks[MSTP305]),
> - CLKDEV_DEV_ID("sh_cmt.0", &mstp_clks[MSTP124]),
> CLKDEV_DEV_ID("qspi.0", &mstp_clks[MSTP917]),
> CLKDEV_DEV_ID("renesas_usbhs", &mstp_clks[MSTP704]),
> CLKDEV_DEV_ID("pci-rcar-gen2.0", &mstp_clks[MSTP703]),
> @@ -367,6 +366,7 @@ static struct clk_lookup lookups[] = {
> CLKDEV_DEV_ID("sata-r8a7790.1", &mstp_clks[MSTP814]),
>
> /* ICK */
> + CLKDEV_ICK_ID("fck", "sh-cmt-48-gen2.0", &mstp_clks[MSTP124]),
> CLKDEV_ICK_ID("usbhs", "usb_phy_rcar_gen2", &mstp_clks[MSTP704]),
> CLKDEV_ICK_ID("lvds.0", "rcar-du-r8a7790", &mstp_clks[MSTP726]),
> CLKDEV_ICK_ID("lvds.1", "rcar-du-r8a7790", &mstp_clks[MSTP725]),
> diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c
> b/arch/arm/mach-shmobile/setup-r8a7790.c index c4616f0..87327f3 100644
> --- a/arch/arm/mach-shmobile/setup-r8a7790.c
> +++ b/arch/arm/mach-shmobile/setup-r8a7790.c
> @@ -269,20 +269,17 @@ static const struct resource thermal_resources[]
> __initconst = { thermal_resources, \
> ARRAY_SIZE(thermal_resources))
>
> -static const struct sh_timer_config cmt00_platform_data __initconst = {
> - .name = "CMT00",
> - .timer_bit = 0,
> - .clockevent_rating = 80,
> +static struct sh_timer_config cmt0_platform_data = {
> + .channels_mask = 0x60,
> };
>
> -static const struct resource cmt00_resources[] __initconst = {
> - DEFINE_RES_MEM(0xffca0510, 0x0c),
> - DEFINE_RES_MEM(0xffca0500, 0x04),
> - DEFINE_RES_IRQ(gic_spi(142)), /* CMT0_0 */
> +static struct resource cmt0_resources[] = {
> + DEFINE_RES_MEM(0xffca0000, 0x1004),
> + DEFINE_RES_IRQ(gic_spi(142)),
> };
>
> #define r8a7790_register_cmt(idx) \
> - platform_device_register_resndata(&platform_bus, "sh_cmt", \
> + platform_device_register_resndata(&platform_bus, "sh-cmt-48-gen2", \
> idx, cmt##idx##_resources, \
> ARRAY_SIZE(cmt##idx##_resources), \
> &cmt##idx##_platform_data, \
> @@ -300,7 +297,7 @@ void __init r8a7790_add_dt_devices(void)
> r8a7790_register_scif(7);
> r8a7790_register_scif(8);
> r8a7790_register_scif(9);
> - r8a7790_register_cmt(00);
> + r8a7790_register_cmt(0);
> }
>
> void __init r8a7790_add_standard_devices(void)
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-05-12 12:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-23 11:15 [PATCH v5 06/15] ARM: shmobile: r8a7790: Switch to new style CMT device Laurent Pinchart
2014-05-11 11:46 ` Simon Horman
2014-05-12 12:40 ` Laurent Pinchart
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).