diff options
author | Jamie Iles <jamie@jamieiles.com> | 2011-08-09 10:51:11 -0400 |
---|---|---|
committer | Jamie Iles <jamie@jamieiles.com> | 2011-11-22 10:21:13 -0500 |
commit | 865d605ee81813dc73d5422fd2f9bd132d10d194 (patch) | |
tree | 0107d957ce7e3fbbabf596073410aff4f3f81e89 /arch/arm/mach-at91/at91sam9263.c | |
parent | cfcfc9eca2bcbd26a8e206baeb005b055dbf8e37 (diff) |
at91: provide macb clks with "pclk" and "hclk" name
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>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'arch/arm/mach-at91/at91sam9263.c')
-rw-r--r-- | arch/arm/mach-at91/at91sam9263.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c index f83fbb0ee0c..182d112dc59 100644 --- a/arch/arm/mach-at91/at91sam9263.c +++ b/arch/arm/mach-at91/at91sam9263.c | |||
@@ -118,7 +118,7 @@ static struct clk pwm_clk = { | |||
118 | .type = CLK_TYPE_PERIPHERAL, | 118 | .type = CLK_TYPE_PERIPHERAL, |
119 | }; | 119 | }; |
120 | static struct clk macb_clk = { | 120 | static struct clk macb_clk = { |
121 | .name = "macb_clk", | 121 | .name = "pclk", |
122 | .pmc_mask = 1 << AT91SAM9263_ID_EMAC, | 122 | .pmc_mask = 1 << AT91SAM9263_ID_EMAC, |
123 | .type = CLK_TYPE_PERIPHERAL, | 123 | .type = CLK_TYPE_PERIPHERAL, |
124 | }; | 124 | }; |
@@ -182,6 +182,8 @@ static struct clk *periph_clocks[] __initdata = { | |||
182 | }; | 182 | }; |
183 | 183 | ||
184 | static struct clk_lookup periph_clocks_lookups[] = { | 184 | static struct clk_lookup periph_clocks_lookups[] = { |
185 | /* One additional fake clock for macb_hclk */ | ||
186 | CLKDEV_CON_ID("hclk", &macb_clk), | ||
185 | CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk), | 187 | CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk), |
186 | CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk), | 188 | CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk), |
187 | CLKDEV_CON_DEV_ID("mci_clk", "at91_mci.0", &mmc0_clk), | 189 | CLKDEV_CON_DEV_ID("mci_clk", "at91_mci.0", &mmc0_clk), |