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

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

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

parents 07bbeaf1 450008b5

arch/arm/kernel/armksyms.c

+3 −0
Original line number Diff line number Diff line
@@ -41,7 +41,10 @@ extern void fp_enter(void); 
 * This has a special calling convention; it doesn't

 * modify any of the usual registers, except for LR.

 */

#define EXPORT_CRC_ALIAS(sym) __CRC_SYMBOL(sym, "")



#define EXPORT_SYMBOL_ALIAS(sym,orig)		\

 EXPORT_CRC_ALIAS(sym)				\

 const struct kernel_symbol __ksymtab_##sym	\

  __attribute__((section("__ksymtab"))) =	\

    { (unsigned long)&orig, #sym };

arch/arm/mach-ixp4xx/common-pci.c

+2 −2
Original line number Diff line number Diff line
@@ -453,8 +453,8 @@ int ixp4xx_setup(int nr, struct pci_sys_data *sys) 
	local_write_config(PCI_COMMAND, 2, PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY);



	res[0].name = "PCI I/O Space";

	res[0].start = 0x00001000;

	res[0].end = 0xffff0000;

	res[0].start = 0x00000000;

	res[0].end = 0x0000ffff;

	res[0].flags = IORESOURCE_IO;



	res[1].name = "PCI Memory Space";

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

+15 −12
Original line number Diff line number Diff line
@@ -56,7 +56,8 @@ static struct resource coyote_uart_resource = { 
	.flags	= IORESOURCE_MEM,

};



static struct plat_serial8250_port coyote_uart_data = {

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,
@@ -64,13 +65,15 @@ static struct plat_serial8250_port coyote_uart_data = { 
		.iotype		= UPIO_MEM,

		.regshift	= 2,

		.uartclk	= IXP4XX_UART_XTAL,

	},

	{ },

};



static struct platform_device coyote_uart = {

	.name		= "serial8250",

	.id		= 0,

	.dev			= {

		.platform_data	= &coyote_uart_data,

		.platform_data	= coyote_uart_data,

	},

	.num_resources	= 1,

	.resource	= &coyote_uart_resource,
@@ -87,10 +90,10 @@ static void __init coyote_init(void) 
	*IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0;



	if (machine_is_ixdpg425()) {

		coyote_uart_data.membase =

		coyote_uart_data[0].membase =

			(char*)(IXP4XX_UART1_BASE_VIRT + REG_OFFSET);

		coyote_uart_data.mapbase = IXP4XX_UART1_BASE_PHYS;

		coyote_uart_data.irq = IRQ_IXP4XX_UART1;

		coyote_uart_data[0].mapbase = IXP4XX_UART1_BASE_PHYS;

		coyote_uart_data[0].irq = IRQ_IXP4XX_UART1;

	}

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

+2 −1
Original line number Diff line number Diff line
@@ -95,7 +95,8 @@ static struct plat_serial8250_port ixdp425_uart_data[] = { 
		.iotype		= UPIO_MEM,

		.regshift	= 2,

		.uartclk	= IXP4XX_UART_XTAL,

	}

	},

	{ },

};



static struct platform_device ixdp425_uart = {

arch/arm/mm/proc-v6.S

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ __v6_setup: 
	mcr	p15, 0, r4, c2, c0, 1		@ load TTB1

#ifdef CONFIG_VFP

	mrc	p15, 0, r0, c1, c0, 2

	orr	r0, r0, #(3 << 20)

	orr	r0, r0, #(0xf << 20)

	mcr	p15, 0, r0, c1, c0, 2		@ Enable full access to VFP

#endif

	mrc	p15, 0, r0, c1, c0, 0		@ read control register