Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0af4316b authored by Jean-Christophe PLAGNIOL-VILLARD's avatar Jean-Christophe PLAGNIOL-VILLARD Committed by Arnd Bergmann
Browse files

at91: ohci-at91: always provide all the clocks 



Remove the cpu_is_at91xxxx() macros in the ohci-at91 driver.
SoCs at91sam9261 and at91sam9g10 expect one additional clock: hck0.

Signed-off-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent c6a389f1

arch/arm/mach-at91/at91cap9.c

+2 −0
Original line number Diff line number Diff line
@@ -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[] = {

arch/arm/mach-at91/at91rm9200.c

+2 −0
Original line number Diff line number Diff line
@@ -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[] = {

arch/arm/mach-at91/at91sam9260.c

+2 −0
Original line number Diff line number Diff line
@@ -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[] = {

arch/arm/mach-at91/at91sam9261.c

+15 −14
Original line number Diff line number Diff line
@@ -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;

arch/arm/mach-at91/at91sam9263.c

+2 −0
Original line number Diff line number Diff line
@@ -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[] = {