Skip to content

L
linux
Commit 6bec1192 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

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

* master.kernel.org:/home/rmk/linux-2.6-arm:
  ARM: 6061/1: PL061 GPIO: Bug fix - setting gpio for HIGH_LEVEL interrupt is not working.
  ARM: 5957/1: ARM: RealView SD/MMC Card detection and write-protect using GPIOLIB
  ARM: 6030/1: KS8695: enable console
  ARM: 6060/1: PL061 GPIO: Setting gpio val after changing direction to OUT.
  ARM: 6059/1: PL061 GPIO: Changing *_irq_chip_data with *_irq_data for real irqs.
  ARM: 6023/1: update bcmring_defconfig to latest version and fix build error
  ARM: fix build error in arch/arm/kernel/process.c
parents 553cbf0a db7e1bc4
Expand all Show whitespace changes
Inline Side-by-side
Showing with 200 additions and 116 deletions
arch/arm/Kconfig
View file @ 6bec1192
...@@ -253,6 +253,7 @@ config ARCH_REALVIEW ...@@ -253,6 +253,7 @@ config ARCH_REALVIEW
select GENERIC_TIME select GENERIC_TIME
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
select ARCH_WANT_OPTIONAL_GPIOLIB select ARCH_WANT_OPTIONAL_GPIOLIB
select GPIO_PL061 if GPIOLIB
help help
This enables support for ARM Ltd RealView boards. This enables support for ARM Ltd RealView boards.
......
arch/arm/configs/bcmring_defconfig
View file @ 6bec1192
This diff is collapsed.
arch/arm/include/asm/assembler.h
View file @ 6bec1192
...@@ -149,10 +149,10 @@ ...@@ -149,10 +149,10 @@
#define USER(x...) \ #define USER(x...) \
9999: x; \ 9999: x; \
.section __ex_table,"a"; \ .pushsection __ex_table,"a"; \
.align 3; \ .align 3; \
.long 9999b,9001f; \ .long 9999b,9001f; \
.previous .popsection
/* /*
* SMP data memory barrier * SMP data memory barrier
...@@ -193,10 +193,10 @@ ...@@ -193,10 +193,10 @@
.error "Unsupported inc macro argument" .error "Unsupported inc macro argument"
.endif .endif
.section __ex_table,"a" .pushsection __ex_table,"a"
.align 3 .align 3
.long 9999b, \abort .long 9999b, \abort
.previous .popsection
.endm .endm
.macro usracc, instr, reg, ptr, inc, cond, rept, abort .macro usracc, instr, reg, ptr, inc, cond, rept, abort
...@@ -234,10 +234,10 @@ ...@@ -234,10 +234,10 @@
.error "Unsupported inc macro argument" .error "Unsupported inc macro argument"
.endif .endif
.section __ex_table,"a" .pushsection __ex_table,"a"
.align 3 .align 3
.long 9999b, \abort .long 9999b, \abort
.previous .popsection
.endr .endr
.endm .endm
......
arch/arm/include/asm/futex.h
View file @ 6bec1192
...@@ -21,14 +21,14 @@ ...@@ -21,14 +21,14 @@
"2: strt %0, [%2]\n" \ "2: strt %0, [%2]\n" \
" mov %0, #0\n" \ " mov %0, #0\n" \
"3:\n" \ "3:\n" \
" .section __ex_table,\"a\"\n" \ " .pushsection __ex_table,\"a\"\n" \
" .align 3\n" \ " .align 3\n" \
" .long 1b, 4f, 2b, 4f\n" \ " .long 1b, 4f, 2b, 4f\n" \
" .previous\n" \ " .popsection\n" \
" .section .fixup,\"ax\"\n" \ " .pushsection .fixup,\"ax\"\n" \
"4: mov %0, %4\n" \ "4: mov %0, %4\n" \
" b 3b\n" \ " b 3b\n" \
" .previous" \ " .popsection" \
: "=&r" (ret), "=&r" (oldval) \ : "=&r" (ret), "=&r" (oldval) \
: "r" (uaddr), "r" (oparg), "Ir" (-EFAULT) \ : "r" (uaddr), "r" (oparg), "Ir" (-EFAULT) \
: "cc", "memory") : "cc", "memory")
...@@ -102,14 +102,14 @@ futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval) ...@@ -102,14 +102,14 @@ futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval)
" it eq @ explicit IT needed for the 2b label\n" " it eq @ explicit IT needed for the 2b label\n"
"2: streqt %2, [%3]\n" "2: streqt %2, [%3]\n"
"3:\n" "3:\n"
" .section __ex_table,\"a\"\n" " .pushsection __ex_table,\"a\"\n"
" .align 3\n" " .align 3\n"
" .long 1b, 4f, 2b, 4f\n" " .long 1b, 4f, 2b, 4f\n"
" .previous\n" " .popsection\n"
" .section .fixup,\"ax\"\n" " .pushsection .fixup,\"ax\"\n"
"4: mov %0, %4\n" "4: mov %0, %4\n"
" b 3b\n" " b 3b\n"
" .previous" " .popsection"
: "=&r" (val) : "=&r" (val)
: "r" (oldval), "r" (newval), "r" (uaddr), "Ir" (-EFAULT) : "r" (oldval), "r" (newval), "r" (uaddr), "Ir" (-EFAULT)
: "cc", "memory"); : "cc", "memory");
......
arch/arm/include/asm/uaccess.h
View file @ 6bec1192
...@@ -229,16 +229,16 @@ do { \ ...@@ -229,16 +229,16 @@ do { \
__asm__ __volatile__( \ __asm__ __volatile__( \
"1: ldrbt %1,[%2]\n" \ "1: ldrbt %1,[%2]\n" \
"2:\n" \ "2:\n" \
" .section .fixup,\"ax\"\n" \ " .pushsection .fixup,\"ax\"\n" \
" .align 2\n" \ " .align 2\n" \
"3: mov %0, %3\n" \ "3: mov %0, %3\n" \
" mov %1, #0\n" \ " mov %1, #0\n" \
" b 2b\n" \ " b 2b\n" \
" .previous\n" \ " .popsection\n" \
" .section __ex_table,\"a\"\n" \ " .pushsection __ex_table,\"a\"\n" \
" .align 3\n" \ " .align 3\n" \
" .long 1b, 3b\n" \ " .long 1b, 3b\n" \
" .previous" \ " .popsection" \
: "+r" (err), "=&r" (x) \ : "+r" (err), "=&r" (x) \
: "r" (addr), "i" (-EFAULT) \ : "r" (addr), "i" (-EFAULT) \
: "cc") : "cc")
...@@ -265,16 +265,16 @@ do { \ ...@@ -265,16 +265,16 @@ do { \
__asm__ __volatile__( \ __asm__ __volatile__( \
"1: ldrt %1,[%2]\n" \ "1: ldrt %1,[%2]\n" \
"2:\n" \ "2:\n" \
" .section .fixup,\"ax\"\n" \ " .pushsection .fixup,\"ax\"\n" \
" .align 2\n" \ " .align 2\n" \
"3: mov %0, %3\n" \ "3: mov %0, %3\n" \
" mov %1, #0\n" \ " mov %1, #0\n" \
" b 2b\n" \ " b 2b\n" \
" .previous\n" \ " .popsection\n" \
" .section __ex_table,\"a\"\n" \ " .pushsection __ex_table,\"a\"\n" \
" .align 3\n" \ " .align 3\n" \
" .long 1b, 3b\n" \ " .long 1b, 3b\n" \
" .previous" \ " .popsection" \
: "+r" (err), "=&r" (x) \ : "+r" (err), "=&r" (x) \
: "r" (addr), "i" (-EFAULT) \ : "r" (addr), "i" (-EFAULT) \
: "cc") : "cc")
...@@ -310,15 +310,15 @@ do { \ ...@@ -310,15 +310,15 @@ do { \
__asm__ __volatile__( \ __asm__ __volatile__( \
"1: strbt %1,[%2]\n" \ "1: strbt %1,[%2]\n" \
"2:\n" \ "2:\n" \
" .section .fixup,\"ax\"\n" \ " .pushsection .fixup,\"ax\"\n" \
" .align 2\n" \ " .align 2\n" \
"3: mov %0, %3\n" \ "3: mov %0, %3\n" \
" b 2b\n" \ " b 2b\n" \
" .previous\n" \ " .popsection\n" \
" .section __ex_table,\"a\"\n" \ " .pushsection __ex_table,\"a\"\n" \
" .align 3\n" \ " .align 3\n" \
" .long 1b, 3b\n" \ " .long 1b, 3b\n" \
" .previous" \ " .popsection" \
: "+r" (err) \ : "+r" (err) \
: "r" (x), "r" (__pu_addr), "i" (-EFAULT) \ : "r" (x), "r" (__pu_addr), "i" (-EFAULT) \
: "cc") : "cc")
...@@ -343,15 +343,15 @@ do { \ ...@@ -343,15 +343,15 @@ do { \
__asm__ __volatile__( \ __asm__ __volatile__( \
"1: strt %1,[%2]\n" \ "1: strt %1,[%2]\n" \
"2:\n" \ "2:\n" \
" .section .fixup,\"ax\"\n" \ " .pushsection .fixup,\"ax\"\n" \
" .align 2\n" \ " .align 2\n" \
"3: mov %0, %3\n" \ "3: mov %0, %3\n" \
" b 2b\n" \ " b 2b\n" \
" .previous\n" \ " .popsection\n" \
" .section __ex_table,\"a\"\n" \ " .pushsection __ex_table,\"a\"\n" \
" .align 3\n" \ " .align 3\n" \
" .long 1b, 3b\n" \ " .long 1b, 3b\n" \
" .previous" \ " .popsection" \
: "+r" (err) \ : "+r" (err) \
: "r" (x), "r" (__pu_addr), "i" (-EFAULT) \ : "r" (x), "r" (__pu_addr), "i" (-EFAULT) \
: "cc") : "cc")
...@@ -371,16 +371,16 @@ do { \ ...@@ -371,16 +371,16 @@ do { \
THUMB( "1: strt " __reg_oper1 ", [%1]\n" ) \ THUMB( "1: strt " __reg_oper1 ", [%1]\n" ) \
THUMB( "2: strt " __reg_oper0 ", [%1, #4]\n" ) \ THUMB( "2: strt " __reg_oper0 ", [%1, #4]\n" ) \
"3:\n" \ "3:\n" \
" .section .fixup,\"ax\"\n" \ " .pushsection .fixup,\"ax\"\n" \
" .align 2\n" \ " .align 2\n" \
"4: mov %0, %3\n" \ "4: mov %0, %3\n" \
" b 3b\n" \ " b 3b\n" \
" .previous\n" \ " .popsection\n" \
" .section __ex_table,\"a\"\n" \ " .pushsection __ex_table,\"a\"\n" \
" .align 3\n" \ " .align 3\n" \
" .long 1b, 4b\n" \ " .long 1b, 4b\n" \
" .long 2b, 4b\n" \ " .long 2b, 4b\n" \
" .previous" \ " .popsection" \
: "+r" (err), "+r" (__pu_addr) \ : "+r" (err), "+r" (__pu_addr) \
: "r" (x), "i" (-EFAULT) \ : "r" (x), "i" (-EFAULT) \
: "cc") : "cc")
......
arch/arm/kernel/entry-armv.S
View file @ 6bec1192
...@@ -523,16 +523,16 @@ ENDPROC(__und_usr) ...@@ -523,16 +523,16 @@ ENDPROC(__und_usr)
/* /*
* The out of line fixup for the ldrt above. * The out of line fixup for the ldrt above.
*/ */
.section .fixup, "ax" .pushsection .fixup, "ax"
4: mov pc, r9 4: mov pc, r9
.previous .popsection
.section __ex_table,"a" .pushsection __ex_table,"a"
.long 1b, 4b .long 1b, 4b
#if __LINUX_ARM_ARCH__ >= 7 #if __LINUX_ARM_ARCH__ >= 7
.long 2b, 4b .long 2b, 4b
.long 3b, 4b .long 3b, 4b
#endif #endif
.previous .popsection
/* /*
* Check whether the instruction is a co-processor instruction. * Check whether the instruction is a co-processor instruction.
...@@ -679,7 +679,7 @@ do_fpe: ...@@ -679,7 +679,7 @@ do_fpe:
.data .data
ENTRY(fp_enter) ENTRY(fp_enter)
.word no_fp .word no_fp
.previous .text
ENTRY(no_fp) ENTRY(no_fp)
mov pc, lr mov pc, lr
......
arch/arm/kernel/ftrace.c
View file @ 6bec1192
...@@ -62,15 +62,15 @@ int ftrace_modify_code(unsigned long pc, unsigned char *old_code, ...@@ -62,15 +62,15 @@ int ftrace_modify_code(unsigned long pc, unsigned char *old_code,
" movne %0, #2 \n" " movne %0, #2 \n"
"3:\n" "3:\n"
".section .fixup, \"ax\"\n" ".pushsection .fixup, \"ax\"\n"
"4: mov %0, #1 \n" "4: mov %0, #1 \n"
" b 3b \n" " b 3b \n"
".previous\n" ".popsection\n"
".section __ex_table, \"a\"\n" ".pushsection __ex_table, \"a\"\n"
" .long 1b, 4b \n" " .long 1b, 4b \n"
" .long 2b, 4b \n" " .long 2b, 4b \n"
".previous\n" ".popsection\n"
: "=r"(err), "=r"(replaced) : "=r"(err), "=r"(replaced)
: "r"(pc), "r"(new), "r"(old), "0"(err), "1"(replaced) : "r"(pc), "r"(new), "r"(old), "0"(err), "1"(replaced)
......
arch/arm/kernel/process.c
View file @ 6bec1192
...@@ -355,7 +355,7 @@ EXPORT_SYMBOL(dump_fpu); ...@@ -355,7 +355,7 @@ EXPORT_SYMBOL(dump_fpu);
* the thread function, and r3 points to the exit function. * the thread function, and r3 points to the exit function.
*/ */
extern void kernel_thread_helper(void); extern void kernel_thread_helper(void);
asm( ".section .text\n" asm( ".pushsection .text\n"
" .align\n" " .align\n"
" .type kernel_thread_helper, #function\n" " .type kernel_thread_helper, #function\n"
"kernel_thread_helper:\n" "kernel_thread_helper:\n"
...@@ -363,11 +363,11 @@ asm( ".section .text\n" ...@@ -363,11 +363,11 @@ asm( ".section .text\n"
" mov lr, r3\n" " mov lr, r3\n"
" mov pc, r2\n" " mov pc, r2\n"
" .size kernel_thread_helper, . - kernel_thread_helper\n" " .size kernel_thread_helper, . - kernel_thread_helper\n"
" .previous"); " .popsection");
#ifdef CONFIG_ARM_UNWIND #ifdef CONFIG_ARM_UNWIND
extern void kernel_thread_exit(long code); extern void kernel_thread_exit(long code);
asm( ".section .text\n" asm( ".pushsection .text\n"
" .align\n" " .align\n"
" .type kernel_thread_exit, #function\n" " .type kernel_thread_exit, #function\n"
"kernel_thread_exit:\n" "kernel_thread_exit:\n"
...@@ -377,7 +377,7 @@ asm( ".section .text\n" ...@@ -377,7 +377,7 @@ asm( ".section .text\n"
" nop\n" " nop\n"
" .fnend\n" " .fnend\n"
" .size kernel_thread_exit, . - kernel_thread_exit\n" " .size kernel_thread_exit, . - kernel_thread_exit\n"
" .previous"); " .popsection");
#else #else
#define kernel_thread_exit do_exit #define kernel_thread_exit do_exit
#endif #endif
......
arch/arm/lib/backtrace.S
View file @ 6bec1192
...@@ -110,13 +110,13 @@ no_frame: ldmfd sp!, {r4 - r8, pc} ...@@ -110,13 +110,13 @@ no_frame: ldmfd sp!, {r4 - r8, pc}
ENDPROC(__backtrace) ENDPROC(__backtrace)
ENDPROC(c_backtrace) ENDPROC(c_backtrace)
.section __ex_table,"a" .pushsection __ex_table,"a"
.align 3 .align 3
.long 1001b, 1006b .long 1001b, 1006b
.long 1002b, 1006b .long 1002b, 1006b
.long 1003b, 1006b .long 1003b, 1006b
.long 1004b, 1006b .long 1004b, 1006b
.previous .popsection
#define instr r4 #define instr r4
#define reg r5 #define reg r5
......
arch/arm/lib/clear_user.S
View file @ 6bec1192
...@@ -46,8 +46,8 @@ USER( strnebt r2, [r0]) ...@@ -46,8 +46,8 @@ USER( strnebt r2, [r0])
ldmfd sp!, {r1, pc} ldmfd sp!, {r1, pc}
ENDPROC(__clear_user) ENDPROC(__clear_user)
.section .fixup,"ax" .pushsection .fixup,"ax"
.align 0 .align 0
9001: ldmfd sp!, {r0, pc} 9001: ldmfd sp!, {r0, pc}
.previous .popsection
arch/arm/lib/copy_from_user.S
View file @ 6bec1192
...@@ -90,7 +90,7 @@ ENTRY(__copy_from_user) ...@@ -90,7 +90,7 @@ ENTRY(__copy_from_user)
ENDPROC(__copy_from_user) ENDPROC(__copy_from_user)
.section .fixup,"ax" .pushsection .fixup,"ax"
.align 0 .align 0
copy_abort_preamble copy_abort_preamble
ldmfd sp!, {r1, r2} ldmfd sp!, {r1, r2}
...@@ -100,5 +100,5 @@ ENDPROC(__copy_from_user) ...@@ -100,5 +100,5 @@ ENDPROC(__copy_from_user)
bl __memzero bl __memzero
ldr r0, [sp], #4 ldr r0, [sp], #4
copy_abort_end copy_abort_end
.previous .popsection
arch/arm/lib/copy_to_user.S
View file @ 6bec1192
...@@ -94,12 +94,12 @@ WEAK(__copy_to_user) ...@@ -94,12 +94,12 @@ WEAK(__copy_to_user)
ENDPROC(__copy_to_user) ENDPROC(__copy_to_user)
.section .fixup,"ax" .pushsection .fixup,"ax"
.align 0 .align 0
copy_abort_preamble copy_abort_preamble
ldmfd sp!, {r1, r2, r3} ldmfd sp!, {r1, r2, r3}
sub r0, r0, r1 sub r0, r0, r1
rsb r0, r0, r2 rsb r0, r0, r2
copy_abort_end copy_abort_end
.previous .popsection
arch/arm/lib/csumpartialcopyuser.S
View file @ 6bec1192
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
* so properly, we would have to add in whatever registers were loaded before * so properly, we would have to add in whatever registers were loaded before
* the fault, which, with the current asm above is not predictable. * the fault, which, with the current asm above is not predictable.
*/ */
.section .fixup,"ax" .pushsection .fixup,"ax"
.align 4 .align 4
9001: mov r4, #-EFAULT 9001: mov r4, #-EFAULT
ldr r5, [fp, #4] @ *err_ptr ldr r5, [fp, #4] @ *err_ptr
...@@ -80,4 +80,4 @@ ...@@ -80,4 +80,4 @@
strneb r0, [r1], #1 strneb r0, [r1], #1
bne 9002b bne 9002b
load_regs load_regs
.previous .popsection
arch/arm/lib/getuser.S
View file @ 6bec1192
...@@ -64,9 +64,9 @@ __get_user_bad: ...@@ -64,9 +64,9 @@ __get_user_bad:
mov pc, lr mov pc, lr
ENDPROC(__get_user_bad) ENDPROC(__get_user_bad)
.section __ex_table, "a" .pushsection __ex_table, "a"
.long 1b, __get_user_bad .long 1b, __get_user_bad
.long 2b, __get_user_bad .long 2b, __get_user_bad
.long 3b, __get_user_bad .long 3b, __get_user_bad
.long 4b, __get_user_bad .long 4b, __get_user_bad
.previous .popsection
arch/arm/lib/putuser.S
View file @ 6bec1192
...@@ -81,11 +81,11 @@ __put_user_bad: ...@@ -81,11 +81,11 @@ __put_user_bad:
mov pc, lr mov pc, lr
ENDPROC(__put_user_bad) ENDPROC(__put_user_bad)
.section __ex_table, "a" .pushsection __ex_table, "a"
.long 1b, __put_user_bad .long 1b, __put_user_bad
.long 2b, __put_user_bad .long 2b, __put_user_bad
.long 3b, __put_user_bad .long 3b, __put_user_bad
.long 4b, __put_user_bad .long 4b, __put_user_bad
.long 5b, __put_user_bad .long 5b, __put_user_bad
.long 6b, __put_user_bad .long 6b, __put_user_bad
.previous .popsection
arch/arm/lib/strncpy_from_user.S
View file @ 6bec1192
...@@ -33,11 +33,11 @@ ENTRY(__strncpy_from_user) ...@@ -33,11 +33,11 @@ ENTRY(__strncpy_from_user)
mov pc, lr mov pc, lr
ENDPROC(__strncpy_from_user) ENDPROC(__strncpy_from_user)
.section .fixup,"ax" .pushsection .fixup,"ax"
.align 0 .align 0
9001: mov r3, #0 9001: mov r3, #0
strb r3, [r0, #0] @ null terminate strb r3, [r0, #0] @ null terminate
mov r0, #-EFAULT mov r0, #-EFAULT
mov pc, lr mov pc, lr
.previous .popsection
arch/arm/lib/strnlen_user.S
View file @ 6bec1192
...@@ -33,8 +33,8 @@ ENTRY(__strnlen_user) ...@@ -33,8 +33,8 @@ ENTRY(__strnlen_user)
mov pc, lr mov pc, lr
ENDPROC(__strnlen_user) ENDPROC(__strnlen_user)
.section .fixup,"ax" .pushsection .fixup,"ax"
.align 0 .align 0
9001: mov r0, #0 9001: mov r0, #0
mov pc, lr mov pc, lr
.previous .popsection
arch/arm/lib/uaccess.S
View file @ 6bec1192
...@@ -279,10 +279,10 @@ USER( strgtbt r3, [r0], #1) @ May fault ...@@ -279,10 +279,10 @@ USER( strgtbt r3, [r0], #1) @ May fault
b .Lc2u_finished b .Lc2u_finished
ENDPROC(__copy_to_user) ENDPROC(__copy_to_user)
.section .fixup,"ax" .pushsection .fixup,"ax"
.align 0 .align 0
9001: ldmfd sp!, {r0, r4 - r7, pc} 9001: ldmfd sp!, {r0, r4 - r7, pc}
.previous .popsection
/* Prototype: unsigned long __copy_from_user(void *to,const void *from,unsigned long n); /* Prototype: unsigned long __copy_from_user(void *to,const void *from,unsigned long n);
* Purpose : copy a block from user memory to kernel memory * Purpose : copy a block from user memory to kernel memory
...@@ -545,7 +545,7 @@ USER( ldrgtbt r3, [r1], #1) @ May fault ...@@ -545,7 +545,7 @@ USER( ldrgtbt r3, [r1], #1) @ May fault
b .Lcfu_finished b .Lcfu_finished
ENDPROC(__copy_from_user) ENDPROC(__copy_from_user)
.section .fixup,"ax" .pushsection .fixup,"ax"
.align 0 .align 0
/* /*
* We took an exception. r0 contains a pointer to * We took an exception. r0 contains a pointer to
...@@ -559,5 +559,5 @@ ENDPROC(__copy_from_user) ...@@ -559,5 +559,5 @@ ENDPROC(__copy_from_user)
blne __memzero blne __memzero
mov r0, r4 mov r0, r4
ldmfd sp!, {r4 - r7, pc} ldmfd sp!, {r4 - r7, pc}
.previous .popsection
arch/arm/mach-realview/core.c
View file @ 6bec1192
...@@ -254,7 +254,7 @@ static unsigned int realview_mmc_status(struct device *dev) ...@@ -254,7 +254,7 @@ static unsigned int realview_mmc_status(struct device *dev)
else else
mask = 2; mask = 2;
return readl(REALVIEW_SYSMCI) & mask; return !(readl(REALVIEW_SYSMCI) & mask);
} }
struct mmci_platform_data realview_mmc0_plat_data = { struct mmci_platform_data realview_mmc0_plat_data = {
......
arch/arm/mm/alignment.c
View file @ 6bec1192
...@@ -166,15 +166,15 @@ union offset_union { ...@@ -166,15 +166,15 @@ union offset_union {
THUMB( "1: "ins" %1, [%2]\n" ) \ THUMB( "1: "ins" %1, [%2]\n" ) \
THUMB( " add %2, %2, #1\n" ) \ THUMB( " add %2, %2, #1\n" ) \
"2:\n" \ "2:\n" \
" .section .fixup,\"ax\"\n" \ " .pushsection .fixup,\"ax\"\n" \
" .align 2\n" \ " .align 2\n" \
"3: mov %0, #1\n" \ "3: mov %0, #1\n" \
" b 2b\n" \ " b 2b\n" \
" .previous\n" \ " .popsection\n" \
" .section __ex_table,\"a\"\n" \ " .pushsection __ex_table,\"a\"\n" \
" .align 3\n" \ " .align 3\n" \
" .long 1b, 3b\n" \ " .long 1b, 3b\n" \
" .previous\n" \ " .popsection\n" \
: "=r" (err), "=&r" (val), "=r" (addr) \ : "=r" (err), "=&r" (val), "=r" (addr) \
: "0" (err), "2" (addr)) : "0" (err), "2" (addr))
...@@ -226,16 +226,16 @@ union offset_union { ...@@ -226,16 +226,16 @@ union offset_union {
" mov %1, %1, "NEXT_BYTE"\n" \ " mov %1, %1, "NEXT_BYTE"\n" \
"2: "ins" %1, [%2]\n" \ "2: "ins" %1, [%2]\n" \
"3:\n" \ "3:\n" \
" .section .fixup,\"ax\"\n" \ " .pushsection .fixup,\"ax\"\n" \
" .align 2\n" \ " .align 2\n" \
"4: mov %0, #1\n" \ "4: mov %0, #1\n" \
" b 3b\n" \ " b 3b\n" \
" .previous\n" \ " .popsection\n" \
" .section __ex_table,\"a\"\n" \ " .pushsection __ex_table,\"a\"\n" \
" .align 3\n" \ " .align 3\n" \
" .long 1b, 4b\n" \ " .long 1b, 4b\n" \
" .long 2b, 4b\n" \ " .long 2b, 4b\n" \
" .previous\n" \ " .popsection\n" \
: "=r" (err), "=&r" (v), "=&r" (a) \ : "=r" (err), "=&r" (v), "=&r" (a) \
: "0" (err), "1" (v), "2" (a)); \ : "0" (err), "1" (v), "2" (a)); \
if (err) \ if (err) \
...@@ -266,18 +266,18 @@ union offset_union { ...@@ -266,18 +266,18 @@ union offset_union {
" mov %1, %1, "NEXT_BYTE"\n" \ " mov %1, %1, "NEXT_BYTE"\n" \
"4: "ins" %1, [%2]\n" \ "4: "ins" %1, [%2]\n" \
"5:\n" \ "5:\n" \
" .section .fixup,\"ax\"\n" \ " .pushsection .fixup,\"ax\"\n" \
" .align 2\n" \ " .align 2\n" \
"6: mov %0, #1\n" \ "6: mov %0, #1\n" \
" b 5b\n" \ " b 5b\n" \
" .previous\n" \ " .popsection\n" \
" .section __ex_table,\"a\"\n" \ " .pushsection __ex_table,\"a\"\n" \
" .align 3\n" \ " .align 3\n" \
" .long 1b, 6b\n" \ " .long 1b, 6b\n" \
" .long 2b, 6b\n" \ " .long 2b, 6b\n" \
" .long 3b, 6b\n" \ " .long 3b, 6b\n" \
" .long 4b, 6b\n" \ " .long 4b, 6b\n" \
" .previous\n" \ " .popsection\n" \
: "=r" (err), "=&r" (v), "=&r" (a) \ : "=r" (err), "=&r" (v), "=&r" (a) \
: "0" (err), "1" (v), "2" (a)); \ : "0" (err), "1" (v), "2" (a)); \
if (err) \ if (err) \
......
arch/arm/mm/proc-sa1100.S
View file @ 6bec1192
...@@ -45,7 +45,7 @@ ENTRY(cpu_sa1100_proc_init) ...@@ -45,7 +45,7 @@ ENTRY(cpu_sa1100_proc_init)
mcr p15, 0, r0, c9, c0, 5 @ Allow read-buffer operations from userland mcr p15, 0, r0, c9, c0, 5 @ Allow read-buffer operations from userland
mov pc, lr mov pc, lr
.previous .section .text
/* /*
* cpu_sa1100_proc_fin() * cpu_sa1100_proc_fin()
......
arch/arm/nwfpe/entry.S
View file @ 6bec1192
...@@ -111,12 +111,12 @@ next: ...@@ -111,12 +111,12 @@ next:
@ to fault. Emit the appropriate exception gunk to fix things up. @ to fault. Emit the appropriate exception gunk to fix things up.
@ ??? For some reason, faults can happen at .Lx2 even with a @ ??? For some reason, faults can happen at .Lx2 even with a
@ plain LDR instruction. Weird, but it seems harmless. @ plain LDR instruction. Weird, but it seems harmless.
.section .fixup,"ax" .pushsection .fixup,"ax"
.align 2 .align 2
.Lfix: mov pc, r9 @ let the user eat segfaults .Lfix: mov pc, r9 @ let the user eat segfaults
.previous .popsection
.section __ex_table,"a" .pushsection __ex_table,"a"
.align 3 .align 3
.long .Lx1, .Lfix .long .Lx1, .Lfix
.previous .popsection
drivers/gpio/pl061.c
View file @ 6bec1192
...@@ -91,6 +91,12 @@ static int pl061_direction_output(struct gpio_chip *gc, unsigned offset, ...@@ -91,6 +91,12 @@ static int pl061_direction_output(struct gpio_chip *gc, unsigned offset,
gpiodir = readb(chip->base + GPIODIR); gpiodir = readb(chip->base + GPIODIR);
gpiodir |= 1 << offset; gpiodir |= 1 << offset;
writeb(gpiodir, chip->base + GPIODIR); writeb(gpiodir, chip->base + GPIODIR);
/*
* gpio value is set again, because pl061 doesn't allow to set value of
* a gpio pin before configuring it in OUT mode.
*/
writeb(!!value << offset, chip->base + (1 << (offset + 2)));
spin_unlock_irqrestore(&chip->lock, flags); spin_unlock_irqrestore(&chip->lock, flags);
return 0; return 0;
...@@ -183,7 +189,7 @@ static int pl061_irq_type(unsigned irq, unsigned trigger) ...@@ -183,7 +189,7 @@ static int pl061_irq_type(unsigned irq, unsigned trigger)
gpioibe &= ~(1 << offset); gpioibe &= ~(1 << offset);
if (trigger & IRQ_TYPE_EDGE_RISING) if (trigger & IRQ_TYPE_EDGE_RISING)
gpioiev |= 1 << offset; gpioiev |= 1 << offset;
else else if (trigger & IRQ_TYPE_EDGE_FALLING)
gpioiev &= ~(1 << offset); gpioiev &= ~(1 << offset);
} }
writeb(gpioibe, chip->base + GPIOIBE); writeb(gpioibe, chip->base + GPIOIBE);
...@@ -204,7 +210,7 @@ static struct irq_chip pl061_irqchip = { ...@@ -204,7 +210,7 @@ static struct irq_chip pl061_irqchip = {
static void pl061_irq_handler(unsigned irq, struct irq_desc *desc) static void pl061_irq_handler(unsigned irq, struct irq_desc *desc)
{ {
struct list_head *chip_list = get_irq_chip_data(irq); struct list_head *chip_list = get_irq_data(irq);
struct list_head *ptr; struct list_head *ptr;
struct pl061_gpio *chip; struct pl061_gpio *chip;
...@@ -297,9 +303,9 @@ static int __init pl061_probe(struct amba_device *dev, struct amba_id *id) ...@@ -297,9 +303,9 @@ static int __init pl061_probe(struct amba_device *dev, struct amba_id *id)
goto iounmap; goto iounmap;
} }
INIT_LIST_HEAD(chip_list); INIT_LIST_HEAD(chip_list);
set_irq_chip_data(irq, chip_list); set_irq_data(irq, chip_list);
} else } else
chip_list = get_irq_chip_data(irq); chip_list = get_irq_data(irq);
list_add(&chip->list, chip_list); list_add(&chip->list, chip_list);
for (i = 0; i < PL061_GPIO_NR; i++) { for (i = 0; i < PL061_GPIO_NR; i++) {
......
drivers/serial/serial_ks8695.c
View file @ 6bec1192
...@@ -650,6 +650,7 @@ static struct console ks8695_console = { ...@@ -650,6 +650,7 @@ static struct console ks8695_console = {
static int __init ks8695_console_init(void) static int __init ks8695_console_init(void)
{ {
add_preferred_console(SERIAL_KS8695_DEVNAME, 0, NULL);
register_console(&ks8695_console); register_console(&ks8695_console);
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7