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

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

ARM: at91: switch gpio clock to clkdev 



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

arch/arm/mach-at91/at91cap9.c

+4 −4
Original line number Diff line number Diff line
@@ -222,6 +222,10 @@ static struct clk_lookup periph_clocks_lookups[] = { 
	CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),

	/* fake hclk clock */

	CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),

	CLKDEV_CON_ID("pioA", &pioABCD_clk),

	CLKDEV_CON_ID("pioB", &pioABCD_clk),

	CLKDEV_CON_ID("pioC", &pioABCD_clk),

	CLKDEV_CON_ID("pioD", &pioABCD_clk),

};



static struct clk_lookup usart_clocks_lookups[] = {
@@ -298,19 +302,15 @@ static struct at91_gpio_bank at91cap9_gpio[] = { 
	{

		.id		= AT91CAP9_ID_PIOABCD,

		.regbase	= AT91CAP9_BASE_PIOA,

		.clock		= &pioABCD_clk,

	}, {

		.id		= AT91CAP9_ID_PIOABCD,

		.regbase	= AT91CAP9_BASE_PIOB,

		.clock		= &pioABCD_clk,

	}, {

		.id		= AT91CAP9_ID_PIOABCD,

		.regbase	= AT91CAP9_BASE_PIOC,

		.clock		= &pioABCD_clk,

	}, {

		.id		= AT91CAP9_ID_PIOABCD,

		.regbase	= AT91CAP9_BASE_PIOD,

		.clock		= &pioABCD_clk,

	}

};

arch/arm/mach-at91/at91rm9200.c

+4 −4
Original line number Diff line number Diff line
@@ -196,6 +196,10 @@ static struct clk_lookup periph_clocks_lookups[] = { 
	CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk),

	/* fake hclk clock */

	CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),

	CLKDEV_CON_ID("pioA", &pioA_clk),

	CLKDEV_CON_ID("pioB", &pioB_clk),

	CLKDEV_CON_ID("pioC", &pioC_clk),

	CLKDEV_CON_ID("pioD", &pioD_clk),

};



static struct clk_lookup usart_clocks_lookups[] = {
@@ -273,19 +277,15 @@ static struct at91_gpio_bank at91rm9200_gpio[] = { 
	{

		.id		= AT91RM9200_ID_PIOA,

		.regbase	= AT91RM9200_BASE_PIOA,

		.clock		= &pioA_clk,

	}, {

		.id		= AT91RM9200_ID_PIOB,

		.regbase	= AT91RM9200_BASE_PIOB,

		.clock		= &pioB_clk,

	}, {

		.id		= AT91RM9200_ID_PIOC,

		.regbase	= AT91RM9200_BASE_PIOC,

		.clock		= &pioC_clk,

	}, {

		.id		= AT91RM9200_ID_PIOD,

		.regbase	= AT91RM9200_BASE_PIOD,

		.clock		= &pioD_clk,

	}

};

arch/arm/mach-at91/at91sam9260.c

+3 −3
Original line number Diff line number Diff line
@@ -210,6 +210,9 @@ static struct clk_lookup periph_clocks_lookups[] = { 
	CLKDEV_CON_DEV_ID("usart", "fffd8000.serial", &usart5_clk),

	/* fake hclk clock */

	CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),

	CLKDEV_CON_ID("pioA", &pioA_clk),

	CLKDEV_CON_ID("pioB", &pioB_clk),

	CLKDEV_CON_ID("pioC", &pioC_clk),

};



static struct clk_lookup usart_clocks_lookups[] = {
@@ -275,15 +278,12 @@ static struct at91_gpio_bank at91sam9260_gpio[] = { 
	{

		.id		= AT91SAM9260_ID_PIOA,

		.regbase	= AT91SAM9260_BASE_PIOA,

		.clock		= &pioA_clk,

	}, {

		.id		= AT91SAM9260_ID_PIOB,

		.regbase	= AT91SAM9260_BASE_PIOB,

		.clock		= &pioB_clk,

	}, {

		.id		= AT91SAM9260_ID_PIOC,

		.regbase	= AT91SAM9260_BASE_PIOC,

		.clock		= &pioC_clk,

	}

};

arch/arm/mach-at91/at91sam9261.c

+3 −3
Original line number Diff line number Diff line
@@ -175,6 +175,9 @@ static struct clk_lookup periph_clocks_lookups[] = { 
	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),

	CLKDEV_CON_ID("pioA", &pioA_clk),

	CLKDEV_CON_ID("pioB", &pioB_clk),

	CLKDEV_CON_ID("pioC", &pioC_clk),

};



static struct clk_lookup usart_clocks_lookups[] = {
@@ -254,15 +257,12 @@ static struct at91_gpio_bank at91sam9261_gpio[] = { 
	{

		.id		= AT91SAM9261_ID_PIOA,

		.regbase	= AT91SAM9261_BASE_PIOA,

		.clock		= &pioA_clk,

	}, {

		.id		= AT91SAM9261_ID_PIOB,

		.regbase	= AT91SAM9261_BASE_PIOB,

		.clock		= &pioB_clk,

	}, {

		.id		= AT91SAM9261_ID_PIOC,

		.regbase	= AT91SAM9261_BASE_PIOC,

		.clock		= &pioC_clk,

	}

};

arch/arm/mach-at91/at91sam9263.c

+5 −5
Original line number Diff line number Diff line
@@ -192,6 +192,11 @@ static struct clk_lookup periph_clocks_lookups[] = { 
	CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tcb_clk),

	/* fake hclk clock */

	CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),

	CLKDEV_CON_ID("pioA", &pioA_clk),

	CLKDEV_CON_ID("pioB", &pioB_clk),

	CLKDEV_CON_ID("pioC", &pioCDE_clk),

	CLKDEV_CON_ID("pioD", &pioCDE_clk),

	CLKDEV_CON_ID("pioE", &pioCDE_clk),

};



static struct clk_lookup usart_clocks_lookups[] = {
@@ -268,23 +273,18 @@ static struct at91_gpio_bank at91sam9263_gpio[] = { 
	{

		.id		= AT91SAM9263_ID_PIOA,

		.regbase	= AT91SAM9263_BASE_PIOA,

		.clock		= &pioA_clk,

	}, {

		.id		= AT91SAM9263_ID_PIOB,

		.regbase	= AT91SAM9263_BASE_PIOB,

		.clock		= &pioB_clk,

	}, {

		.id		= AT91SAM9263_ID_PIOCDE,

		.regbase	= AT91SAM9263_BASE_PIOC,

		.clock		= &pioCDE_clk,

	}, {

		.id		= AT91SAM9263_ID_PIOCDE,

		.regbase	= AT91SAM9263_BASE_PIOD,

		.clock		= &pioCDE_clk,

	}, {

		.id		= AT91SAM9263_ID_PIOCDE,

		.regbase	= AT91SAM9263_BASE_PIOE,

		.clock		= &pioCDE_clk,

	}

};