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

Commit 63c422af authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 3848/1: pxafb: Add option of fixing video modes and spitz QVGA mode support
  [ARM] 3880/1: remove the last trace of iop31x support
  [ARM] 3879/1: ep93xx: instantiate platform devices for ep93xx ethernet
  [ARM] 3809/3: get rid of 4 megabyte kernel image size limit
  [ARM] Fix XIP_KERNEL build error in arch/arm/mm/mmu.c
  [ARM] 3874/1: Remove leftover usage of asm/timeofday.h
parents 6f3a28f7 d14b272b

arch/arm/boot/compressed/head.S

+2 −1
Original line number Diff line number Diff line
@@ -237,7 +237,8 @@ not_relocated: mov r0, #0 
 */

		cmp	r4, r2

		bhs	wont_overwrite

		add	r0, r4, #4096*1024	@ 4MB largest kernel size

		sub	r3, sp, r5		@ > compressed kernel size

		add	r0, r4, r3, lsl #2	@ allow for 4x expansion

		cmp	r0, r5

		bls	wont_overwrite

arch/arm/kernel/head.S

+9 −9
Original line number Diff line number Diff line
@@ -234,18 +234,18 @@ __create_page_tables: 


	/*

	 * Now setup the pagetables for our kernel direct

	 * mapped region.  We round TEXTADDR down to the

	 * nearest megabyte boundary.  It is assumed that

	 * the kernel fits within 4 contigous 1MB sections.

	 * mapped region.

	 */

	add	r0, r4,  #(TEXTADDR & 0xff000000) >> 18	@ start of kernel

	str	r3, [r0, #(TEXTADDR & 0x00f00000) >> 18]!

	add	r3, r3, #1 << 20

	str	r3, [r0, #4]!			@ KERNEL + 1MB

	add	r3, r3, #1 << 20

	str	r3, [r0, #4]!			@ KERNEL + 2MB

	add	r3, r3, #1 << 20

	str	r3, [r0, #4]			@ KERNEL + 3MB



	ldr	r6, =(_end - PAGE_OFFSET - 1)	@ r6 = number of sections

	mov	r6, r6, lsr #20			@ needed for kernel minus 1



1:	add	r3, r3, #1 << 20

	str	r3, [r0, #4]!

	subs	r6, r6, #1

	bgt	1b



	/*

	 * Then map first 1MB of ram in case it contains our boot params.

arch/arm/mach-ep93xx/edb9315a.c

+30 −0
Original line number Diff line number Diff line
@@ -44,10 +44,40 @@ static struct platform_device edb9315a_flash = { 
	.resource	= &edb9315a_flash_resource,

};



static struct ep93xx_eth_data edb9315a_eth_data = {

	.phy_id			= 1,

};



static struct resource edb9315a_eth_resource[] = {

	{

		.start	= EP93XX_ETHERNET_PHYS_BASE,

		.end	= EP93XX_ETHERNET_PHYS_BASE + 0xffff,

		.flags	= IORESOURCE_MEM,

	}, {

		.start	= IRQ_EP93XX_ETHERNET,

		.end	= IRQ_EP93XX_ETHERNET,

		.flags	= IORESOURCE_IRQ,

	}

};



static struct platform_device edb9315a_eth_device = {

	.name		= "ep93xx-eth",

	.id		= -1,

	.dev		= {

		.platform_data	= &edb9315a_eth_data,

	},

	.num_resources	= 2,

	.resource	= edb9315a_eth_resource,

};



static void __init edb9315a_init_machine(void)

{

	ep93xx_init_devices();

	platform_device_register(&edb9315a_flash);



	memcpy(edb9315a_eth_data.dev_addr,

		(void *)(EP93XX_ETHERNET_BASE + 0x50), 6);

	platform_device_register(&edb9315a_eth_device);

}



MACHINE_START(EDB9315A, "Cirrus Logic EDB9315A Evaluation Board")

arch/arm/mach-ep93xx/gesbc9312.c

+27 −0
Original line number Diff line number Diff line
@@ -43,10 +43,37 @@ static struct platform_device gesbc9312_flash = { 
	.resource	= &gesbc9312_flash_resource,

};



static struct ep93xx_eth_data gesbc9312_eth_data = {

	.phy_id			= 1,

};



static struct resource gesbc9312_eth_resource[] = {

	{

		.start	= EP93XX_ETHERNET_PHYS_BASE,

		.end	= EP93XX_ETHERNET_PHYS_BASE + 0xffff,

		.flags	= IORESOURCE_MEM,

	}, {

		.start	= IRQ_EP93XX_ETHERNET,

		.end	= IRQ_EP93XX_ETHERNET,

		.flags	= IORESOURCE_IRQ,

	}

};



static struct platform_device gesbc9312_eth_device = {

	.name		= "ep93xx-eth",

	.id		= -1,

	.dev		= {

		.platform_data	= &gesbc9312_eth_data,

	},

	.num_resources	= 2,

	.resource	= gesbc9312_eth_resource,

};



static void __init gesbc9312_init_machine(void)

{

	ep93xx_init_devices();

	platform_device_register(&gesbc9312_flash);

	platform_device_register(&gesbc9312_eth_device);

}



MACHINE_START(GESBC9312, "Glomation GESBC-9312-sx")

arch/arm/mach-ep93xx/ts72xx.c

+30 −0
Original line number Diff line number Diff line
@@ -157,12 +157,42 @@ static struct platform_device ts72xx_rtc_device = { 
	.num_resources		= 0,

};



static struct ep93xx_eth_data ts72xx_eth_data = {

	.phy_id			= 1,

};



static struct resource ts72xx_eth_resource[] = {

	{

		.start	= EP93XX_ETHERNET_PHYS_BASE,

		.end	= EP93XX_ETHERNET_PHYS_BASE + 0xffff,

		.flags	= IORESOURCE_MEM,

	}, {

		.start	= IRQ_EP93XX_ETHERNET,

		.end	= IRQ_EP93XX_ETHERNET,

		.flags	= IORESOURCE_IRQ,

	}

};



static struct platform_device ts72xx_eth_device = {

	.name		= "ep93xx-eth",

	.id		= -1,

	.dev		= {

		.platform_data	= &ts72xx_eth_data,

	},

	.num_resources	= 2,

	.resource	= ts72xx_eth_resource,

};



static void __init ts72xx_init_machine(void)

{

	ep93xx_init_devices();

	if (board_is_ts7200())

		platform_device_register(&ts72xx_flash);

	platform_device_register(&ts72xx_rtc_device);



	memcpy(ts72xx_eth_data.dev_addr,

		(void *)(EP93XX_ETHERNET_BASE + 0x50), 6);

	platform_device_register(&ts72xx_eth_device);

}



MACHINE_START(TS72XX, "Technologic Systems TS-72xx SBC")