* [PATCH 1/1] ARM: at91: fix clock conid for atmel_tcb.1 on 9260/9g20
@ 2011-11-28 11:53 Jean-Christophe PLAGNIOL-VILLARD
2011-11-28 13:46 ` Nicolas Ferre
0 siblings, 1 reply; 2+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2011-11-28 11:53 UTC (permalink / raw)
To: linux-arm-kernel
the conid is supposed to be t0/t1/t2_clk
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: stable at kernel.org
---
Hi,
could you apply this is present since 3.0
Best Regards,
J.
arch/arm/mach-at91/at91sam9260.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c
index 2e59126..8c75932 100644
--- a/arch/arm/mach-at91/at91sam9260.c
+++ b/arch/arm/mach-at91/at91sam9260.c
@@ -196,9 +196,9 @@ static struct clk_lookup periph_clocks_lookups[] = {
CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tc0_clk),
CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.0", &tc1_clk),
CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.0", &tc2_clk),
- CLKDEV_CON_DEV_ID("t3_clk", "atmel_tcb.1", &tc3_clk),
- CLKDEV_CON_DEV_ID("t4_clk", "atmel_tcb.1", &tc4_clk),
- CLKDEV_CON_DEV_ID("t5_clk", "atmel_tcb.1", &tc5_clk),
+ CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.1", &tc3_clk),
+ CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.1", &tc4_clk),
+ CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.1", &tc5_clk),
CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc_clk),
/* more usart lookup table for DT entries */
CLKDEV_CON_DEV_ID("usart", "fffff200.serial", &mck),
--
1.7.7
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH 1/1] ARM: at91: fix clock conid for atmel_tcb.1 on 9260/9g20
2011-11-28 11:53 [PATCH 1/1] ARM: at91: fix clock conid for atmel_tcb.1 on 9260/9g20 Jean-Christophe PLAGNIOL-VILLARD
@ 2011-11-28 13:46 ` Nicolas Ferre
0 siblings, 0 replies; 2+ messages in thread
From: Nicolas Ferre @ 2011-11-28 13:46 UTC (permalink / raw)
To: linux-arm-kernel
On 11/28/2011 12:53 PM, Jean-Christophe PLAGNIOL-VILLARD :
> the conid is supposed to be t0/t1/t2_clk
>
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
I have queued it in branch at91-fixes of
git://github.com/at91linux/linux-at91.git
Thanks, best regards,
> Cc: stable at kernel.org
> ---
> Hi,
>
> could you apply this is present since 3.0
>
> Best Regards,
> J.
> arch/arm/mach-at91/at91sam9260.c | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c
> index 2e59126..8c75932 100644
> --- a/arch/arm/mach-at91/at91sam9260.c
> +++ b/arch/arm/mach-at91/at91sam9260.c
> @@ -196,9 +196,9 @@ static struct clk_lookup periph_clocks_lookups[] = {
> CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tc0_clk),
> CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.0", &tc1_clk),
> CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.0", &tc2_clk),
> - CLKDEV_CON_DEV_ID("t3_clk", "atmel_tcb.1", &tc3_clk),
> - CLKDEV_CON_DEV_ID("t4_clk", "atmel_tcb.1", &tc4_clk),
> - CLKDEV_CON_DEV_ID("t5_clk", "atmel_tcb.1", &tc5_clk),
> + CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.1", &tc3_clk),
> + CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.1", &tc4_clk),
> + CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.1", &tc5_clk),
> CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc_clk),
> /* more usart lookup table for DT entries */
> CLKDEV_CON_DEV_ID("usart", "fffff200.serial", &mck),
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-11-28 13:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-28 11:53 [PATCH 1/1] ARM: at91: fix clock conid for atmel_tcb.1 on 9260/9g20 Jean-Christophe PLAGNIOL-VILLARD
2011-11-28 13:46 ` Nicolas Ferre
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.