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

Commit fc52693f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'at91/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-2.6-arm-soc 

* 'at91/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-2.6-arm-soc:
  AT91: Change nand buswidth logic to match hardware default configuration
  at91: Use "pclk" as con_id on at91cap9 and at91rm9200
  at91: fix udc, ehci and mmc clock device name for cap9/9g45/9rl
  atmel_serial: fix internal port num
  at91: fix at91_set_serial_console: use platform device id
parents aababb97 64393b3a

arch/arm/mach-at91/at91cap9.c

+4 −4
Original line number Diff line number Diff line
@@ -223,15 +223,15 @@ static struct clk *periph_clocks[] __initdata = { 
};



static struct clk_lookup periph_clocks_lookups[] = {

	CLKDEV_CON_DEV_ID("hclk", "atmel_usba_udc.0", &utmi_clk),

	CLKDEV_CON_DEV_ID("pclk", "atmel_usba_udc.0", &udphs_clk),

	CLKDEV_CON_DEV_ID("hclk", "atmel_usba_udc", &utmi_clk),

	CLKDEV_CON_DEV_ID("pclk", "atmel_usba_udc", &udphs_clk),

	CLKDEV_CON_DEV_ID("mci_clk", "at91_mci.0", &mmc0_clk),

	CLKDEV_CON_DEV_ID("mci_clk", "at91_mci.1", &mmc1_clk),

	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),

	CLKDEV_CON_DEV_ID("ssc", "ssc.0", &ssc0_clk),

	CLKDEV_CON_DEV_ID("ssc", "ssc.1", &ssc1_clk),

	CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk),

	CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),

};



static struct clk_lookup usart_clocks_lookups[] = {

arch/arm/mach-at91/at91cap9_devices.c

+1 −1
Original line number Diff line number Diff line
@@ -1220,7 +1220,7 @@ void __init at91_set_serial_console(unsigned portnr) 
{

	if (portnr < ATMEL_MAX_UART) {

		atmel_default_console_device = at91_uarts[portnr];

		at91cap9_set_console_clock(portnr);

		at91cap9_set_console_clock(at91_uarts[portnr]->id);

	}

}

arch/arm/mach-at91/at91rm9200.c

+3 −3
Original line number Diff line number Diff line
@@ -199,9 +199,9 @@ static struct clk_lookup periph_clocks_lookups[] = { 
	CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.1", &tc3_clk),

	CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.1", &tc4_clk),

	CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.1", &tc5_clk),

	CLKDEV_CON_DEV_ID("ssc", "ssc.0", &ssc0_clk),

	CLKDEV_CON_DEV_ID("ssc", "ssc.1", &ssc1_clk),

	CLKDEV_CON_DEV_ID("ssc", "ssc.2", &ssc2_clk),

	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),

};



static struct clk_lookup usart_clocks_lookups[] = {

arch/arm/mach-at91/at91rm9200_devices.c

+1 −1
Original line number Diff line number Diff line
@@ -1135,7 +1135,7 @@ void __init at91_set_serial_console(unsigned portnr) 
{

	if (portnr < ATMEL_MAX_UART) {

		atmel_default_console_device = at91_uarts[portnr];

		at91rm9200_set_console_clock(portnr);

		at91rm9200_set_console_clock(at91_uarts[portnr]->id);

	}

}

arch/arm/mach-at91/at91sam9260_devices.c

+1 −1
Original line number Diff line number Diff line
@@ -1173,7 +1173,7 @@ void __init at91_set_serial_console(unsigned portnr) 
{

	if (portnr < ATMEL_MAX_UART) {

		atmel_default_console_device = at91_uarts[portnr];

		at91sam9260_set_console_clock(portnr);

		at91sam9260_set_console_clock(at91_uarts[portnr]->id);

	}

}