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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
  favr32: improve touchscreen response
  avr32/lib: fix unaligned memcpy where len < 4
  avr32/lib: fix unaligned memcpy()
parents 22e93edd 92c548cd

arch/avr32/boards/favr-32/setup.c

+4 −0
Original line number Diff line number Diff line
@@ -72,6 +72,10 @@ static struct ads7846_platform_data ads7843_data = { 
	.debounce_max		= 20,

	.debounce_rep		= 4,

	.debounce_tol		= 5,



	.keep_vref_on		= true,

	.settle_delay_usecs	= 500,

	.penirq_recheck_delay_usecs = 100,

};



static struct spi_board_info __initdata spi1_board_info[] = {

arch/avr32/lib/memcpy.S

+13 −3
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ memcpy: 
	brne	1f



	/* At this point, "from" is word-aligned */

2:	sub	r10, 4

	mov	r9, r12

2:	mov	r9, r12

5:	sub	r10, 4

	brlt	4f



3:	ld.w	r8, r11++
@@ -49,6 +49,7 @@ memcpy: 


	/* Handle unaligned "from" pointer */

1:	sub	r10, 4

	movlt	r9, r12

	brlt	4b

	add	r10, r9

	lsl	r9, 2
@@ -59,4 +60,13 @@ memcpy: 
	st.b	r12++, r8

	ld.ub	r8, r11++

	st.b	r12++, r8

	rjmp	2b
 
	mov	r8, r12

	add	pc, pc, r9

	sub	r8, 1

	nop

	sub	r8, 1

	nop

	sub	r8, 1

	nop

	mov	r9, r8

	rjmp	5b