From: Jamie Iles <jamie@jamieiles.com> To: netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: plagnioj@jcrosoft.com, Jamie Iles <jamie@jamieiles.com> Subject: [PATCHv3 1/9] at91: provide macb clks with "pclk" and "hclk" name Date: Tue, 9 Aug 2011 10:16:43 +0100 [thread overview] Message-ID: <1312881411-2376-2-git-send-email-jamie@jamieiles.com> (raw) In-Reply-To: <1312881411-2376-1-git-send-email-jamie@jamieiles.com> The macb driver expects clocks with the names "pclk" and "hclk". We currently provide "macb_clk" but to fit in line with other architectures (namely AVR32), provide "pclk" and a fake "hclk". Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Jamie Iles <jamie@jamieiles.com> Acked-by: David S. Miller <davem@davemloft.net> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> --- arch/arm/mach-at91/at91cap9.c | 8 +++++++- arch/arm/mach-at91/at91sam9260.c | 8 +++++++- arch/arm/mach-at91/at91sam9263.c | 8 +++++++- arch/arm/mach-at91/at91sam9g45.c | 8 +++++++- 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-at91/at91cap9.c b/arch/arm/mach-at91/at91cap9.c index bfc6844..da17a72 100644 --- a/arch/arm/mach-at91/at91cap9.c +++ b/arch/arm/mach-at91/at91cap9.c @@ -137,10 +137,15 @@ static struct clk pwm_clk = { .type = CLK_TYPE_PERIPHERAL, }; static struct clk macb_clk = { - .name = "macb_clk", + .name = "pclk", .pmc_mask = 1 << AT91CAP9_ID_EMAC, .type = CLK_TYPE_PERIPHERAL, }; +static struct clk macb_hclk = { + .name = "hclk", + .pmc_mask = 0, + .type = CLK_TYPE_PERIPHERAL, +}; static struct clk aestdes_clk = { .name = "aestdes_clk", .pmc_mask = 1 << AT91CAP9_ID_AESTDES, @@ -199,6 +204,7 @@ static struct clk *periph_clocks[] __initdata = { &tcb_clk, &pwm_clk, &macb_clk, + &macb_hclk, &aestdes_clk, &adc_clk, &isi_clk, diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c index cb397be..d4e70cd 100644 --- a/arch/arm/mach-at91/at91sam9260.c +++ b/arch/arm/mach-at91/at91sam9260.c @@ -120,10 +120,15 @@ static struct clk ohci_clk = { .type = CLK_TYPE_PERIPHERAL, }; static struct clk macb_clk = { - .name = "macb_clk", + .name = "pclk", .pmc_mask = 1 << AT91SAM9260_ID_EMAC, .type = CLK_TYPE_PERIPHERAL, }; +static struct clk macb_hclk = { + .name = "hclk", + .pmc_mask = 0, + .type = CLK_TYPE_PERIPHERAL, +}; static struct clk isi_clk = { .name = "isi_clk", .pmc_mask = 1 << AT91SAM9260_ID_ISI, @@ -179,6 +184,7 @@ static struct clk *periph_clocks[] __initdata = { &tc2_clk, &ohci_clk, &macb_clk, + &macb_hclk, &isi_clk, &usart3_clk, &usart4_clk, diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c index 044f3c9..ff4ddd3 100644 --- a/arch/arm/mach-at91/at91sam9263.c +++ b/arch/arm/mach-at91/at91sam9263.c @@ -118,10 +118,15 @@ static struct clk pwm_clk = { .type = CLK_TYPE_PERIPHERAL, }; static struct clk macb_clk = { - .name = "macb_clk", + .name = "pclk", .pmc_mask = 1 << AT91SAM9263_ID_EMAC, .type = CLK_TYPE_PERIPHERAL, }; +static struct clk macb_hclk = { + .name = "hclk", + .pmc_mask = 0, + .type = CLK_TYPE_PERIPHERAL, +}; static struct clk dma_clk = { .name = "dma_clk", .pmc_mask = 1 << AT91SAM9263_ID_DMA, @@ -172,6 +177,7 @@ static struct clk *periph_clocks[] __initdata = { &tcb_clk, &pwm_clk, &macb_clk, + &macb_hclk, &twodge_clk, &udc_clk, &isi_clk, diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c index e04c5fb..3726d1b 100644 --- a/arch/arm/mach-at91/at91sam9g45.c +++ b/arch/arm/mach-at91/at91sam9g45.c @@ -144,10 +144,15 @@ static struct clk ac97_clk = { .type = CLK_TYPE_PERIPHERAL, }; static struct clk macb_clk = { - .name = "macb_clk", + .name = "pclk", .pmc_mask = 1 << AT91SAM9G45_ID_EMAC, .type = CLK_TYPE_PERIPHERAL, }; +static struct clk macb_hclk = { + .name = "hclk", + .pmc_mask = 0, + .type = CLK_TYPE_PERIPHERAL, +}; static struct clk isi_clk = { .name = "isi_clk", .pmc_mask = 1 << AT91SAM9G45_ID_ISI, @@ -195,6 +200,7 @@ static struct clk *periph_clocks[] __initdata = { &lcdc_clk, &ac97_clk, &macb_clk, + &macb_hclk, &isi_clk, &udphs_clk, &mmc1_clk, -- 1.7.4.1
WARNING: multiple messages have this Message-ID (diff)
From: jamie@jamieiles.com (Jamie Iles) To: linux-arm-kernel@lists.infradead.org Subject: [PATCHv3 1/9] at91: provide macb clks with "pclk" and "hclk" name Date: Tue, 9 Aug 2011 10:16:43 +0100 [thread overview] Message-ID: <1312881411-2376-2-git-send-email-jamie@jamieiles.com> (raw) In-Reply-To: <1312881411-2376-1-git-send-email-jamie@jamieiles.com> The macb driver expects clocks with the names "pclk" and "hclk". We currently provide "macb_clk" but to fit in line with other architectures (namely AVR32), provide "pclk" and a fake "hclk". Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Jamie Iles <jamie@jamieiles.com> Acked-by: David S. Miller <davem@davemloft.net> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> --- arch/arm/mach-at91/at91cap9.c | 8 +++++++- arch/arm/mach-at91/at91sam9260.c | 8 +++++++- arch/arm/mach-at91/at91sam9263.c | 8 +++++++- arch/arm/mach-at91/at91sam9g45.c | 8 +++++++- 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-at91/at91cap9.c b/arch/arm/mach-at91/at91cap9.c index bfc6844..da17a72 100644 --- a/arch/arm/mach-at91/at91cap9.c +++ b/arch/arm/mach-at91/at91cap9.c @@ -137,10 +137,15 @@ static struct clk pwm_clk = { .type = CLK_TYPE_PERIPHERAL, }; static struct clk macb_clk = { - .name = "macb_clk", + .name = "pclk", .pmc_mask = 1 << AT91CAP9_ID_EMAC, .type = CLK_TYPE_PERIPHERAL, }; +static struct clk macb_hclk = { + .name = "hclk", + .pmc_mask = 0, + .type = CLK_TYPE_PERIPHERAL, +}; static struct clk aestdes_clk = { .name = "aestdes_clk", .pmc_mask = 1 << AT91CAP9_ID_AESTDES, @@ -199,6 +204,7 @@ static struct clk *periph_clocks[] __initdata = { &tcb_clk, &pwm_clk, &macb_clk, + &macb_hclk, &aestdes_clk, &adc_clk, &isi_clk, diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c index cb397be..d4e70cd 100644 --- a/arch/arm/mach-at91/at91sam9260.c +++ b/arch/arm/mach-at91/at91sam9260.c @@ -120,10 +120,15 @@ static struct clk ohci_clk = { .type = CLK_TYPE_PERIPHERAL, }; static struct clk macb_clk = { - .name = "macb_clk", + .name = "pclk", .pmc_mask = 1 << AT91SAM9260_ID_EMAC, .type = CLK_TYPE_PERIPHERAL, }; +static struct clk macb_hclk = { + .name = "hclk", + .pmc_mask = 0, + .type = CLK_TYPE_PERIPHERAL, +}; static struct clk isi_clk = { .name = "isi_clk", .pmc_mask = 1 << AT91SAM9260_ID_ISI, @@ -179,6 +184,7 @@ static struct clk *periph_clocks[] __initdata = { &tc2_clk, &ohci_clk, &macb_clk, + &macb_hclk, &isi_clk, &usart3_clk, &usart4_clk, diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c index 044f3c9..ff4ddd3 100644 --- a/arch/arm/mach-at91/at91sam9263.c +++ b/arch/arm/mach-at91/at91sam9263.c @@ -118,10 +118,15 @@ static struct clk pwm_clk = { .type = CLK_TYPE_PERIPHERAL, }; static struct clk macb_clk = { - .name = "macb_clk", + .name = "pclk", .pmc_mask = 1 << AT91SAM9263_ID_EMAC, .type = CLK_TYPE_PERIPHERAL, }; +static struct clk macb_hclk = { + .name = "hclk", + .pmc_mask = 0, + .type = CLK_TYPE_PERIPHERAL, +}; static struct clk dma_clk = { .name = "dma_clk", .pmc_mask = 1 << AT91SAM9263_ID_DMA, @@ -172,6 +177,7 @@ static struct clk *periph_clocks[] __initdata = { &tcb_clk, &pwm_clk, &macb_clk, + &macb_hclk, &twodge_clk, &udc_clk, &isi_clk, diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c index e04c5fb..3726d1b 100644 --- a/arch/arm/mach-at91/at91sam9g45.c +++ b/arch/arm/mach-at91/at91sam9g45.c @@ -144,10 +144,15 @@ static struct clk ac97_clk = { .type = CLK_TYPE_PERIPHERAL, }; static struct clk macb_clk = { - .name = "macb_clk", + .name = "pclk", .pmc_mask = 1 << AT91SAM9G45_ID_EMAC, .type = CLK_TYPE_PERIPHERAL, }; +static struct clk macb_hclk = { + .name = "hclk", + .pmc_mask = 0, + .type = CLK_TYPE_PERIPHERAL, +}; static struct clk isi_clk = { .name = "isi_clk", .pmc_mask = 1 << AT91SAM9G45_ID_ISI, @@ -195,6 +200,7 @@ static struct clk *periph_clocks[] __initdata = { &lcdc_clk, &ac97_clk, &macb_clk, + &macb_hclk, &isi_clk, &udphs_clk, &mmc1_clk, -- 1.7.4.1
next prev parent reply other threads:[~2011-08-09 9:17 UTC|newest] Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-08-09 9:16 [PATCHv3 0/9] macb: add support for Cadence GEM Jamie Iles 2011-08-09 9:16 ` Jamie Iles 2011-08-09 9:16 ` Jamie Iles [this message] 2011-08-09 9:16 ` [PATCHv3 1/9] at91: provide macb clks with "pclk" and "hclk" name Jamie Iles 2011-08-09 14:49 ` Jean-Christophe PLAGNIOL-VILLARD 2011-08-09 14:49 ` Jean-Christophe PLAGNIOL-VILLARD 2011-08-09 14:51 ` [PATCH 1/9 v4] " Jean-Christophe PLAGNIOL-VILLARD 2011-08-09 14:51 ` Jean-Christophe PLAGNIOL-VILLARD 2011-08-09 9:16 ` [PATCHv3 2/9] macb: remove conditional clk handling Jamie Iles 2011-08-09 9:16 ` Jamie Iles 2011-08-09 14:52 ` Jean-Christophe PLAGNIOL-VILLARD 2011-08-09 14:52 ` Jean-Christophe PLAGNIOL-VILLARD 2011-08-09 9:16 ` [PATCHv3 3/9] macb: unify at91 and avr32 platform data Jamie Iles 2011-08-09 9:16 ` Jamie Iles 2011-08-09 14:53 ` Jean-Christophe PLAGNIOL-VILLARD 2011-08-09 14:53 ` Jean-Christophe PLAGNIOL-VILLARD 2011-08-09 9:16 ` [PATCHv3 4/9] macb: convert printk to netdev_ and friends Jamie Iles 2011-08-09 9:16 ` Jamie Iles 2011-08-09 20:20 ` Joe Perches 2011-08-09 20:20 ` Joe Perches 2011-08-11 9:01 ` Jamie Iles 2011-08-11 9:01 ` Jamie Iles 2011-08-09 9:16 ` [PATCHv3 5/9] macb: initial support for Cadence GEM Jamie Iles 2011-08-09 9:16 ` Jamie Iles 2011-08-09 14:55 ` Jean-Christophe PLAGNIOL-VILLARD 2011-08-09 14:55 ` Jean-Christophe PLAGNIOL-VILLARD 2011-08-09 9:16 ` [PATCHv3 6/9] macb: support higher rate GEM MDIO clock divisors Jamie Iles 2011-08-09 9:16 ` Jamie Iles 2011-08-09 14:56 ` Jean-Christophe PLAGNIOL-VILLARD 2011-08-09 14:56 ` Jean-Christophe PLAGNIOL-VILLARD 2011-08-09 9:16 ` [PATCHv3 7/9] macb: support statistics for GEM devices Jamie Iles 2011-08-09 9:16 ` Jamie Iles 2011-08-09 14:57 ` Jean-Christophe PLAGNIOL-VILLARD 2011-08-09 14:57 ` Jean-Christophe PLAGNIOL-VILLARD 2011-08-09 9:16 ` [PATCHv3 8/9] macb: support DMA bus widths > 32 bits Jamie Iles 2011-08-09 9:16 ` Jamie Iles 2011-08-09 14:57 ` Jean-Christophe PLAGNIOL-VILLARD 2011-08-09 14:57 ` Jean-Christophe PLAGNIOL-VILLARD 2011-08-09 9:16 ` [PATCHv3 9/9] macb: allow GEM to have configurable receive buffer size Jamie Iles 2011-08-09 9:16 ` Jamie Iles 2011-08-09 14:59 ` Jean-Christophe PLAGNIOL-VILLARD 2011-08-09 14:59 ` Jean-Christophe PLAGNIOL-VILLARD 2011-08-09 14:59 ` [PATCHv3 0/9] macb: add support for Cadence GEM Jean-Christophe PLAGNIOL-VILLARD 2011-08-09 14:59 ` Jean-Christophe PLAGNIOL-VILLARD 2011-08-11 9:21 ` Jamie Iles 2011-08-11 9:21 ` Jamie Iles 2011-08-23 9:34 ` Jamie Iles 2011-08-23 9:34 ` Jamie Iles 2011-08-28 6:08 ` Jean-Christophe PLAGNIOL-VILLARD 2011-08-28 6:08 ` Jean-Christophe PLAGNIOL-VILLARD
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1312881411-2376-2-git-send-email-jamie@jamieiles.com \ --to=jamie@jamieiles.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=netdev@vger.kernel.org \ --cc=plagnioj@jcrosoft.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.