aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91/at91sam9261.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-at91/at91sam9261.c')
-rw-r--r--arch/arm/mach-at91/at91sam9261.c29
1 files changed, 15 insertions, 14 deletions
diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c
index 6c8e3b5f669f..658a5185abfd 100644
--- a/arch/arm/mach-at91/at91sam9261.c
+++ b/arch/arm/mach-at91/at91sam9261.c
@@ -129,6 +129,20 @@ static struct clk lcdc_clk = {
129 .type = CLK_TYPE_PERIPHERAL, 129 .type = CLK_TYPE_PERIPHERAL,
130}; 130};
131 131
132/* HClocks */
133static struct clk hck0 = {
134 .name = "hck0",
135 .pmc_mask = AT91_PMC_HCK0,
136 .type = CLK_TYPE_SYSTEM,
137 .id = 0,
138};
139static struct clk hck1 = {
140 .name = "hck1",
141 .pmc_mask = AT91_PMC_HCK1,
142 .type = CLK_TYPE_SYSTEM,
143 .id = 1,
144};
145
132static struct clk *periph_clocks[] __initdata = { 146static struct clk *periph_clocks[] __initdata = {
133 &pioA_clk, 147 &pioA_clk,
134 &pioB_clk, 148 &pioB_clk,
@@ -161,6 +175,7 @@ static struct clk_lookup periph_clocks_lookups[] = {
161 CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk), 175 CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk),
162 CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk), 176 CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),
163 CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk), 177 CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk),
178 CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &hck0),
164}; 179};
165 180
166static struct clk_lookup usart_clocks_lookups[] = { 181static struct clk_lookup usart_clocks_lookups[] = {
@@ -199,20 +214,6 @@ static struct clk pck3 = {
199 .id = 3, 214 .id = 3,
200}; 215};
201 216
202/* HClocks */
203static struct clk hck0 = {
204 .name = "hck0",
205 .pmc_mask = AT91_PMC_HCK0,
206 .type = CLK_TYPE_SYSTEM,
207 .id = 0,
208};
209static struct clk hck1 = {
210 .name = "hck1",
211 .pmc_mask = AT91_PMC_HCK1,
212 .type = CLK_TYPE_SYSTEM,
213 .id = 1,
214};
215
216static void __init at91sam9261_register_clocks(void) 217static void __init at91sam9261_register_clocks(void)
217{ 218{
218 int i; 219 int i;