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

Commit 194d0710 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm

parents a68d2ebc 9bbd0375

Documentation/dontdiff

+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ logo_*.c 
logo_*_clut224.c

logo_*_mono.c

lxdialog

mach-types

mach-types.h

make_times_h

map

arch/arm/mach-ixp4xx/coyote-setup.c

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ static struct plat_serial8250_port coyote_uart_data[] = { 
		.mapbase	= IXP4XX_UART2_BASE_PHYS,

		.membase	= (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,

		.irq		= IRQ_IXP4XX_UART2,

		.flags		= UPF_BOOT_AUTOCONF,

		.flags		= UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,

		.iotype		= UPIO_MEM,

		.regshift	= 2,

		.uartclk	= IXP4XX_UART_XTAL,

arch/arm/mach-ixp4xx/gtwx5715-setup.c

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static struct plat_serial8250_port gtwx5715_uart_platform_data[] = { 
	.mapbase	= IXP4XX_UART2_BASE_PHYS,

	.membase	= (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,

	.irq		= IRQ_IXP4XX_UART2,

	.flags		= UPF_BOOT_AUTOCONF,

	.flags		= UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,

	.iotype		= UPIO_MEM,

	.regshift	= 2,

	.uartclk	= IXP4XX_UART_XTAL,

arch/arm/mach-ixp4xx/ixdp425-setup.c

+2 −2
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static struct plat_serial8250_port ixdp425_uart_data[] = { 
		.mapbase	= IXP4XX_UART1_BASE_PHYS,

		.membase	= (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET,

		.irq		= IRQ_IXP4XX_UART1,

		.flags		= UPF_BOOT_AUTOCONF,

		.flags		= UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,

		.iotype		= UPIO_MEM,

		.regshift	= 2,

		.uartclk	= IXP4XX_UART_XTAL,
@@ -91,7 +91,7 @@ static struct plat_serial8250_port ixdp425_uart_data[] = { 
		.mapbase	= IXP4XX_UART2_BASE_PHYS,

		.membase	= (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,

		.irq		= IRQ_IXP4XX_UART1,

		.flags		= UPF_BOOT_AUTOCONF,

		.flags		= UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,

		.iotype		= UPIO_MEM,

		.regshift	= 2,

		.uartclk	= IXP4XX_UART_XTAL,

arch/arm/mach-s3c2410/mach-bast.c

+15 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
 *     28-Jun-2005 BJD  Moved pm functionality out to common code

 *     17-Jul-2005 BJD  Changed to platform device for SuperIO 16550s

 *     25-Jul-2005 BJD  Removed ASIX static mappings

 *     27-Jul-2005 BJD  Ensure maximum frequency of i2c bus

*/



#include <linux/kernel.h>
@@ -60,6 +61,7 @@ 
#include <asm/arch/regs-mem.h>

#include <asm/arch/regs-lcd.h>

#include <asm/arch/nand.h>

#include <asm/arch/iic.h>



#include <linux/mtd/mtd.h>

#include <linux/mtd/nand.h>
@@ -304,7 +306,7 @@ static void bast_nand_select(struct s3c2410_nand_set *set, int slot) 
}



static struct s3c2410_platform_nand bast_nand_info = {

	.tacls		= 80,

	.tacls		= 40,

	.twrph0		= 80,

	.twrph1		= 80,

	.nr_sets	= ARRAY_SIZE(bast_nand_sets),
@@ -385,6 +387,17 @@ static struct platform_device bast_sio = { 
	},

};



/* we have devices on the bus which cannot work much over the

 * standard 100KHz i2c bus frequency

*/



static struct s3c2410_platform_i2c bast_i2c_info = {

	.flags		= 0,

	.slave_addr	= 0x10,

	.bus_freq	= 100*1000,

	.max_freq	= 130*1000,

};



/* Standard BAST devices */



static struct platform_device *bast_devices[] __initdata = {
@@ -431,6 +444,7 @@ void __init bast_map_io(void) 
	s3c24xx_uclk.parent  = &s3c24xx_clkout1;



	s3c_device_nand.dev.platform_data = &bast_nand_info;

	s3c_device_i2c.dev.platform_data = &bast_i2c_info;



	s3c24xx_init_io(bast_iodesc, ARRAY_SIZE(bast_iodesc));

	s3c24xx_init_clocks(0);