diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-24 12:26:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-24 12:26:48 -0700 |
| commit | e40c9056db75e093e6d99d2c14510cb131eb482a (patch) | |
| tree | 8e8ccddd0485ef4e6222c6752d5ce9768d9a2e00 /arch | |
| parent | 22e93eddd9c63c61e5a38b82eea08f6095189e7f (diff) | |
| parent | 92c548cd35d50df398f442b07021150094578460 (diff) | |
| download | blackbird-op-linux-e40c9056db75e093e6d99d2c14510cb131eb482a.tar.gz blackbird-op-linux-e40c9056db75e093e6d99d2c14510cb131eb482a.zip | |
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()
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/avr32/boards/favr-32/setup.c | 4 | ||||
| -rw-r--r-- | arch/avr32/lib/memcpy.S | 16 |
2 files changed, 17 insertions, 3 deletions
diff --git a/arch/avr32/boards/favr-32/setup.c b/arch/avr32/boards/favr-32/setup.c index 46c9b0a224cf..75f19f47fb2f 100644 --- a/arch/avr32/boards/favr-32/setup.c +++ b/arch/avr32/boards/favr-32/setup.c @@ -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[] = { diff --git a/arch/avr32/lib/memcpy.S b/arch/avr32/lib/memcpy.S index 0abb26142b64..c2ca49d705af 100644 --- a/arch/avr32/lib/memcpy.S +++ b/arch/avr32/lib/memcpy.S @@ -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 |
