Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

.L_\@:

		.endm

		/*

		 * The kernel build system appends the size of the

		 * decompressed kernel at the end of the compressed data

		 * in little-endian form.

		 */

		.macro	get_inflated_image_size, res:req, tmp1:req, tmp2:req

		adr	\res, .Linflated_image_size_offset

		ldr	\tmp1, [\res]

		add	\tmp1, \tmp1, \res	@ address of inflated image size

		ldrb	\res, [\tmp1]		@ get_unaligned_le32

		ldrb	\tmp2, [\tmp1, #1]

		orr	\res, \res, \tmp2, lsl #8

		ldrb	\tmp2, [\tmp1, #2]

		ldrb	\tmp1, [\tmp1, #3]

		orr	\res, \res, \tmp2, lsl #16

		orr	\res, \res, \tmp1, lsl #24

		.endm

		.section ".start", "ax"

/*

 * sort out different calling conventions

		 */

		mov	r0, pc

		cmp	r0, r4

		ldrcc	r0, LC0+32

		ldrcc	r0, LC0+28

		addcc	r0, r0, pc

		cmpcc	r4, r0

		orrcc	r4, r4, #1		@ remember we skipped cache_on

		blcs	cache_on

restart:	adr	r0, LC0

		ldmia	r0, {r1, r2, r3, r6, r10, r11, r12}

		ldr	sp, [r0, #28]

		ldmia	r0, {r1, r2, r3, r6, r11, r12}

		ldr	sp, [r0, #24]

		/*

		 * We might be running at a different address.  We need

		 */

		sub	r0, r0, r1		@ calculate the delta offset

		add	r6, r6, r0		@ _edata

		add	r10, r10, r0		@ inflated kernel size location

		/*

		 * The kernel build system appends the size of the

		 * decompressed kernel at the end of the compressed data

		 * in little-endian form.

		 */

		ldrb	r9, [r10, #0]

		ldrb	lr, [r10, #1]

		orr	r9, r9, lr, lsl #8

		ldrb	lr, [r10, #2]

		ldrb	r10, [r10, #3]

		orr	r9, r9, lr, lsl #16

		orr	r9, r9, r10, lsl #24

		get_inflated_image_size	r9, r10, lr

#ifndef CONFIG_ZBOOT_ROM

		/* malloc space is above the relocated stack (64k max) */

		/* Preserve offset to relocated code. */

		sub	r6, r9, r6

#ifndef CONFIG_ZBOOT_ROM

		/* cache_clean_flush may use the stack, so relocate it */

		add	sp, sp, r6

#endif

		mov	r0, r9			@ start of relocated zImage

		add	r1, sp, r6		@ end of relocated zImage

		bl	cache_clean_flush

		badr	r0, restart

		add	r2, sp, #0x10000	@ 64k max

		mov	r3, r7

		bl	decompress_kernel

		get_inflated_image_size	r1, r2, r3

		mov	r0, r4			@ start of inflated image

		add	r1, r1, r0		@ end of inflated image

		bl	cache_clean_flush

		bl	cache_off

		.word	__bss_start		@ r2

		.word	_end			@ r3

		.word	_edata			@ r6

		.word	input_data_end - 4	@ r10 (inflated size location)

		.word	_got_start		@ r11

		.word	_got_end		@ ip

		.word	.L_user_stack_end	@ sp

		.word	_end - restart + 16384 + 1024*1024

		.size	LC0, . - LC0

.Linflated_image_size_offset:

		.long	(input_data_end - 4) - .

#ifdef CONFIG_ARCH_RPC

		.globl	params

params:		ldr	r0, =0x10000100		@ params_phys for RPC

		.align

#endif

/*

 * dcache_line_size - get the minimum D-cache line size from the CTR register

 * on ARMv7.

 */

		.macro	dcache_line_size, reg, tmp

#ifdef CONFIG_CPU_V7M

		movw	\tmp, #:lower16:BASEADDR_V7M_SCB + V7M_SCB_CTR

		movt	\tmp, #:upper16:BASEADDR_V7M_SCB + V7M_SCB_CTR

		ldr	\tmp, [\tmp]

#else

		mrc	p15, 0, \tmp, c0, c0, 1		@ read ctr

#endif

		lsr	\tmp, \tmp, #16

		and	\tmp, \tmp, #0xf		@ cache line size encoding

		mov	\reg, #4			@ bytes per word

		mov	\reg, \reg, lsl \tmp		@ actual cache line size

		.endm

/*

 * Turn on the cache.  We need to setup some page tables so that we

 * can have both the I and D caches on.

		bic	r0, r0, #0x000c

#endif

		mcr	p15, 0, r0, c1, c0	@ turn MMU and cache off

		mov	r12, lr

		bl	__armv7_mmu_cache_flush

		mov	r0, #0

#ifdef CONFIG_MMU

		mcr	p15, 0, r0, c8, c7, 0	@ invalidate whole TLB

		mcr	p15, 0, r0, c7, c5, 6	@ invalidate BTC

		mcr	p15, 0, r0, c7, c10, 4	@ DSB

		mcr	p15, 0, r0, c7, c5, 4	@ ISB

		mov	pc, r12

		mov	pc, lr

/*

 * Clean and flush the cache to maintain consistency.

 *

 * On entry,

 *  r0 = start address

 *  r1 = end address (exclusive)

 * On exit,

 *  r1, r2, r3, r9, r10, r11, r12 corrupted

 * This routine must preserve:

		.align	5

cache_clean_flush:

		mov	r3, #16

		mov	r11, r1

		b	call_cache_fn

__armv4_mpu_cache_flush:

		mcr	p15, 0, r10, c7, c14, 0	@ clean+invalidate D

		b	iflush

hierarchical:

		mcr	p15, 0, r10, c7, c10, 5	@ DMB

		stmfd	sp!, {r0-r7, r9-r11}

		mrc	p15, 1, r0, c0, c0, 1	@ read clidr

		ands	r3, r0, #0x7000000	@ extract loc from clidr

		mov	r3, r3, lsr #23		@ left align loc bit field

		beq	finished		@ if loc is 0, then no need to clean

		mov	r10, #0			@ start clean at cache level 0

loop1:

		add	r2, r10, r10, lsr #1	@ work out 3x current cache level

		mov	r1, r0, lsr r2		@ extract cache type bits from clidr

		and	r1, r1, #7		@ mask of the bits for current cache only

		cmp	r1, #2			@ see what cache we have at this level

		blt	skip			@ skip if no cache, or just i-cache

		mcr	p15, 2, r10, c0, c0, 0	@ select current cache level in cssr

		mcr	p15, 0, r10, c7, c5, 4	@ isb to sych the new cssr&csidr

		mrc	p15, 1, r1, c0, c0, 0	@ read the new csidr

		and	r2, r1, #7		@ extract the length of the cache lines

		add	r2, r2, #4		@ add 4 (line length offset)

		ldr	r4, =0x3ff

		ands	r4, r4, r1, lsr #3	@ find maximum number on the way size

		clz	r5, r4			@ find bit position of way size increment

		ldr	r7, =0x7fff

		ands	r7, r7, r1, lsr #13	@ extract max number of the index size

loop2:

		mov	r9, r4			@ create working copy of max way size

loop3:

 ARM(		orr	r11, r10, r9, lsl r5	) @ factor way and cache number into r11

 ARM(		orr	r11, r11, r7, lsl r2	) @ factor index number into r11

 THUMB(		lsl	r6, r9, r5		)

 THUMB(		orr	r11, r10, r6		) @ factor way and cache number into r11

 THUMB(		lsl	r6, r7, r2		)

 THUMB(		orr	r11, r11, r6		) @ factor index number into r11

		mcr	p15, 0, r11, c7, c14, 2	@ clean & invalidate by set/way

		subs	r9, r9, #1		@ decrement the way

		bge	loop3

		subs	r7, r7, #1		@ decrement the index

		bge	loop2

skip:

		add	r10, r10, #2		@ increment cache number

		cmp	r3, r10

		bgt	loop1

finished:

		ldmfd	sp!, {r0-r7, r9-r11}

		mov	r10, #0			@ switch back to cache level 0

		mcr	p15, 2, r10, c0, c0, 0	@ select current cache level in cssr

		dcache_line_size r1, r2		@ r1 := dcache min line size

		sub	r2, r1, #1		@ r2 := line size mask

		bic	r0, r0, r2		@ round down start to line size

		sub	r11, r11, #1		@ end address is exclusive

		bic	r11, r11, r2		@ round down end to line size

0:		cmp	r0, r11			@ finished?

		bgt	iflush

		mcr	p15, 0, r0, c7, c14, 1	@ Dcache clean/invalidate by VA

		add	r0, r0, r1

		b	0b

iflush:

		mcr	p15, 0, r10, c7, c10, 4	@ DSB

		mcr	p15, 0, r10, c7, c5, 0	@ invalidate I+BTB

    *(.start)

    *(.text)

    *(.text.*)

    *(.fixup)

    *(.gnu.warning)

    *(.glue_7t)

    *(.glue_7)

	ldr	r3, [r0],#4

	/* Is it a destination page. Put destination address to r4 */

	tst	r3,#1,0

	tst	r3,#1

	beq	1f

	bic	r4,r3,#1

	b	0b

1:

	/* Is it an indirection page */

	tst	r3,#2,0

	tst	r3,#2

	beq	1f

	bic	r0,r3,#2

	b	0b

1:

	/* are we done ? */

	tst	r3,#4,0

	tst	r3,#4

	beq	1f

	b	2f

1:

	/* is it source ? */

	tst	r3,#8,0

	tst	r3,#8

	beq	0b

	bic r3,r3,#8

	mov r6,#1024

		ctrl.vrs[PC] = ctrl.vrs[LR];

	/* check for infinite loop */

	if (frame->pc == ctrl.vrs[PC])

	if (frame->pc == ctrl.vrs[PC] && frame->sp == ctrl.vrs[SP])

		return -URC_FAILURE;

	frame->fp = ctrl.vrs[FP];

	return IRQ_HANDLED;

}

static struct irqaction ebsa110_timer_irq = {

	.name		= "EBSA110 Timer Tick",

	.flags		= IRQF_TIMER | IRQF_IRQPOLL,

	.handler	= ebsa110_timer_interrupt,

};

/*

 * Set up timer interrupt.

 */

void __init ebsa110_timer_init(void)

{

	int irq = IRQ_EBSA110_TIMER0;

	arch_gettimeoffset = ebsa110_gettimeoffset;

	/*

	__raw_writeb(COUNT & 0xff, PIT_T1);

	__raw_writeb(COUNT >> 8, PIT_T1);

	setup_irq(IRQ_EBSA110_TIMER0, &ebsa110_timer_irq);

	if (request_irq(irq, ebsa110_timer_interrupt, IRQF_TIMER | IRQF_IRQPOLL,

			"EBSA110 Timer Tick", NULL))

		pr_err("Failed to request irq %d (EBSA110 Timer Tick)\n", irq);

}

static struct plat_serial8250_port serial_platform_data[] = {