diff options
Diffstat (limited to 'arch/arm/mach-at91/at91sam9261.c')
| -rw-r--r-- | arch/arm/mach-at91/at91sam9261.c | 29 | 
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 = {  	.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;  | 
