* [PATCH] at91/usb: always provide all the clocks
@ 2011-08-30 1:29 Jean-Christophe PLAGNIOL-VILLARD
2011-08-30 10:48 ` ABRAHAM, KISHON VIJAY
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2011-08-30 1:29 UTC (permalink / raw)
To: linux-arm-kernel
drop the cpu_is in the driver
at91sam9261 and at91sam9g10 expect 3 clocks
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
---
arch/arm/mach-at91/at91cap9.c | 2 ++
arch/arm/mach-at91/at91rm9200.c | 2 ++
arch/arm/mach-at91/at91sam9260.c | 2 ++
arch/arm/mach-at91/at91sam9261.c | 29 +++++++++++++++--------------
arch/arm/mach-at91/at91sam9263.c | 2 ++
arch/arm/mach-at91/at91sam9g45.c | 2 ++
drivers/usb/host/ohci-at91.c | 15 +++++----------
7 files changed, 30 insertions(+), 24 deletions(-)
diff --git a/arch/arm/mach-at91/at91cap9.c b/arch/arm/mach-at91/at91cap9.c
index bfc6844..ecdd54d 100644
--- a/arch/arm/mach-at91/at91cap9.c
+++ b/arch/arm/mach-at91/at91cap9.c
@@ -219,6 +219,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tcb_clk),
CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk),
CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),
+ /* fake hclk clock */
+ CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),
};
static struct clk_lookup usart_clocks_lookups[] = {
diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c
index f73302d..713d3bd 100644
--- a/arch/arm/mach-at91/at91rm9200.c
+++ b/arch/arm/mach-at91/at91rm9200.c
@@ -193,6 +193,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk),
CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),
CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk),
+ /* fake hclk clock */
+ CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),
};
static struct clk_lookup usart_clocks_lookups[] = {
diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c
index cb397be..a9be758 100644
--- a/arch/arm/mach-at91/at91sam9260.c
+++ b/arch/arm/mach-at91/at91sam9260.c
@@ -199,6 +199,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
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("pclk", "ssc.0", &ssc_clk),
+ /* fake hclk clock */
+ CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),
};
static struct clk_lookup usart_clocks_lookups[] = {
diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c
index 6c8e3b5..658a518 100644
--- a/arch/arm/mach-at91/at91sam9261.c
+++ b/arch/arm/mach-at91/at91sam9261.c
@@ -129,6 +129,20 @@ static struct clk lcdc_clk = {
.type = CLK_TYPE_PERIPHERAL,
};
+/* HClocks */
+static struct clk hck0 = {
+ .name = "hck0",
+ .pmc_mask = AT91_PMC_HCK0,
+ .type = CLK_TYPE_SYSTEM,
+ .id = 0,
+};
+static struct clk hck1 = {
+ .name = "hck1",
+ .pmc_mask = AT91_PMC_HCK1,
+ .type = CLK_TYPE_SYSTEM,
+ .id = 1,
+};
+
static struct clk *periph_clocks[] __initdata = {
&pioA_clk,
&pioB_clk,
@@ -161,6 +175,7 @@ static struct clk_lookup periph_clocks_lookups[] = {
CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk),
CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),
CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk),
+ CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &hck0),
};
static struct clk_lookup usart_clocks_lookups[] = {
@@ -199,20 +214,6 @@ static struct clk pck3 = {
.id = 3,
};
-/* HClocks */
-static struct clk hck0 = {
- .name = "hck0",
- .pmc_mask = AT91_PMC_HCK0,
- .type = CLK_TYPE_SYSTEM,
- .id = 0,
-};
-static struct clk hck1 = {
- .name = "hck1",
- .pmc_mask = AT91_PMC_HCK1,
- .type = CLK_TYPE_SYSTEM,
- .id = 1,
-};
-
static void __init at91sam9261_register_clocks(void)
{
int i;
diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c
index 044f3c9..f83fbb0 100644
--- a/arch/arm/mach-at91/at91sam9263.c
+++ b/arch/arm/mach-at91/at91sam9263.c
@@ -189,6 +189,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.0", &spi0_clk),
CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.1", &spi1_clk),
CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tcb_clk),
+ /* fake hclk clock */
+ CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),
};
static struct clk_lookup usart_clocks_lookups[] = {
diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c
index e04c5fb..4d743c0 100644
--- a/arch/arm/mach-at91/at91sam9g45.c
+++ b/arch/arm/mach-at91/at91sam9g45.c
@@ -215,6 +215,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.1", &tcb0_clk),
CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk),
CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),
+ /* fake hclk clock */
+ CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),
};
static struct clk_lookup usart_clocks_lookups[] = {
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index 944291e..e08cb10 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -35,8 +35,7 @@ extern int usb_disabled(void);
static void at91_start_clock(void)
{
- if (cpu_is_at91sam9261() || cpu_is_at91sam9g10())
- clk_enable(hclk);
+ clk_enable(hclk);
clk_enable(iclk);
clk_enable(fclk);
clocked = 1;
@@ -46,8 +45,7 @@ static void at91_stop_clock(void)
{
clk_disable(fclk);
clk_disable(iclk);
- if (cpu_is_at91sam9261() || cpu_is_at91sam9g10())
- clk_disable(hclk);
+ clk_disable(hclk);
clocked = 0;
}
@@ -142,8 +140,7 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver,
iclk = clk_get(&pdev->dev, "ohci_clk");
fclk = clk_get(&pdev->dev, "uhpck");
- if (cpu_is_at91sam9261() || cpu_is_at91sam9g10())
- hclk = clk_get(&pdev->dev, "hck0");
+ hclk = clk_get(&pdev->dev, "hclk");
at91_start_hc(pdev);
ohci_hcd_init(hcd_to_ohci(hcd));
@@ -155,8 +152,7 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver,
/* Error handling */
at91_stop_hc(pdev);
- if (cpu_is_at91sam9261() || cpu_is_at91sam9g10())
- clk_put(hclk);
+ clk_put(hclk);
clk_put(fclk);
clk_put(iclk);
@@ -192,8 +188,7 @@ static void usb_hcd_at91_remove(struct usb_hcd *hcd,
release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
usb_put_hcd(hcd);
- if (cpu_is_at91sam9261() || cpu_is_at91sam9g10())
- clk_put(hclk);
+ clk_put(hclk);
clk_put(fclk);
clk_put(iclk);
fclk = iclk = hclk = NULL;
--
1.7.5.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH] at91/usb: always provide all the clocks
2011-08-30 1:29 [PATCH] at91/usb: always provide all the clocks Jean-Christophe PLAGNIOL-VILLARD
@ 2011-08-30 10:48 ` ABRAHAM, KISHON VIJAY
2011-09-02 18:30 ` Jean-Christophe PLAGNIOL-VILLARD
2011-09-07 8:50 ` Nicolas Ferre
2011-09-07 13:47 ` Nicolas Ferre
2 siblings, 1 reply; 7+ messages in thread
From: ABRAHAM, KISHON VIJAY @ 2011-08-30 10:48 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Aug 30, 2011 at 6:59 AM, Jean-Christophe PLAGNIOL-VILLARD
<plagnioj@jcrosoft.com> wrote:
> drop the cpu_is in the driver
> at91sam9261 and at91sam9g10 expect 3 clocks
>
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
> ---
> ?arch/arm/mach-at91/at91cap9.c ? ?| ? ?2 ++
> ?arch/arm/mach-at91/at91rm9200.c ?| ? ?2 ++
> ?arch/arm/mach-at91/at91sam9260.c | ? ?2 ++
> ?arch/arm/mach-at91/at91sam9261.c | ? 29 +++++++++++++++--------------
> ?arch/arm/mach-at91/at91sam9263.c | ? ?2 ++
> ?arch/arm/mach-at91/at91sam9g45.c | ? ?2 ++
> ?drivers/usb/host/ohci-at91.c ? ? | ? 15 +++++----------
> ?7 files changed, 30 insertions(+), 24 deletions(-)
>
> diff --git a/arch/arm/mach-at91/at91cap9.c b/arch/arm/mach-at91/at91cap9.c
> index bfc6844..ecdd54d 100644
> --- a/arch/arm/mach-at91/at91cap9.c
> +++ b/arch/arm/mach-at91/at91cap9.c
> @@ -219,6 +219,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
> ? ? ? ?CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tcb_clk),
> ? ? ? ?CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk),
> ? ? ? ?CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),
> + ? ? ? /* fake hclk clock */
why is it a fake clock??
> + ? ? ? CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),
> ?};
>
> ?static struct clk_lookup usart_clocks_lookups[] = {
> diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c
> index f73302d..713d3bd 100644
> --- a/arch/arm/mach-at91/at91rm9200.c
> +++ b/arch/arm/mach-at91/at91rm9200.c
> @@ -193,6 +193,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
> ? ? ? ?CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk),
> ? ? ? ?CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),
> ? ? ? ?CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk),
> + ? ? ? /* fake hclk clock */
> + ? ? ? CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),
> ?};
>
> ?static struct clk_lookup usart_clocks_lookups[] = {
> diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c
> index cb397be..a9be758 100644
> --- a/arch/arm/mach-at91/at91sam9260.c
> +++ b/arch/arm/mach-at91/at91sam9260.c
> @@ -199,6 +199,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
> ? ? ? ?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("pclk", "ssc.0", &ssc_clk),
> + ? ? ? /* fake hclk clock */
> + ? ? ? CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),
> ?};
>
> ?static struct clk_lookup usart_clocks_lookups[] = {
> diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c
> index 6c8e3b5..658a518 100644
> --- a/arch/arm/mach-at91/at91sam9261.c
> +++ b/arch/arm/mach-at91/at91sam9261.c
> @@ -129,6 +129,20 @@ static struct clk lcdc_clk = {
> ? ? ? ?.type ? ? ? ? ? = CLK_TYPE_PERIPHERAL,
> ?};
>
> +/* HClocks */
> +static struct clk hck0 = {
> + ? ? ? .name ? ? ? ? ? = "hck0",
> + ? ? ? .pmc_mask ? ? ? = AT91_PMC_HCK0,
> + ? ? ? .type ? ? ? ? ? = CLK_TYPE_SYSTEM,
> + ? ? ? .id ? ? ? ? ? ? = 0,
> +};
> +static struct clk hck1 = {
> + ? ? ? .name ? ? ? ? ? = "hck1",
> + ? ? ? .pmc_mask ? ? ? = AT91_PMC_HCK1,
> + ? ? ? .type ? ? ? ? ? = CLK_TYPE_SYSTEM,
> + ? ? ? .id ? ? ? ? ? ? = 1,
> +};
> +
> ?static struct clk *periph_clocks[] __initdata = {
> ? ? ? ?&pioA_clk,
> ? ? ? ?&pioB_clk,
> @@ -161,6 +175,7 @@ static struct clk_lookup periph_clocks_lookups[] = {
> ? ? ? ?CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk),
> ? ? ? ?CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),
> ? ? ? ?CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk),
> + ? ? ? CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &hck0),
> ?};
>
> ?static struct clk_lookup usart_clocks_lookups[] = {
> @@ -199,20 +214,6 @@ static struct clk pck3 = {
> ? ? ? ?.id ? ? ? ? ? ? = 3,
> ?};
>
> -/* HClocks */
> -static struct clk hck0 = {
> - ? ? ? .name ? ? ? ? ? = "hck0",
> - ? ? ? .pmc_mask ? ? ? = AT91_PMC_HCK0,
> - ? ? ? .type ? ? ? ? ? = CLK_TYPE_SYSTEM,
> - ? ? ? .id ? ? ? ? ? ? = 0,
> -};
> -static struct clk hck1 = {
> - ? ? ? .name ? ? ? ? ? = "hck1",
> - ? ? ? .pmc_mask ? ? ? = AT91_PMC_HCK1,
> - ? ? ? .type ? ? ? ? ? = CLK_TYPE_SYSTEM,
> - ? ? ? .id ? ? ? ? ? ? = 1,
> -};
> -
> ?static void __init at91sam9261_register_clocks(void)
> ?{
> ? ? ? ?int i;
> diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c
> index 044f3c9..f83fbb0 100644
> --- a/arch/arm/mach-at91/at91sam9263.c
> +++ b/arch/arm/mach-at91/at91sam9263.c
> @@ -189,6 +189,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
> ? ? ? ?CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.0", &spi0_clk),
> ? ? ? ?CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.1", &spi1_clk),
> ? ? ? ?CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tcb_clk),
> + ? ? ? /* fake hclk clock */
> + ? ? ? CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),
> ?};
>
> ?static struct clk_lookup usart_clocks_lookups[] = {
> diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c
> index e04c5fb..4d743c0 100644
> --- a/arch/arm/mach-at91/at91sam9g45.c
> +++ b/arch/arm/mach-at91/at91sam9g45.c
> @@ -215,6 +215,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
> ? ? ? ?CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.1", &tcb0_clk),
> ? ? ? ?CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk),
> ? ? ? ?CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),
> + ? ? ? /* fake hclk clock */
> + ? ? ? CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),
> ?};
>
> ?static struct clk_lookup usart_clocks_lookups[] = {
> diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
> index 944291e..e08cb10 100644
> --- a/drivers/usb/host/ohci-at91.c
> +++ b/drivers/usb/host/ohci-at91.c
> @@ -35,8 +35,7 @@ extern int usb_disabled(void);
>
> ?static void at91_start_clock(void)
> ?{
> - ? ? ? if (cpu_is_at91sam9261() || cpu_is_at91sam9g10())
> - ? ? ? ? ? ? ? clk_enable(hclk);
> + ? ? ? clk_enable(hclk);
> ? ? ? ?clk_enable(iclk);
> ? ? ? ?clk_enable(fclk);
> ? ? ? ?clocked = 1;
> @@ -46,8 +45,7 @@ static void at91_stop_clock(void)
> ?{
> ? ? ? ?clk_disable(fclk);
> ? ? ? ?clk_disable(iclk);
> - ? ? ? if (cpu_is_at91sam9261() || cpu_is_at91sam9g10())
> - ? ? ? ? ? ? ? clk_disable(hclk);
> + ? ? ? clk_disable(hclk);
> ? ? ? ?clocked = 0;
> ?}
>
> @@ -142,8 +140,7 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver,
>
> ? ? ? ?iclk = clk_get(&pdev->dev, "ohci_clk");
> ? ? ? ?fclk = clk_get(&pdev->dev, "uhpck");
> - ? ? ? if (cpu_is_at91sam9261() || cpu_is_at91sam9g10())
> - ? ? ? ? ? ? ? hclk = clk_get(&pdev->dev, "hck0");
> + ? ? ? hclk = clk_get(&pdev->dev, "hclk");
>
> ? ? ? ?at91_start_hc(pdev);
> ? ? ? ?ohci_hcd_init(hcd_to_ohci(hcd));
> @@ -155,8 +152,7 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver,
> ? ? ? ?/* Error handling */
> ? ? ? ?at91_stop_hc(pdev);
>
> - ? ? ? if (cpu_is_at91sam9261() || cpu_is_at91sam9g10())
> - ? ? ? ? ? ? ? clk_put(hclk);
> + ? ? ? clk_put(hclk);
> ? ? ? ?clk_put(fclk);
> ? ? ? ?clk_put(iclk);
>
> @@ -192,8 +188,7 @@ static void usb_hcd_at91_remove(struct usb_hcd *hcd,
> ? ? ? ?release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
> ? ? ? ?usb_put_hcd(hcd);
>
> - ? ? ? if (cpu_is_at91sam9261() || cpu_is_at91sam9g10())
> - ? ? ? ? ? ? ? clk_put(hclk);
> + ? ? ? clk_put(hclk);
> ? ? ? ?clk_put(fclk);
> ? ? ? ?clk_put(iclk);
> ? ? ? ?fclk = iclk = hclk = NULL;
> --
> 1.7.5.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-usb" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at ?http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] at91/usb: always provide all the clocks
2011-08-30 10:48 ` ABRAHAM, KISHON VIJAY
@ 2011-09-02 18:30 ` Jean-Christophe PLAGNIOL-VILLARD
0 siblings, 0 replies; 7+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2011-09-02 18:30 UTC (permalink / raw)
To: linux-arm-kernel
On 16:18 Tue 30 Aug , ABRAHAM, KISHON VIJAY wrote:
> On Tue, Aug 30, 2011 at 6:59 AM, Jean-Christophe PLAGNIOL-VILLARD
> <plagnioj@jcrosoft.com> wrote:
> > drop the cpu_is in the driver
> > at91sam9261 and at91sam9g10 expect 3 clocks
> >
> > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> > Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
> > ---
> > ?arch/arm/mach-at91/at91cap9.c ? ?| ? ?2 ++
> > ?arch/arm/mach-at91/at91rm9200.c ?| ? ?2 ++
> > ?arch/arm/mach-at91/at91sam9260.c | ? ?2 ++
> > ?arch/arm/mach-at91/at91sam9261.c | ? 29 +++++++++++++++--------------
> > ?arch/arm/mach-at91/at91sam9263.c | ? ?2 ++
> > ?arch/arm/mach-at91/at91sam9g45.c | ? ?2 ++
> > ?drivers/usb/host/ohci-at91.c ? ? | ? 15 +++++----------
> > ?7 files changed, 30 insertions(+), 24 deletions(-)
> >
> > diff --git a/arch/arm/mach-at91/at91cap9.c b/arch/arm/mach-at91/at91cap9.c
> > index bfc6844..ecdd54d 100644
> > --- a/arch/arm/mach-at91/at91cap9.c
> > +++ b/arch/arm/mach-at91/at91cap9.c
> > @@ -219,6 +219,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
> > ? ? ? ?CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tcb_clk),
> > ? ? ? ?CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk),
> > ? ? ? ?CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),
> > + ? ? ? /* fake hclk clock */
> why is it a fake clock??
because we do have the hclk only on 9261 and 9g10
Best Regards,
J.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] at91/usb: always provide all the clocks
2011-08-30 1:29 [PATCH] at91/usb: always provide all the clocks Jean-Christophe PLAGNIOL-VILLARD
2011-08-30 10:48 ` ABRAHAM, KISHON VIJAY
@ 2011-09-07 8:50 ` Nicolas Ferre
2011-09-07 13:47 ` Nicolas Ferre
2 siblings, 0 replies; 7+ messages in thread
From: Nicolas Ferre @ 2011-09-07 8:50 UTC (permalink / raw)
To: linux-arm-kernel
Le 30/08/2011 03:29, Jean-Christophe PLAGNIOL-VILLARD :
> drop the cpu_is in the driver
> at91sam9261 and at91sam9g10 expect 3 clocks
>
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
included in at91-l2 branch on:
git://github.com/at91linux/linux-at91.git
(mind the removal of -2.6-)
> ---
> arch/arm/mach-at91/at91cap9.c | 2 ++
> arch/arm/mach-at91/at91rm9200.c | 2 ++
> arch/arm/mach-at91/at91sam9260.c | 2 ++
> arch/arm/mach-at91/at91sam9261.c | 29 +++++++++++++++--------------
> arch/arm/mach-at91/at91sam9263.c | 2 ++
> arch/arm/mach-at91/at91sam9g45.c | 2 ++
> drivers/usb/host/ohci-at91.c | 15 +++++----------
USB guys,
Are you ok if we send this patch upstream through the ARM soc git tree?
Best regards,
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] at91/usb: always provide all the clocks
2011-09-07 13:47 ` Nicolas Ferre
@ 2011-09-07 13:38 ` Jean-Christophe PLAGNIOL-VILLARD
2011-09-07 14:02 ` Nicolas Ferre
0 siblings, 1 reply; 7+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2011-09-07 13:38 UTC (permalink / raw)
To: linux-arm-kernel
On 15:47 Wed 07 Sep , Nicolas Ferre wrote:
> Le 30/08/2011 03:29, Jean-Christophe PLAGNIOL-VILLARD :
> > drop the cpu_is in the driver
> > at91sam9261 and at91sam9g10 expect 3 clocks
> >
> > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> > Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
> > ---
> > arch/arm/mach-at91/at91cap9.c | 2 ++
> > arch/arm/mach-at91/at91rm9200.c | 2 ++
> > arch/arm/mach-at91/at91sam9260.c | 2 ++
> > arch/arm/mach-at91/at91sam9261.c | 29 +++++++++++++++--------------
> > arch/arm/mach-at91/at91sam9263.c | 2 ++
> > arch/arm/mach-at91/at91sam9g45.c | 2 ++
>
> I know that I have signed the patch *but* there is an issue here...
>
>
> > drivers/usb/host/ohci-at91.c | 15 +++++----------
> > 7 files changed, 30 insertions(+), 24 deletions(-)
> >
> > diff --git a/arch/arm/mach-at91/at91cap9.c b/arch/arm/mach-at91/at91cap9.c
> > index bfc6844..ecdd54d 100644
> > --- a/arch/arm/mach-at91/at91cap9.c
> > +++ b/arch/arm/mach-at91/at91cap9.c
> > @@ -219,6 +219,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
> > CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tcb_clk),
> > CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk),
> > CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),
> > + /* fake hclk clock */
> > + CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),
> > };
> >
> > static struct clk_lookup usart_clocks_lookups[] = {
> > diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c
> > index f73302d..713d3bd 100644
> > --- a/arch/arm/mach-at91/at91rm9200.c
> > +++ b/arch/arm/mach-at91/at91rm9200.c
> > @@ -193,6 +193,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
> > CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk),
> > CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),
> > CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk),
> > + /* fake hclk clock */
> > + CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),
> > };
> >
> > static struct clk_lookup usart_clocks_lookups[] = {
> > diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c
> > index cb397be..a9be758 100644
> > --- a/arch/arm/mach-at91/at91sam9260.c
> > +++ b/arch/arm/mach-at91/at91sam9260.c
> > @@ -199,6 +199,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
> > 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("pclk", "ssc.0", &ssc_clk),
> > + /* fake hclk clock */
> > + CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),
> > };
> >
> > static struct clk_lookup usart_clocks_lookups[] = {
> > diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c
> > index 6c8e3b5..658a518 100644
> > --- a/arch/arm/mach-at91/at91sam9261.c
> > +++ b/arch/arm/mach-at91/at91sam9261.c
> > @@ -129,6 +129,20 @@ static struct clk lcdc_clk = {
> > .type = CLK_TYPE_PERIPHERAL,
> > };
> >
> > +/* HClocks */
> > +static struct clk hck0 = {
> > + .name = "hck0",
> > + .pmc_mask = AT91_PMC_HCK0,
> > + .type = CLK_TYPE_SYSTEM,
> > + .id = 0,
> > +};
> > +static struct clk hck1 = {
> > + .name = "hck1",
> > + .pmc_mask = AT91_PMC_HCK1,
> > + .type = CLK_TYPE_SYSTEM,
> > + .id = 1,
> > +};
> > +
> > static struct clk *periph_clocks[] __initdata = {
> > &pioA_clk,
> > &pioB_clk,
> > @@ -161,6 +175,7 @@ static struct clk_lookup periph_clocks_lookups[] = {
> > CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk),
> > CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),
> > CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk),
> > + CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &hck0),
> > };
> >
> > static struct clk_lookup usart_clocks_lookups[] = {
> > @@ -199,20 +214,6 @@ static struct clk pck3 = {
> > .id = 3,
> > };
> >
> > -/* HClocks */
> > -static struct clk hck0 = {
> > - .name = "hck0",
> > - .pmc_mask = AT91_PMC_HCK0,
> > - .type = CLK_TYPE_SYSTEM,
> > - .id = 0,
> > -};
> > -static struct clk hck1 = {
> > - .name = "hck1",
> > - .pmc_mask = AT91_PMC_HCK1,
> > - .type = CLK_TYPE_SYSTEM,
> > - .id = 1,
> > -};
> > -
> > static void __init at91sam9261_register_clocks(void)
> > {
> > int i;
> > diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c
> > index 044f3c9..f83fbb0 100644
> > --- a/arch/arm/mach-at91/at91sam9263.c
> > +++ b/arch/arm/mach-at91/at91sam9263.c
> > @@ -189,6 +189,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
> > CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.0", &spi0_clk),
> > CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.1", &spi1_clk),
> > CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tcb_clk),
> > + /* fake hclk clock */
> > + CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),
>
> We cannot do this: it does not even compiles.
> The ohci_clk clock is not existing on this device. Moreover, the "hclk"
> con_id is already existing for the *gadget* device...
>
> We have to correct this before I can send it upstream.
we can as the conid + devid are prioritary than just the conid
so
CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &uhphs_clk),
Best Regards,
J.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] at91/usb: always provide all the clocks
2011-08-30 1:29 [PATCH] at91/usb: always provide all the clocks Jean-Christophe PLAGNIOL-VILLARD
2011-08-30 10:48 ` ABRAHAM, KISHON VIJAY
2011-09-07 8:50 ` Nicolas Ferre
@ 2011-09-07 13:47 ` Nicolas Ferre
2011-09-07 13:38 ` Jean-Christophe PLAGNIOL-VILLARD
2 siblings, 1 reply; 7+ messages in thread
From: Nicolas Ferre @ 2011-09-07 13:47 UTC (permalink / raw)
To: linux-arm-kernel
Le 30/08/2011 03:29, Jean-Christophe PLAGNIOL-VILLARD :
> drop the cpu_is in the driver
> at91sam9261 and at91sam9g10 expect 3 clocks
>
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
> ---
> arch/arm/mach-at91/at91cap9.c | 2 ++
> arch/arm/mach-at91/at91rm9200.c | 2 ++
> arch/arm/mach-at91/at91sam9260.c | 2 ++
> arch/arm/mach-at91/at91sam9261.c | 29 +++++++++++++++--------------
> arch/arm/mach-at91/at91sam9263.c | 2 ++
> arch/arm/mach-at91/at91sam9g45.c | 2 ++
I know that I have signed the patch *but* there is an issue here...
> drivers/usb/host/ohci-at91.c | 15 +++++----------
> 7 files changed, 30 insertions(+), 24 deletions(-)
>
> diff --git a/arch/arm/mach-at91/at91cap9.c b/arch/arm/mach-at91/at91cap9.c
> index bfc6844..ecdd54d 100644
> --- a/arch/arm/mach-at91/at91cap9.c
> +++ b/arch/arm/mach-at91/at91cap9.c
> @@ -219,6 +219,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
> CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tcb_clk),
> CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk),
> CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),
> + /* fake hclk clock */
> + CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),
> };
>
> static struct clk_lookup usart_clocks_lookups[] = {
> diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c
> index f73302d..713d3bd 100644
> --- a/arch/arm/mach-at91/at91rm9200.c
> +++ b/arch/arm/mach-at91/at91rm9200.c
> @@ -193,6 +193,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
> CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk),
> CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),
> CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk),
> + /* fake hclk clock */
> + CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),
> };
>
> static struct clk_lookup usart_clocks_lookups[] = {
> diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c
> index cb397be..a9be758 100644
> --- a/arch/arm/mach-at91/at91sam9260.c
> +++ b/arch/arm/mach-at91/at91sam9260.c
> @@ -199,6 +199,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
> 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("pclk", "ssc.0", &ssc_clk),
> + /* fake hclk clock */
> + CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),
> };
>
> static struct clk_lookup usart_clocks_lookups[] = {
> diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c
> index 6c8e3b5..658a518 100644
> --- a/arch/arm/mach-at91/at91sam9261.c
> +++ b/arch/arm/mach-at91/at91sam9261.c
> @@ -129,6 +129,20 @@ static struct clk lcdc_clk = {
> .type = CLK_TYPE_PERIPHERAL,
> };
>
> +/* HClocks */
> +static struct clk hck0 = {
> + .name = "hck0",
> + .pmc_mask = AT91_PMC_HCK0,
> + .type = CLK_TYPE_SYSTEM,
> + .id = 0,
> +};
> +static struct clk hck1 = {
> + .name = "hck1",
> + .pmc_mask = AT91_PMC_HCK1,
> + .type = CLK_TYPE_SYSTEM,
> + .id = 1,
> +};
> +
> static struct clk *periph_clocks[] __initdata = {
> &pioA_clk,
> &pioB_clk,
> @@ -161,6 +175,7 @@ static struct clk_lookup periph_clocks_lookups[] = {
> CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk),
> CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),
> CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk),
> + CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &hck0),
> };
>
> static struct clk_lookup usart_clocks_lookups[] = {
> @@ -199,20 +214,6 @@ static struct clk pck3 = {
> .id = 3,
> };
>
> -/* HClocks */
> -static struct clk hck0 = {
> - .name = "hck0",
> - .pmc_mask = AT91_PMC_HCK0,
> - .type = CLK_TYPE_SYSTEM,
> - .id = 0,
> -};
> -static struct clk hck1 = {
> - .name = "hck1",
> - .pmc_mask = AT91_PMC_HCK1,
> - .type = CLK_TYPE_SYSTEM,
> - .id = 1,
> -};
> -
> static void __init at91sam9261_register_clocks(void)
> {
> int i;
> diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c
> index 044f3c9..f83fbb0 100644
> --- a/arch/arm/mach-at91/at91sam9263.c
> +++ b/arch/arm/mach-at91/at91sam9263.c
> @@ -189,6 +189,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
> CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.0", &spi0_clk),
> CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.1", &spi1_clk),
> CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tcb_clk),
> + /* fake hclk clock */
> + CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),
We cannot do this: it does not even compiles.
The ohci_clk clock is not existing on this device. Moreover, the "hclk"
con_id is already existing for the *gadget* device...
We have to correct this before I can send it upstream.
Bye,
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] at91/usb: always provide all the clocks
2011-09-07 13:38 ` Jean-Christophe PLAGNIOL-VILLARD
@ 2011-09-07 14:02 ` Nicolas Ferre
0 siblings, 0 replies; 7+ messages in thread
From: Nicolas Ferre @ 2011-09-07 14:02 UTC (permalink / raw)
To: linux-arm-kernel
Le 07/09/2011 15:38, Jean-Christophe PLAGNIOL-VILLARD :
> On 15:47 Wed 07 Sep , Nicolas Ferre wrote:
>> Le 30/08/2011 03:29, Jean-Christophe PLAGNIOL-VILLARD :
>>> drop the cpu_is in the driver
>>> at91sam9261 and at91sam9g10 expect 3 clocks
>>>
>>> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
>>> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
>>> ---
>>> arch/arm/mach-at91/at91cap9.c | 2 ++
>>> arch/arm/mach-at91/at91rm9200.c | 2 ++
>>> arch/arm/mach-at91/at91sam9260.c | 2 ++
>>> arch/arm/mach-at91/at91sam9261.c | 29 +++++++++++++++--------------
>>> arch/arm/mach-at91/at91sam9263.c | 2 ++
>>> arch/arm/mach-at91/at91sam9g45.c | 2 ++
>>
>> I know that I have signed the patch *but* there is an issue here...
>>
>>
>>> drivers/usb/host/ohci-at91.c | 15 +++++----------
>>> 7 files changed, 30 insertions(+), 24 deletions(-)
>>>
>>> diff --git a/arch/arm/mach-at91/at91cap9.c b/arch/arm/mach-at91/at91cap9.c
>>> index bfc6844..ecdd54d 100644
>>> --- a/arch/arm/mach-at91/at91cap9.c
>>> +++ b/arch/arm/mach-at91/at91cap9.c
>>> @@ -219,6 +219,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
>>> CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tcb_clk),
>>> CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk),
>>> CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),
>>> + /* fake hclk clock */
>>> + CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),
>>> };
>>>
>>> static struct clk_lookup usart_clocks_lookups[] = {
>>> diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c
>>> index f73302d..713d3bd 100644
>>> --- a/arch/arm/mach-at91/at91rm9200.c
>>> +++ b/arch/arm/mach-at91/at91rm9200.c
>>> @@ -193,6 +193,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
>>> CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk),
>>> CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),
>>> CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk),
>>> + /* fake hclk clock */
>>> + CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),
>>> };
>>>
>>> static struct clk_lookup usart_clocks_lookups[] = {
>>> diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c
>>> index cb397be..a9be758 100644
>>> --- a/arch/arm/mach-at91/at91sam9260.c
>>> +++ b/arch/arm/mach-at91/at91sam9260.c
>>> @@ -199,6 +199,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
>>> 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("pclk", "ssc.0", &ssc_clk),
>>> + /* fake hclk clock */
>>> + CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),
>>> };
>>>
>>> static struct clk_lookup usart_clocks_lookups[] = {
>>> diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c
>>> index 6c8e3b5..658a518 100644
>>> --- a/arch/arm/mach-at91/at91sam9261.c
>>> +++ b/arch/arm/mach-at91/at91sam9261.c
>>> @@ -129,6 +129,20 @@ static struct clk lcdc_clk = {
>>> .type = CLK_TYPE_PERIPHERAL,
>>> };
>>>
>>> +/* HClocks */
>>> +static struct clk hck0 = {
>>> + .name = "hck0",
>>> + .pmc_mask = AT91_PMC_HCK0,
>>> + .type = CLK_TYPE_SYSTEM,
>>> + .id = 0,
>>> +};
>>> +static struct clk hck1 = {
>>> + .name = "hck1",
>>> + .pmc_mask = AT91_PMC_HCK1,
>>> + .type = CLK_TYPE_SYSTEM,
>>> + .id = 1,
>>> +};
>>> +
>>> static struct clk *periph_clocks[] __initdata = {
>>> &pioA_clk,
>>> &pioB_clk,
>>> @@ -161,6 +175,7 @@ static struct clk_lookup periph_clocks_lookups[] = {
>>> CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk),
>>> CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),
>>> CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk),
>>> + CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &hck0),
>>> };
>>>
>>> static struct clk_lookup usart_clocks_lookups[] = {
>>> @@ -199,20 +214,6 @@ static struct clk pck3 = {
>>> .id = 3,
>>> };
>>>
>>> -/* HClocks */
>>> -static struct clk hck0 = {
>>> - .name = "hck0",
>>> - .pmc_mask = AT91_PMC_HCK0,
>>> - .type = CLK_TYPE_SYSTEM,
>>> - .id = 0,
>>> -};
>>> -static struct clk hck1 = {
>>> - .name = "hck1",
>>> - .pmc_mask = AT91_PMC_HCK1,
>>> - .type = CLK_TYPE_SYSTEM,
>>> - .id = 1,
>>> -};
>>> -
>>> static void __init at91sam9261_register_clocks(void)
>>> {
>>> int i;
>>> diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c
>>> index 044f3c9..f83fbb0 100644
>>> --- a/arch/arm/mach-at91/at91sam9263.c
>>> +++ b/arch/arm/mach-at91/at91sam9263.c
>>> @@ -189,6 +189,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
>>> CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.0", &spi0_clk),
>>> CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.1", &spi1_clk),
>>> CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tcb_clk),
>>> + /* fake hclk clock */
>>> + CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),
>>
>> We cannot do this: it does not even compiles.
>> The ohci_clk clock is not existing on this device. Moreover, the "hclk"
>> con_id is already existing for the *gadget* device...
>>
>> We have to correct this before I can send it upstream.
> we can as the conid + devid are prioritary than just the conid
>
> so
> CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &uhphs_clk),
Ok, I correct in the patch.
Thanks for the quick answer. Bye,
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2011-09-07 14:02 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-30 1:29 [PATCH] at91/usb: always provide all the clocks Jean-Christophe PLAGNIOL-VILLARD
2011-08-30 10:48 ` ABRAHAM, KISHON VIJAY
2011-09-02 18:30 ` Jean-Christophe PLAGNIOL-VILLARD
2011-09-07 8:50 ` Nicolas Ferre
2011-09-07 13:47 ` Nicolas Ferre
2011-09-07 13:38 ` Jean-Christophe PLAGNIOL-VILLARD
2011-09-07 14:02 ` Nicolas Ferre
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).