diff options
Diffstat (limited to 'arch')
181 files changed, 2772 insertions, 2033 deletions
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig index 6110197757a..9fb8aae5c39 100644 --- a/arch/alpha/Kconfig +++ b/arch/alpha/Kconfig | |||
@@ -8,6 +8,7 @@ config ALPHA | |||
8 | select HAVE_AOUT | 8 | select HAVE_AOUT |
9 | select HAVE_IDE | 9 | select HAVE_IDE |
10 | select HAVE_OPROFILE | 10 | select HAVE_OPROFILE |
11 | select HAVE_SYSCALL_WRAPPERS | ||
11 | help | 12 | help |
12 | The Alpha is a 64-bit general-purpose processor designed and | 13 | The Alpha is a 64-bit general-purpose processor designed and |
13 | marketed by the Digital Equipment Corporation of blessed memory, | 14 | marketed by the Digital Equipment Corporation of blessed memory, |
diff --git a/arch/alpha/include/asm/bug.h b/arch/alpha/include/asm/bug.h index 695a5ee4b5d..1720c8ad86f 100644 --- a/arch/alpha/include/asm/bug.h +++ b/arch/alpha/include/asm/bug.h | |||
@@ -8,17 +8,12 @@ | |||
8 | 8 | ||
9 | /* ??? Would be nice to use .gprel32 here, but we can't be sure that the | 9 | /* ??? Would be nice to use .gprel32 here, but we can't be sure that the |
10 | function loaded the GP, so this could fail in modules. */ | 10 | function loaded the GP, so this could fail in modules. */ |
11 | static inline void ATTRIB_NORET __BUG(const char *file, int line) | 11 | #define BUG() do { \ |
12 | { | 12 | __asm__ __volatile__( \ |
13 | __asm__ __volatile__( | 13 | "call_pal %0 # bugchk\n\t" \ |
14 | "call_pal %0 # bugchk\n\t" | 14 | ".long %1\n\t.8byte %2" \ |
15 | ".long %1\n\t.8byte %2" | 15 | : : "i"(PAL_bugchk), "i"(__LINE__), "i"(__FILE__)); \ |
16 | : : "i" (PAL_bugchk), "i"(line), "i"(file)); | 16 | for ( ; ; ); } while (0) |
17 | for ( ; ; ) | ||
18 | ; | ||
19 | } | ||
20 | |||
21 | #define BUG() __BUG(__FILE__, __LINE__) | ||
22 | 17 | ||
23 | #define HAVE_ARCH_BUG | 18 | #define HAVE_ARCH_BUG |
24 | #endif | 19 | #endif |
diff --git a/arch/alpha/include/asm/dma-mapping.h b/arch/alpha/include/asm/dma-mapping.h index a5801ae02e4..04eb5681448 100644 --- a/arch/alpha/include/asm/dma-mapping.h +++ b/arch/alpha/include/asm/dma-mapping.h | |||
@@ -29,6 +29,8 @@ | |||
29 | 29 | ||
30 | #else /* no PCI - no IOMMU. */ | 30 | #else /* no PCI - no IOMMU. */ |
31 | 31 | ||
32 | #include <asm/io.h> /* for virt_to_phys() */ | ||
33 | |||
32 | struct scatterlist; | 34 | struct scatterlist; |
33 | void *dma_alloc_coherent(struct device *dev, size_t size, | 35 | void *dma_alloc_coherent(struct device *dev, size_t size, |
34 | dma_addr_t *dma_handle, gfp_t gfp); | 36 | dma_addr_t *dma_handle, gfp_t gfp); |
diff --git a/arch/alpha/kernel/entry.S b/arch/alpha/kernel/entry.S index aa2e50cf985..e4a54b61589 100644 --- a/arch/alpha/kernel/entry.S +++ b/arch/alpha/kernel/entry.S | |||
@@ -933,7 +933,7 @@ sys_execve: | |||
933 | osf_sigprocmask: | 933 | osf_sigprocmask: |
934 | .prologue 0 | 934 | .prologue 0 |
935 | mov $sp, $18 | 935 | mov $sp, $18 |
936 | jmp $31, do_osf_sigprocmask | 936 | jmp $31, sys_osf_sigprocmask |
937 | .end osf_sigprocmask | 937 | .end osf_sigprocmask |
938 | 938 | ||
939 | .align 4 | 939 | .align 4 |
diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c index 18a3ea1aac5..ae41f097864 100644 --- a/arch/alpha/kernel/osf_sys.c +++ b/arch/alpha/kernel/osf_sys.c | |||
@@ -54,8 +54,7 @@ extern int do_pipe(int *); | |||
54 | * identical to OSF as we don't return 0 on success, but doing otherwise | 54 | * identical to OSF as we don't return 0 on success, but doing otherwise |
55 | * would require changes to libc. Hopefully this is good enough. | 55 | * would require changes to libc. Hopefully this is good enough. |
56 | */ | 56 | */ |
57 | asmlinkage unsigned long | 57 | SYSCALL_DEFINE1(osf_brk, unsigned long, brk) |
58 | osf_brk(unsigned long brk) | ||
59 | { | 58 | { |
60 | unsigned long retval = sys_brk(brk); | 59 | unsigned long retval = sys_brk(brk); |
61 | if (brk && brk != retval) | 60 | if (brk && brk != retval) |
@@ -66,9 +65,9 @@ osf_brk(unsigned long brk) | |||
66 | /* | 65 | /* |
67 | * This is pure guess-work.. | 66 | * This is pure guess-work.. |
68 | */ | 67 | */ |
69 | asmlinkage int | 68 | SYSCALL_DEFINE4(osf_set_program_attributes, unsigned long, text_start, |
70 | osf_set_program_attributes(unsigned long text_start, unsigned long text_len, | 69 | unsigned long, text_len, unsigned long, bss_start, |
71 | unsigned long bss_start, unsigned long bss_len) | 70 | unsigned long, bss_len) |
72 | { | 71 | { |
73 | struct mm_struct *mm; | 72 | struct mm_struct *mm; |
74 | 73 | ||
@@ -146,9 +145,9 @@ Efault: | |||
146 | return -EFAULT; | 145 | return -EFAULT; |
147 | } | 146 | } |
148 | 147 | ||
149 | asmlinkage int | 148 | SYSCALL_DEFINE4(osf_getdirentries, unsigned int, fd, |
150 | osf_getdirentries(unsigned int fd, struct osf_dirent __user *dirent, | 149 | struct osf_dirent __user *, dirent, unsigned int, count, |
151 | unsigned int count, long __user *basep) | 150 | long __user *, basep) |
152 | { | 151 | { |
153 | int error; | 152 | int error; |
154 | struct file *file; | 153 | struct file *file; |
@@ -177,9 +176,9 @@ osf_getdirentries(unsigned int fd, struct osf_dirent __user *dirent, | |||
177 | 176 | ||
178 | #undef NAME_OFFSET | 177 | #undef NAME_OFFSET |
179 | 178 | ||
180 | asmlinkage unsigned long | 179 | SYSCALL_DEFINE6(osf_mmap, unsigned long, addr, unsigned long, len, |
181 | osf_mmap(unsigned long addr, unsigned long len, unsigned long prot, | 180 | unsigned long, prot, unsigned long, flags, unsigned long, fd, |
182 | unsigned long flags, unsigned long fd, unsigned long off) | 181 | unsigned long, off) |
183 | { | 182 | { |
184 | struct file *file = NULL; | 183 | struct file *file = NULL; |
185 | unsigned long ret = -EBADF; | 184 | unsigned long ret = -EBADF; |
@@ -254,8 +253,8 @@ do_osf_statfs(struct dentry * dentry, struct osf_statfs __user *buffer, | |||
254 | return error; | 253 | return error; |
255 | } | 254 | } |
256 | 255 | ||
257 | asmlinkage int | 256 | SYSCALL_DEFINE3(osf_statfs, char __user *, pathname, |
258 | osf_statfs(char __user *pathname, struct osf_statfs __user *buffer, unsigned long bufsiz) | 257 | struct osf_statfs __user *, buffer, unsigned long, bufsiz) |
259 | { | 258 | { |
260 | struct path path; | 259 | struct path path; |
261 | int retval; | 260 | int retval; |
@@ -268,8 +267,8 @@ osf_statfs(char __user *pathname, struct osf_statfs __user *buffer, unsigned lon | |||
268 | return retval; | 267 | return retval; |
269 | } | 268 | } |
270 | 269 | ||
271 | asmlinkage int | 270 | SYSCALL_DEFINE3(osf_fstatfs, unsigned long, fd, |
272 | osf_fstatfs(unsigned long fd, struct osf_statfs __user *buffer, unsigned long bufsiz) | 271 | struct osf_statfs __user *, buffer, unsigned long, bufsiz) |
273 | { | 272 | { |
274 | struct file *file; | 273 | struct file *file; |
275 | int retval; | 274 | int retval; |
@@ -368,8 +367,8 @@ osf_procfs_mount(char *dirname, struct procfs_args __user *args, int flags) | |||
368 | return do_mount("", dirname, "proc", flags, NULL); | 367 | return do_mount("", dirname, "proc", flags, NULL); |
369 | } | 368 | } |
370 | 369 | ||
371 | asmlinkage int | 370 | SYSCALL_DEFINE4(osf_mount, unsigned long, typenr, char __user *, path, |
372 | osf_mount(unsigned long typenr, char __user *path, int flag, void __user *data) | 371 | int, flag, void __user *, data) |
373 | { | 372 | { |
374 | int retval = -EINVAL; | 373 | int retval = -EINVAL; |
375 | char *name; | 374 | char *name; |
@@ -399,8 +398,7 @@ osf_mount(unsigned long typenr, char __user *path, int flag, void __user *data) | |||
399 | return retval; | 398 | return retval; |
400 | } | 399 | } |
401 | 400 | ||
402 | asmlinkage int | 401 | SYSCALL_DEFINE1(osf_utsname, char __user *, name) |
403 | osf_utsname(char __user *name) | ||
404 | { | 402 | { |
405 | int error; | 403 | int error; |
406 | 404 | ||
@@ -423,14 +421,12 @@ osf_utsname(char __user *name) | |||
423 | return error; | 421 | return error; |
424 | } | 422 | } |
425 | 423 | ||
426 | asmlinkage unsigned long | 424 | SYSCALL_DEFINE0(getpagesize) |
427 | sys_getpagesize(void) | ||
428 | { | 425 | { |
429 | return PAGE_SIZE; | 426 | return PAGE_SIZE; |
430 | } | 427 | } |
431 | 428 | ||
432 | asmlinkage unsigned long | 429 | SYSCALL_DEFINE0(getdtablesize) |
433 | sys_getdtablesize(void) | ||
434 | { | 430 | { |
435 | return sysctl_nr_open; | 431 | return sysctl_nr_open; |
436 | } | 432 | } |
@@ -438,8 +434,7 @@ sys_getdtablesize(void) | |||
438 | /* | 434 | /* |
439 | * For compatibility with OSF/1 only. Use utsname(2) instead. | 435 | * For compatibility with OSF/1 only. Use utsname(2) instead. |
440 | */ | 436 | */ |
441 | asmlinkage int | 437 | SYSCALL_DEFINE2(osf_getdomainname, char __user *, name, int, namelen) |
442 | osf_getdomainname(char __user *name, int namelen) | ||
443 | { | 438 | { |
444 | unsigned len; | 439 | unsigned len; |
445 | int i; | 440 | int i; |
@@ -527,8 +522,8 @@ enum pl_code { | |||
527 | PL_DEL = 5, PL_FDEL = 6 | 522 | PL_DEL = 5, PL_FDEL = 6 |
528 | }; | 523 | }; |
529 | 524 | ||
530 | asmlinkage long | 525 | SYSCALL_DEFINE2(osf_proplist_syscall, enum pl_code, code, |
531 | osf_proplist_syscall(enum pl_code code, union pl_args __user *args) | 526 | union pl_args __user *, args) |
532 | { | 527 | { |
533 | long error; | 528 | long error; |
534 | int __user *min_buf_size_ptr; | 529 | int __user *min_buf_size_ptr; |
@@ -567,8 +562,8 @@ osf_proplist_syscall(enum pl_code code, union pl_args __user *args) | |||
567 | return error; | 562 | return error; |
568 | } | 563 | } |
569 | 564 | ||
570 | asmlinkage int | 565 | SYSCALL_DEFINE2(osf_sigstack, struct sigstack __user *, uss, |
571 | osf_sigstack(struct sigstack __user *uss, struct sigstack __user *uoss) | 566 | struct sigstack __user *, uoss) |
572 | { | 567 | { |
573 | unsigned long usp = rdusp(); | 568 | unsigned long usp = rdusp(); |
574 | unsigned long oss_sp = current->sas_ss_sp + current->sas_ss_size; | 569 | unsigned long oss_sp = current->sas_ss_sp + current->sas_ss_size; |
@@ -608,8 +603,7 @@ osf_sigstack(struct sigstack __user *uss, struct sigstack __user *uoss) | |||
608 | return error; | 603 | return error; |
609 | } | 604 | } |
610 | 605 | ||
611 | asmlinkage long | 606 | SYSCALL_DEFINE3(osf_sysinfo, int, command, char __user *, buf, long, count) |
612 | osf_sysinfo(int command, char __user *buf, long count) | ||
613 | { | 607 | { |
614 | char *sysinfo_table[] = { | 608 | char *sysinfo_table[] = { |
615 | utsname()->sysname, | 609 | utsname()->sysname, |
@@ -647,9 +641,8 @@ osf_sysinfo(int command, char __user *buf, long count) | |||
647 | return err; | 641 | return err; |
648 | } | 642 | } |
649 | 643 | ||
650 | asmlinkage unsigned long | 644 | SYSCALL_DEFINE5(osf_getsysinfo, unsigned long, op, void __user *, buffer, |
651 | osf_getsysinfo(unsigned long op, void __user *buffer, unsigned long nbytes, | 645 | unsigned long, nbytes, int __user *, start, void __user *, arg) |
652 | int __user *start, void __user *arg) | ||
653 | { | 646 | { |
654 | unsigned long w; | 647 | unsigned long w; |
655 | struct percpu_struct *cpu; | 648 | struct percpu_struct *cpu; |
@@ -705,9 +698,8 @@ osf_getsysinfo(unsigned long op, void __user *buffer, unsigned long nbytes, | |||
705 | return -EOPNOTSUPP; | 698 | return -EOPNOTSUPP; |
706 | } | 699 | } |
707 | 700 | ||
708 | asmlinkage unsigned long | 701 | SYSCALL_DEFINE5(osf_setsysinfo, unsigned long, op, void __user *, buffer, |
709 | osf_setsysinfo(unsigned long op, void __user *buffer, unsigned long nbytes, | 702 | unsigned long, nbytes, int __user *, start, void __user *, arg) |
710 | int __user *start, void __user *arg) | ||
711 | { | 703 | { |
712 | switch (op) { | 704 | switch (op) { |
713 | case SSI_IEEE_FP_CONTROL: { | 705 | case SSI_IEEE_FP_CONTROL: { |
@@ -880,8 +872,8 @@ jiffies_to_timeval32(unsigned long jiffies, struct timeval32 *value) | |||
880 | value->tv_sec = jiffies / HZ; | 872 | value->tv_sec = jiffies / HZ; |
881 | } | 873 | } |
882 | 874 | ||
883 | asmlinkage int | 875 | SYSCALL_DEFINE2(osf_gettimeofday, struct timeval32 __user *, tv, |
884 | osf_gettimeofday(struct timeval32 __user *tv, struct timezone __user *tz) | 876 | struct timezone __user *, tz) |
885 | { | 877 | { |
886 | if (tv) { | 878 | if (tv) { |
887 | struct timeval ktv; | 879 | struct timeval ktv; |
@@ -896,8 +888,8 @@ osf_gettimeofday(struct timeval32 __user *tv, struct timezone __user *tz) | |||
896 | return 0; | 888 | return 0; |
897 | } | 889 | } |
898 | 890 | ||
899 | asmlinkage int | 891 | SYSCALL_DEFINE2(osf_settimeofday, struct timeval32 __user *, tv, |
900 | osf_settimeofday(struct timeval32 __user *tv, struct timezone __user *tz) | 892 | struct timezone __user *, tz) |
901 | { | 893 | { |
902 | struct timespec kts; | 894 | struct timespec kts; |
903 | struct timezone ktz; | 895 | struct timezone ktz; |
@@ -916,8 +908,7 @@ osf_settimeofday(struct timeval32 __user *tv, struct timezone __user *tz) | |||
916 | return do_sys_settimeofday(tv ? &kts : NULL, tz ? &ktz : NULL); | 908 | return do_sys_settimeofday(tv ? &kts : NULL, tz ? &ktz : NULL); |
917 | } | 909 | } |
918 | 910 | ||
919 | asmlinkage int | 911 | SYSCALL_DEFINE2(osf_getitimer, int, which, struct itimerval32 __user *, it) |
920 | osf_getitimer(int which, struct itimerval32 __user *it) | ||
921 | { | 912 | { |
922 | struct itimerval kit; | 913 | struct itimerval kit; |
923 | int error; | 914 | int error; |
@@ -929,8 +920,8 @@ osf_getitimer(int which, struct itimerval32 __user *it) | |||
929 | return error; | 920 | return error; |
930 | } | 921 | } |
931 | 922 | ||
932 | asmlinkage int | 923 | SYSCALL_DEFINE3(osf_setitimer, int, which, struct itimerval32 __user *, in, |
933 | osf_setitimer(int which, struct itimerval32 __user *in, struct itimerval32 __user *out) | 924 | struct itimerval32 __user *, out) |
934 | { | 925 | { |
935 | struct itimerval kin, kout; | 926 | struct itimerval kin, kout; |
936 | int error; | 927 | int error; |
@@ -952,8 +943,8 @@ osf_setitimer(int which, struct itimerval32 __user *in, struct itimerval32 __use | |||
952 | 943 | ||
953 | } | 944 | } |
954 | 945 | ||
955 | asmlinkage int | 946 | SYSCALL_DEFINE2(osf_utimes, char __user *, filename, |
956 | osf_utimes(char __user *filename, struct timeval32 __user *tvs) | 947 | struct timeval32 __user *, tvs) |
957 | { | 948 | { |
958 | struct timespec tv[2]; | 949 | struct timespec tv[2]; |
959 | 950 | ||
@@ -979,9 +970,8 @@ osf_utimes(char __user *filename, struct timeval32 __user *tvs) | |||
979 | #define MAX_SELECT_SECONDS \ | 970 | #define MAX_SELECT_SECONDS \ |
980 | ((unsigned long) (MAX_SCHEDULE_TIMEOUT / HZ)-1) | 971 | ((unsigned long) (MAX_SCHEDULE_TIMEOUT / HZ)-1) |
981 | 972 | ||
982 | asmlinkage int | 973 | SYSCALL_DEFINE5(osf_select, int, n, fd_set __user *, inp, fd_set __user *, outp, |
983 | osf_select(int n, fd_set __user *inp, fd_set __user *outp, fd_set __user *exp, | 974 | fd_set __user *, exp, struct timeval32 __user *, tvp) |
984 | struct timeval32 __user *tvp) | ||
985 | { | 975 | { |
986 | struct timespec end_time, *to = NULL; | 976 | struct timespec end_time, *to = NULL; |
987 | if (tvp) { | 977 | if (tvp) { |
@@ -1026,8 +1016,7 @@ struct rusage32 { | |||
1026 | long ru_nivcsw; /* involuntary " */ | 1016 | long ru_nivcsw; /* involuntary " */ |
1027 | }; | 1017 | }; |
1028 | 1018 | ||
1029 | asmlinkage int | 1019 | SYSCALL_DEFINE2(osf_getrusage, int, who, struct rusage32 __user *, ru) |
1030 | osf_getrusage(int who, struct rusage32 __user *ru) | ||
1031 | { | 1020 | { |
1032 | struct rusage32 r; | 1021 | struct rusage32 r; |
1033 | 1022 | ||
@@ -1053,9 +1042,8 @@ osf_getrusage(int who, struct rusage32 __user *ru) | |||
1053 | return copy_to_user(ru, &r, sizeof(r)) ? -EFAULT : 0; | 1042 | return copy_to_user(ru, &r, sizeof(r)) ? -EFAULT : 0; |
1054 | } | 1043 | } |
1055 | 1044 | ||
1056 | asmlinkage long | 1045 | SYSCALL_DEFINE4(osf_wait4, pid_t, pid, int __user *, ustatus, int, options, |
1057 | osf_wait4(pid_t pid, int __user *ustatus, int options, | 1046 | struct rusage32 __user *, ur) |
1058 | struct rusage32 __user *ur) | ||
1059 | { | 1047 | { |
1060 | struct rusage r; | 1048 | struct rusage r; |
1061 | long ret, err; | 1049 | long ret, err; |
@@ -1101,8 +1089,8 @@ osf_wait4(pid_t pid, int __user *ustatus, int options, | |||
1101 | * seems to be a timeval pointer, and I suspect the second | 1089 | * seems to be a timeval pointer, and I suspect the second |
1102 | * one is the time remaining.. Ho humm.. No documentation. | 1090 | * one is the time remaining.. Ho humm.. No documentation. |
1103 | */ | 1091 | */ |
1104 | asmlinkage int | 1092 | SYSCALL_DEFINE2(osf_usleep_thread, struct timeval32 __user *, sleep, |
1105 | osf_usleep_thread(struct timeval32 __user *sleep, struct timeval32 __user *remain) | 1093 | struct timeval32 __user *, remain) |
1106 | { | 1094 | { |
1107 | struct timeval tmp; | 1095 | struct timeval tmp; |
1108 | unsigned long ticks; | 1096 | unsigned long ticks; |
@@ -1155,8 +1143,7 @@ struct timex32 { | |||
1155 | int :32; int :32; int :32; int :32; | 1143 | int :32; int :32; int :32; int :32; |
1156 | }; | 1144 | }; |
1157 | 1145 | ||
1158 | asmlinkage int | 1146 | SYSCALL_DEFINE1(old_adjtimex, struct timex32 __user *, txc_p) |
1159 | sys_old_adjtimex(struct timex32 __user *txc_p) | ||
1160 | { | 1147 | { |
1161 | struct timex txc; | 1148 | struct timex txc; |
1162 | int ret; | 1149 | int ret; |
@@ -1267,8 +1254,8 @@ osf_fix_iov_len(const struct iovec __user *iov, unsigned long count) | |||
1267 | return 0; | 1254 | return 0; |
1268 | } | 1255 | } |
1269 | 1256 | ||
1270 | asmlinkage ssize_t | 1257 | SYSCALL_DEFINE3(osf_readv, unsigned long, fd, |
1271 | osf_readv(unsigned long fd, const struct iovec __user * vector, unsigned long count) | 1258 | const struct iovec __user *, vector, unsigned long, count) |
1272 | { | 1259 | { |
1273 | if (unlikely(personality(current->personality) == PER_OSF4)) | 1260 | if (unlikely(personality(current->personality) == PER_OSF4)) |
1274 | if (osf_fix_iov_len(vector, count)) | 1261 | if (osf_fix_iov_len(vector, count)) |
@@ -1276,8 +1263,8 @@ osf_readv(unsigned long fd, const struct iovec __user * vector, unsigned long co | |||
1276 | return sys_readv(fd, vector, count); | 1263 | return sys_readv(fd, vector, count); |
1277 | } | 1264 | } |
1278 | 1265 | ||
1279 | asmlinkage ssize_t | 1266 | SYSCALL_DEFINE3(osf_writev, unsigned long, fd, |
1280 | osf_writev(unsigned long fd, const struct iovec __user * vector, unsigned long count) | 1267 | const struct iovec __user *, vector, unsigned long, count) |
1281 | { | 1268 | { |
1282 | if (unlikely(personality(current->personality) == PER_OSF4)) | 1269 | if (unlikely(personality(current->personality) == PER_OSF4)) |
1283 | if (osf_fix_iov_len(vector, count)) | 1270 | if (osf_fix_iov_len(vector, count)) |
diff --git a/arch/alpha/kernel/pci-noop.c b/arch/alpha/kernel/pci-noop.c index 8ac08311f5a..c19a376520f 100644 --- a/arch/alpha/kernel/pci-noop.c +++ b/arch/alpha/kernel/pci-noop.c | |||
@@ -109,7 +109,8 @@ sys_pciconfig_write(unsigned long bus, unsigned long dfn, | |||
109 | /* Stubs for the routines in pci_iommu.c: */ | 109 | /* Stubs for the routines in pci_iommu.c: */ |
110 | 110 | ||
111 | void * | 111 | void * |
112 | pci_alloc_consistent(struct pci_dev *pdev, size_t size, dma_addr_t *dma_addrp) | 112 | __pci_alloc_consistent(struct pci_dev *pdev, size_t size, |
113 | dma_addr_t *dma_addrp, gfp_t gfp) | ||
113 | { | 114 | { |
114 | return NULL; | 115 | return NULL; |
115 | } | 116 | } |
diff --git a/arch/alpha/kernel/signal.c b/arch/alpha/kernel/signal.c index 410af4f3140..df65eaa84c4 100644 --- a/arch/alpha/kernel/signal.c +++ b/arch/alpha/kernel/signal.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <linux/tty.h> | 19 | #include <linux/tty.h> |
20 | #include <linux/binfmts.h> | 20 | #include <linux/binfmts.h> |
21 | #include <linux/bitops.h> | 21 | #include <linux/bitops.h> |
22 | #include <linux/syscalls.h> | ||
22 | 23 | ||
23 | #include <asm/uaccess.h> | 24 | #include <asm/uaccess.h> |
24 | #include <asm/sigcontext.h> | 25 | #include <asm/sigcontext.h> |
@@ -51,8 +52,8 @@ static void do_signal(struct pt_regs *, struct switch_stack *, | |||
51 | * Note that we don't need to acquire the kernel lock for SMP | 52 | * Note that we don't need to acquire the kernel lock for SMP |
52 | * operation, as all of this is local to this thread. | 53 | * operation, as all of this is local to this thread. |
53 | */ | 54 | */ |
54 | asmlinkage unsigned long | 55 | SYSCALL_DEFINE3(osf_sigprocmask, int, how, unsigned long, newmask, |
55 | do_osf_sigprocmask(int how, unsigned long newmask, struct pt_regs *regs) | 56 | struct pt_regs *, regs) |
56 | { | 57 | { |
57 | unsigned long oldmask = -EINVAL; | 58 | unsigned long oldmask = -EINVAL; |
58 | 59 | ||
@@ -81,9 +82,9 @@ do_osf_sigprocmask(int how, unsigned long newmask, struct pt_regs *regs) | |||
81 | return oldmask; | 82 | return oldmask; |
82 | } | 83 | } |
83 | 84 | ||
84 | asmlinkage int | 85 | SYSCALL_DEFINE3(osf_sigaction, int, sig, |
85 | osf_sigaction(int sig, const struct osf_sigaction __user *act, | 86 | const struct osf_sigaction __user *, act, |
86 | struct osf_sigaction __user *oact) | 87 | struct osf_sigaction __user *, oact) |
87 | { | 88 | { |
88 | struct k_sigaction new_ka, old_ka; | 89 | struct k_sigaction new_ka, old_ka; |
89 | int ret; | 90 | int ret; |
@@ -112,10 +113,9 @@ osf_sigaction(int sig, const struct osf_sigaction __user *act, | |||
112 | return ret; | 113 | return ret; |
113 | } | 114 | } |
114 | 115 | ||
115 | asmlinkage long | 116 | SYSCALL_DEFINE5(rt_sigaction, int, sig, const struct sigaction __user *, act, |
116 | sys_rt_sigaction(int sig, const struct sigaction __user *act, | 117 | struct sigaction __user *, oact, |
117 | struct sigaction __user *oact, | 118 | size_t, sigsetsize, void __user *, restorer) |
118 | size_t sigsetsize, void __user *restorer) | ||
119 | { | 119 | { |
120 | struct k_sigaction new_ka, old_ka; | 120 | struct k_sigaction new_ka, old_ka; |
121 | int ret; | 121 | int ret; |
diff --git a/arch/alpha/kernel/smp.c b/arch/alpha/kernel/smp.c index d953e510f68..00f1dc3dfd5 100644 --- a/arch/alpha/kernel/smp.c +++ b/arch/alpha/kernel/smp.c | |||
@@ -120,8 +120,9 @@ void __cpuinit | |||
120 | smp_callin(void) | 120 | smp_callin(void) |
121 | { | 121 | { |
122 | int cpuid = hard_smp_processor_id(); | 122 | int cpuid = hard_smp_processor_id(); |
123 | cpumask_t mask = cpu_online_map; | ||
123 | 124 | ||
124 | if (cpu_test_and_set(cpuid, cpu_online_map)) { | 125 | if (cpu_test_and_set(cpuid, mask)) { |
125 | printk("??, cpu 0x%x already present??\n", cpuid); | 126 | printk("??, cpu 0x%x already present??\n", cpuid); |
126 | BUG(); | 127 | BUG(); |
127 | } | 128 | } |
diff --git a/arch/alpha/kernel/systbls.S b/arch/alpha/kernel/systbls.S index 9d9e3a98bb9..95c9aef1c10 100644 --- a/arch/alpha/kernel/systbls.S +++ b/arch/alpha/kernel/systbls.S | |||
@@ -17,7 +17,7 @@ sys_call_table: | |||
17 | .quad sys_write | 17 | .quad sys_write |
18 | .quad alpha_ni_syscall /* 5 */ | 18 | .quad alpha_ni_syscall /* 5 */ |
19 | .quad sys_close | 19 | .quad sys_close |
20 | .quad osf_wait4 | 20 | .quad sys_osf_wait4 |
21 | .quad alpha_ni_syscall | 21 | .quad alpha_ni_syscall |
22 | .quad sys_link | 22 | .quad sys_link |
23 | .quad sys_unlink /* 10 */ | 23 | .quad sys_unlink /* 10 */ |
@@ -27,11 +27,11 @@ sys_call_table: | |||
27 | .quad sys_mknod | 27 | .quad sys_mknod |
28 | .quad sys_chmod /* 15 */ | 28 | .quad sys_chmod /* 15 */ |
29 | .quad sys_chown | 29 | .quad sys_chown |
30 | .quad osf_brk | 30 | .quad sys_osf_brk |
31 | .quad alpha_ni_syscall | 31 | .quad alpha_ni_syscall |
32 | .quad sys_lseek | 32 | .quad sys_lseek |
33 | .quad sys_getxpid /* 20 */ | 33 | .quad sys_getxpid /* 20 */ |
34 | .quad osf_mount | 34 | .quad sys_osf_mount |
35 | .quad sys_umount | 35 | .quad sys_umount |
36 | .quad sys_setuid | 36 | .quad sys_setuid |
37 | .quad sys_getxuid | 37 | .quad sys_getxuid |
@@ -53,7 +53,7 @@ sys_call_table: | |||
53 | .quad alpha_ni_syscall /* 40 */ | 53 | .quad alpha_ni_syscall /* 40 */ |
54 | .quad sys_dup | 54 | .quad sys_dup |
55 | .quad sys_alpha_pipe | 55 | .quad sys_alpha_pipe |
56 | .quad osf_set_program_attributes | 56 | .quad sys_osf_set_program_attributes |
57 | .quad alpha_ni_syscall | 57 | .quad alpha_ni_syscall |
58 | .quad sys_open /* 45 */ | 58 | .quad sys_open /* 45 */ |
59 | .quad alpha_ni_syscall | 59 | .quad alpha_ni_syscall |
@@ -81,7 +81,7 @@ sys_call_table: | |||
81 | .quad sys_newlstat | 81 | .quad sys_newlstat |
82 | .quad alpha_ni_syscall | 82 | .quad alpha_ni_syscall |
83 | .quad alpha_ni_syscall /* 70 */ | 83 | .quad alpha_ni_syscall /* 70 */ |
84 | .quad osf_mmap | 84 | .quad sys_osf_mmap |
85 | .quad alpha_ni_syscall | 85 | .quad alpha_ni_syscall |
86 | .quad sys_munmap | 86 | .quad sys_munmap |
87 | .quad sys_mprotect | 87 | .quad sys_mprotect |
@@ -94,17 +94,17 @@ sys_call_table: | |||
94 | .quad sys_setgroups /* 80 */ | 94 | .quad sys_setgroups /* 80 */ |
95 | .quad alpha_ni_syscall | 95 | .quad alpha_ni_syscall |
96 | .quad sys_setpgid | 96 | .quad sys_setpgid |
97 | .quad osf_setitimer | 97 | .quad sys_osf_setitimer |
98 | .quad alpha_ni_syscall | 98 | .quad alpha_ni_syscall |
99 | .quad alpha_ni_syscall /* 85 */ | 99 | .quad alpha_ni_syscall /* 85 */ |
100 | .quad osf_getitimer | 100 | .quad sys_osf_getitimer |
101 | .quad sys_gethostname | 101 | .quad sys_gethostname |
102 | .quad sys_sethostname | 102 | .quad sys_sethostname |
103 | .quad sys_getdtablesize | 103 | .quad sys_getdtablesize |
104 | .quad sys_dup2 /* 90 */ | 104 | .quad sys_dup2 /* 90 */ |
105 | .quad sys_newfstat | 105 | .quad sys_newfstat |
106 | .quad sys_fcntl | 106 | .quad sys_fcntl |
107 | .quad osf_select | 107 | .quad sys_osf_select |
108 | .quad sys_poll | 108 | .quad sys_poll |
109 | .quad sys_fsync /* 95 */ | 109 | .quad sys_fsync /* 95 */ |
110 | .quad sys_setpriority | 110 | .quad sys_setpriority |
@@ -123,22 +123,22 @@ sys_call_table: | |||
123 | .quad alpha_ni_syscall | 123 | .quad alpha_ni_syscall |
124 | .quad alpha_ni_syscall /* 110 */ | 124 | .quad alpha_ni_syscall /* 110 */ |
125 | .quad sys_sigsuspend | 125 | .quad sys_sigsuspend |
126 | .quad osf_sigstack | 126 | .quad sys_osf_sigstack |
127 | .quad sys_recvmsg | 127 | .quad sys_recvmsg |
128 | .quad sys_sendmsg | 128 | .quad sys_sendmsg |
129 | .quad alpha_ni_syscall /* 115 */ | 129 | .quad alpha_ni_syscall /* 115 */ |
130 | .quad osf_gettimeofday | 130 | .quad sys_osf_gettimeofday |
131 | .quad osf_getrusage | 131 | .quad sys_osf_getrusage |
132 | .quad sys_getsockopt | 132 | .quad sys_getsockopt |
133 | .quad alpha_ni_syscall | 133 | .quad alpha_ni_syscall |
134 | #ifdef CONFIG_OSF4_COMPAT | 134 | #ifdef CONFIG_OSF4_COMPAT |
135 | .quad osf_readv /* 120 */ | 135 | .quad sys_osf_readv /* 120 */ |
136 | .quad osf_writev | 136 | .quad sys_osf_writev |
137 | #else | 137 | #else |
138 | .quad sys_readv /* 120 */ | 138 | .quad sys_readv /* 120 */ |
139 | .quad sys_writev | 139 | .quad sys_writev |
140 | #endif | 140 | #endif |
141 | .quad osf_settimeofday | 141 | .quad sys_osf_settimeofday |
142 | .quad sys_fchown | 142 | .quad sys_fchown |
143 | .quad sys_fchmod | 143 | .quad sys_fchmod |
144 | .quad sys_recvfrom /* 125 */ | 144 | .quad sys_recvfrom /* 125 */ |
@@ -154,7 +154,7 @@ sys_call_table: | |||
154 | .quad sys_socketpair /* 135 */ | 154 | .quad sys_socketpair /* 135 */ |
155 | .quad sys_mkdir | 155 | .quad sys_mkdir |
156 | .quad sys_rmdir | 156 | .quad sys_rmdir |
157 | .quad osf_utimes | 157 | .quad sys_osf_utimes |
158 | .quad alpha_ni_syscall | 158 | .quad alpha_ni_syscall |
159 | .quad alpha_ni_syscall /* 140 */ | 159 | .quad alpha_ni_syscall /* 140 */ |
160 | .quad sys_getpeername | 160 | .quad sys_getpeername |
@@ -172,16 +172,16 @@ sys_call_table: | |||
172 | .quad alpha_ni_syscall | 172 | .quad alpha_ni_syscall |
173 | .quad alpha_ni_syscall | 173 | .quad alpha_ni_syscall |
174 | .quad alpha_ni_syscall /* 155 */ | 174 | .quad alpha_ni_syscall /* 155 */ |
175 | .quad osf_sigaction | 175 | .quad sys_osf_sigaction |
176 | .quad alpha_ni_syscall | 176 | .quad alpha_ni_syscall |
177 | .quad alpha_ni_syscall | 177 | .quad alpha_ni_syscall |
178 | .quad osf_getdirentries | 178 | .quad sys_osf_getdirentries |
179 | .quad osf_statfs /* 160 */ | 179 | .quad sys_osf_statfs /* 160 */ |
180 | .quad osf_fstatfs | 180 | .quad sys_osf_fstatfs |
181 | .quad alpha_ni_syscall | 181 | .quad alpha_ni_syscall |
182 | .quad alpha_ni_syscall | 182 | .quad alpha_ni_syscall |
183 | .quad alpha_ni_syscall | 183 | .quad alpha_ni_syscall |
184 | .quad osf_getdomainname /* 165 */ | 184 | .quad sys_osf_getdomainname /* 165 */ |
185 | .quad sys_setdomainname | 185 | .quad sys_setdomainname |
186 | .quad alpha_ni_syscall | 186 | .quad alpha_ni_syscall |
187 | .quad alpha_ni_syscall | 187 | .quad alpha_ni_syscall |
@@ -224,7 +224,7 @@ sys_call_table: | |||
224 | .quad sys_semctl | 224 | .quad sys_semctl |
225 | .quad sys_semget /* 205 */ | 225 | .quad sys_semget /* 205 */ |
226 | .quad sys_semop | 226 | .quad sys_semop |
227 | .quad osf_utsname | 227 | .quad sys_osf_utsname |
228 | .quad sys_lchown | 228 | .quad sys_lchown |
229 | .quad sys_shmat | 229 | .quad sys_shmat |
230 | .quad sys_shmctl /* 210 */ | 230 | .quad sys_shmctl /* 210 */ |
@@ -258,23 +258,23 @@ sys_call_table: | |||
258 | .quad alpha_ni_syscall | 258 | .quad alpha_ni_syscall |
259 | .quad alpha_ni_syscall | 259 | .quad alpha_ni_syscall |
260 | .quad alpha_ni_syscall /* 240 */ | 260 | .quad alpha_ni_syscall /* 240 */ |
261 | .quad osf_sysinfo | 261 | .quad sys_osf_sysinfo |
262 | .quad alpha_ni_syscall | 262 | .quad alpha_ni_syscall |
263 | .quad alpha_ni_syscall | 263 | .quad alpha_ni_syscall |
264 | .quad osf_proplist_syscall | 264 | .quad sys_osf_proplist_syscall |
265 | .quad alpha_ni_syscall /* 245 */ | 265 | .quad alpha_ni_syscall /* 245 */ |
266 | .quad alpha_ni_syscall | 266 | .quad alpha_ni_syscall |
267 | .quad alpha_ni_syscall | 267 | .quad alpha_ni_syscall |
268 | .quad alpha_ni_syscall | 268 | .quad alpha_ni_syscall |
269 | .quad alpha_ni_syscall | 269 | .quad alpha_ni_syscall |
270 | .quad alpha_ni_syscall /* 250 */ | 270 | .quad alpha_ni_syscall /* 250 */ |
271 | .quad osf_usleep_thread | 271 | .quad sys_osf_usleep_thread |
272 | .quad alpha_ni_syscall | 272 | .quad alpha_ni_syscall |
273 | .quad alpha_ni_syscall | 273 | .quad alpha_ni_syscall |
274 | .quad sys_sysfs | 274 | .quad sys_sysfs |
275 | .quad alpha_ni_syscall /* 255 */ | 275 | .quad alpha_ni_syscall /* 255 */ |
276 | .quad osf_getsysinfo | 276 | .quad sys_osf_getsysinfo |
277 | .quad osf_setsysinfo | 277 | .quad sys_osf_setsysinfo |
278 | .quad alpha_ni_syscall | 278 | .quad alpha_ni_syscall |
279 | .quad alpha_ni_syscall | 279 | .quad alpha_ni_syscall |
280 | .quad alpha_ni_syscall /* 260 */ | 280 | .quad alpha_ni_syscall /* 260 */ |
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 77b04747553..85040cfeb5e 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S | |||
@@ -650,6 +650,7 @@ ENTRY(fp_enter) | |||
650 | no_fp: mov pc, lr | 650 | no_fp: mov pc, lr |
651 | 651 | ||
652 | __und_usr_unknown: | 652 | __und_usr_unknown: |
653 | enable_irq | ||
653 | mov r0, sp | 654 | mov r0, sp |
654 | adr lr, ret_from_exception | 655 | adr lr, ret_from_exception |
655 | b do_undefinstr | 656 | b do_undefinstr |
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index 06269ea375c..49a6ba926c2 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S | |||
@@ -136,7 +136,7 @@ ENTRY(mcount) | |||
136 | ldmia sp!, {r0-r3, pc} | 136 | ldmia sp!, {r0-r3, pc} |
137 | 137 | ||
138 | trace: | 138 | trace: |
139 | ldr r1, [fp, #-4] | 139 | ldr r1, [fp, #-4] @ lr of instrumented routine |
140 | mov r0, lr | 140 | mov r0, lr |
141 | sub r0, r0, #MCOUNT_INSN_SIZE | 141 | sub r0, r0, #MCOUNT_INSN_SIZE |
142 | mov lr, pc | 142 | mov lr, pc |
diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c index 7141cee1fab..363db186cb9 100644 --- a/arch/arm/kernel/irq.c +++ b/arch/arm/kernel/irq.c | |||
@@ -101,7 +101,7 @@ unlock: | |||
101 | /* Handle bad interrupts */ | 101 | /* Handle bad interrupts */ |
102 | static struct irq_desc bad_irq_desc = { | 102 | static struct irq_desc bad_irq_desc = { |
103 | .handle_irq = handle_bad_irq, | 103 | .handle_irq = handle_bad_irq, |
104 | .lock = SPIN_LOCK_UNLOCKED | 104 | .lock = __SPIN_LOCK_UNLOCKED(bad_irq_desc.lock), |
105 | }; | 105 | }; |
106 | 106 | ||
107 | /* | 107 | /* |
diff --git a/arch/arm/mach-msm/board-halibut.c b/arch/arm/mach-msm/board-halibut.c index c2a96e3965a..e61967dde9a 100644 --- a/arch/arm/mach-msm/board-halibut.c +++ b/arch/arm/mach-msm/board-halibut.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <asm/mach/map.h> | 27 | #include <asm/mach/map.h> |
28 | #include <asm/mach/flash.h> | 28 | #include <asm/mach/flash.h> |
29 | 29 | ||
30 | #include <mach/irqs.h> | ||
30 | #include <mach/board.h> | 31 | #include <mach/board.h> |
31 | #include <mach/msm_iomap.h> | 32 | #include <mach/msm_iomap.h> |
32 | 33 | ||
diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c index 77382d8b6b2..ba5d7c08dc1 100644 --- a/arch/arm/mach-omap1/devices.c +++ b/arch/arm/mach-omap1/devices.c | |||
@@ -181,7 +181,7 @@ void __init omap1_init_mmc(struct omap_mmc_platform_data **mmc_data, | |||
181 | } | 181 | } |
182 | size = OMAP1_MMC_SIZE; | 182 | size = OMAP1_MMC_SIZE; |
183 | 183 | ||
184 | omap_mmc_add(i, base, size, irq, mmc_data[i]); | 184 | omap_mmc_add("mmci-omap", i, base, size, irq, mmc_data[i]); |
185 | }; | 185 | }; |
186 | } | 186 | } |
187 | 187 | ||
diff --git a/arch/arm/mach-omap1/mcbsp.c b/arch/arm/mach-omap1/mcbsp.c index ca7a0cc1707..575ba31295c 100644 --- a/arch/arm/mach-omap1/mcbsp.c +++ b/arch/arm/mach-omap1/mcbsp.c | |||
@@ -28,81 +28,8 @@ | |||
28 | #define DPS_RSTCT2_PER_EN (1 << 0) | 28 | #define DPS_RSTCT2_PER_EN (1 << 0) |
29 | #define DSP_RSTCT2_WD_PER_EN (1 << 1) | 29 | #define DSP_RSTCT2_WD_PER_EN (1 << 1) |
30 | 30 | ||
31 | struct mcbsp_internal_clk { | ||
32 | struct clk clk; | ||
33 | struct clk **childs; | ||
34 | int n_childs; | ||
35 | }; | ||
36 | |||
37 | #if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX) | 31 | #if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX) |
38 | static void omap_mcbsp_clk_init(struct mcbsp_internal_clk *mclk) | 32 | const char *clk_names[] = { "dsp_ck", "api_ck", "dspxor_ck" }; |
39 | { | ||
40 | const char *clk_names[] = { "dsp_ck", "api_ck", "dspxor_ck" }; | ||
41 | int i; | ||
42 | |||
43 | mclk->n_childs = ARRAY_SIZE(clk_names); | ||
44 | mclk->childs = kzalloc(mclk->n_childs * sizeof(struct clk *), | ||
45 | GFP_KERNEL); | ||
46 | |||
47 | for (i = 0; i < mclk->n_childs; i++) { | ||
48 | /* We fake a platform device to get correct device id */ | ||
49 | struct platform_device pdev; | ||
50 | |||
51 | pdev.dev.bus = &platform_bus_type; | ||
52 | pdev.id = mclk->clk.id; | ||
53 | mclk->childs[i] = clk_get(&pdev.dev, clk_names[i]); | ||
54 | if (IS_ERR(mclk->childs[i])) | ||
55 | printk(KERN_ERR "Could not get clock %s (%d).\n", | ||
56 | clk_names[i], mclk->clk.id); | ||
57 | } | ||
58 | } | ||
59 | |||
60 | static int omap_mcbsp_clk_enable(struct clk *clk) | ||
61 | { | ||
62 | struct mcbsp_internal_clk *mclk = container_of(clk, | ||
63 | struct mcbsp_internal_clk, clk); | ||
64 | int i; | ||
65 | |||
66 | for (i = 0; i < mclk->n_childs; i++) | ||
67 | clk_enable(mclk->childs[i]); | ||
68 | return 0; | ||
69 | } | ||
70 | |||
71 | static void omap_mcbsp_clk_disable(struct clk *clk) | ||
72 | { | ||
73 | struct mcbsp_internal_clk *mclk = container_of(clk, | ||
74 | struct mcbsp_internal_clk, clk); | ||
75 | int i; | ||
76 | |||
77 | for (i = 0; i < mclk->n_childs; i++) | ||
78 | clk_disable(mclk->childs[i]); | ||
79 | } | ||
80 | |||
81 | static struct mcbsp_internal_clk omap_mcbsp_clks[] = { | ||
82 | { | ||
83 | .clk = { | ||
84 | .name = "mcbsp_clk", | ||
85 | .id = 1, | ||
86 | .enable = omap_mcbsp_clk_enable, | ||
87 | .disable = omap_mcbsp_clk_disable, | ||
88 | }, | ||
89 | }, | ||
90 | { | ||
91 | .clk = { | ||
92 | .name = "mcbsp_clk", | ||
93 | .id = 3, | ||
94 | .enable = omap_mcbsp_clk_enable, | ||
95 | .disable = omap_mcbsp_clk_disable, | ||
96 | }, | ||
97 | }, | ||
98 | }; | ||
99 | |||
100 | #define omap_mcbsp_clks_size ARRAY_SIZE(omap_mcbsp_clks) | ||
101 | #else | ||
102 | #define omap_mcbsp_clks_size 0 | ||
103 | static struct mcbsp_internal_clk __initdata *omap_mcbsp_clks; | ||
104 | static inline void omap_mcbsp_clk_init(struct mcbsp_internal_clk *mclk) | ||
105 | { } | ||
106 | #endif | 33 | #endif |
107 | 34 | ||
108 | static void omap1_mcbsp_request(unsigned int id) | 35 | static void omap1_mcbsp_request(unsigned int id) |
@@ -167,8 +94,9 @@ static struct omap_mcbsp_platform_data omap15xx_mcbsp_pdata[] = { | |||
167 | .rx_irq = INT_McBSP1RX, | 94 | .rx_irq = INT_McBSP1RX, |
168 | .tx_irq = INT_McBSP1TX, | 95 | .tx_irq = INT_McBSP1TX, |
169 | .ops = &omap1_mcbsp_ops, | 96 | .ops = &omap1_mcbsp_ops, |
170 | .clk_name = "mcbsp_clk", | 97 | .clk_names = clk_names, |
171 | }, | 98 | .num_clks = 3, |
99 | }, | ||
172 | { | 100 | { |
173 | .phys_base = OMAP1510_MCBSP2_BASE, | 101 | .phys_base = OMAP1510_MCBSP2_BASE, |
174 | .dma_rx_sync = OMAP_DMA_MCBSP2_RX, | 102 | .dma_rx_sync = OMAP_DMA_MCBSP2_RX, |
@@ -184,7 +112,8 @@ static struct omap_mcbsp_platform_data omap15xx_mcbsp_pdata[] = { | |||
184 | .rx_irq = INT_McBSP3RX, | 112 | .rx_irq = INT_McBSP3RX, |
185 | .tx_irq = INT_McBSP3TX, | 113 | .tx_irq = INT_McBSP3TX, |
186 | .ops = &omap1_mcbsp_ops, | 114 | .ops = &omap1_mcbsp_ops, |
187 | .clk_name = "mcbsp_clk", | 115 | .clk_names = clk_names, |
116 | .num_clks = 3, | ||
188 | }, | 117 | }, |
189 | }; | 118 | }; |
190 | #define OMAP15XX_MCBSP_PDATA_SZ ARRAY_SIZE(omap15xx_mcbsp_pdata) | 119 | #define OMAP15XX_MCBSP_PDATA_SZ ARRAY_SIZE(omap15xx_mcbsp_pdata) |
@@ -202,7 +131,8 @@ static struct omap_mcbsp_platform_data omap16xx_mcbsp_pdata[] = { | |||
202 | .rx_irq = INT_McBSP1RX, | 131 | .rx_irq = INT_McBSP1RX, |
203 | .tx_irq = INT_McBSP1TX, | 132 | .tx_irq = INT_McBSP1TX, |
204 | .ops = &omap1_mcbsp_ops, | 133 | .ops = &omap1_mcbsp_ops, |
205 | .clk_name = "mcbsp_clk", | 134 | .clk_names = clk_names, |
135 | .num_clks = 3, | ||
206 | }, | 136 | }, |
207 | { | 137 | { |
208 | .phys_base = OMAP1610_MCBSP2_BASE, | 138 | .phys_base = OMAP1610_MCBSP2_BASE, |
@@ -219,7 +149,8 @@ static struct omap_mcbsp_platform_data omap16xx_mcbsp_pdata[] = { | |||
219 | .rx_irq = INT_McBSP3RX, | 149 | .rx_irq = INT_McBSP3RX, |
220 | .tx_irq = INT_McBSP3TX, | 150 | .tx_irq = INT_McBSP3TX, |
221 | .ops = &omap1_mcbsp_ops, | 151 | .ops = &omap1_mcbsp_ops, |
222 | .clk_name = "mcbsp_clk", | 152 | .clk_names = clk_names, |
153 | .num_clks = 3, | ||
223 | }, | 154 | }, |
224 | }; | 155 | }; |
225 | #define OMAP16XX_MCBSP_PDATA_SZ ARRAY_SIZE(omap16xx_mcbsp_pdata) | 156 | #define OMAP16XX_MCBSP_PDATA_SZ ARRAY_SIZE(omap16xx_mcbsp_pdata) |
@@ -230,15 +161,6 @@ static struct omap_mcbsp_platform_data omap16xx_mcbsp_pdata[] = { | |||
230 | 161 | ||
231 | int __init omap1_mcbsp_init(void) | 162 | int __init omap1_mcbsp_init(void) |
232 | { | 163 | { |
233 | int i; | ||
234 | |||
235 | for (i = 0; i < omap_mcbsp_clks_size; i++) { | ||
236 | if (cpu_is_omap15xx() || cpu_is_omap16xx()) { | ||
237 | omap_mcbsp_clk_init(&omap_mcbsp_clks[i]); | ||
238 | clk_register(&omap_mcbsp_clks[i].clk); | ||
239 | } | ||
240 | } | ||
241 | |||
242 | if (cpu_is_omap730()) | 164 | if (cpu_is_omap730()) |
243 | omap_mcbsp_count = OMAP730_MCBSP_PDATA_SZ; | 165 | omap_mcbsp_count = OMAP730_MCBSP_PDATA_SZ; |
244 | if (cpu_is_omap15xx()) | 166 | if (cpu_is_omap15xx()) |
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 9d7216ff6c9..ce03fa75077 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c | |||
@@ -421,6 +421,7 @@ void __init omap2_init_mmc(struct omap_mmc_platform_data **mmc_data, | |||
421 | int nr_controllers) | 421 | int nr_controllers) |
422 | { | 422 | { |
423 | int i; | 423 | int i; |
424 | char *name; | ||
424 | 425 | ||
425 | for (i = 0; i < nr_controllers; i++) { | 426 | for (i = 0; i < nr_controllers; i++) { |
426 | unsigned long base, size; | 427 | unsigned long base, size; |
@@ -450,12 +451,14 @@ void __init omap2_init_mmc(struct omap_mmc_platform_data **mmc_data, | |||
450 | continue; | 451 | continue; |
451 | } | 452 | } |
452 | 453 | ||
453 | if (cpu_is_omap2420()) | 454 | if (cpu_is_omap2420()) { |
454 | size = OMAP2420_MMC_SIZE; | 455 | size = OMAP2420_MMC_SIZE; |
455 | else | 456 | name = "mmci-omap"; |
457 | } else { | ||
456 | size = HSMMC_SIZE; | 458 | size = HSMMC_SIZE; |
457 | 459 | name = "mmci-omap-hs"; | |
458 | omap_mmc_add(i, base, size, irq, mmc_data[i]); | 460 | } |
461 | omap_mmc_add(name, i, base, size, irq, mmc_data[i]); | ||
459 | }; | 462 | }; |
460 | } | 463 | } |
461 | 464 | ||
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index b0f8e7d6279..b52a02fc7cd 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c | |||
@@ -172,9 +172,13 @@ void __init omap34xx_check_revision(void) | |||
172 | omap_revision = OMAP3430_REV_ES3_0; | 172 | omap_revision = OMAP3430_REV_ES3_0; |
173 | rev_name = "ES3.0"; | 173 | rev_name = "ES3.0"; |
174 | break; | 174 | break; |
175 | case 4: | ||
176 | omap_revision = OMAP3430_REV_ES3_1; | ||
177 | rev_name = "ES3.1"; | ||
178 | break; | ||
175 | default: | 179 | default: |
176 | /* Use the latest known revision as default */ | 180 | /* Use the latest known revision as default */ |
177 | omap_revision = OMAP3430_REV_ES3_0; | 181 | omap_revision = OMAP3430_REV_ES3_1; |
178 | rev_name = "Unknown revision\n"; | 182 | rev_name = "Unknown revision\n"; |
179 | } | 183 | } |
180 | } | 184 | } |
diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c index 636e2821af7..9ba20d985dd 100644 --- a/arch/arm/mach-omap2/irq.c +++ b/arch/arm/mach-omap2/irq.c | |||
@@ -134,6 +134,7 @@ static struct irq_chip omap_irq_chip = { | |||
134 | .ack = omap_mask_ack_irq, | 134 | .ack = omap_mask_ack_irq, |
135 | .mask = omap_mask_irq, | 135 | .mask = omap_mask_irq, |
136 | .unmask = omap_unmask_irq, | 136 | .unmask = omap_unmask_irq, |
137 | .disable = omap_mask_irq, | ||
137 | }; | 138 | }; |
138 | 139 | ||
139 | static void __init omap_irq_bank_init_one(struct omap_irq_bank *bank) | 140 | static void __init omap_irq_bank_init_one(struct omap_irq_bank *bank) |
diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c index e20023c9d15..a9e631fc113 100644 --- a/arch/arm/mach-omap2/mcbsp.c +++ b/arch/arm/mach-omap2/mcbsp.c | |||
@@ -24,106 +24,7 @@ | |||
24 | #include <mach/cpu.h> | 24 | #include <mach/cpu.h> |
25 | #include <mach/mcbsp.h> | 25 | #include <mach/mcbsp.h> |
26 | 26 | ||
27 | struct mcbsp_internal_clk { | 27 | const char *clk_names[] = { "mcbsp_ick", "mcbsp_fck" }; |
28 | struct clk clk; | ||
29 | struct clk **childs; | ||
30 | int n_childs; | ||
31 | }; | ||
32 | |||
33 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) | ||
34 | static void omap_mcbsp_clk_init(struct mcbsp_internal_clk *mclk) | ||
35 | { | ||
36 | const char *clk_names[] = { "mcbsp_ick", "mcbsp_fck" }; | ||
37 | int i; | ||
38 | |||
39 | mclk->n_childs = ARRAY_SIZE(clk_names); | ||
40 | mclk->childs = kzalloc(mclk->n_childs * sizeof(struct clk *), | ||
41 | GFP_KERNEL); | ||
42 | |||
43 | for (i = 0; i < mclk->n_childs; i++) { | ||
44 | /* We fake a platform device to get correct device id */ | ||
45 | struct platform_device pdev; | ||
46 | |||
47 | pdev.dev.bus = &platform_bus_type; | ||
48 | pdev.id = mclk->clk.id; | ||
49 | mclk->childs[i] = clk_get(&pdev.dev, clk_names[i]); | ||
50 | if (IS_ERR(mclk->childs[i])) | ||
51 | printk(KERN_ERR "Could not get clock %s (%d).\n", | ||
52 | clk_names[i], mclk->clk.id); | ||
53 | } | ||
54 | } | ||
55 | |||
56 | static int omap_mcbsp_clk_enable(struct clk *clk) | ||
57 | { | ||
58 | struct mcbsp_internal_clk *mclk = container_of(clk, | ||
59 | struct mcbsp_internal_clk, clk); | ||
60 | int i; | ||
61 | |||
62 | for (i = 0; i < mclk->n_childs; i++) | ||
63 | clk_enable(mclk->childs[i]); | ||
64 | return 0; | ||
65 | } | ||
66 | |||
67 | static void omap_mcbsp_clk_disable(struct clk *clk) | ||
68 | { | ||
69 | struct mcbsp_internal_clk *mclk = container_of(clk, | ||
70 | struct mcbsp_internal_clk, clk); | ||
71 | int i; | ||
72 | |||
73 | for (i = 0; i < mclk->n_childs; i++) | ||
74 | clk_disable(mclk->childs[i]); | ||
75 | } | ||
76 | |||
77 | static struct mcbsp_internal_clk omap_mcbsp_clks[] = { | ||
78 | { | ||
79 | .clk = { | ||
80 | .name = "mcbsp_clk", | ||
81 | .id = 1, | ||
82 | .enable = omap_mcbsp_clk_enable, | ||
83 | .disable = omap_mcbsp_clk_disable, | ||
84 | }, | ||
85 | }, | ||
86 | { | ||
87 | .clk = { | ||
88 | .name = "mcbsp_clk", | ||
89 | .id = 2, | ||
90 | .enable = omap_mcbsp_clk_enable, | ||
91 | .disable = omap_mcbsp_clk_disable, | ||
92 | }, | ||
93 | }, | ||
94 | { | ||
95 | .clk = { | ||
96 | .name = "mcbsp_clk", | ||
97 | .id = 3, | ||
98 | .enable = omap_mcbsp_clk_enable, | ||
99 | .disable = omap_mcbsp_clk_disable, | ||
100 | }, | ||
101 | }, | ||
102 | { | ||
103 | .clk = { | ||
104 | .name = "mcbsp_clk", | ||
105 | .id = 4, | ||
106 | .enable = omap_mcbsp_clk_enable, | ||
107 | .disable = omap_mcbsp_clk_disable, | ||
108 | }, | ||
109 | }, | ||
110 | { | ||
111 | .clk = { | ||
112 | .name = "mcbsp_clk", | ||
113 | .id = 5, | ||
114 | .enable = omap_mcbsp_clk_enable, | ||
115 | .disable = omap_mcbsp_clk_disable, | ||
116 | }, | ||
117 | }, | ||
118 | }; | ||
119 | |||
120 | #define omap_mcbsp_clks_size ARRAY_SIZE(omap_mcbsp_clks) | ||
121 | #else | ||
122 | #define omap_mcbsp_clks_size 0 | ||
123 | static struct mcbsp_internal_clk __initdata *omap_mcbsp_clks; | ||
124 | static inline void omap_mcbsp_clk_init(struct clk *clk) | ||
125 | { } | ||
126 | #endif | ||
127 | 28 | ||
128 | static void omap2_mcbsp2_mux_setup(void) | 29 | static void omap2_mcbsp2_mux_setup(void) |
129 | { | 30 | { |
@@ -156,7 +57,8 @@ static struct omap_mcbsp_platform_data omap2420_mcbsp_pdata[] = { | |||
156 | .rx_irq = INT_24XX_MCBSP1_IRQ_RX, | 57 | .rx_irq = INT_24XX_MCBSP1_IRQ_RX, |
157 | .tx_irq = INT_24XX_MCBSP1_IRQ_TX, | 58 | .tx_irq = INT_24XX_MCBSP1_IRQ_TX, |
158 | .ops = &omap2_mcbsp_ops, | 59 | .ops = &omap2_mcbsp_ops, |
159 | .clk_name = "mcbsp_clk", | 60 | .clk_names = clk_names, |
61 | .num_clks = 2, | ||
160 | }, | 62 | }, |
161 | { | 63 | { |
162 | .phys_base = OMAP24XX_MCBSP2_BASE, | 64 | .phys_base = OMAP24XX_MCBSP2_BASE, |
@@ -165,7 +67,8 @@ static struct omap_mcbsp_platform_data omap2420_mcbsp_pdata[] = { | |||
165 | .rx_irq = INT_24XX_MCBSP2_IRQ_RX, | 67 | .rx_irq = INT_24XX_MCBSP2_IRQ_RX, |
166 | .tx_irq = INT_24XX_MCBSP2_IRQ_TX, | 68 | .tx_irq = INT_24XX_MCBSP2_IRQ_TX, |
167 | .ops = &omap2_mcbsp_ops, | 69 | .ops = &omap2_mcbsp_ops, |
168 | .clk_name = "mcbsp_clk", | 70 | .clk_names = clk_names, |
71 | .num_clks = 2, | ||
169 | }, | 72 | }, |
170 | }; | 73 | }; |
171 | #define OMAP2420_MCBSP_PDATA_SZ ARRAY_SIZE(omap2420_mcbsp_pdata) | 74 | #define OMAP2420_MCBSP_PDATA_SZ ARRAY_SIZE(omap2420_mcbsp_pdata) |
@@ -183,7 +86,8 @@ static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata[] = { | |||
183 | .rx_irq = INT_24XX_MCBSP1_IRQ_RX, | 86 | .rx_irq = INT_24XX_MCBSP1_IRQ_RX, |
184 | .tx_irq = INT_24XX_MCBSP1_IRQ_TX, | 87 | .tx_irq = INT_24XX_MCBSP1_IRQ_TX, |
185 | .ops = &omap2_mcbsp_ops, | 88 | .ops = &omap2_mcbsp_ops, |
186 | .clk_name = "mcbsp_clk", | 89 | .clk_names = clk_names, |
90 | .num_clks = 2, | ||
187 | }, | 91 | }, |
188 | { | 92 | { |
189 | .phys_base = OMAP24XX_MCBSP2_BASE, | 93 | .phys_base = OMAP24XX_MCBSP2_BASE, |
@@ -192,7 +96,8 @@ static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata[] = { | |||
192 | .rx_irq = INT_24XX_MCBSP2_IRQ_RX, | 96 | .rx_irq = INT_24XX_MCBSP2_IRQ_RX, |
193 | .tx_irq = INT_24XX_MCBSP2_IRQ_TX, | 97 | .tx_irq = INT_24XX_MCBSP2_IRQ_TX, |
194 | .ops = &omap2_mcbsp_ops, | 98 | .ops = &omap2_mcbsp_ops, |
195 | .clk_name = "mcbsp_clk", | 99 | .clk_names = clk_names, |
100 | .num_clks = 2, | ||
196 | }, | 101 | }, |
197 | { | 102 | { |
198 | .phys_base = OMAP2430_MCBSP3_BASE, | 103 | .phys_base = OMAP2430_MCBSP3_BASE, |
@@ -201,7 +106,8 @@ static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata[] = { | |||
201 | .rx_irq = INT_24XX_MCBSP3_IRQ_RX, | 106 | .rx_irq = INT_24XX_MCBSP3_IRQ_RX, |
202 | .tx_irq = INT_24XX_MCBSP3_IRQ_TX, | 107 | .tx_irq = INT_24XX_MCBSP3_IRQ_TX, |
203 | .ops = &omap2_mcbsp_ops, | 108 | .ops = &omap2_mcbsp_ops, |
204 | .clk_name = "mcbsp_clk", | 109 | .clk_names = clk_names, |
110 | .num_clks = 2, | ||
205 | }, | 111 | }, |
206 | { | 112 | { |
207 | .phys_base = OMAP2430_MCBSP4_BASE, | 113 | .phys_base = OMAP2430_MCBSP4_BASE, |
@@ -210,7 +116,8 @@ static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata[] = { | |||
210 | .rx_irq = INT_24XX_MCBSP4_IRQ_RX, | 116 | .rx_irq = INT_24XX_MCBSP4_IRQ_RX, |
211 | .tx_irq = INT_24XX_MCBSP4_IRQ_TX, | 117 | .tx_irq = INT_24XX_MCBSP4_IRQ_TX, |
212 | .ops = &omap2_mcbsp_ops, | 118 | .ops = &omap2_mcbsp_ops, |
213 | .clk_name = "mcbsp_clk", | 119 | .clk_names = clk_names, |
120 | .num_clks = 2, | ||
214 | }, | 121 | }, |
215 | { | 122 | { |
216 | .phys_base = OMAP2430_MCBSP5_BASE, | 123 | .phys_base = OMAP2430_MCBSP5_BASE, |
@@ -219,7 +126,8 @@ static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata[] = { | |||
219 | .rx_irq = INT_24XX_MCBSP5_IRQ_RX, | 126 | .rx_irq = INT_24XX_MCBSP5_IRQ_RX, |
220 | .tx_irq = INT_24XX_MCBSP5_IRQ_TX, | 127 | .tx_irq = INT_24XX_MCBSP5_IRQ_TX, |
221 | .ops = &omap2_mcbsp_ops, | 128 | .ops = &omap2_mcbsp_ops, |
222 | .clk_name = "mcbsp_clk", | 129 | .clk_names = clk_names, |
130 | .num_clks = 2, | ||
223 | }, | 131 | }, |
224 | }; | 132 | }; |
225 | #define OMAP2430_MCBSP_PDATA_SZ ARRAY_SIZE(omap2430_mcbsp_pdata) | 133 | #define OMAP2430_MCBSP_PDATA_SZ ARRAY_SIZE(omap2430_mcbsp_pdata) |
@@ -237,7 +145,8 @@ static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = { | |||
237 | .rx_irq = INT_24XX_MCBSP1_IRQ_RX, | 145 | .rx_irq = INT_24XX_MCBSP1_IRQ_RX, |
238 | .tx_irq = INT_24XX_MCBSP1_IRQ_TX, | 146 | .tx_irq = INT_24XX_MCBSP1_IRQ_TX, |
239 | .ops = &omap2_mcbsp_ops, | 147 | .ops = &omap2_mcbsp_ops, |
240 | .clk_name = "mcbsp_clk", | 148 | .clk_names = clk_names, |
149 | .num_clks = 2, | ||
241 | }, | 150 | }, |
242 | { | 151 | { |
243 | .phys_base = OMAP34XX_MCBSP2_BASE, | 152 | .phys_base = OMAP34XX_MCBSP2_BASE, |
@@ -246,7 +155,8 @@ static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = { | |||
246 | .rx_irq = INT_24XX_MCBSP2_IRQ_RX, | 155 | .rx_irq = INT_24XX_MCBSP2_IRQ_RX, |
247 | .tx_irq = INT_24XX_MCBSP2_IRQ_TX, | 156 | .tx_irq = INT_24XX_MCBSP2_IRQ_TX, |
248 | .ops = &omap2_mcbsp_ops, | 157 | .ops = &omap2_mcbsp_ops, |
249 | .clk_name = "mcbsp_clk", | 158 | .clk_names = clk_names, |
159 | .num_clks = 2, | ||
250 | }, | 160 | }, |
251 | { | 161 | { |
252 | .phys_base = OMAP34XX_MCBSP3_BASE, | 162 | .phys_base = OMAP34XX_MCBSP3_BASE, |
@@ -255,7 +165,8 @@ static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = { | |||
255 | .rx_irq = INT_24XX_MCBSP3_IRQ_RX, | 165 | .rx_irq = INT_24XX_MCBSP3_IRQ_RX, |
256 | .tx_irq = INT_24XX_MCBSP3_IRQ_TX, | 166 | .tx_irq = INT_24XX_MCBSP3_IRQ_TX, |
257 | .ops = &omap2_mcbsp_ops, | 167 | .ops = &omap2_mcbsp_ops, |
258 | .clk_name = "mcbsp_clk", | 168 | .clk_names = clk_names, |
169 | .num_clks = 2, | ||
259 | }, | 170 | }, |
260 | { | 171 | { |
261 | .phys_base = OMAP34XX_MCBSP4_BASE, | 172 | .phys_base = OMAP34XX_MCBSP4_BASE, |
@@ -264,7 +175,8 @@ static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = { | |||
264 | .rx_irq = INT_24XX_MCBSP4_IRQ_RX, | 175 | .rx_irq = INT_24XX_MCBSP4_IRQ_RX, |
265 | .tx_irq = INT_24XX_MCBSP4_IRQ_TX, | 176 | .tx_irq = INT_24XX_MCBSP4_IRQ_TX, |
266 | .ops = &omap2_mcbsp_ops, | 177 | .ops = &omap2_mcbsp_ops, |
267 | .clk_name = "mcbsp_clk", | 178 | .clk_names = clk_names, |
179 | .num_clks = 2, | ||
268 | }, | 180 | }, |
269 | { | 181 | { |
270 | .phys_base = OMAP34XX_MCBSP5_BASE, | 182 | .phys_base = OMAP34XX_MCBSP5_BASE, |
@@ -273,7 +185,8 @@ static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = { | |||
273 | .rx_irq = INT_24XX_MCBSP5_IRQ_RX, | 185 | .rx_irq = INT_24XX_MCBSP5_IRQ_RX, |
274 | .tx_irq = INT_24XX_MCBSP5_IRQ_TX, | 186 | .tx_irq = INT_24XX_MCBSP5_IRQ_TX, |
275 | .ops = &omap2_mcbsp_ops, | 187 | .ops = &omap2_mcbsp_ops, |
276 | .clk_name = "mcbsp_clk", | 188 | .clk_names = clk_names, |
189 | .num_clks = 2, | ||
277 | }, | 190 | }, |
278 | }; | 191 | }; |
279 | #define OMAP34XX_MCBSP_PDATA_SZ ARRAY_SIZE(omap34xx_mcbsp_pdata) | 192 | #define OMAP34XX_MCBSP_PDATA_SZ ARRAY_SIZE(omap34xx_mcbsp_pdata) |
@@ -284,14 +197,6 @@ static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = { | |||
284 | 197 | ||
285 | static int __init omap2_mcbsp_init(void) | 198 | static int __init omap2_mcbsp_init(void) |
286 | { | 199 | { |
287 | int i; | ||
288 | |||
289 | for (i = 0; i < omap_mcbsp_clks_size; i++) { | ||
290 | /* Once we call clk_get inside init, we do not register it */ | ||
291 | omap_mcbsp_clk_init(&omap_mcbsp_clks[i]); | ||
292 | clk_register(&omap_mcbsp_clks[i].clk); | ||
293 | } | ||
294 | |||
295 | if (cpu_is_omap2420()) | 200 | if (cpu_is_omap2420()) |
296 | omap_mcbsp_count = OMAP2420_MCBSP_PDATA_SZ; | 201 | omap_mcbsp_count = OMAP2420_MCBSP_PDATA_SZ; |
297 | if (cpu_is_omap2430()) | 202 | if (cpu_is_omap2430()) |
diff --git a/arch/arm/mach-omap2/sleep24xx.S b/arch/arm/mach-omap2/sleep24xx.S index 43336b93b21..bf9e96105e1 100644 --- a/arch/arm/mach-omap2/sleep24xx.S +++ b/arch/arm/mach-omap2/sleep24xx.S | |||
@@ -93,9 +93,8 @@ ENTRY(omap24xx_cpu_suspend) | |||
93 | orr r4, r4, #0x40 @ enable self refresh on idle req | 93 | orr r4, r4, #0x40 @ enable self refresh on idle req |
94 | mov r5, #0x2000 @ set delay (DPLL relock + DLL relock) | 94 | mov r5, #0x2000 @ set delay (DPLL relock + DLL relock) |
95 | str r4, [r2] @ make it so | 95 | str r4, [r2] @ make it so |
96 | mov r2, #0 | ||
97 | nop | 96 | nop |
98 | mcr p15, 0, r2, c7, c0, 4 @ wait for interrupt | 97 | mcr p15, 0, r3, c7, c0, 4 @ wait for interrupt |
99 | nop | 98 | nop |
100 | loop: | 99 | loop: |
101 | subs r5, r5, #0x1 @ awake, wait just a bit | 100 | subs r5, r5, #0x1 @ awake, wait just a bit |
diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c index ae6036300f6..9fc13a2cc3f 100644 --- a/arch/arm/mach-omap2/timer-gp.c +++ b/arch/arm/mach-omap2/timer-gp.c | |||
@@ -118,7 +118,8 @@ static void __init omap2_gp_clockevent_init(void) | |||
118 | clockevent_gpt.max_delta_ns = | 118 | clockevent_gpt.max_delta_ns = |
119 | clockevent_delta2ns(0xffffffff, &clockevent_gpt); | 119 | clockevent_delta2ns(0xffffffff, &clockevent_gpt); |
120 | clockevent_gpt.min_delta_ns = | 120 | clockevent_gpt.min_delta_ns = |
121 | clockevent_delta2ns(1, &clockevent_gpt); | 121 | clockevent_delta2ns(3, &clockevent_gpt); |
122 | /* Timer internal resynch latency. */ | ||
122 | 123 | ||
123 | clockevent_gpt.cpumask = cpumask_of(0); | 124 | clockevent_gpt.cpumask = cpumask_of(0); |
124 | clockevents_register_device(&clockevent_gpt); | 125 | clockevents_register_device(&clockevent_gpt); |
diff --git a/arch/arm/mach-sa1100/generic.c b/arch/arm/mach-sa1100/generic.c index c1fbd5b5f9c..23cfdd59395 100644 --- a/arch/arm/mach-sa1100/generic.c +++ b/arch/arm/mach-sa1100/generic.c | |||
@@ -289,7 +289,7 @@ static struct platform_device sa11x0pcmcia_device = { | |||
289 | }; | 289 | }; |
290 | 290 | ||
291 | static struct platform_device sa11x0mtd_device = { | 291 | static struct platform_device sa11x0mtd_device = { |
292 | .name = "flash", | 292 | .name = "sa1100-mtd", |
293 | .id = -1, | 293 | .id = -1, |
294 | }; | 294 | }; |
295 | 295 | ||
diff --git a/arch/arm/mm/fault-armv.c b/arch/arm/mm/fault-armv.c index 81d0b8772de..bc0099d5ae8 100644 --- a/arch/arm/mm/fault-armv.c +++ b/arch/arm/mm/fault-armv.c | |||
@@ -66,7 +66,10 @@ static int adjust_pte(struct vm_area_struct *vma, unsigned long address) | |||
66 | * fault (ie, is old), we can safely ignore any issues. | 66 | * fault (ie, is old), we can safely ignore any issues. |
67 | */ | 67 | */ |
68 | if (ret && (pte_val(entry) & L_PTE_MT_MASK) != shared_pte_mask) { | 68 | if (ret && (pte_val(entry) & L_PTE_MT_MASK) != shared_pte_mask) { |
69 | flush_cache_page(vma, address, pte_pfn(entry)); | 69 | unsigned long pfn = pte_pfn(entry); |
70 | flush_cache_page(vma, address, pfn); | ||
71 | outer_flush_range((pfn << PAGE_SHIFT), | ||
72 | (pfn << PAGE_SHIFT) + PAGE_SIZE); | ||
70 | pte_val(entry) &= ~L_PTE_MT_MASK; | 73 | pte_val(entry) &= ~L_PTE_MT_MASK; |
71 | pte_val(entry) |= shared_pte_mask; | 74 | pte_val(entry) |= shared_pte_mask; |
72 | set_pte_at(vma->vm_mm, address, pte, entry); | 75 | set_pte_at(vma->vm_mm, address, pte, entry); |
diff --git a/arch/arm/plat-mxc/include/mach/mmc.h b/arch/arm/plat-mxc/include/mach/mmc.h new file mode 100644 index 00000000000..de2128dada5 --- /dev/null +++ b/arch/arm/plat-mxc/include/mach/mmc.h | |||
@@ -0,0 +1,36 @@ | |||
1 | #ifndef ASMARM_ARCH_MMC_H | ||
2 | #define ASMARM_ARCH_MMC_H | ||
3 | |||
4 | #include <linux/mmc/host.h> | ||
5 | |||
6 | struct device; | ||
7 | |||
8 | /* board specific SDHC data, optional. | ||
9 | * If not present, a writable card with 3,3V is assumed. | ||
10 | */ | ||
11 | struct imxmmc_platform_data { | ||
12 | /* Return values for the get_ro callback should be: | ||
13 | * 0 for a read/write card | ||
14 | * 1 for a read-only card | ||
15 | * -ENOSYS when not supported (equal to NULL callback) | ||
16 | * or a negative errno value when something bad happened | ||
17 | */ | ||
18 | int (*get_ro)(struct device *); | ||
19 | |||
20 | /* board specific hook to (de)initialize the SD slot. | ||
21 | * The board code can call 'handler' on a card detection | ||
22 | * change giving data as argument. | ||
23 | */ | ||
24 | int (*init)(struct device *dev, irq_handler_t handler, void *data); | ||
25 | void (*exit)(struct device *dev, void *data); | ||
26 | |||
27 | /* available voltages. If not given, assume | ||
28 | * MMC_VDD_32_33 | MMC_VDD_33_34 | ||
29 | */ | ||
30 | unsigned int ocr_avail; | ||
31 | |||
32 | /* adjust slot voltage */ | ||
33 | void (*setpower)(struct device *, unsigned int vdd); | ||
34 | }; | ||
35 | |||
36 | #endif | ||
diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c index ac15c23fd5d..208dbb121f4 100644 --- a/arch/arm/plat-omap/devices.c +++ b/arch/arm/plat-omap/devices.c | |||
@@ -200,14 +200,15 @@ void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config, | |||
200 | /* | 200 | /* |
201 | * Register MMC devices. Called from mach-omap1 and mach-omap2 device init. | 201 | * Register MMC devices. Called from mach-omap1 and mach-omap2 device init. |
202 | */ | 202 | */ |
203 | int __init omap_mmc_add(int id, unsigned long base, unsigned long size, | 203 | int __init omap_mmc_add(const char *name, int id, unsigned long base, |
204 | unsigned int irq, struct omap_mmc_platform_data *data) | 204 | unsigned long size, unsigned int irq, |
205 | struct omap_mmc_platform_data *data) | ||
205 | { | 206 | { |
206 | struct platform_device *pdev; | 207 | struct platform_device *pdev; |
207 | struct resource res[OMAP_MMC_NR_RES]; | 208 | struct resource res[OMAP_MMC_NR_RES]; |
208 | int ret; | 209 | int ret; |
209 | 210 | ||
210 | pdev = platform_device_alloc("mmci-omap", id); | 211 | pdev = platform_device_alloc(name, id); |
211 | if (!pdev) | 212 | if (!pdev) |
212 | return -ENOMEM; | 213 | return -ENOMEM; |
213 | 214 | ||
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index e77373c39f8..47ec77af4cc 100644 --- a/arch/arm/plat-omap/dma.c +++ b/arch/arm/plat-omap/dma.c | |||
@@ -709,6 +709,7 @@ int omap_request_dma(int dev_id, const char *dev_name, | |||
709 | chan->dev_name = dev_name; | 709 | chan->dev_name = dev_name; |
710 | chan->callback = callback; | 710 | chan->callback = callback; |
711 | chan->data = data; | 711 | chan->data = data; |
712 | chan->flags = 0; | ||
712 | 713 | ||
713 | #ifndef CONFIG_ARCH_OMAP1 | 714 | #ifndef CONFIG_ARCH_OMAP1 |
714 | if (cpu_class_is_omap2()) { | 715 | if (cpu_class_is_omap2()) { |
@@ -1888,11 +1889,11 @@ static int omap2_dma_handle_ch(int ch) | |||
1888 | status = dma_read(CSR(ch)); | 1889 | status = dma_read(CSR(ch)); |
1889 | } | 1890 | } |
1890 | 1891 | ||
1892 | dma_write(status, CSR(ch)); | ||
1893 | |||
1891 | if (likely(dma_chan[ch].callback != NULL)) | 1894 | if (likely(dma_chan[ch].callback != NULL)) |
1892 | dma_chan[ch].callback(ch, status, dma_chan[ch].data); | 1895 | dma_chan[ch].callback(ch, status, dma_chan[ch].data); |
1893 | 1896 | ||
1894 | dma_write(status, CSR(ch)); | ||
1895 | |||
1896 | return 0; | 1897 | return 0; |
1897 | } | 1898 | } |
1898 | 1899 | ||
diff --git a/arch/arm/plat-omap/include/mach/cpu.h b/arch/arm/plat-omap/include/mach/cpu.h index b2062f1175d..a8e1178a946 100644 --- a/arch/arm/plat-omap/include/mach/cpu.h +++ b/arch/arm/plat-omap/include/mach/cpu.h | |||
@@ -339,6 +339,7 @@ IS_OMAP_TYPE(3430, 0x3430) | |||
339 | #define OMAP3430_REV_ES2_0 0x34301034 | 339 | #define OMAP3430_REV_ES2_0 0x34301034 |
340 | #define OMAP3430_REV_ES2_1 0x34302034 | 340 | #define OMAP3430_REV_ES2_1 0x34302034 |
341 | #define OMAP3430_REV_ES3_0 0x34303034 | 341 | #define OMAP3430_REV_ES3_0 0x34303034 |
342 | #define OMAP3430_REV_ES3_1 0x34304034 | ||
342 | 343 | ||
343 | /* | 344 | /* |
344 | * omap_chip bits | 345 | * omap_chip bits |
diff --git a/arch/arm/plat-omap/include/mach/mcbsp.h b/arch/arm/plat-omap/include/mach/mcbsp.h index eef873db3d4..113c2466c86 100644 --- a/arch/arm/plat-omap/include/mach/mcbsp.h +++ b/arch/arm/plat-omap/include/mach/mcbsp.h | |||
@@ -344,7 +344,8 @@ struct omap_mcbsp_platform_data { | |||
344 | u8 dma_rx_sync, dma_tx_sync; | 344 | u8 dma_rx_sync, dma_tx_sync; |
345 | u16 rx_irq, tx_irq; | 345 | u16 rx_irq, tx_irq; |
346 | struct omap_mcbsp_ops *ops; | 346 | struct omap_mcbsp_ops *ops; |
347 | char const *clk_name; | 347 | char const **clk_names; |
348 | int num_clks; | ||
348 | }; | 349 | }; |
349 | 350 | ||
350 | struct omap_mcbsp { | 351 | struct omap_mcbsp { |
@@ -376,7 +377,8 @@ struct omap_mcbsp { | |||
376 | /* Protect the field .free, while checking if the mcbsp is in use */ | 377 | /* Protect the field .free, while checking if the mcbsp is in use */ |
377 | spinlock_t lock; | 378 | spinlock_t lock; |
378 | struct omap_mcbsp_platform_data *pdata; | 379 | struct omap_mcbsp_platform_data *pdata; |
379 | struct clk *clk; | 380 | struct clk **clks; |
381 | int num_clks; | ||
380 | }; | 382 | }; |
381 | extern struct omap_mcbsp **mcbsp_ptr; | 383 | extern struct omap_mcbsp **mcbsp_ptr; |
382 | extern int omap_mcbsp_count; | 384 | extern int omap_mcbsp_count; |
diff --git a/arch/arm/plat-omap/include/mach/mmc.h b/arch/arm/plat-omap/include/mach/mmc.h index 031250f0280..73a9e15031b 100644 --- a/arch/arm/plat-omap/include/mach/mmc.h +++ b/arch/arm/plat-omap/include/mach/mmc.h | |||
@@ -115,8 +115,9 @@ void omap1_init_mmc(struct omap_mmc_platform_data **mmc_data, | |||
115 | int nr_controllers); | 115 | int nr_controllers); |
116 | void omap2_init_mmc(struct omap_mmc_platform_data **mmc_data, | 116 | void omap2_init_mmc(struct omap_mmc_platform_data **mmc_data, |
117 | int nr_controllers); | 117 | int nr_controllers); |
118 | int omap_mmc_add(int id, unsigned long base, unsigned long size, | 118 | int omap_mmc_add(const char *name, int id, unsigned long base, |
119 | unsigned int irq, struct omap_mmc_platform_data *data); | 119 | unsigned long size, unsigned int irq, |
120 | struct omap_mmc_platform_data *data); | ||
120 | #else | 121 | #else |
121 | static inline void omap1_init_mmc(struct omap_mmc_platform_data **mmc_data, | 122 | static inline void omap1_init_mmc(struct omap_mmc_platform_data **mmc_data, |
122 | int nr_controllers) | 123 | int nr_controllers) |
@@ -126,8 +127,9 @@ static inline void omap2_init_mmc(struct omap_mmc_platform_data **mmc_data, | |||
126 | int nr_controllers) | 127 | int nr_controllers) |
127 | { | 128 | { |
128 | } | 129 | } |
129 | static inline int omap_mmc_add(int id, unsigned long base, unsigned long size, | 130 | static inline int omap_mmc_add(const char *name, int id, unsigned long base, |
130 | unsigned int irq, struct omap_mmc_platform_data *data) | 131 | unsigned long size, unsigned int irq, |
132 | struct omap_mmc_platform_data *data) | ||
131 | { | 133 | { |
132 | return 0; | 134 | return 0; |
133 | } | 135 | } |
diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c index f2401a831f9..e5842e30e53 100644 --- a/arch/arm/plat-omap/mcbsp.c +++ b/arch/arm/plat-omap/mcbsp.c | |||
@@ -214,6 +214,7 @@ EXPORT_SYMBOL(omap_mcbsp_set_io_type); | |||
214 | int omap_mcbsp_request(unsigned int id) | 214 | int omap_mcbsp_request(unsigned int id) |
215 | { | 215 | { |
216 | struct omap_mcbsp *mcbsp; | 216 | struct omap_mcbsp *mcbsp; |
217 | int i; | ||
217 | int err; | 218 | int err; |
218 | 219 | ||
219 | if (!omap_mcbsp_check_valid_id(id)) { | 220 | if (!omap_mcbsp_check_valid_id(id)) { |
@@ -225,7 +226,8 @@ int omap_mcbsp_request(unsigned int id) | |||
225 | if (mcbsp->pdata && mcbsp->pdata->ops && mcbsp->pdata->ops->request) | 226 | if (mcbsp->pdata && mcbsp->pdata->ops && mcbsp->pdata->ops->request) |
226 | mcbsp->pdata->ops->request(id); | 227 | mcbsp->pdata->ops->request(id); |
227 | 228 | ||
228 | clk_enable(mcbsp->clk); | 229 | for (i = 0; i < mcbsp->num_clks; i++) |
230 | clk_enable(mcbsp->clks[i]); | ||
229 | 231 | ||
230 | spin_lock(&mcbsp->lock); | 232 | spin_lock(&mcbsp->lock); |
231 | if (!mcbsp->free) { | 233 | if (!mcbsp->free) { |
@@ -276,6 +278,7 @@ EXPORT_SYMBOL(omap_mcbsp_request); | |||
276 | void omap_mcbsp_free(unsigned int id) | 278 | void omap_mcbsp_free(unsigned int id) |
277 | { | 279 | { |
278 | struct omap_mcbsp *mcbsp; | 280 | struct omap_mcbsp *mcbsp; |
281 | int i; | ||
279 | 282 | ||
280 | if (!omap_mcbsp_check_valid_id(id)) { | 283 | if (!omap_mcbsp_check_valid_id(id)) { |
281 | printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); | 284 | printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); |
@@ -286,7 +289,8 @@ void omap_mcbsp_free(unsigned int id) | |||
286 | if (mcbsp->pdata && mcbsp->pdata->ops && mcbsp->pdata->ops->free) | 289 | if (mcbsp->pdata && mcbsp->pdata->ops && mcbsp->pdata->ops->free) |
287 | mcbsp->pdata->ops->free(id); | 290 | mcbsp->pdata->ops->free(id); |
288 | 291 | ||
289 | clk_disable(mcbsp->clk); | 292 | for (i = mcbsp->num_clks - 1; i >= 0; i--) |
293 | clk_disable(mcbsp->clks[i]); | ||
290 | 294 | ||
291 | spin_lock(&mcbsp->lock); | 295 | spin_lock(&mcbsp->lock); |
292 | if (mcbsp->free) { | 296 | if (mcbsp->free) { |
@@ -872,6 +876,7 @@ static int __devinit omap_mcbsp_probe(struct platform_device *pdev) | |||
872 | struct omap_mcbsp_platform_data *pdata = pdev->dev.platform_data; | 876 | struct omap_mcbsp_platform_data *pdata = pdev->dev.platform_data; |
873 | struct omap_mcbsp *mcbsp; | 877 | struct omap_mcbsp *mcbsp; |
874 | int id = pdev->id - 1; | 878 | int id = pdev->id - 1; |
879 | int i; | ||
875 | int ret = 0; | 880 | int ret = 0; |
876 | 881 | ||
877 | if (!pdata) { | 882 | if (!pdata) { |
@@ -916,14 +921,25 @@ static int __devinit omap_mcbsp_probe(struct platform_device *pdev) | |||
916 | mcbsp->dma_rx_sync = pdata->dma_rx_sync; | 921 | mcbsp->dma_rx_sync = pdata->dma_rx_sync; |
917 | mcbsp->dma_tx_sync = pdata->dma_tx_sync; | 922 | mcbsp->dma_tx_sync = pdata->dma_tx_sync; |
918 | 923 | ||
919 | if (pdata->clk_name) | 924 | if (pdata->num_clks) { |
920 | mcbsp->clk = clk_get(&pdev->dev, pdata->clk_name); | 925 | mcbsp->num_clks = pdata->num_clks; |
921 | if (IS_ERR(mcbsp->clk)) { | 926 | mcbsp->clks = kzalloc(mcbsp->num_clks * sizeof(struct clk *), |
922 | dev_err(&pdev->dev, | 927 | GFP_KERNEL); |
923 | "Invalid clock configuration for McBSP%d.\n", | 928 | if (!mcbsp->clks) { |
924 | mcbsp->id); | 929 | ret = -ENOMEM; |
925 | ret = PTR_ERR(mcbsp->clk); | 930 | goto exit; |
926 | goto err_clk; | 931 | } |
932 | for (i = 0; i < mcbsp->num_clks; i++) { | ||
933 | mcbsp->clks[i] = clk_get(&pdev->dev, pdata->clk_names[i]); | ||
934 | if (IS_ERR(mcbsp->clks[i])) { | ||
935 | dev_err(&pdev->dev, | ||
936 | "Invalid %s configuration for McBSP%d.\n", | ||
937 | pdata->clk_names[i], mcbsp->id); | ||
938 | ret = PTR_ERR(mcbsp->clks[i]); | ||
939 | goto err_clk; | ||
940 | } | ||
941 | } | ||
942 | |||
927 | } | 943 | } |
928 | 944 | ||
929 | mcbsp->pdata = pdata; | 945 | mcbsp->pdata = pdata; |
@@ -932,6 +948,9 @@ static int __devinit omap_mcbsp_probe(struct platform_device *pdev) | |||
932 | return 0; | 948 | return 0; |
933 | 949 | ||
934 | err_clk: | 950 | err_clk: |
951 | while (i--) | ||
952 | clk_put(mcbsp->clks[i]); | ||
953 | kfree(mcbsp->clks); | ||
935 | iounmap(mcbsp->io_base); | 954 | iounmap(mcbsp->io_base); |
936 | err_ioremap: | 955 | err_ioremap: |
937 | mcbsp->free = 0; | 956 | mcbsp->free = 0; |
@@ -942,6 +961,7 @@ exit: | |||
942 | static int __devexit omap_mcbsp_remove(struct platform_device *pdev) | 961 | static int __devexit omap_mcbsp_remove(struct platform_device *pdev) |
943 | { | 962 | { |
944 | struct omap_mcbsp *mcbsp = platform_get_drvdata(pdev); | 963 | struct omap_mcbsp *mcbsp = platform_get_drvdata(pdev); |
964 | int i; | ||
945 | 965 | ||
946 | platform_set_drvdata(pdev, NULL); | 966 | platform_set_drvdata(pdev, NULL); |
947 | if (mcbsp) { | 967 | if (mcbsp) { |
@@ -950,12 +970,18 @@ static int __devexit omap_mcbsp_remove(struct platform_device *pdev) | |||
950 | mcbsp->pdata->ops->free) | 970 | mcbsp->pdata->ops->free) |
951 | mcbsp->pdata->ops->free(mcbsp->id); | 971 | mcbsp->pdata->ops->free(mcbsp->id); |
952 | 972 | ||
953 | clk_disable(mcbsp->clk); | 973 | for (i = mcbsp->num_clks - 1; i >= 0; i--) { |
954 | clk_put(mcbsp->clk); | 974 | clk_disable(mcbsp->clks[i]); |
975 | clk_put(mcbsp->clks[i]); | ||
976 | } | ||
955 | 977 | ||
956 | iounmap(mcbsp->io_base); | 978 | iounmap(mcbsp->io_base); |
957 | 979 | ||
958 | mcbsp->clk = NULL; | 980 | if (mcbsp->num_clks) { |
981 | kfree(mcbsp->clks); | ||
982 | mcbsp->clks = NULL; | ||
983 | mcbsp->num_clks = 0; | ||
984 | } | ||
959 | mcbsp->free = 0; | 985 | mcbsp->free = 0; |
960 | mcbsp->dev = NULL; | 986 | mcbsp->dev = NULL; |
961 | } | 987 | } |
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index a949c4fbbdd..8f1f97d56e1 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig | |||
@@ -169,26 +169,51 @@ config BF542 | |||
169 | help | 169 | help |
170 | BF542 Processor Support. | 170 | BF542 Processor Support. |
171 | 171 | ||
172 | config BF542M | ||
173 | bool "BF542m" | ||
174 | help | ||
175 | BF542 Processor Support. | ||
176 | |||
172 | config BF544 | 177 | config BF544 |
173 | bool "BF544" | 178 | bool "BF544" |
174 | help | 179 | help |
175 | BF544 Processor Support. | 180 | BF544 Processor Support. |
176 | 181 | ||
182 | config BF544M | ||
183 | bool "BF544m" | ||
184 | help | ||
185 | BF544 Processor Support. | ||
186 | |||
177 | config BF547 | 187 | config BF547 |
178 | bool "BF547" | 188 | bool "BF547" |
179 | help | 189 | help |
180 | BF547 Processor Support. | 190 | BF547 Processor Support. |
181 | 191 | ||
192 | config BF547M | ||
193 | bool "BF547m" | ||
194 | help | ||
195 | BF547 Processor Support. | ||
196 | |||
182 | config BF548 | 197 | config BF548 |
183 | bool "BF548" | 198 | bool "BF548" |
184 | help | 199 | help |
185 | BF548 Processor Support. | 200 | BF548 Processor Support. |
186 | 201 | ||
202 | config BF548M | ||
203 | bool "BF548m" | ||
204 | help | ||
205 | BF548 Processor Support. | ||
206 | |||
187 | config BF549 | 207 | config BF549 |
188 | bool "BF549" | 208 | bool "BF549" |
189 | help | 209 | help |
190 | BF549 Processor Support. | 210 | BF549 Processor Support. |
191 | 211 | ||
212 | config BF549M | ||
213 | bool "BF549m" | ||
214 | help | ||
215 | BF549 Processor Support. | ||
216 | |||
192 | config BF561 | 217 | config BF561 |
193 | bool "BF561" | 218 | bool "BF561" |
194 | help | 219 | help |
@@ -224,39 +249,39 @@ config TICK_SOURCE_SYSTMR0 | |||
224 | 249 | ||
225 | config BF_REV_MIN | 250 | config BF_REV_MIN |
226 | int | 251 | int |
227 | default 0 if (BF51x || BF52x || BF54x) | 252 | default 0 if (BF51x || BF52x || (BF54x && !BF54xM)) |
228 | default 2 if (BF537 || BF536 || BF534) | 253 | default 2 if (BF537 || BF536 || BF534) |
229 | default 3 if (BF561 ||BF533 || BF532 || BF531) | 254 | default 3 if (BF561 || BF533 || BF532 || BF531 || BF54xM) |
230 | default 4 if (BF538 || BF539) | 255 | default 4 if (BF538 || BF539) |
231 | 256 | ||
232 | config BF_REV_MAX | 257 | config BF_REV_MAX |
233 | int | 258 | int |
234 | default 2 if (BF51x || BF52x || BF54x) | 259 | default 2 if (BF51x || BF52x || (BF54x && !BF54xM)) |
235 | default 3 if (BF537 || BF536 || BF534) | 260 | default 3 if (BF537 || BF536 || BF534 || BF54xM) |
236 | default 5 if (BF561 || BF538 || BF539) | 261 | default 5 if (BF561 || BF538 || BF539) |
237 | default 6 if (BF533 || BF532 || BF531) | 262 | default 6 if (BF533 || BF532 || BF531) |
238 | 263 | ||
239 | choice | 264 | choice |
240 | prompt "Silicon Rev" | 265 | prompt "Silicon Rev" |
241 | default BF_REV_0_1 if (BF51x || BF52x || BF54x) | 266 | default BF_REV_0_1 if (BF51x || BF52x || (BF54x && !BF54xM)) |
242 | default BF_REV_0_2 if (BF534 || BF536 || BF537) | 267 | default BF_REV_0_2 if (BF534 || BF536 || BF537) |
243 | default BF_REV_0_3 if (BF531 || BF532 || BF533 || BF561) | 268 | default BF_REV_0_3 if (BF531 || BF532 || BF533 || BF54xM || BF561) |
244 | 269 | ||
245 | config BF_REV_0_0 | 270 | config BF_REV_0_0 |
246 | bool "0.0" | 271 | bool "0.0" |
247 | depends on (BF51x || BF52x || BF54x) | 272 | depends on (BF51x || BF52x || (BF54x && !BF54xM)) |
248 | 273 | ||
249 | config BF_REV_0_1 | 274 | config BF_REV_0_1 |
250 | bool "0.1" | 275 | bool "0.1" |
251 | depends on (BF52x || BF54x) | 276 | depends on (BF52x || (BF54x && !BF54xM)) |
252 | 277 | ||
253 | config BF_REV_0_2 | 278 | config BF_REV_0_2 |
254 | bool "0.2" | 279 | bool "0.2" |
255 | depends on (BF52x || BF537 || BF536 || BF534 || BF54x) | 280 | depends on (BF52x || BF537 || BF536 || BF534 || (BF54x && !BF54xM)) |
256 | 281 | ||
257 | config BF_REV_0_3 | 282 | config BF_REV_0_3 |
258 | bool "0.3" | 283 | bool "0.3" |
259 | depends on (BF561 || BF537 || BF536 || BF534 || BF533 || BF532 || BF531) | 284 | depends on (BF54xM || BF561 || BF537 || BF536 || BF534 || BF533 || BF532 || BF531) |
260 | 285 | ||
261 | config BF_REV_0_4 | 286 | config BF_REV_0_4 |
262 | bool "0.4" | 287 | bool "0.4" |
@@ -293,9 +318,14 @@ config BF53x | |||
293 | depends on (BF531 || BF532 || BF533 || BF534 || BF536 || BF537) | 318 | depends on (BF531 || BF532 || BF533 || BF534 || BF536 || BF537) |
294 | default y | 319 | default y |
295 | 320 | ||
321 | config BF54xM | ||
322 | bool | ||
323 | depends on (BF542M || BF544M || BF547M || BF548M || BF549M) | ||
324 | default y | ||
325 | |||
296 | config BF54x | 326 | config BF54x |
297 | bool | 327 | bool |
298 | depends on (BF542 || BF544 || BF547 || BF548 || BF549) | 328 | depends on (BF542 || BF544 || BF547 || BF548 || BF549 || BF54xM) |
299 | default y | 329 | default y |
300 | 330 | ||
301 | config MEM_GENERIC_BOARD | 331 | config MEM_GENERIC_BOARD |
diff --git a/arch/blackfin/Makefile b/arch/blackfin/Makefile index e550c8d4606..d54c8283825 100644 --- a/arch/blackfin/Makefile +++ b/arch/blackfin/Makefile | |||
@@ -21,57 +21,67 @@ KALLSYMS += --symbol-prefix=_ | |||
21 | KBUILD_DEFCONFIG := BF537-STAMP_defconfig | 21 | KBUILD_DEFCONFIG := BF537-STAMP_defconfig |
22 | 22 | ||
23 | # setup the machine name and the machine dependent settings | 23 | # setup the machine name and the machine dependent settings |
24 | machine-$(CONFIG_BF512) := bf518 | 24 | machine-$(CONFIG_BF512) := bf518 |
25 | machine-$(CONFIG_BF514) := bf518 | 25 | machine-$(CONFIG_BF514) := bf518 |
26 | machine-$(CONFIG_BF516) := bf518 | 26 | machine-$(CONFIG_BF516) := bf518 |
27 | machine-$(CONFIG_BF518) := bf518 | 27 | machine-$(CONFIG_BF518) := bf518 |
28 | machine-$(CONFIG_BF522) := bf527 | 28 | machine-$(CONFIG_BF522) := bf527 |
29 | machine-$(CONFIG_BF523) := bf527 | 29 | machine-$(CONFIG_BF523) := bf527 |
30 | machine-$(CONFIG_BF524) := bf527 | 30 | machine-$(CONFIG_BF524) := bf527 |
31 | machine-$(CONFIG_BF525) := bf527 | 31 | machine-$(CONFIG_BF525) := bf527 |
32 | machine-$(CONFIG_BF526) := bf527 | 32 | machine-$(CONFIG_BF526) := bf527 |
33 | machine-$(CONFIG_BF527) := bf527 | 33 | machine-$(CONFIG_BF527) := bf527 |
34 | machine-$(CONFIG_BF531) := bf533 | 34 | machine-$(CONFIG_BF531) := bf533 |
35 | machine-$(CONFIG_BF532) := bf533 | 35 | machine-$(CONFIG_BF532) := bf533 |
36 | machine-$(CONFIG_BF533) := bf533 | 36 | machine-$(CONFIG_BF533) := bf533 |
37 | machine-$(CONFIG_BF534) := bf537 | 37 | machine-$(CONFIG_BF534) := bf537 |
38 | machine-$(CONFIG_BF536) := bf537 | 38 | machine-$(CONFIG_BF536) := bf537 |
39 | machine-$(CONFIG_BF537) := bf537 | 39 | machine-$(CONFIG_BF537) := bf537 |
40 | machine-$(CONFIG_BF538) := bf538 | 40 | machine-$(CONFIG_BF538) := bf538 |
41 | machine-$(CONFIG_BF539) := bf538 | 41 | machine-$(CONFIG_BF539) := bf538 |
42 | machine-$(CONFIG_BF542) := bf548 | 42 | machine-$(CONFIG_BF542) := bf548 |
43 | machine-$(CONFIG_BF544) := bf548 | 43 | machine-$(CONFIG_BF542M) := bf548 |
44 | machine-$(CONFIG_BF547) := bf548 | 44 | machine-$(CONFIG_BF544) := bf548 |
45 | machine-$(CONFIG_BF548) := bf548 | 45 | machine-$(CONFIG_BF544M) := bf548 |
46 | machine-$(CONFIG_BF549) := bf548 | 46 | machine-$(CONFIG_BF547) := bf548 |
47 | machine-$(CONFIG_BF561) := bf561 | 47 | machine-$(CONFIG_BF547M) := bf548 |
48 | machine-$(CONFIG_BF548) := bf548 | ||
49 | machine-$(CONFIG_BF548M) := bf548 | ||
50 | machine-$(CONFIG_BF549) := bf548 | ||
51 | machine-$(CONFIG_BF549M) := bf548 | ||
52 | machine-$(CONFIG_BF561) := bf561 | ||
48 | MACHINE := $(machine-y) | 53 | MACHINE := $(machine-y) |
49 | export MACHINE | 54 | export MACHINE |
50 | 55 | ||
51 | cpu-$(CONFIG_BF512) := bf512 | 56 | cpu-$(CONFIG_BF512) := bf512 |
52 | cpu-$(CONFIG_BF514) := bf514 | 57 | cpu-$(CONFIG_BF514) := bf514 |
53 | cpu-$(CONFIG_BF516) := bf516 | 58 | cpu-$(CONFIG_BF516) := bf516 |
54 | cpu-$(CONFIG_BF518) := bf518 | 59 | cpu-$(CONFIG_BF518) := bf518 |
55 | cpu-$(CONFIG_BF522) := bf522 | 60 | cpu-$(CONFIG_BF522) := bf522 |
56 | cpu-$(CONFIG_BF523) := bf523 | 61 | cpu-$(CONFIG_BF523) := bf523 |
57 | cpu-$(CONFIG_BF524) := bf524 | 62 | cpu-$(CONFIG_BF524) := bf524 |
58 | cpu-$(CONFIG_BF525) := bf525 | 63 | cpu-$(CONFIG_BF525) := bf525 |
59 | cpu-$(CONFIG_BF526) := bf526 | 64 | cpu-$(CONFIG_BF526) := bf526 |
60 | cpu-$(CONFIG_BF527) := bf527 | 65 | cpu-$(CONFIG_BF527) := bf527 |
61 | cpu-$(CONFIG_BF531) := bf531 | 66 | cpu-$(CONFIG_BF531) := bf531 |
62 | cpu-$(CONFIG_BF532) := bf532 | 67 | cpu-$(CONFIG_BF532) := bf532 |
63 | cpu-$(CONFIG_BF533) := bf533 | 68 | cpu-$(CONFIG_BF533) := bf533 |
64 | cpu-$(CONFIG_BF534) := bf534 | 69 | cpu-$(CONFIG_BF534) := bf534 |
65 | cpu-$(CONFIG_BF536) := bf536 | 70 | cpu-$(CONFIG_BF536) := bf536 |
66 | cpu-$(CONFIG_BF537) := bf537 | 71 | cpu-$(CONFIG_BF537) := bf537 |
67 | cpu-$(CONFIG_BF538) := bf538 | 72 | cpu-$(CONFIG_BF538) := bf538 |
68 | cpu-$(CONFIG_BF539) := bf539 | 73 | cpu-$(CONFIG_BF539) := bf539 |
69 | cpu-$(CONFIG_BF542) := bf542 | 74 | cpu-$(CONFIG_BF542) := bf542 |
70 | cpu-$(CONFIG_BF544) := bf544 | 75 | cpu-$(CONFIG_BF542M) := bf542m |
71 | cpu-$(CONFIG_BF547) := bf547 | 76 | cpu-$(CONFIG_BF544) := bf544 |
72 | cpu-$(CONFIG_BF548) := bf548 | 77 | cpu-$(CONFIG_BF544M) := bf544m |
73 | cpu-$(CONFIG_BF549) := bf549 | 78 | cpu-$(CONFIG_BF547) := bf547 |
74 | cpu-$(CONFIG_BF561) := bf561 | 79 | cpu-$(CONFIG_BF547M) := bf547m |
80 | cpu-$(CONFIG_BF548) := bf548 | ||
81 | cpu-$(CONFIG_BF548M) := bf548m | ||
82 | cpu-$(CONFIG_BF549) := bf549 | ||
83 | cpu-$(CONFIG_BF549M) := bf549m | ||
84 | cpu-$(CONFIG_BF561) := bf561 | ||
75 | 85 | ||
76 | rev-$(CONFIG_BF_REV_0_0) := 0.0 | 86 | rev-$(CONFIG_BF_REV_0_0) := 0.0 |
77 | rev-$(CONFIG_BF_REV_0_1) := 0.1 | 87 | rev-$(CONFIG_BF_REV_0_1) := 0.1 |
diff --git a/arch/blackfin/configs/BF518F-EZBRD_defconfig b/arch/blackfin/configs/BF518F-EZBRD_defconfig index defb9785c65..4fdb9e04759 100644 --- a/arch/blackfin/configs/BF518F-EZBRD_defconfig +++ b/arch/blackfin/configs/BF518F-EZBRD_defconfig | |||
@@ -1,6 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.28-rc2 | 3 | # Linux kernel version: 2.6.28-rc2 |
4 | # Fri Jan 9 17:58:41 2009 | ||
4 | # | 5 | # |
5 | # CONFIG_MMU is not set | 6 | # CONFIG_MMU is not set |
6 | # CONFIG_FPU is not set | 7 | # CONFIG_FPU is not set |
@@ -149,6 +150,7 @@ CONFIG_BF_REV_0_0=y | |||
149 | # CONFIG_BF_REV_ANY is not set | 150 | # CONFIG_BF_REV_ANY is not set |
150 | # CONFIG_BF_REV_NONE is not set | 151 | # CONFIG_BF_REV_NONE is not set |
151 | CONFIG_BF51x=y | 152 | CONFIG_BF51x=y |
153 | CONFIG_MEM_MT48LC32M8A2_75=y | ||
152 | CONFIG_BFIN518F_EZBRD=y | 154 | CONFIG_BFIN518F_EZBRD=y |
153 | 155 | ||
154 | # | 156 | # |
@@ -598,7 +600,10 @@ CONFIG_PHYLIB=y | |||
598 | # CONFIG_MDIO_BITBANG is not set | 600 | # CONFIG_MDIO_BITBANG is not set |
599 | CONFIG_NET_ETHERNET=y | 601 | CONFIG_NET_ETHERNET=y |
600 | CONFIG_MII=y | 602 | CONFIG_MII=y |
601 | # CONFIG_BFIN_MAC is not set | 603 | CONFIG_BFIN_MAC=y |
604 | CONFIG_BFIN_TX_DESC_NUM=10 | ||
605 | CONFIG_BFIN_RX_DESC_NUM=20 | ||
606 | # CONFIG_BFIN_MAC_RMII is not set | ||
602 | # CONFIG_SMC91X is not set | 607 | # CONFIG_SMC91X is not set |
603 | # CONFIG_SMSC911X is not set | 608 | # CONFIG_SMSC911X is not set |
604 | # CONFIG_DM9000 is not set | 609 | # CONFIG_DM9000 is not set |
@@ -679,7 +684,7 @@ CONFIG_VT_CONSOLE=y | |||
679 | CONFIG_HW_CONSOLE=y | 684 | CONFIG_HW_CONSOLE=y |
680 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 685 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
681 | # CONFIG_DEVKMEM is not set | 686 | # CONFIG_DEVKMEM is not set |
682 | # CONFIG_BFIN_JTAG_COMM is not set | 687 | CONFIG_BFIN_JTAG_COMM=m |
683 | # CONFIG_SERIAL_NONSTANDARD is not set | 688 | # CONFIG_SERIAL_NONSTANDARD is not set |
684 | 689 | ||
685 | # | 690 | # |
diff --git a/arch/blackfin/configs/BF526-EZBRD_defconfig b/arch/blackfin/configs/BF526-EZBRD_defconfig index 992424ff315..8e2b855b8db 100644 --- a/arch/blackfin/configs/BF526-EZBRD_defconfig +++ b/arch/blackfin/configs/BF526-EZBRD_defconfig | |||
@@ -723,7 +723,7 @@ CONFIG_VT_CONSOLE=y | |||
723 | CONFIG_HW_CONSOLE=y | 723 | CONFIG_HW_CONSOLE=y |
724 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 724 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
725 | # CONFIG_DEVKMEM is not set | 725 | # CONFIG_DEVKMEM is not set |
726 | # CONFIG_BFIN_JTAG_COMM is not set | 726 | CONFIG_BFIN_JTAG_COMM=m |
727 | # CONFIG_SERIAL_NONSTANDARD is not set | 727 | # CONFIG_SERIAL_NONSTANDARD is not set |
728 | 728 | ||
729 | # | 729 | # |
diff --git a/arch/blackfin/configs/BF527-EZKIT_defconfig b/arch/blackfin/configs/BF527-EZKIT_defconfig index 21e3c1af55b..833128b3972 100644 --- a/arch/blackfin/configs/BF527-EZKIT_defconfig +++ b/arch/blackfin/configs/BF527-EZKIT_defconfig | |||
@@ -767,7 +767,7 @@ CONFIG_VT_CONSOLE=y | |||
767 | CONFIG_HW_CONSOLE=y | 767 | CONFIG_HW_CONSOLE=y |
768 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 768 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
769 | # CONFIG_DEVKMEM is not set | 769 | # CONFIG_DEVKMEM is not set |
770 | # CONFIG_BFIN_JTAG_COMM is not set | 770 | CONFIG_BFIN_JTAG_COMM=m |
771 | # CONFIG_SERIAL_NONSTANDARD is not set | 771 | # CONFIG_SERIAL_NONSTANDARD is not set |
772 | 772 | ||
773 | # | 773 | # |
diff --git a/arch/blackfin/configs/BF533-EZKIT_defconfig b/arch/blackfin/configs/BF533-EZKIT_defconfig index 0bdf20a1af6..334c94b51c4 100644 --- a/arch/blackfin/configs/BF533-EZKIT_defconfig +++ b/arch/blackfin/configs/BF533-EZKIT_defconfig | |||
@@ -672,7 +672,7 @@ CONFIG_BFIN_DMA_INTERFACE=m | |||
672 | CONFIG_SIMPLE_GPIO=m | 672 | CONFIG_SIMPLE_GPIO=m |
673 | # CONFIG_VT is not set | 673 | # CONFIG_VT is not set |
674 | # CONFIG_DEVKMEM is not set | 674 | # CONFIG_DEVKMEM is not set |
675 | # CONFIG_BFIN_JTAG_COMM is not set | 675 | CONFIG_BFIN_JTAG_COMM=m |
676 | # CONFIG_SERIAL_NONSTANDARD is not set | 676 | # CONFIG_SERIAL_NONSTANDARD is not set |
677 | 677 | ||
678 | # | 678 | # |
diff --git a/arch/blackfin/configs/BF533-STAMP_defconfig b/arch/blackfin/configs/BF533-STAMP_defconfig index 2f747d6e97e..9d733436e30 100644 --- a/arch/blackfin/configs/BF533-STAMP_defconfig +++ b/arch/blackfin/configs/BF533-STAMP_defconfig | |||
@@ -679,7 +679,7 @@ CONFIG_BFIN_DMA_INTERFACE=m | |||
679 | CONFIG_SIMPLE_GPIO=m | 679 | CONFIG_SIMPLE_GPIO=m |
680 | # CONFIG_VT is not set | 680 | # CONFIG_VT is not set |
681 | # CONFIG_DEVKMEM is not set | 681 | # CONFIG_DEVKMEM is not set |
682 | # CONFIG_BFIN_JTAG_COMM is not set | 682 | CONFIG_BFIN_JTAG_COMM=m |
683 | # CONFIG_SERIAL_NONSTANDARD is not set | 683 | # CONFIG_SERIAL_NONSTANDARD is not set |
684 | 684 | ||
685 | # | 685 | # |
diff --git a/arch/blackfin/configs/BF537-STAMP_defconfig b/arch/blackfin/configs/BF537-STAMP_defconfig index 8b0a81294e6..4fb4108d310 100644 --- a/arch/blackfin/configs/BF537-STAMP_defconfig +++ b/arch/blackfin/configs/BF537-STAMP_defconfig | |||
@@ -722,7 +722,7 @@ CONFIG_BFIN_DMA_INTERFACE=m | |||
722 | CONFIG_SIMPLE_GPIO=m | 722 | CONFIG_SIMPLE_GPIO=m |
723 | # CONFIG_VT is not set | 723 | # CONFIG_VT is not set |
724 | # CONFIG_DEVKMEM is not set | 724 | # CONFIG_DEVKMEM is not set |
725 | # CONFIG_BFIN_JTAG_COMM is not set | 725 | CONFIG_BFIN_JTAG_COMM=m |
726 | # CONFIG_SERIAL_NONSTANDARD is not set | 726 | # CONFIG_SERIAL_NONSTANDARD is not set |
727 | 727 | ||
728 | # | 728 | # |
diff --git a/arch/blackfin/configs/BF538-EZKIT_defconfig b/arch/blackfin/configs/BF538-EZKIT_defconfig index a1f766bf7d9..cb32f5624a1 100644 --- a/arch/blackfin/configs/BF538-EZKIT_defconfig +++ b/arch/blackfin/configs/BF538-EZKIT_defconfig | |||
@@ -726,7 +726,7 @@ CONFIG_BFIN_DMA_INTERFACE=m | |||
726 | CONFIG_SIMPLE_GPIO=m | 726 | CONFIG_SIMPLE_GPIO=m |
727 | # CONFIG_VT is not set | 727 | # CONFIG_VT is not set |
728 | # CONFIG_DEVKMEM is not set | 728 | # CONFIG_DEVKMEM is not set |
729 | # CONFIG_BFIN_JTAG_COMM is not set | 729 | CONFIG_BFIN_JTAG_COMM=m |
730 | # CONFIG_SERIAL_NONSTANDARD is not set | 730 | # CONFIG_SERIAL_NONSTANDARD is not set |
731 | 731 | ||
732 | # | 732 | # |
diff --git a/arch/blackfin/configs/BF548-EZKIT_defconfig b/arch/blackfin/configs/BF548-EZKIT_defconfig index cd2da6b7692..0f8697618aa 100644 --- a/arch/blackfin/configs/BF548-EZKIT_defconfig +++ b/arch/blackfin/configs/BF548-EZKIT_defconfig | |||
@@ -856,7 +856,7 @@ CONFIG_VT_CONSOLE=y | |||
856 | CONFIG_HW_CONSOLE=y | 856 | CONFIG_HW_CONSOLE=y |
857 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 857 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
858 | # CONFIG_DEVKMEM is not set | 858 | # CONFIG_DEVKMEM is not set |
859 | # CONFIG_BFIN_JTAG_COMM is not set | 859 | CONFIG_BFIN_JTAG_COMM=m |
860 | # CONFIG_SERIAL_NONSTANDARD is not set | 860 | # CONFIG_SERIAL_NONSTANDARD is not set |
861 | 861 | ||
862 | # | 862 | # |
diff --git a/arch/blackfin/configs/BF561-EZKIT_defconfig b/arch/blackfin/configs/BF561-EZKIT_defconfig index b398ca202db..042c7adfccf 100644 --- a/arch/blackfin/configs/BF561-EZKIT_defconfig +++ b/arch/blackfin/configs/BF561-EZKIT_defconfig | |||
@@ -709,7 +709,7 @@ CONFIG_BFIN_DMA_INTERFACE=m | |||
709 | CONFIG_SIMPLE_GPIO=m | 709 | CONFIG_SIMPLE_GPIO=m |
710 | # CONFIG_VT is not set | 710 | # CONFIG_VT is not set |
711 | # CONFIG_DEVKMEM is not set | 711 | # CONFIG_DEVKMEM is not set |
712 | # CONFIG_BFIN_JTAG_COMM is not set | 712 | CONFIG_BFIN_JTAG_COMM=m |
713 | # CONFIG_SERIAL_NONSTANDARD is not set | 713 | # CONFIG_SERIAL_NONSTANDARD is not set |
714 | 714 | ||
715 | # | 715 | # |
diff --git a/arch/blackfin/configs/CM-BF527_defconfig b/arch/blackfin/configs/CM-BF527_defconfig index 95146948166..865ed85a576 100644 --- a/arch/blackfin/configs/CM-BF527_defconfig +++ b/arch/blackfin/configs/CM-BF527_defconfig | |||
@@ -1,7 +1,6 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.24.7 | 3 | # Linux kernel version: 2.6.28 |
4 | # Fri Jul 18 18:00:41 2008 | ||
5 | # | 4 | # |
6 | # CONFIG_MMU is not set | 5 | # CONFIG_MMU is not set |
7 | # CONFIG_FPU is not set | 6 | # CONFIG_FPU is not set |
@@ -9,7 +8,6 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y | |||
9 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set | 8 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set |
10 | CONFIG_BLACKFIN=y | 9 | CONFIG_BLACKFIN=y |
11 | CONFIG_ZONE_DMA=y | 10 | CONFIG_ZONE_DMA=y |
12 | CONFIG_SEMAPHORE_SLEEPERS=y | ||
13 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 11 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
14 | CONFIG_GENERIC_HWEIGHT=y | 12 | CONFIG_GENERIC_HWEIGHT=y |
15 | CONFIG_GENERIC_HARDIRQS=y | 13 | CONFIG_GENERIC_HARDIRQS=y |
@@ -32,18 +30,16 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
32 | # CONFIG_POSIX_MQUEUE is not set | 30 | # CONFIG_POSIX_MQUEUE is not set |
33 | # CONFIG_BSD_PROCESS_ACCT is not set | 31 | # CONFIG_BSD_PROCESS_ACCT is not set |
34 | # CONFIG_TASKSTATS is not set | 32 | # CONFIG_TASKSTATS is not set |
35 | # CONFIG_USER_NS is not set | ||
36 | # CONFIG_PID_NS is not set | ||
37 | # CONFIG_AUDIT is not set | 33 | # CONFIG_AUDIT is not set |
38 | CONFIG_IKCONFIG=y | 34 | CONFIG_IKCONFIG=y |
39 | CONFIG_IKCONFIG_PROC=y | 35 | CONFIG_IKCONFIG_PROC=y |
40 | CONFIG_LOG_BUF_SHIFT=14 | 36 | CONFIG_LOG_BUF_SHIFT=14 |
41 | # CONFIG_CGROUPS is not set | 37 | # CONFIG_CGROUPS is not set |
42 | CONFIG_FAIR_GROUP_SCHED=y | 38 | # CONFIG_GROUP_SCHED is not set |
43 | CONFIG_FAIR_USER_SCHED=y | 39 | CONFIG_SYSFS_DEPRECATED=y |
44 | # CONFIG_FAIR_CGROUP_SCHED is not set | 40 | CONFIG_SYSFS_DEPRECATED_V2=y |
45 | # CONFIG_SYSFS_DEPRECATED is not set | ||
46 | # CONFIG_RELAY is not set | 41 | # CONFIG_RELAY is not set |
42 | # CONFIG_NAMESPACES is not set | ||
47 | CONFIG_BLK_DEV_INITRD=y | 43 | CONFIG_BLK_DEV_INITRD=y |
48 | CONFIG_INITRAMFS_SOURCE="" | 44 | CONFIG_INITRAMFS_SOURCE="" |
49 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 45 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
@@ -52,26 +48,35 @@ CONFIG_EMBEDDED=y | |||
52 | CONFIG_UID16=y | 48 | CONFIG_UID16=y |
53 | CONFIG_SYSCTL_SYSCALL=y | 49 | CONFIG_SYSCTL_SYSCALL=y |
54 | CONFIG_KALLSYMS=y | 50 | CONFIG_KALLSYMS=y |
51 | # CONFIG_KALLSYMS_ALL is not set | ||
55 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 52 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
56 | CONFIG_HOTPLUG=y | 53 | CONFIG_HOTPLUG=y |
57 | CONFIG_PRINTK=y | 54 | CONFIG_PRINTK=y |
58 | CONFIG_BUG=y | 55 | CONFIG_BUG=y |
59 | # CONFIG_ELF_CORE is not set | 56 | # CONFIG_ELF_CORE is not set |
57 | CONFIG_COMPAT_BRK=y | ||
60 | CONFIG_BASE_FULL=y | 58 | CONFIG_BASE_FULL=y |
61 | CONFIG_FUTEX=y | 59 | CONFIG_FUTEX=y |
62 | CONFIG_ANON_INODES=y | 60 | CONFIG_ANON_INODES=y |
63 | CONFIG_EPOLL=y | 61 | CONFIG_EPOLL=y |
64 | CONFIG_SIGNALFD=y | 62 | CONFIG_SIGNALFD=y |
63 | CONFIG_TIMERFD=y | ||
65 | CONFIG_EVENTFD=y | 64 | CONFIG_EVENTFD=y |
65 | CONFIG_AIO=y | ||
66 | CONFIG_VM_EVENT_COUNTERS=y | 66 | CONFIG_VM_EVENT_COUNTERS=y |
67 | CONFIG_SLAB=y | 67 | CONFIG_SLAB=y |
68 | # CONFIG_SLUB is not set | 68 | # CONFIG_SLUB is not set |
69 | # CONFIG_SLOB is not set | 69 | # CONFIG_SLOB is not set |
70 | # CONFIG_PROFILING is not set | ||
71 | # CONFIG_MARKERS is not set | ||
72 | CONFIG_HAVE_OPROFILE=y | ||
73 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
70 | CONFIG_SLABINFO=y | 74 | CONFIG_SLABINFO=y |
71 | CONFIG_RT_MUTEXES=y | 75 | CONFIG_RT_MUTEXES=y |
72 | CONFIG_TINY_SHMEM=y | 76 | CONFIG_TINY_SHMEM=y |
73 | CONFIG_BASE_SMALL=0 | 77 | CONFIG_BASE_SMALL=0 |
74 | CONFIG_MODULES=y | 78 | CONFIG_MODULES=y |
79 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
75 | CONFIG_MODULE_UNLOAD=y | 80 | CONFIG_MODULE_UNLOAD=y |
76 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 81 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
77 | # CONFIG_MODVERSIONS is not set | 82 | # CONFIG_MODVERSIONS is not set |
@@ -82,6 +87,7 @@ CONFIG_BLOCK=y | |||
82 | # CONFIG_BLK_DEV_IO_TRACE is not set | 87 | # CONFIG_BLK_DEV_IO_TRACE is not set |
83 | # CONFIG_LSF is not set | 88 | # CONFIG_LSF is not set |
84 | # CONFIG_BLK_DEV_BSG is not set | 89 | # CONFIG_BLK_DEV_BSG is not set |
90 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
85 | 91 | ||
86 | # | 92 | # |
87 | # IO Schedulers | 93 | # IO Schedulers |
@@ -95,9 +101,11 @@ CONFIG_IOSCHED_CFQ=y | |||
95 | CONFIG_DEFAULT_CFQ=y | 101 | CONFIG_DEFAULT_CFQ=y |
96 | # CONFIG_DEFAULT_NOOP is not set | 102 | # CONFIG_DEFAULT_NOOP is not set |
97 | CONFIG_DEFAULT_IOSCHED="cfq" | 103 | CONFIG_DEFAULT_IOSCHED="cfq" |
104 | CONFIG_CLASSIC_RCU=y | ||
98 | # CONFIG_PREEMPT_NONE is not set | 105 | # CONFIG_PREEMPT_NONE is not set |
99 | CONFIG_PREEMPT_VOLUNTARY=y | 106 | CONFIG_PREEMPT_VOLUNTARY=y |
100 | # CONFIG_PREEMPT is not set | 107 | # CONFIG_PREEMPT is not set |
108 | # CONFIG_FREEZER is not set | ||
101 | 109 | ||
102 | # | 110 | # |
103 | # Blackfin Processor Options | 111 | # Blackfin Processor Options |
@@ -106,6 +114,10 @@ CONFIG_PREEMPT_VOLUNTARY=y | |||
106 | # | 114 | # |
107 | # Processor and Board Settings | 115 | # Processor and Board Settings |
108 | # | 116 | # |
117 | # CONFIG_BF512 is not set | ||
118 | # CONFIG_BF514 is not set | ||
119 | # CONFIG_BF516 is not set | ||
120 | # CONFIG_BF518 is not set | ||
109 | # CONFIG_BF522 is not set | 121 | # CONFIG_BF522 is not set |
110 | # CONFIG_BF523 is not set | 122 | # CONFIG_BF523 is not set |
111 | # CONFIG_BF524 is not set | 123 | # CONFIG_BF524 is not set |
@@ -118,48 +130,32 @@ CONFIG_BF527=y | |||
118 | # CONFIG_BF534 is not set | 130 | # CONFIG_BF534 is not set |
119 | # CONFIG_BF536 is not set | 131 | # CONFIG_BF536 is not set |
120 | # CONFIG_BF537 is not set | 132 | # CONFIG_BF537 is not set |
133 | # CONFIG_BF538 is not set | ||
134 | # CONFIG_BF539 is not set | ||
121 | # CONFIG_BF542 is not set | 135 | # CONFIG_BF542 is not set |
136 | # CONFIG_BF542M is not set | ||
122 | # CONFIG_BF544 is not set | 137 | # CONFIG_BF544 is not set |
138 | # CONFIG_BF544M is not set | ||
123 | # CONFIG_BF547 is not set | 139 | # CONFIG_BF547 is not set |
140 | # CONFIG_BF547M is not set | ||
124 | # CONFIG_BF548 is not set | 141 | # CONFIG_BF548 is not set |
142 | # CONFIG_BF548M is not set | ||
125 | # CONFIG_BF549 is not set | 143 | # CONFIG_BF549 is not set |
144 | # CONFIG_BF549M is not set | ||
126 | # CONFIG_BF561 is not set | 145 | # CONFIG_BF561 is not set |
146 | CONFIG_BF_REV_MIN=0 | ||
147 | CONFIG_BF_REV_MAX=2 | ||
127 | # CONFIG_BF_REV_0_0 is not set | 148 | # CONFIG_BF_REV_0_0 is not set |
128 | CONFIG_BF_REV_0_1=y | 149 | CONFIG_BF_REV_0_1=y |
129 | # CONFIG_BF_REV_0_2 is not set | 150 | # CONFIG_BF_REV_0_2 is not set |
130 | # CONFIG_BF_REV_0_3 is not set | 151 | # CONFIG_BF_REV_0_3 is not set |
131 | # CONFIG_BF_REV_0_4 is not set | 152 | # CONFIG_BF_REV_0_4 is not set |
132 | # CONFIG_BF_REV_0_5 is not set | 153 | # CONFIG_BF_REV_0_5 is not set |
154 | # CONFIG_BF_REV_0_6 is not set | ||
133 | # CONFIG_BF_REV_ANY is not set | 155 | # CONFIG_BF_REV_ANY is not set |
134 | # CONFIG_BF_REV_NONE is not set | 156 | # CONFIG_BF_REV_NONE is not set |
135 | CONFIG_BF52x=y | 157 | CONFIG_BF52x=y |
136 | CONFIG_MEM_MT48LC16M16A2TG_75=y | 158 | CONFIG_MEM_MT48LC16M16A2TG_75=y |
137 | # CONFIG_BFIN527_EZKIT is not set | ||
138 | CONFIG_BFIN527_BLUETECHNIX_CM=y | ||
139 | |||
140 | # | ||
141 | # BF527 Specific Configuration | ||
142 | # | ||
143 | |||
144 | # | ||
145 | # Alternative Multiplexing Scheme | ||
146 | # | ||
147 | # CONFIG_BF527_SPORT0_PORTF is not set | ||
148 | CONFIG_BF527_SPORT0_PORTG=y | ||
149 | CONFIG_BF527_SPORT0_TSCLK_PG10=y | ||
150 | # CONFIG_BF527_SPORT0_TSCLK_PG14 is not set | ||
151 | CONFIG_BF527_UART1_PORTF=y | ||
152 | # CONFIG_BF527_UART1_PORTG is not set | ||
153 | # CONFIG_BF527_NAND_D_PORTF is not set | ||
154 | CONFIG_BF527_NAND_D_PORTH=y | ||
155 | |||
156 | # | ||
157 | # Interrupt Priority Assignment | ||
158 | # | ||
159 | |||
160 | # | ||
161 | # Priority | ||
162 | # | ||
163 | CONFIG_IRQ_PLL_WAKEUP=7 | 159 | CONFIG_IRQ_PLL_WAKEUP=7 |
164 | CONFIG_IRQ_DMA0_ERROR=7 | 160 | CONFIG_IRQ_DMA0_ERROR=7 |
165 | CONFIG_IRQ_DMAR0_BLK=7 | 161 | CONFIG_IRQ_DMAR0_BLK=7 |
@@ -179,7 +175,6 @@ CONFIG_IRQ_SPORT0_TX=9 | |||
179 | CONFIG_IRQ_SPORT1_RX=9 | 175 | CONFIG_IRQ_SPORT1_RX=9 |
180 | CONFIG_IRQ_SPORT1_TX=9 | 176 | CONFIG_IRQ_SPORT1_TX=9 |
181 | CONFIG_IRQ_TWI=10 | 177 | CONFIG_IRQ_TWI=10 |
182 | CONFIG_IRQ_SPI=10 | ||
183 | CONFIG_IRQ_UART0_RX=10 | 178 | CONFIG_IRQ_UART0_RX=10 |
184 | CONFIG_IRQ_UART0_TX=10 | 179 | CONFIG_IRQ_UART0_TX=10 |
185 | CONFIG_IRQ_UART1_RX=10 | 180 | CONFIG_IRQ_UART1_RX=10 |
@@ -205,6 +200,34 @@ CONFIG_IRQ_MEM_DMA1=13 | |||
205 | CONFIG_IRQ_WATCH=13 | 200 | CONFIG_IRQ_WATCH=13 |
206 | CONFIG_IRQ_PORTF_INTA=13 | 201 | CONFIG_IRQ_PORTF_INTA=13 |
207 | CONFIG_IRQ_PORTF_INTB=13 | 202 | CONFIG_IRQ_PORTF_INTB=13 |
203 | # CONFIG_BFIN527_EZKIT is not set | ||
204 | CONFIG_BFIN527_BLUETECHNIX_CM=y | ||
205 | # CONFIG_BFIN526_EZBRD is not set | ||
206 | |||
207 | # | ||
208 | # BF527 Specific Configuration | ||
209 | # | ||
210 | |||
211 | # | ||
212 | # Alternative Multiplexing Scheme | ||
213 | # | ||
214 | # CONFIG_BF527_SPORT0_PORTF is not set | ||
215 | CONFIG_BF527_SPORT0_PORTG=y | ||
216 | CONFIG_BF527_SPORT0_TSCLK_PG10=y | ||
217 | # CONFIG_BF527_SPORT0_TSCLK_PG14 is not set | ||
218 | CONFIG_BF527_UART1_PORTF=y | ||
219 | # CONFIG_BF527_UART1_PORTG is not set | ||
220 | # CONFIG_BF527_NAND_D_PORTF is not set | ||
221 | CONFIG_BF527_NAND_D_PORTH=y | ||
222 | |||
223 | # | ||
224 | # Interrupt Priority Assignment | ||
225 | # | ||
226 | |||
227 | # | ||
228 | # Priority | ||
229 | # | ||
230 | CONFIG_IRQ_SPI=10 | ||
208 | CONFIG_IRQ_SPI_ERROR=7 | 231 | CONFIG_IRQ_SPI_ERROR=7 |
209 | CONFIG_IRQ_NFC_ERROR=7 | 232 | CONFIG_IRQ_NFC_ERROR=7 |
210 | CONFIG_IRQ_HDMA_ERROR=7 | 233 | CONFIG_IRQ_HDMA_ERROR=7 |
@@ -226,7 +249,6 @@ CONFIG_BOOT_LOAD=0x1000 | |||
226 | # | 249 | # |
227 | CONFIG_CLKIN_HZ=25000000 | 250 | CONFIG_CLKIN_HZ=25000000 |
228 | # CONFIG_BFIN_KERNEL_CLOCK is not set | 251 | # CONFIG_BFIN_KERNEL_CLOCK is not set |
229 | CONFIG_MAX_MEM_SIZE=512 | ||
230 | CONFIG_MAX_VCO_HZ=600000000 | 252 | CONFIG_MAX_VCO_HZ=600000000 |
231 | CONFIG_MIN_VCO_HZ=50000000 | 253 | CONFIG_MIN_VCO_HZ=50000000 |
232 | CONFIG_MAX_SCLK_HZ=133333333 | 254 | CONFIG_MAX_SCLK_HZ=133333333 |
@@ -240,10 +262,10 @@ CONFIG_HZ_250=y | |||
240 | # CONFIG_HZ_300 is not set | 262 | # CONFIG_HZ_300 is not set |
241 | # CONFIG_HZ_1000 is not set | 263 | # CONFIG_HZ_1000 is not set |
242 | CONFIG_HZ=250 | 264 | CONFIG_HZ=250 |
265 | # CONFIG_SCHED_HRTICK is not set | ||
243 | CONFIG_GENERIC_TIME=y | 266 | CONFIG_GENERIC_TIME=y |
244 | CONFIG_GENERIC_CLOCKEVENTS=y | 267 | CONFIG_GENERIC_CLOCKEVENTS=y |
245 | # CONFIG_CYCLES_CLOCKSOURCE is not set | 268 | # CONFIG_CYCLES_CLOCKSOURCE is not set |
246 | # CONFIG_TICK_ONESHOT is not set | ||
247 | # CONFIG_NO_HZ is not set | 269 | # CONFIG_NO_HZ is not set |
248 | # CONFIG_HIGH_RES_TIMERS is not set | 270 | # CONFIG_HIGH_RES_TIMERS is not set |
249 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | 271 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y |
@@ -277,6 +299,12 @@ CONFIG_ACCESS_OK_L1=y | |||
277 | CONFIG_CACHELINE_ALIGNED_L1=y | 299 | CONFIG_CACHELINE_ALIGNED_L1=y |
278 | # CONFIG_SYSCALL_TAB_L1 is not set | 300 | # CONFIG_SYSCALL_TAB_L1 is not set |
279 | # CONFIG_CPLB_SWITCH_TAB_L1 is not set | 301 | # CONFIG_CPLB_SWITCH_TAB_L1 is not set |
302 | CONFIG_APP_STACK_L1=y | ||
303 | |||
304 | # | ||
305 | # Speed Optimizations | ||
306 | # | ||
307 | CONFIG_BFIN_INS_LOWOVERHEAD=y | ||
280 | CONFIG_RAMKERNEL=y | 308 | CONFIG_RAMKERNEL=y |
281 | # CONFIG_ROMKERNEL is not set | 309 | # CONFIG_ROMKERNEL is not set |
282 | CONFIG_SELECT_MEMORY_MODEL=y | 310 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -285,10 +313,10 @@ CONFIG_FLATMEM_MANUAL=y | |||
285 | # CONFIG_SPARSEMEM_MANUAL is not set | 313 | # CONFIG_SPARSEMEM_MANUAL is not set |
286 | CONFIG_FLATMEM=y | 314 | CONFIG_FLATMEM=y |
287 | CONFIG_FLAT_NODE_MEM_MAP=y | 315 | CONFIG_FLAT_NODE_MEM_MAP=y |
288 | # CONFIG_SPARSEMEM_STATIC is not set | 316 | CONFIG_PAGEFLAGS_EXTENDED=y |
289 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
290 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 317 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
291 | # CONFIG_RESOURCES_64BIT is not set | 318 | # CONFIG_RESOURCES_64BIT is not set |
319 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
292 | CONFIG_ZONE_DMA_FLAG=1 | 320 | CONFIG_ZONE_DMA_FLAG=1 |
293 | CONFIG_VIRT_TO_BUS=y | 321 | CONFIG_VIRT_TO_BUS=y |
294 | CONFIG_BFIN_GPTIMERS=y | 322 | CONFIG_BFIN_GPTIMERS=y |
@@ -334,7 +362,6 @@ CONFIG_BANK_3=0xFFC0 | |||
334 | # | 362 | # |
335 | # Bus options (PCI, PCMCIA, EISA, MCA, ISA) | 363 | # Bus options (PCI, PCMCIA, EISA, MCA, ISA) |
336 | # | 364 | # |
337 | # CONFIG_PCI is not set | ||
338 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 365 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
339 | # CONFIG_PCCARD is not set | 366 | # CONFIG_PCCARD is not set |
340 | 367 | ||
@@ -345,25 +372,20 @@ CONFIG_BINFMT_ELF_FDPIC=y | |||
345 | CONFIG_BINFMT_FLAT=y | 372 | CONFIG_BINFMT_FLAT=y |
346 | CONFIG_BINFMT_ZFLAT=y | 373 | CONFIG_BINFMT_ZFLAT=y |
347 | # CONFIG_BINFMT_SHARED_FLAT is not set | 374 | # CONFIG_BINFMT_SHARED_FLAT is not set |
375 | # CONFIG_HAVE_AOUT is not set | ||
348 | # CONFIG_BINFMT_MISC is not set | 376 | # CONFIG_BINFMT_MISC is not set |
349 | 377 | ||
350 | # | 378 | # |
351 | # Power management options | 379 | # Power management options |
352 | # | 380 | # |
353 | # CONFIG_PM is not set | 381 | # CONFIG_PM is not set |
354 | CONFIG_SUSPEND_UP_POSSIBLE=y | 382 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
355 | # CONFIG_PM_BFIN_SLEEP_DEEPER is not set | ||
356 | # CONFIG_PM_BFIN_SLEEP is not set | ||
357 | # CONFIG_PM_WAKEUP_BY_GPIO is not set | 383 | # CONFIG_PM_WAKEUP_BY_GPIO is not set |
358 | 384 | ||
359 | # | 385 | # |
360 | # CPU Frequency scaling | 386 | # CPU Frequency scaling |
361 | # | 387 | # |
362 | # CONFIG_CPU_FREQ is not set | 388 | # CONFIG_CPU_FREQ is not set |
363 | |||
364 | # | ||
365 | # Networking | ||
366 | # | ||
367 | CONFIG_NET=y | 389 | CONFIG_NET=y |
368 | 390 | ||
369 | # | 391 | # |
@@ -376,6 +398,7 @@ CONFIG_XFRM=y | |||
376 | # CONFIG_XFRM_USER is not set | 398 | # CONFIG_XFRM_USER is not set |
377 | # CONFIG_XFRM_SUB_POLICY is not set | 399 | # CONFIG_XFRM_SUB_POLICY is not set |
378 | # CONFIG_XFRM_MIGRATE is not set | 400 | # CONFIG_XFRM_MIGRATE is not set |
401 | # CONFIG_XFRM_STATISTICS is not set | ||
379 | # CONFIG_NET_KEY is not set | 402 | # CONFIG_NET_KEY is not set |
380 | CONFIG_INET=y | 403 | CONFIG_INET=y |
381 | # CONFIG_IP_MULTICAST is not set | 404 | # CONFIG_IP_MULTICAST is not set |
@@ -405,8 +428,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
405 | CONFIG_DEFAULT_TCP_CONG="cubic" | 428 | CONFIG_DEFAULT_TCP_CONG="cubic" |
406 | # CONFIG_TCP_MD5SIG is not set | 429 | # CONFIG_TCP_MD5SIG is not set |
407 | # CONFIG_IPV6 is not set | 430 | # CONFIG_IPV6 is not set |
408 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
409 | # CONFIG_INET6_TUNNEL is not set | ||
410 | # CONFIG_NETLABEL is not set | 431 | # CONFIG_NETLABEL is not set |
411 | # CONFIG_NETWORK_SECMARK is not set | 432 | # CONFIG_NETWORK_SECMARK is not set |
412 | # CONFIG_NETFILTER is not set | 433 | # CONFIG_NETFILTER is not set |
@@ -415,6 +436,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
415 | # CONFIG_TIPC is not set | 436 | # CONFIG_TIPC is not set |
416 | # CONFIG_ATM is not set | 437 | # CONFIG_ATM is not set |
417 | # CONFIG_BRIDGE is not set | 438 | # CONFIG_BRIDGE is not set |
439 | # CONFIG_NET_DSA is not set | ||
418 | # CONFIG_VLAN_8021Q is not set | 440 | # CONFIG_VLAN_8021Q is not set |
419 | # CONFIG_DECNET is not set | 441 | # CONFIG_DECNET is not set |
420 | # CONFIG_LLC2 is not set | 442 | # CONFIG_LLC2 is not set |
@@ -431,14 +453,14 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
431 | # | 453 | # |
432 | # CONFIG_NET_PKTGEN is not set | 454 | # CONFIG_NET_PKTGEN is not set |
433 | # CONFIG_HAMRADIO is not set | 455 | # CONFIG_HAMRADIO is not set |
456 | # CONFIG_CAN is not set | ||
434 | # CONFIG_IRDA is not set | 457 | # CONFIG_IRDA is not set |
435 | # CONFIG_BT is not set | 458 | # CONFIG_BT is not set |
436 | # CONFIG_AF_RXRPC is not set | 459 | # CONFIG_AF_RXRPC is not set |
437 | 460 | # CONFIG_PHONET is not set | |
438 | # | 461 | CONFIG_WIRELESS=y |
439 | # Wireless | ||
440 | # | ||
441 | # CONFIG_CFG80211 is not set | 462 | # CONFIG_CFG80211 is not set |
463 | CONFIG_WIRELESS_OLD_REGULATORY=y | ||
442 | # CONFIG_WIRELESS_EXT is not set | 464 | # CONFIG_WIRELESS_EXT is not set |
443 | # CONFIG_MAC80211 is not set | 465 | # CONFIG_MAC80211 is not set |
444 | # CONFIG_IEEE80211 is not set | 466 | # CONFIG_IEEE80211 is not set |
@@ -456,6 +478,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
456 | CONFIG_STANDALONE=y | 478 | CONFIG_STANDALONE=y |
457 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 479 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
458 | # CONFIG_FW_LOADER is not set | 480 | # CONFIG_FW_LOADER is not set |
481 | # CONFIG_DEBUG_DRIVER is not set | ||
482 | # CONFIG_DEBUG_DEVRES is not set | ||
459 | # CONFIG_SYS_HYPERVISOR is not set | 483 | # CONFIG_SYS_HYPERVISOR is not set |
460 | # CONFIG_CONNECTOR is not set | 484 | # CONFIG_CONNECTOR is not set |
461 | CONFIG_MTD=y | 485 | CONFIG_MTD=y |
@@ -464,6 +488,7 @@ CONFIG_MTD=y | |||
464 | CONFIG_MTD_PARTITIONS=y | 488 | CONFIG_MTD_PARTITIONS=y |
465 | # CONFIG_MTD_REDBOOT_PARTS is not set | 489 | # CONFIG_MTD_REDBOOT_PARTS is not set |
466 | # CONFIG_MTD_CMDLINE_PARTS is not set | 490 | # CONFIG_MTD_CMDLINE_PARTS is not set |
491 | # CONFIG_MTD_AR7_PARTS is not set | ||
467 | 492 | ||
468 | # | 493 | # |
469 | # User Modules And Translation Layers | 494 | # User Modules And Translation Layers |
@@ -507,6 +532,7 @@ CONFIG_MTD_ROM=m | |||
507 | # | 532 | # |
508 | CONFIG_MTD_COMPLEX_MAPPINGS=y | 533 | CONFIG_MTD_COMPLEX_MAPPINGS=y |
509 | # CONFIG_MTD_PHYSMAP is not set | 534 | # CONFIG_MTD_PHYSMAP is not set |
535 | # CONFIG_MTD_GPIO_ADDR is not set | ||
510 | # CONFIG_MTD_UCLINUX is not set | 536 | # CONFIG_MTD_UCLINUX is not set |
511 | # CONFIG_MTD_PLATRAM is not set | 537 | # CONFIG_MTD_PLATRAM is not set |
512 | 538 | ||
@@ -542,10 +568,12 @@ CONFIG_BLK_DEV=y | |||
542 | CONFIG_BLK_DEV_RAM=y | 568 | CONFIG_BLK_DEV_RAM=y |
543 | CONFIG_BLK_DEV_RAM_COUNT=16 | 569 | CONFIG_BLK_DEV_RAM_COUNT=16 |
544 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 570 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
545 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 571 | # CONFIG_BLK_DEV_XIP is not set |
546 | # CONFIG_CDROM_PKTCDVD is not set | 572 | # CONFIG_CDROM_PKTCDVD is not set |
547 | # CONFIG_ATA_OVER_ETH is not set | 573 | # CONFIG_ATA_OVER_ETH is not set |
574 | # CONFIG_BLK_DEV_HD is not set | ||
548 | # CONFIG_MISC_DEVICES is not set | 575 | # CONFIG_MISC_DEVICES is not set |
576 | CONFIG_HAVE_IDE=y | ||
549 | # CONFIG_IDE is not set | 577 | # CONFIG_IDE is not set |
550 | 578 | ||
551 | # | 579 | # |
@@ -558,7 +586,6 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | |||
558 | # CONFIG_ATA is not set | 586 | # CONFIG_ATA is not set |
559 | # CONFIG_MD is not set | 587 | # CONFIG_MD is not set |
560 | CONFIG_NETDEVICES=y | 588 | CONFIG_NETDEVICES=y |
561 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
562 | # CONFIG_DUMMY is not set | 589 | # CONFIG_DUMMY is not set |
563 | # CONFIG_BONDING is not set | 590 | # CONFIG_BONDING is not set |
564 | # CONFIG_MACVLAN is not set | 591 | # CONFIG_MACVLAN is not set |
@@ -579,6 +606,7 @@ CONFIG_PHYLIB=y | |||
579 | # CONFIG_SMSC_PHY is not set | 606 | # CONFIG_SMSC_PHY is not set |
580 | # CONFIG_BROADCOM_PHY is not set | 607 | # CONFIG_BROADCOM_PHY is not set |
581 | # CONFIG_ICPLUS_PHY is not set | 608 | # CONFIG_ICPLUS_PHY is not set |
609 | # CONFIG_REALTEK_PHY is not set | ||
582 | # CONFIG_FIXED_PHY is not set | 610 | # CONFIG_FIXED_PHY is not set |
583 | # CONFIG_MDIO_BITBANG is not set | 611 | # CONFIG_MDIO_BITBANG is not set |
584 | CONFIG_NET_ETHERNET=y | 612 | CONFIG_NET_ETHERNET=y |
@@ -591,11 +619,14 @@ CONFIG_BFIN_MAC_RMII=y | |||
591 | # CONFIG_SMC91X is not set | 619 | # CONFIG_SMC91X is not set |
592 | # CONFIG_SMSC911X is not set | 620 | # CONFIG_SMSC911X is not set |
593 | # CONFIG_DM9000 is not set | 621 | # CONFIG_DM9000 is not set |
622 | # CONFIG_ENC28J60 is not set | ||
594 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 623 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
595 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 624 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
596 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 625 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
597 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 626 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
598 | # CONFIG_B44 is not set | 627 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set |
628 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
629 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
599 | # CONFIG_NETDEV_1000 is not set | 630 | # CONFIG_NETDEV_1000 is not set |
600 | # CONFIG_NETDEV_10000 is not set | 631 | # CONFIG_NETDEV_10000 is not set |
601 | 632 | ||
@@ -604,6 +635,7 @@ CONFIG_BFIN_MAC_RMII=y | |||
604 | # | 635 | # |
605 | # CONFIG_WLAN_PRE80211 is not set | 636 | # CONFIG_WLAN_PRE80211 is not set |
606 | # CONFIG_WLAN_80211 is not set | 637 | # CONFIG_WLAN_80211 is not set |
638 | # CONFIG_IWLWIFI_LEDS is not set | ||
607 | 639 | ||
608 | # | 640 | # |
609 | # USB Network Adapters | 641 | # USB Network Adapters |
@@ -616,7 +648,6 @@ CONFIG_BFIN_MAC_RMII=y | |||
616 | # CONFIG_WAN is not set | 648 | # CONFIG_WAN is not set |
617 | # CONFIG_PPP is not set | 649 | # CONFIG_PPP is not set |
618 | # CONFIG_SLIP is not set | 650 | # CONFIG_SLIP is not set |
619 | # CONFIG_SHAPER is not set | ||
620 | # CONFIG_NETCONSOLE is not set | 651 | # CONFIG_NETCONSOLE is not set |
621 | # CONFIG_NETPOLL is not set | 652 | # CONFIG_NETPOLL is not set |
622 | # CONFIG_NET_POLL_CONTROLLER is not set | 653 | # CONFIG_NET_POLL_CONTROLLER is not set |
@@ -642,14 +673,15 @@ CONFIG_BFIN_MAC_RMII=y | |||
642 | # CONFIG_BF5xx_PPIFCD is not set | 673 | # CONFIG_BF5xx_PPIFCD is not set |
643 | # CONFIG_BFIN_SIMPLE_TIMER is not set | 674 | # CONFIG_BFIN_SIMPLE_TIMER is not set |
644 | # CONFIG_BF5xx_PPI is not set | 675 | # CONFIG_BF5xx_PPI is not set |
645 | CONFIG_BFIN_OTP=y | 676 | # CONFIG_BF5xx_EPPI is not set |
646 | # CONFIG_BFIN_OTP_WRITE_ENABLE is not set | ||
647 | # CONFIG_BFIN_SPORT is not set | 677 | # CONFIG_BFIN_SPORT is not set |
648 | # CONFIG_BFIN_TIMER_LATENCY is not set | 678 | # CONFIG_BFIN_TIMER_LATENCY is not set |
649 | # CONFIG_TWI_LCD is not set | 679 | # CONFIG_TWI_LCD is not set |
680 | CONFIG_BFIN_DMA_INTERFACE=m | ||
650 | CONFIG_SIMPLE_GPIO=m | 681 | CONFIG_SIMPLE_GPIO=m |
651 | # CONFIG_VT is not set | 682 | # CONFIG_VT is not set |
652 | # CONFIG_DEVKMEM is not set | 683 | # CONFIG_DEVKMEM is not set |
684 | # CONFIG_BFIN_JTAG_COMM is not set | ||
653 | # CONFIG_SERIAL_NONSTANDARD is not set | 685 | # CONFIG_SERIAL_NONSTANDARD is not set |
654 | 686 | ||
655 | # | 687 | # |
@@ -673,6 +705,8 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
673 | # CONFIG_SERIAL_BFIN_SPORT is not set | 705 | # CONFIG_SERIAL_BFIN_SPORT is not set |
674 | CONFIG_UNIX98_PTYS=y | 706 | CONFIG_UNIX98_PTYS=y |
675 | # CONFIG_LEGACY_PTYS is not set | 707 | # CONFIG_LEGACY_PTYS is not set |
708 | CONFIG_BFIN_OTP=y | ||
709 | # CONFIG_BFIN_OTP_WRITE_ENABLE is not set | ||
676 | 710 | ||
677 | # | 711 | # |
678 | # CAN, the car bus and industrial fieldbus | 712 | # CAN, the car bus and industrial fieldbus |
@@ -680,44 +714,49 @@ CONFIG_UNIX98_PTYS=y | |||
680 | # CONFIG_CAN4LINUX is not set | 714 | # CONFIG_CAN4LINUX is not set |
681 | # CONFIG_IPMI_HANDLER is not set | 715 | # CONFIG_IPMI_HANDLER is not set |
682 | # CONFIG_HW_RANDOM is not set | 716 | # CONFIG_HW_RANDOM is not set |
683 | # CONFIG_GEN_RTC is not set | ||
684 | # CONFIG_R3964 is not set | 717 | # CONFIG_R3964 is not set |
685 | # CONFIG_RAW_DRIVER is not set | 718 | # CONFIG_RAW_DRIVER is not set |
686 | # CONFIG_TCG_TPM is not set | 719 | # CONFIG_TCG_TPM is not set |
687 | CONFIG_I2C=y | 720 | CONFIG_I2C=y |
688 | CONFIG_I2C_BOARDINFO=y | 721 | CONFIG_I2C_BOARDINFO=y |
689 | CONFIG_I2C_CHARDEV=m | 722 | CONFIG_I2C_CHARDEV=m |
723 | CONFIG_I2C_HELPER_AUTO=y | ||
690 | 724 | ||
691 | # | 725 | # |
692 | # I2C Algorithms | 726 | # I2C Hardware Bus support |
693 | # | 727 | # |
694 | # CONFIG_I2C_ALGOBIT is not set | ||
695 | # CONFIG_I2C_ALGOPCF is not set | ||
696 | # CONFIG_I2C_ALGOPCA is not set | ||
697 | 728 | ||
698 | # | 729 | # |
699 | # I2C Hardware Bus support | 730 | # I2C system bus drivers (mostly embedded / system-on-chip) |
700 | # | 731 | # |
701 | CONFIG_I2C_BLACKFIN_TWI=m | 732 | CONFIG_I2C_BLACKFIN_TWI=m |
702 | CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100 | 733 | CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100 |
703 | # CONFIG_I2C_GPIO is not set | 734 | # CONFIG_I2C_GPIO is not set |
704 | # CONFIG_I2C_OCORES is not set | 735 | # CONFIG_I2C_OCORES is not set |
705 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
706 | # CONFIG_I2C_SIMTEC is not set | 736 | # CONFIG_I2C_SIMTEC is not set |
737 | |||
738 | # | ||
739 | # External I2C/SMBus adapter drivers | ||
740 | # | ||
741 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
707 | # CONFIG_I2C_TAOS_EVM is not set | 742 | # CONFIG_I2C_TAOS_EVM is not set |
708 | # CONFIG_I2C_STUB is not set | ||
709 | # CONFIG_I2C_TINY_USB is not set | 743 | # CONFIG_I2C_TINY_USB is not set |
710 | 744 | ||
711 | # | 745 | # |
746 | # Other I2C/SMBus bus drivers | ||
747 | # | ||
748 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
749 | # CONFIG_I2C_STUB is not set | ||
750 | |||
751 | # | ||
712 | # Miscellaneous I2C Chip support | 752 | # Miscellaneous I2C Chip support |
713 | # | 753 | # |
714 | # CONFIG_SENSORS_DS1337 is not set | ||
715 | # CONFIG_SENSORS_DS1374 is not set | ||
716 | # CONFIG_DS1682 is not set | 754 | # CONFIG_DS1682 is not set |
755 | # CONFIG_AT24 is not set | ||
717 | # CONFIG_SENSORS_AD5252 is not set | 756 | # CONFIG_SENSORS_AD5252 is not set |
718 | # CONFIG_EEPROM_LEGACY is not set | 757 | # CONFIG_SENSORS_EEPROM is not set |
719 | # CONFIG_SENSORS_PCF8574 is not set | 758 | # CONFIG_SENSORS_PCF8574 is not set |
720 | # CONFIG_SENSORS_PCF8575 is not set | 759 | # CONFIG_PCF8575 is not set |
721 | # CONFIG_SENSORS_PCA9539 is not set | 760 | # CONFIG_SENSORS_PCA9539 is not set |
722 | # CONFIG_SENSORS_PCF8591 is not set | 761 | # CONFIG_SENSORS_PCF8591 is not set |
723 | # CONFIG_SENSORS_MAX6875 is not set | 762 | # CONFIG_SENSORS_MAX6875 is not set |
@@ -726,37 +765,41 @@ CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100 | |||
726 | # CONFIG_I2C_DEBUG_ALGO is not set | 765 | # CONFIG_I2C_DEBUG_ALGO is not set |
727 | # CONFIG_I2C_DEBUG_BUS is not set | 766 | # CONFIG_I2C_DEBUG_BUS is not set |
728 | # CONFIG_I2C_DEBUG_CHIP is not set | 767 | # CONFIG_I2C_DEBUG_CHIP is not set |
729 | |||
730 | # | ||
731 | # SPI support | ||
732 | # | ||
733 | CONFIG_SPI=y | 768 | CONFIG_SPI=y |
769 | # CONFIG_SPI_DEBUG is not set | ||
734 | CONFIG_SPI_MASTER=y | 770 | CONFIG_SPI_MASTER=y |
735 | 771 | ||
736 | # | 772 | # |
737 | # SPI Master Controller Drivers | 773 | # SPI Master Controller Drivers |
738 | # | 774 | # |
739 | CONFIG_SPI_BFIN=y | 775 | CONFIG_SPI_BFIN=y |
776 | # CONFIG_SPI_BFIN_LOCK is not set | ||
740 | # CONFIG_SPI_BITBANG is not set | 777 | # CONFIG_SPI_BITBANG is not set |
741 | 778 | ||
742 | # | 779 | # |
743 | # SPI Protocol Masters | 780 | # SPI Protocol Masters |
744 | # | 781 | # |
745 | # CONFIG_EEPROM_AT25 is not set | 782 | # CONFIG_SPI_AT25 is not set |
746 | # CONFIG_SPI_SPIDEV is not set | 783 | # CONFIG_SPI_SPIDEV is not set |
747 | # CONFIG_SPI_TLE62X0 is not set | 784 | # CONFIG_SPI_TLE62X0 is not set |
785 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
786 | # CONFIG_GPIOLIB is not set | ||
748 | # CONFIG_W1 is not set | 787 | # CONFIG_W1 is not set |
749 | # CONFIG_POWER_SUPPLY is not set | 788 | # CONFIG_POWER_SUPPLY is not set |
750 | CONFIG_HWMON=y | 789 | CONFIG_HWMON=y |
751 | # CONFIG_HWMON_VID is not set | 790 | # CONFIG_HWMON_VID is not set |
791 | # CONFIG_SENSORS_AD7414 is not set | ||
752 | # CONFIG_SENSORS_AD7418 is not set | 792 | # CONFIG_SENSORS_AD7418 is not set |
793 | # CONFIG_SENSORS_ADCXX is not set | ||
753 | # CONFIG_SENSORS_ADM1021 is not set | 794 | # CONFIG_SENSORS_ADM1021 is not set |
754 | # CONFIG_SENSORS_ADM1025 is not set | 795 | # CONFIG_SENSORS_ADM1025 is not set |
755 | # CONFIG_SENSORS_ADM1026 is not set | 796 | # CONFIG_SENSORS_ADM1026 is not set |
756 | # CONFIG_SENSORS_ADM1029 is not set | 797 | # CONFIG_SENSORS_ADM1029 is not set |
757 | # CONFIG_SENSORS_ADM1031 is not set | 798 | # CONFIG_SENSORS_ADM1031 is not set |
758 | # CONFIG_SENSORS_ADM9240 is not set | 799 | # CONFIG_SENSORS_ADM9240 is not set |
800 | # CONFIG_SENSORS_ADT7462 is not set | ||
759 | # CONFIG_SENSORS_ADT7470 is not set | 801 | # CONFIG_SENSORS_ADT7470 is not set |
802 | # CONFIG_SENSORS_ADT7473 is not set | ||
760 | # CONFIG_SENSORS_ATXP1 is not set | 803 | # CONFIG_SENSORS_ATXP1 is not set |
761 | # CONFIG_SENSORS_DS1621 is not set | 804 | # CONFIG_SENSORS_DS1621 is not set |
762 | # CONFIG_SENSORS_F71805F is not set | 805 | # CONFIG_SENSORS_F71805F is not set |
@@ -777,6 +820,7 @@ CONFIG_HWMON=y | |||
777 | # CONFIG_SENSORS_LM90 is not set | 820 | # CONFIG_SENSORS_LM90 is not set |
778 | # CONFIG_SENSORS_LM92 is not set | 821 | # CONFIG_SENSORS_LM92 is not set |
779 | # CONFIG_SENSORS_LM93 is not set | 822 | # CONFIG_SENSORS_LM93 is not set |
823 | # CONFIG_SENSORS_MAX1111 is not set | ||
780 | # CONFIG_SENSORS_MAX1619 is not set | 824 | # CONFIG_SENSORS_MAX1619 is not set |
781 | # CONFIG_SENSORS_MAX6650 is not set | 825 | # CONFIG_SENSORS_MAX6650 is not set |
782 | # CONFIG_SENSORS_PC87360 is not set | 826 | # CONFIG_SENSORS_PC87360 is not set |
@@ -785,6 +829,7 @@ CONFIG_HWMON=y | |||
785 | # CONFIG_SENSORS_SMSC47M1 is not set | 829 | # CONFIG_SENSORS_SMSC47M1 is not set |
786 | # CONFIG_SENSORS_SMSC47M192 is not set | 830 | # CONFIG_SENSORS_SMSC47M192 is not set |
787 | # CONFIG_SENSORS_SMSC47B397 is not set | 831 | # CONFIG_SENSORS_SMSC47B397 is not set |
832 | # CONFIG_SENSORS_ADS7828 is not set | ||
788 | # CONFIG_SENSORS_THMC50 is not set | 833 | # CONFIG_SENSORS_THMC50 is not set |
789 | # CONFIG_SENSORS_VT1211 is not set | 834 | # CONFIG_SENSORS_VT1211 is not set |
790 | # CONFIG_SENSORS_W83781D is not set | 835 | # CONFIG_SENSORS_W83781D is not set |
@@ -792,9 +837,12 @@ CONFIG_HWMON=y | |||
792 | # CONFIG_SENSORS_W83792D is not set | 837 | # CONFIG_SENSORS_W83792D is not set |
793 | # CONFIG_SENSORS_W83793 is not set | 838 | # CONFIG_SENSORS_W83793 is not set |
794 | # CONFIG_SENSORS_W83L785TS is not set | 839 | # CONFIG_SENSORS_W83L785TS is not set |
840 | # CONFIG_SENSORS_W83L786NG is not set | ||
795 | # CONFIG_SENSORS_W83627HF is not set | 841 | # CONFIG_SENSORS_W83627HF is not set |
796 | # CONFIG_SENSORS_W83627EHF is not set | 842 | # CONFIG_SENSORS_W83627EHF is not set |
797 | # CONFIG_HWMON_DEBUG_CHIP is not set | 843 | # CONFIG_HWMON_DEBUG_CHIP is not set |
844 | # CONFIG_THERMAL is not set | ||
845 | # CONFIG_THERMAL_HWMON is not set | ||
798 | CONFIG_WATCHDOG=y | 846 | CONFIG_WATCHDOG=y |
799 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 847 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
800 | 848 | ||
@@ -810,21 +858,31 @@ CONFIG_BFIN_WDT=y | |||
810 | # CONFIG_USBPCWATCHDOG is not set | 858 | # CONFIG_USBPCWATCHDOG is not set |
811 | 859 | ||
812 | # | 860 | # |
813 | # Sonics Silicon Backplane | ||
814 | # | ||
815 | CONFIG_SSB_POSSIBLE=y | ||
816 | # CONFIG_SSB is not set | ||
817 | |||
818 | # | ||
819 | # Multifunction device drivers | 861 | # Multifunction device drivers |
820 | # | 862 | # |
863 | # CONFIG_MFD_CORE is not set | ||
821 | # CONFIG_MFD_SM501 is not set | 864 | # CONFIG_MFD_SM501 is not set |
865 | # CONFIG_HTC_PASIC3 is not set | ||
866 | # CONFIG_MFD_TMIO is not set | ||
867 | # CONFIG_PMIC_DA903X is not set | ||
868 | # CONFIG_MFD_WM8400 is not set | ||
869 | # CONFIG_MFD_WM8350_I2C is not set | ||
870 | # CONFIG_REGULATOR is not set | ||
822 | 871 | ||
823 | # | 872 | # |
824 | # Multimedia devices | 873 | # Multimedia devices |
825 | # | 874 | # |
875 | |||
876 | # | ||
877 | # Multimedia core support | ||
878 | # | ||
826 | # CONFIG_VIDEO_DEV is not set | 879 | # CONFIG_VIDEO_DEV is not set |
827 | # CONFIG_DVB_CORE is not set | 880 | # CONFIG_DVB_CORE is not set |
881 | # CONFIG_VIDEO_MEDIA is not set | ||
882 | |||
883 | # | ||
884 | # Multimedia drivers | ||
885 | # | ||
828 | # CONFIG_DAB is not set | 886 | # CONFIG_DAB is not set |
829 | 887 | ||
830 | # | 888 | # |
@@ -839,10 +897,6 @@ CONFIG_SSB_POSSIBLE=y | |||
839 | # Display device support | 897 | # Display device support |
840 | # | 898 | # |
841 | # CONFIG_DISPLAY_SUPPORT is not set | 899 | # CONFIG_DISPLAY_SUPPORT is not set |
842 | |||
843 | # | ||
844 | # Sound | ||
845 | # | ||
846 | # CONFIG_SOUND is not set | 900 | # CONFIG_SOUND is not set |
847 | CONFIG_USB_SUPPORT=y | 901 | CONFIG_USB_SUPPORT=y |
848 | CONFIG_USB_ARCH_HAS_HCD=y | 902 | CONFIG_USB_ARCH_HAS_HCD=y |
@@ -850,6 +904,7 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
850 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 904 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
851 | CONFIG_USB=y | 905 | CONFIG_USB=y |
852 | # CONFIG_USB_DEBUG is not set | 906 | # CONFIG_USB_DEBUG is not set |
907 | # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set | ||
853 | 908 | ||
854 | # | 909 | # |
855 | # Miscellaneous USB options | 910 | # Miscellaneous USB options |
@@ -860,40 +915,48 @@ CONFIG_USB_DEVICE_CLASS=y | |||
860 | # CONFIG_USB_OTG is not set | 915 | # CONFIG_USB_OTG is not set |
861 | # CONFIG_USB_OTG_WHITELIST is not set | 916 | # CONFIG_USB_OTG_WHITELIST is not set |
862 | CONFIG_USB_OTG_BLACKLIST_HUB=y | 917 | CONFIG_USB_OTG_BLACKLIST_HUB=y |
918 | CONFIG_USB_MON=y | ||
919 | # CONFIG_USB_WUSB is not set | ||
920 | # CONFIG_USB_WUSB_CBAF is not set | ||
863 | 921 | ||
864 | # | 922 | # |
865 | # USB Host Controller Drivers | 923 | # USB Host Controller Drivers |
866 | # | 924 | # |
925 | # CONFIG_USB_C67X00_HCD is not set | ||
867 | # CONFIG_USB_ISP116X_HCD is not set | 926 | # CONFIG_USB_ISP116X_HCD is not set |
868 | # CONFIG_USB_ISP1362_HCD is not set | ||
869 | # CONFIG_USB_ISP1760_HCD is not set | 927 | # CONFIG_USB_ISP1760_HCD is not set |
928 | # CONFIG_USB_ISP1362_HCD is not set | ||
870 | # CONFIG_USB_SL811_HCD is not set | 929 | # CONFIG_USB_SL811_HCD is not set |
871 | # CONFIG_USB_R8A66597_HCD is not set | 930 | # CONFIG_USB_R8A66597_HCD is not set |
931 | # CONFIG_USB_HWA_HCD is not set | ||
872 | CONFIG_USB_MUSB_HDRC=y | 932 | CONFIG_USB_MUSB_HDRC=y |
873 | CONFIG_USB_MUSB_SOC=y | 933 | CONFIG_USB_MUSB_SOC=y |
874 | 934 | ||
875 | # | 935 | # |
876 | # Blackfin high speed USB support | 936 | # Blackfin high speed USB Support |
877 | # | 937 | # |
878 | CONFIG_USB_MUSB_HOST=y | 938 | CONFIG_USB_MUSB_HOST=y |
879 | # CONFIG_USB_MUSB_PERIPHERAL is not set | 939 | # CONFIG_USB_MUSB_PERIPHERAL is not set |
880 | # CONFIG_USB_MUSB_OTG is not set | 940 | # CONFIG_USB_MUSB_OTG is not set |
881 | CONFIG_USB_MUSB_HDRC_HCD=y | 941 | CONFIG_USB_MUSB_HDRC_HCD=y |
882 | CONFIG_MUSB_PIO_ONLY=y | 942 | CONFIG_MUSB_PIO_ONLY=y |
883 | CONFIG_USB_MUSB_LOGLEVEL=0 | 943 | CONFIG_MUSB_DMA_POLL=y |
944 | # CONFIG_USB_MUSB_DEBUG is not set | ||
884 | 945 | ||
885 | # | 946 | # |
886 | # USB Device Class drivers | 947 | # USB Device Class drivers |
887 | # | 948 | # |
888 | # CONFIG_USB_ACM is not set | 949 | # CONFIG_USB_ACM is not set |
889 | # CONFIG_USB_PRINTER is not set | 950 | # CONFIG_USB_PRINTER is not set |
951 | # CONFIG_USB_WDM is not set | ||
952 | # CONFIG_USB_TMC is not set | ||
890 | 953 | ||
891 | # | 954 | # |
892 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 955 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; |
893 | # | 956 | # |
894 | 957 | ||
895 | # | 958 | # |
896 | # may also be needed; see USB_STORAGE Help for more information | 959 | # see USB_STORAGE Help for more information |
897 | # | 960 | # |
898 | # CONFIG_USB_LIBUSUAL is not set | 961 | # CONFIG_USB_LIBUSUAL is not set |
899 | 962 | ||
@@ -901,15 +964,10 @@ CONFIG_USB_MUSB_LOGLEVEL=0 | |||
901 | # USB Imaging devices | 964 | # USB Imaging devices |
902 | # | 965 | # |
903 | # CONFIG_USB_MDC800 is not set | 966 | # CONFIG_USB_MDC800 is not set |
904 | CONFIG_USB_MON=y | ||
905 | 967 | ||
906 | # | 968 | # |
907 | # USB port drivers | 969 | # USB port drivers |
908 | # | 970 | # |
909 | |||
910 | # | ||
911 | # USB Serial Converter support | ||
912 | # | ||
913 | # CONFIG_USB_SERIAL is not set | 971 | # CONFIG_USB_SERIAL is not set |
914 | 972 | ||
915 | # | 973 | # |
@@ -918,7 +976,7 @@ CONFIG_USB_MON=y | |||
918 | # CONFIG_USB_EMI62 is not set | 976 | # CONFIG_USB_EMI62 is not set |
919 | # CONFIG_USB_EMI26 is not set | 977 | # CONFIG_USB_EMI26 is not set |
920 | # CONFIG_USB_ADUTUX is not set | 978 | # CONFIG_USB_ADUTUX is not set |
921 | # CONFIG_USB_AUERSWALD is not set | 979 | # CONFIG_USB_SEVSEG is not set |
922 | # CONFIG_USB_RIO500 is not set | 980 | # CONFIG_USB_RIO500 is not set |
923 | # CONFIG_USB_LEGOTOWER is not set | 981 | # CONFIG_USB_LEGOTOWER is not set |
924 | # CONFIG_USB_LCD is not set | 982 | # CONFIG_USB_LCD is not set |
@@ -934,17 +992,13 @@ CONFIG_USB_MON=y | |||
934 | # CONFIG_USB_LD is not set | 992 | # CONFIG_USB_LD is not set |
935 | # CONFIG_USB_TRANCEVIBRATOR is not set | 993 | # CONFIG_USB_TRANCEVIBRATOR is not set |
936 | # CONFIG_USB_IOWARRIOR is not set | 994 | # CONFIG_USB_IOWARRIOR is not set |
937 | 995 | # CONFIG_USB_ISIGHTFW is not set | |
938 | # | 996 | # CONFIG_USB_VST is not set |
939 | # USB DSL modem support | ||
940 | # | ||
941 | |||
942 | # | ||
943 | # USB Gadget Support | ||
944 | # | ||
945 | # CONFIG_USB_GADGET is not set | 997 | # CONFIG_USB_GADGET is not set |
946 | # CONFIG_MMC is not set | 998 | # CONFIG_MMC is not set |
999 | # CONFIG_MEMSTICK is not set | ||
947 | # CONFIG_NEW_LEDS is not set | 1000 | # CONFIG_NEW_LEDS is not set |
1001 | # CONFIG_ACCESSIBILITY is not set | ||
948 | CONFIG_RTC_LIB=y | 1002 | CONFIG_RTC_LIB=y |
949 | CONFIG_RTC_CLASS=y | 1003 | CONFIG_RTC_CLASS=y |
950 | CONFIG_RTC_HCTOSYS=y | 1004 | CONFIG_RTC_HCTOSYS=y |
@@ -973,51 +1027,59 @@ CONFIG_RTC_INTF_DEV=y | |||
973 | # CONFIG_RTC_DRV_PCF8563 is not set | 1027 | # CONFIG_RTC_DRV_PCF8563 is not set |
974 | # CONFIG_RTC_DRV_PCF8583 is not set | 1028 | # CONFIG_RTC_DRV_PCF8583 is not set |
975 | # CONFIG_RTC_DRV_M41T80 is not set | 1029 | # CONFIG_RTC_DRV_M41T80 is not set |
1030 | # CONFIG_RTC_DRV_S35390A is not set | ||
1031 | # CONFIG_RTC_DRV_FM3130 is not set | ||
1032 | # CONFIG_RTC_DRV_RX8581 is not set | ||
976 | 1033 | ||
977 | # | 1034 | # |
978 | # SPI RTC drivers | 1035 | # SPI RTC drivers |
979 | # | 1036 | # |
980 | # CONFIG_RTC_DRV_RS5C348 is not set | 1037 | # CONFIG_RTC_DRV_M41T94 is not set |
1038 | # CONFIG_RTC_DRV_DS1305 is not set | ||
1039 | # CONFIG_RTC_DRV_DS1390 is not set | ||
981 | # CONFIG_RTC_DRV_MAX6902 is not set | 1040 | # CONFIG_RTC_DRV_MAX6902 is not set |
1041 | # CONFIG_RTC_DRV_R9701 is not set | ||
1042 | # CONFIG_RTC_DRV_RS5C348 is not set | ||
1043 | # CONFIG_RTC_DRV_DS3234 is not set | ||
982 | 1044 | ||
983 | # | 1045 | # |
984 | # Platform RTC drivers | 1046 | # Platform RTC drivers |
985 | # | 1047 | # |
1048 | # CONFIG_RTC_DRV_DS1286 is not set | ||
1049 | # CONFIG_RTC_DRV_DS1511 is not set | ||
986 | # CONFIG_RTC_DRV_DS1553 is not set | 1050 | # CONFIG_RTC_DRV_DS1553 is not set |
987 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
988 | # CONFIG_RTC_DRV_DS1742 is not set | 1051 | # CONFIG_RTC_DRV_DS1742 is not set |
1052 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
989 | # CONFIG_RTC_DRV_M48T86 is not set | 1053 | # CONFIG_RTC_DRV_M48T86 is not set |
1054 | # CONFIG_RTC_DRV_M48T35 is not set | ||
990 | # CONFIG_RTC_DRV_M48T59 is not set | 1055 | # CONFIG_RTC_DRV_M48T59 is not set |
1056 | # CONFIG_RTC_DRV_BQ4802 is not set | ||
991 | # CONFIG_RTC_DRV_V3020 is not set | 1057 | # CONFIG_RTC_DRV_V3020 is not set |
992 | 1058 | ||
993 | # | 1059 | # |
994 | # on-CPU RTC drivers | 1060 | # on-CPU RTC drivers |
995 | # | 1061 | # |
996 | CONFIG_RTC_DRV_BFIN=y | 1062 | CONFIG_RTC_DRV_BFIN=y |
997 | 1063 | # CONFIG_DMADEVICES is not set | |
998 | # | ||
999 | # Userspace I/O | ||
1000 | # | ||
1001 | # CONFIG_UIO is not set | 1064 | # CONFIG_UIO is not set |
1065 | # CONFIG_STAGING is not set | ||
1002 | 1066 | ||
1003 | # | 1067 | # |
1004 | # File systems | 1068 | # File systems |
1005 | # | 1069 | # |
1006 | # CONFIG_EXT2_FS is not set | 1070 | # CONFIG_EXT2_FS is not set |
1007 | # CONFIG_EXT3_FS is not set | 1071 | # CONFIG_EXT3_FS is not set |
1008 | # CONFIG_EXT4DEV_FS is not set | 1072 | # CONFIG_EXT4_FS is not set |
1009 | # CONFIG_REISERFS_FS is not set | 1073 | # CONFIG_REISERFS_FS is not set |
1010 | # CONFIG_JFS_FS is not set | 1074 | # CONFIG_JFS_FS is not set |
1011 | # CONFIG_FS_POSIX_ACL is not set | 1075 | # CONFIG_FS_POSIX_ACL is not set |
1076 | CONFIG_FILE_LOCKING=y | ||
1012 | # CONFIG_XFS_FS is not set | 1077 | # CONFIG_XFS_FS is not set |
1013 | # CONFIG_GFS2_FS is not set | ||
1014 | # CONFIG_OCFS2_FS is not set | 1078 | # CONFIG_OCFS2_FS is not set |
1015 | # CONFIG_MINIX_FS is not set | 1079 | # CONFIG_DNOTIFY is not set |
1016 | # CONFIG_ROMFS_FS is not set | ||
1017 | CONFIG_INOTIFY=y | 1080 | CONFIG_INOTIFY=y |
1018 | CONFIG_INOTIFY_USER=y | 1081 | CONFIG_INOTIFY_USER=y |
1019 | # CONFIG_QUOTA is not set | 1082 | # CONFIG_QUOTA is not set |
1020 | # CONFIG_DNOTIFY is not set | ||
1021 | # CONFIG_AUTOFS_FS is not set | 1083 | # CONFIG_AUTOFS_FS is not set |
1022 | # CONFIG_AUTOFS4_FS is not set | 1084 | # CONFIG_AUTOFS4_FS is not set |
1023 | # CONFIG_FUSE_FS is not set | 1085 | # CONFIG_FUSE_FS is not set |
@@ -1059,8 +1121,11 @@ CONFIG_SYSFS=y | |||
1059 | # CONFIG_JFFS2_FS is not set | 1121 | # CONFIG_JFFS2_FS is not set |
1060 | # CONFIG_CRAMFS is not set | 1122 | # CONFIG_CRAMFS is not set |
1061 | # CONFIG_VXFS_FS is not set | 1123 | # CONFIG_VXFS_FS is not set |
1124 | # CONFIG_MINIX_FS is not set | ||
1125 | # CONFIG_OMFS_FS is not set | ||
1062 | # CONFIG_HPFS_FS is not set | 1126 | # CONFIG_HPFS_FS is not set |
1063 | # CONFIG_QNX4FS_FS is not set | 1127 | # CONFIG_QNX4FS_FS is not set |
1128 | # CONFIG_ROMFS_FS is not set | ||
1064 | # CONFIG_SYSV_FS is not set | 1129 | # CONFIG_SYSV_FS is not set |
1065 | # CONFIG_UFS_FS is not set | 1130 | # CONFIG_UFS_FS is not set |
1066 | CONFIG_NETWORK_FILESYSTEMS=y | 1131 | CONFIG_NETWORK_FILESYSTEMS=y |
@@ -1068,13 +1133,12 @@ CONFIG_NFS_FS=m | |||
1068 | CONFIG_NFS_V3=y | 1133 | CONFIG_NFS_V3=y |
1069 | # CONFIG_NFS_V3_ACL is not set | 1134 | # CONFIG_NFS_V3_ACL is not set |
1070 | # CONFIG_NFS_V4 is not set | 1135 | # CONFIG_NFS_V4 is not set |
1071 | # CONFIG_NFS_DIRECTIO is not set | ||
1072 | # CONFIG_NFSD is not set | 1136 | # CONFIG_NFSD is not set |
1073 | CONFIG_LOCKD=m | 1137 | CONFIG_LOCKD=m |
1074 | CONFIG_LOCKD_V4=y | 1138 | CONFIG_LOCKD_V4=y |
1075 | CONFIG_NFS_COMMON=y | 1139 | CONFIG_NFS_COMMON=y |
1076 | CONFIG_SUNRPC=m | 1140 | CONFIG_SUNRPC=m |
1077 | # CONFIG_SUNRPC_BIND34 is not set | 1141 | # CONFIG_SUNRPC_REGISTER_V4 is not set |
1078 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1142 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
1079 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1143 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1080 | CONFIG_SMB_FS=m | 1144 | CONFIG_SMB_FS=m |
@@ -1130,7 +1194,6 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
1130 | # CONFIG_NLS_KOI8_U is not set | 1194 | # CONFIG_NLS_KOI8_U is not set |
1131 | # CONFIG_NLS_UTF8 is not set | 1195 | # CONFIG_NLS_UTF8 is not set |
1132 | # CONFIG_DLM is not set | 1196 | # CONFIG_DLM is not set |
1133 | # CONFIG_INSTRUMENTATION is not set | ||
1134 | 1197 | ||
1135 | # | 1198 | # |
1136 | # Kernel hacking | 1199 | # Kernel hacking |
@@ -1138,14 +1201,61 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
1138 | # CONFIG_PRINTK_TIME is not set | 1201 | # CONFIG_PRINTK_TIME is not set |
1139 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1202 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1140 | CONFIG_ENABLE_MUST_CHECK=y | 1203 | CONFIG_ENABLE_MUST_CHECK=y |
1204 | CONFIG_FRAME_WARN=1024 | ||
1141 | # CONFIG_MAGIC_SYSRQ is not set | 1205 | # CONFIG_MAGIC_SYSRQ is not set |
1142 | # CONFIG_UNUSED_SYMBOLS is not set | 1206 | # CONFIG_UNUSED_SYMBOLS is not set |
1143 | CONFIG_DEBUG_FS=y | 1207 | CONFIG_DEBUG_FS=y |
1144 | # CONFIG_HEADERS_CHECK is not set | 1208 | # CONFIG_HEADERS_CHECK is not set |
1145 | # CONFIG_DEBUG_KERNEL is not set | 1209 | CONFIG_DEBUG_KERNEL=y |
1210 | # CONFIG_DEBUG_SHIRQ is not set | ||
1211 | CONFIG_DETECT_SOFTLOCKUP=y | ||
1212 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
1213 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
1214 | # CONFIG_SCHED_DEBUG is not set | ||
1215 | # CONFIG_SCHEDSTATS is not set | ||
1216 | # CONFIG_TIMER_STATS is not set | ||
1217 | # CONFIG_DEBUG_OBJECTS is not set | ||
1218 | # CONFIG_DEBUG_SLAB is not set | ||
1219 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
1220 | # CONFIG_RT_MUTEX_TESTER is not set | ||
1221 | # CONFIG_DEBUG_SPINLOCK is not set | ||
1222 | # CONFIG_DEBUG_MUTEXES is not set | ||
1223 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
1224 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
1225 | # CONFIG_DEBUG_KOBJECT is not set | ||
1146 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1226 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1227 | # CONFIG_DEBUG_INFO is not set | ||
1228 | # CONFIG_DEBUG_VM is not set | ||
1229 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
1230 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
1231 | # CONFIG_DEBUG_LIST is not set | ||
1232 | # CONFIG_DEBUG_SG is not set | ||
1233 | # CONFIG_FRAME_POINTER is not set | ||
1234 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
1235 | # CONFIG_RCU_TORTURE_TEST is not set | ||
1236 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
1237 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
1238 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | ||
1239 | # CONFIG_FAULT_INJECTION is not set | ||
1240 | # CONFIG_SYSCTL_SYSCALL_CHECK is not set | ||
1241 | |||
1242 | # | ||
1243 | # Tracers | ||
1244 | # | ||
1245 | # CONFIG_SCHED_TRACER is not set | ||
1246 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1247 | # CONFIG_BOOT_TRACER is not set | ||
1248 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
1147 | # CONFIG_SAMPLES is not set | 1249 | # CONFIG_SAMPLES is not set |
1250 | CONFIG_HAVE_ARCH_KGDB=y | ||
1251 | # CONFIG_KGDB is not set | ||
1252 | # CONFIG_DEBUG_STACKOVERFLOW is not set | ||
1253 | # CONFIG_DEBUG_STACK_USAGE is not set | ||
1254 | # CONFIG_KGDB_TESTCASE is not set | ||
1255 | CONFIG_DEBUG_VERBOSE=y | ||
1148 | CONFIG_DEBUG_MMRS=y | 1256 | CONFIG_DEBUG_MMRS=y |
1257 | # CONFIG_DEBUG_HWERR is not set | ||
1258 | # CONFIG_DEBUG_DOUBLEFAULT is not set | ||
1149 | CONFIG_DEBUG_HUNT_FOR_ZERO=y | 1259 | CONFIG_DEBUG_HUNT_FOR_ZERO=y |
1150 | CONFIG_DEBUG_BFIN_HWTRACE_ON=y | 1260 | CONFIG_DEBUG_BFIN_HWTRACE_ON=y |
1151 | CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_OFF=y | 1261 | CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_OFF=y |
@@ -1154,7 +1264,7 @@ CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_OFF=y | |||
1154 | CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION=0 | 1264 | CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION=0 |
1155 | # CONFIG_DEBUG_BFIN_HWTRACE_EXPAND is not set | 1265 | # CONFIG_DEBUG_BFIN_HWTRACE_EXPAND is not set |
1156 | # CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set | 1266 | # CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set |
1157 | CONFIG_EARLY_PRINTK=y | 1267 | # CONFIG_EARLY_PRINTK is not set |
1158 | # CONFIG_CPLB_INFO is not set | 1268 | # CONFIG_CPLB_INFO is not set |
1159 | CONFIG_ACCESS_CHECK=y | 1269 | CONFIG_ACCESS_CHECK=y |
1160 | 1270 | ||
@@ -1163,10 +1273,96 @@ CONFIG_ACCESS_CHECK=y | |||
1163 | # | 1273 | # |
1164 | # CONFIG_KEYS is not set | 1274 | # CONFIG_KEYS is not set |
1165 | CONFIG_SECURITY=y | 1275 | CONFIG_SECURITY=y |
1276 | # CONFIG_SECURITYFS is not set | ||
1166 | # CONFIG_SECURITY_NETWORK is not set | 1277 | # CONFIG_SECURITY_NETWORK is not set |
1167 | # CONFIG_SECURITY_CAPABILITIES is not set | 1278 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1168 | # CONFIG_SECURITY_ROOTPLUG is not set | 1279 | # CONFIG_SECURITY_ROOTPLUG is not set |
1169 | # CONFIG_CRYPTO is not set | 1280 | CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0 |
1281 | CONFIG_CRYPTO=y | ||
1282 | |||
1283 | # | ||
1284 | # Crypto core or helper | ||
1285 | # | ||
1286 | # CONFIG_CRYPTO_FIPS is not set | ||
1287 | # CONFIG_CRYPTO_MANAGER is not set | ||
1288 | # CONFIG_CRYPTO_MANAGER2 is not set | ||
1289 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1290 | # CONFIG_CRYPTO_NULL is not set | ||
1291 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1292 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1293 | # CONFIG_CRYPTO_TEST is not set | ||
1294 | |||
1295 | # | ||
1296 | # Authenticated Encryption with Associated Data | ||
1297 | # | ||
1298 | # CONFIG_CRYPTO_CCM is not set | ||
1299 | # CONFIG_CRYPTO_GCM is not set | ||
1300 | # CONFIG_CRYPTO_SEQIV is not set | ||
1301 | |||
1302 | # | ||
1303 | # Block modes | ||
1304 | # | ||
1305 | # CONFIG_CRYPTO_CBC is not set | ||
1306 | # CONFIG_CRYPTO_CTR is not set | ||
1307 | # CONFIG_CRYPTO_CTS is not set | ||
1308 | # CONFIG_CRYPTO_ECB is not set | ||
1309 | # CONFIG_CRYPTO_LRW is not set | ||
1310 | # CONFIG_CRYPTO_PCBC is not set | ||
1311 | # CONFIG_CRYPTO_XTS is not set | ||
1312 | |||
1313 | # | ||
1314 | # Hash modes | ||
1315 | # | ||
1316 | # CONFIG_CRYPTO_HMAC is not set | ||
1317 | # CONFIG_CRYPTO_XCBC is not set | ||
1318 | |||
1319 | # | ||
1320 | # Digest | ||
1321 | # | ||
1322 | # CONFIG_CRYPTO_CRC32C is not set | ||
1323 | # CONFIG_CRYPTO_MD4 is not set | ||
1324 | # CONFIG_CRYPTO_MD5 is not set | ||
1325 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1326 | # CONFIG_CRYPTO_RMD128 is not set | ||
1327 | # CONFIG_CRYPTO_RMD160 is not set | ||
1328 | # CONFIG_CRYPTO_RMD256 is not set | ||
1329 | # CONFIG_CRYPTO_RMD320 is not set | ||
1330 | # CONFIG_CRYPTO_SHA1 is not set | ||
1331 | # CONFIG_CRYPTO_SHA256 is not set | ||
1332 | # CONFIG_CRYPTO_SHA512 is not set | ||
1333 | # CONFIG_CRYPTO_TGR192 is not set | ||
1334 | # CONFIG_CRYPTO_WP512 is not set | ||
1335 | |||
1336 | # | ||
1337 | # Ciphers | ||
1338 | # | ||
1339 | # CONFIG_CRYPTO_AES is not set | ||
1340 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1341 | # CONFIG_CRYPTO_ARC4 is not set | ||
1342 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1343 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1344 | # CONFIG_CRYPTO_CAST5 is not set | ||
1345 | # CONFIG_CRYPTO_CAST6 is not set | ||
1346 | # CONFIG_CRYPTO_DES is not set | ||
1347 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1348 | # CONFIG_CRYPTO_KHAZAD is not set | ||
1349 | # CONFIG_CRYPTO_SALSA20 is not set | ||
1350 | # CONFIG_CRYPTO_SEED is not set | ||
1351 | # CONFIG_CRYPTO_SERPENT is not set | ||
1352 | # CONFIG_CRYPTO_TEA is not set | ||
1353 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1354 | |||
1355 | # | ||
1356 | # Compression | ||
1357 | # | ||
1358 | # CONFIG_CRYPTO_DEFLATE is not set | ||
1359 | # CONFIG_CRYPTO_LZO is not set | ||
1360 | |||
1361 | # | ||
1362 | # Random Number Generation | ||
1363 | # | ||
1364 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
1365 | CONFIG_CRYPTO_HW=y | ||
1170 | 1366 | ||
1171 | # | 1367 | # |
1172 | # Library routines | 1368 | # Library routines |
@@ -1174,6 +1370,7 @@ CONFIG_SECURITY=y | |||
1174 | CONFIG_BITREVERSE=y | 1370 | CONFIG_BITREVERSE=y |
1175 | CONFIG_CRC_CCITT=m | 1371 | CONFIG_CRC_CCITT=m |
1176 | # CONFIG_CRC16 is not set | 1372 | # CONFIG_CRC16 is not set |
1373 | # CONFIG_CRC_T10DIF is not set | ||
1177 | # CONFIG_CRC_ITU_T is not set | 1374 | # CONFIG_CRC_ITU_T is not set |
1178 | CONFIG_CRC32=y | 1375 | CONFIG_CRC32=y |
1179 | # CONFIG_CRC7 is not set | 1376 | # CONFIG_CRC7 is not set |
diff --git a/arch/blackfin/include/asm/checksum.h b/arch/blackfin/include/asm/checksum.h index f67289a0d8d..793581fc955 100644 --- a/arch/blackfin/include/asm/checksum.h +++ b/arch/blackfin/include/asm/checksum.h | |||
@@ -63,23 +63,23 @@ static inline __wsum | |||
63 | csum_tcpudp_nofold(__be32 saddr, __be32 daddr, unsigned short len, | 63 | csum_tcpudp_nofold(__be32 saddr, __be32 daddr, unsigned short len, |
64 | unsigned short proto, __wsum sum) | 64 | unsigned short proto, __wsum sum) |
65 | { | 65 | { |
66 | 66 | unsigned int carry; | |
67 | __asm__ ("%0 = %0 + %1;\n\t" | 67 | |
68 | "CC = AC0;\n\t" | 68 | __asm__ ("%0 = %0 + %2;\n\t" |
69 | "if !CC jump 4;\n\t" | 69 | "CC = AC0;\n\t" |
70 | "%0 = %0 + %4;\n\t" | 70 | "%1 = CC;\n\t" |
71 | "%0 = %0 + %2;\n\t" | 71 | "%0 = %0 + %1;\n\t" |
72 | "CC = AC0;\n\t" | 72 | "%0 = %0 + %3;\n\t" |
73 | "if !CC jump 4;\n\t" | 73 | "CC = AC0;\n\t" |
74 | "%0 = %0 + %4;\n\t" | 74 | "%1 = CC;\n\t" |
75 | "%0 = %0 + %3;\n\t" | 75 | "%0 = %0 + %1;\n\t" |
76 | "CC = AC0;\n\t" | 76 | "%0 = %0 + %4;\n\t" |
77 | "if !CC jump 4;\n\t" | 77 | "CC = AC0;\n\t" |
78 | "%0 = %0 + %4;\n\t" | 78 | "%1 = CC;\n\t" |
79 | "NOP;\n\t" | 79 | "%0 = %0 + %1;\n\t" |
80 | : "=d" (sum) | 80 | : "=d" (sum), "=&d" (carry) |
81 | : "d" (daddr), "d" (saddr), "d" ((ntohs(len)<<16)+proto*256), "d" (1), "0"(sum) | 81 | : "d" (daddr), "d" (saddr), "d" ((len + proto) << 8), "0"(sum) |
82 | : "CC"); | 82 | : "CC"); |
83 | 83 | ||
84 | return (sum); | 84 | return (sum); |
85 | } | 85 | } |
diff --git a/arch/blackfin/include/asm/delay.h b/arch/blackfin/include/asm/delay.h index 0889c3abb59..c31f91cc1d5 100644 --- a/arch/blackfin/include/asm/delay.h +++ b/arch/blackfin/include/asm/delay.h | |||
@@ -13,29 +13,7 @@ | |||
13 | 13 | ||
14 | static inline void __delay(unsigned long loops) | 14 | static inline void __delay(unsigned long loops) |
15 | { | 15 | { |
16 | if (ANOMALY_05000312) { | 16 | __asm__ __volatile__ ( |
17 | /* Interrupted loads to loop registers -> bad */ | ||
18 | unsigned long tmp; | ||
19 | __asm__ __volatile__( | ||
20 | "[--SP] = LC0;" | ||
21 | "[--SP] = LT0;" | ||
22 | "[--SP] = LB0;" | ||
23 | "LSETUP (1f,1f) LC0 = %1;" | ||
24 | "1: NOP;" | ||
25 | /* We take advantage of the fact that LC0 is 0 at | ||
26 | * the end of the loop. Otherwise we'd need some | ||
27 | * NOPs after the CLI here. | ||
28 | */ | ||
29 | "CLI %0;" | ||
30 | "LB0 = [SP++];" | ||
31 | "LT0 = [SP++];" | ||
32 | "LC0 = [SP++];" | ||
33 | "STI %0;" | ||
34 | : "=d" (tmp) | ||
35 | : "a" (loops) | ||
36 | ); | ||
37 | } else | ||
38 | __asm__ __volatile__ ( | ||
39 | "LSETUP(1f, 1f) LC0 = %0;" | 17 | "LSETUP(1f, 1f) LC0 = %0;" |
40 | "1: NOP;" | 18 | "1: NOP;" |
41 | : | 19 | : |
@@ -47,16 +25,15 @@ static inline void __delay(unsigned long loops) | |||
47 | #include <linux/param.h> /* needed for HZ */ | 25 | #include <linux/param.h> /* needed for HZ */ |
48 | 26 | ||
49 | /* | 27 | /* |
50 | * Use only for very small delays ( < 1 msec). Should probably use a | 28 | * close approximation borrowed from m68knommu to avoid 64-bit math |
51 | * lookup table, really, as the multiplications take much too long with | ||
52 | * short delays. This is a "reasonable" implementation, though (and the | ||
53 | * first constant multiplications gets optimized away if the delay is | ||
54 | * a constant) | ||
55 | */ | 29 | */ |
30 | |||
31 | #define HZSCALE (268435456 / (1000000/HZ)) | ||
32 | |||
56 | static inline void udelay(unsigned long usecs) | 33 | static inline void udelay(unsigned long usecs) |
57 | { | 34 | { |
58 | extern unsigned long loops_per_jiffy; | 35 | extern unsigned long loops_per_jiffy; |
59 | __delay(usecs * loops_per_jiffy / (1000000 / HZ)); | 36 | __delay((((usecs * HZSCALE) >> 11) * (loops_per_jiffy >> 11)) >> 6); |
60 | } | 37 | } |
61 | 38 | ||
62 | #endif | 39 | #endif |
diff --git a/arch/blackfin/include/asm/gpio.h b/arch/blackfin/include/asm/gpio.h index 9477d82fcad..d4a082ef75b 100644 --- a/arch/blackfin/include/asm/gpio.h +++ b/arch/blackfin/include/asm/gpio.h | |||
@@ -27,60 +27,6 @@ | |||
27 | * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | 27 | * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
28 | */ | 28 | */ |
29 | 29 | ||
30 | /* | ||
31 | * Number BF537/6/4 BF561 BF533/2/1 | ||
32 | * BF527/5/2 | ||
33 | * | ||
34 | * GPIO_0 PF0 PF0 PF0 | ||
35 | * GPIO_1 PF1 PF1 PF1 | ||
36 | * GPIO_2 PF2 PF2 PF2 | ||
37 | * GPIO_3 PF3 PF3 PF3 | ||
38 | * GPIO_4 PF4 PF4 PF4 | ||
39 | * GPIO_5 PF5 PF5 PF5 | ||
40 | * GPIO_6 PF6 PF6 PF6 | ||
41 | * GPIO_7 PF7 PF7 PF7 | ||
42 | * GPIO_8 PF8 PF8 PF8 | ||
43 | * GPIO_9 PF9 PF9 PF9 | ||
44 | * GPIO_10 PF10 PF10 PF10 | ||
45 | * GPIO_11 PF11 PF11 PF11 | ||
46 | * GPIO_12 PF12 PF12 PF12 | ||
47 | * GPIO_13 PF13 PF13 PF13 | ||
48 | * GPIO_14 PF14 PF14 PF14 | ||
49 | * GPIO_15 PF15 PF15 PF15 | ||
50 | * GPIO_16 PG0 PF16 | ||
51 | * GPIO_17 PG1 PF17 | ||
52 | * GPIO_18 PG2 PF18 | ||
53 | * GPIO_19 PG3 PF19 | ||
54 | * GPIO_20 PG4 PF20 | ||
55 | * GPIO_21 PG5 PF21 | ||
56 | * GPIO_22 PG6 PF22 | ||
57 | * GPIO_23 PG7 PF23 | ||
58 | * GPIO_24 PG8 PF24 | ||
59 | * GPIO_25 PG9 PF25 | ||
60 | * GPIO_26 PG10 PF26 | ||
61 | * GPIO_27 PG11 PF27 | ||
62 | * GPIO_28 PG12 PF28 | ||
63 | * GPIO_29 PG13 PF29 | ||
64 | * GPIO_30 PG14 PF30 | ||
65 | * GPIO_31 PG15 PF31 | ||
66 | * GPIO_32 PH0 PF32 | ||
67 | * GPIO_33 PH1 PF33 | ||
68 | * GPIO_34 PH2 PF34 | ||
69 | * GPIO_35 PH3 PF35 | ||
70 | * GPIO_36 PH4 PF36 | ||
71 | * GPIO_37 PH5 PF37 | ||
72 | * GPIO_38 PH6 PF38 | ||
73 | * GPIO_39 PH7 PF39 | ||
74 | * GPIO_40 PH8 PF40 | ||
75 | * GPIO_41 PH9 PF41 | ||
76 | * GPIO_42 PH10 PF42 | ||
77 | * GPIO_43 PH11 PF43 | ||
78 | * GPIO_44 PH12 PF44 | ||
79 | * GPIO_45 PH13 PF45 | ||
80 | * GPIO_46 PH14 PF46 | ||
81 | * GPIO_47 PH15 PF47 | ||
82 | */ | ||
83 | |||
84 | #ifndef __ARCH_BLACKFIN_GPIO_H__ | 30 | #ifndef __ARCH_BLACKFIN_GPIO_H__ |
85 | #define __ARCH_BLACKFIN_GPIO_H__ | 31 | #define __ARCH_BLACKFIN_GPIO_H__ |
86 | 32 | ||
@@ -295,10 +241,6 @@ int bfin_gpio_direction_output(unsigned gpio, int value); | |||
295 | int bfin_gpio_get_value(unsigned gpio); | 241 | int bfin_gpio_get_value(unsigned gpio); |
296 | void bfin_gpio_set_value(unsigned gpio, int value); | 242 | void bfin_gpio_set_value(unsigned gpio, int value); |
297 | 243 | ||
298 | #ifndef BF548_FAMILY | ||
299 | #define bfin_gpio_set_value(gpio, value) set_gpio_data(gpio, value) | ||
300 | #endif | ||
301 | |||
302 | #ifdef CONFIG_GPIOLIB | 244 | #ifdef CONFIG_GPIOLIB |
303 | #include <asm-generic/gpio.h> /* cansleep wrappers */ | 245 | #include <asm-generic/gpio.h> /* cansleep wrappers */ |
304 | 246 | ||
diff --git a/arch/blackfin/include/asm/kgdb.h b/arch/blackfin/include/asm/kgdb.h index 26ebac6646d..c8b256d2ea3 100644 --- a/arch/blackfin/include/asm/kgdb.h +++ b/arch/blackfin/include/asm/kgdb.h | |||
@@ -1,32 +1,8 @@ | |||
1 | /* | 1 | /* Blackfin KGDB header |
2 | * File: include/asm-blackfin/kgdb.h | ||
3 | * Based on: | ||
4 | * Author: Sonic Zhang | ||
5 | * | ||
6 | * Created: | ||
7 | * Description: | ||
8 | * | ||
9 | * Rev: $Id: kgdb_bfin_linux-2.6.x.patch 4934 2007-02-13 09:32:11Z sonicz $ | ||
10 | * | ||
11 | * Modified: | ||
12 | * Copyright 2005-2006 Analog Devices Inc. | ||
13 | * | ||
14 | * Bugs: Enter bugs at http://blackfin.uclinux.org/ | ||
15 | * | 2 | * |
16 | * This program is free software; you can redistribute it and/or modify | 3 | * Copyright 2005-2009 Analog Devices Inc. |
17 | * it under the terms of the GNU General Public License as published by | ||
18 | * the Free Software Foundation; either version 2 of the License, or | ||
19 | * (at your option) any later version. | ||
20 | * | 4 | * |
21 | * This program is distributed in the hope that it will be useful, | 5 | * Licensed under the GPL-2 or later. |
22 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
23 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
24 | * GNU General Public License for more details. | ||
25 | * | ||
26 | * You should have received a copy of the GNU General Public License | ||
27 | * along with this program; if not, see the file COPYING, or write | ||
28 | * to the Free Software Foundation, Inc., | ||
29 | * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
30 | */ | 6 | */ |
31 | 7 | ||
32 | #ifndef __ASM_BLACKFIN_KGDB_H__ | 8 | #ifndef __ASM_BLACKFIN_KGDB_H__ |
@@ -37,17 +13,18 @@ | |||
37 | /* gdb locks */ | 13 | /* gdb locks */ |
38 | #define KGDB_MAX_NO_CPUS 8 | 14 | #define KGDB_MAX_NO_CPUS 8 |
39 | 15 | ||
40 | /************************************************************************/ | 16 | /* |
41 | /* BUFMAX defines the maximum number of characters in inbound/outbound buffers*/ | 17 | * BUFMAX defines the maximum number of characters in inbound/outbound buffers. |
42 | /* at least NUMREGBYTES*2 are needed for register packets */ | 18 | * At least NUMREGBYTES*2 are needed for register packets. |
43 | /* Longer buffer is needed to list all threads */ | 19 | * Longer buffer is needed to list all threads. |
20 | */ | ||
44 | #define BUFMAX 2048 | 21 | #define BUFMAX 2048 |
45 | 22 | ||
46 | /* | 23 | /* |
47 | * Note that this register image is different from | 24 | * Note that this register image is different from |
48 | * the register image that Linux produces at interrupt time. | 25 | * the register image that Linux produces at interrupt time. |
49 | * | 26 | * |
50 | * Linux's register image is defined by struct pt_regs in ptrace.h. | 27 | * Linux's register image is defined by struct pt_regs in ptrace.h. |
51 | */ | 28 | */ |
52 | enum regnames { | 29 | enum regnames { |
53 | /* Core Registers */ | 30 | /* Core Registers */ |
@@ -104,14 +81,14 @@ enum regnames { | |||
104 | BFIN_RETX, | 81 | BFIN_RETX, |
105 | BFIN_RETN, | 82 | BFIN_RETN, |
106 | BFIN_RETE, | 83 | BFIN_RETE, |
107 | 84 | ||
108 | /* Pseudo Registers */ | 85 | /* Pseudo Registers */ |
109 | BFIN_PC, | 86 | BFIN_PC, |
110 | BFIN_CC, | 87 | BFIN_CC, |
111 | BFIN_EXTRA1, /* Address of .text section. */ | 88 | BFIN_EXTRA1, /* Address of .text section. */ |
112 | BFIN_EXTRA2, /* Address of .data section. */ | 89 | BFIN_EXTRA2, /* Address of .data section. */ |
113 | BFIN_EXTRA3, /* Address of .bss section. */ | 90 | BFIN_EXTRA3, /* Address of .bss section. */ |
114 | BFIN_FDPIC_EXEC, | 91 | BFIN_FDPIC_EXEC, |
115 | BFIN_FDPIC_INTERP, | 92 | BFIN_FDPIC_INTERP, |
116 | 93 | ||
117 | /* MMRs */ | 94 | /* MMRs */ |
@@ -126,7 +103,7 @@ enum regnames { | |||
126 | 103 | ||
127 | static inline void arch_kgdb_breakpoint(void) | 104 | static inline void arch_kgdb_breakpoint(void) |
128 | { | 105 | { |
129 | asm(" EXCPT 2;"); | 106 | asm("EXCPT 2;"); |
130 | } | 107 | } |
131 | #define BREAK_INSTR_SIZE 2 | 108 | #define BREAK_INSTR_SIZE 2 |
132 | #define CACHE_FLUSH_IS_SAFE 1 | 109 | #define CACHE_FLUSH_IS_SAFE 1 |
diff --git a/arch/blackfin/include/asm/mem_init.h b/arch/blackfin/include/asm/mem_init.h index 255a9316ad3..61f7487fbf1 100644 --- a/arch/blackfin/include/asm/mem_init.h +++ b/arch/blackfin/include/asm/mem_init.h | |||
@@ -115,7 +115,7 @@ | |||
115 | #define mem_SDRRC (((CONFIG_SCLK_HZ / 1000) * SDRAM_Tref) / SDRAM_NRA) - (SDRAM_tRAS_num + SDRAM_tRP_num) | 115 | #define mem_SDRRC (((CONFIG_SCLK_HZ / 1000) * SDRAM_Tref) / SDRAM_NRA) - (SDRAM_tRAS_num + SDRAM_tRP_num) |
116 | 116 | ||
117 | /* Enable SCLK Out */ | 117 | /* Enable SCLK Out */ |
118 | #define mem_SDGCTL (0x80000000 | SCTLE | SDRAM_CL | SDRAM_tRAS | SDRAM_tRP | SDRAM_tRCD | SDRAM_tWR | PSS) | 118 | #define mem_SDGCTL (SCTLE | SDRAM_CL | SDRAM_tRAS | SDRAM_tRP | SDRAM_tRCD | SDRAM_tWR | PSS) |
119 | #else | 119 | #else |
120 | #define mem_SDRRC CONFIG_MEM_SDRRC | 120 | #define mem_SDRRC CONFIG_MEM_SDRRC |
121 | #define mem_SDGCTL CONFIG_MEM_SDGCTL | 121 | #define mem_SDGCTL CONFIG_MEM_SDGCTL |
diff --git a/arch/blackfin/include/asm/pda.h b/arch/blackfin/include/asm/pda.h index bd8d4a7efeb..a67142740df 100644 --- a/arch/blackfin/include/asm/pda.h +++ b/arch/blackfin/include/asm/pda.h | |||
@@ -59,6 +59,7 @@ struct blackfin_pda { /* Per-processor Data Area */ | |||
59 | unsigned long icplb_fault_addr; | 59 | unsigned long icplb_fault_addr; |
60 | unsigned long retx; | 60 | unsigned long retx; |
61 | unsigned long seqstat; | 61 | unsigned long seqstat; |
62 | unsigned int __nmi_count; /* number of times NMI asserted on this CPU */ | ||
62 | }; | 63 | }; |
63 | 64 | ||
64 | extern struct blackfin_pda cpu_pda[]; | 65 | extern struct blackfin_pda cpu_pda[]; |
diff --git a/arch/blackfin/include/asm/reboot.h b/arch/blackfin/include/asm/reboot.h index 4856d62b746..ae1e36329be 100644 --- a/arch/blackfin/include/asm/reboot.h +++ b/arch/blackfin/include/asm/reboot.h | |||
@@ -15,6 +15,6 @@ extern void native_machine_halt(void); | |||
15 | extern void native_machine_power_off(void); | 15 | extern void native_machine_power_off(void); |
16 | 16 | ||
17 | /* common reboot workarounds */ | 17 | /* common reboot workarounds */ |
18 | extern void bfin_gpio_reset_spi0_ssel1(void); | 18 | extern void bfin_reset_boot_spi_cs(unsigned short pin); |
19 | 19 | ||
20 | #endif | 20 | #endif |
diff --git a/arch/blackfin/kernel/Makefile b/arch/blackfin/kernel/Makefile index 38a233374f0..4a92a86824b 100644 --- a/arch/blackfin/kernel/Makefile +++ b/arch/blackfin/kernel/Makefile | |||
@@ -15,6 +15,8 @@ else | |||
15 | obj-y += time.o | 15 | obj-y += time.o |
16 | endif | 16 | endif |
17 | 17 | ||
18 | CFLAGS_kgdb_test.o := -mlong-calls -O0 | ||
19 | |||
18 | obj-$(CONFIG_IPIPE) += ipipe.o | 20 | obj-$(CONFIG_IPIPE) += ipipe.o |
19 | obj-$(CONFIG_IPIPE_TRACE_MCOUNT) += mcount.o | 21 | obj-$(CONFIG_IPIPE_TRACE_MCOUNT) += mcount.o |
20 | obj-$(CONFIG_BFIN_GPTIMERS) += gptimers.o | 22 | obj-$(CONFIG_BFIN_GPTIMERS) += gptimers.o |
diff --git a/arch/blackfin/kernel/bfin_dma_5xx.c b/arch/blackfin/kernel/bfin_dma_5xx.c index 07e02c0d1c0..8531693fb48 100644 --- a/arch/blackfin/kernel/bfin_dma_5xx.c +++ b/arch/blackfin/kernel/bfin_dma_5xx.c | |||
@@ -249,6 +249,13 @@ static void __dma_memcpy(u32 daddr, s16 dmod, u32 saddr, s16 smod, size_t cnt, u | |||
249 | 249 | ||
250 | spin_lock_irqsave(&mdma_lock, flags); | 250 | spin_lock_irqsave(&mdma_lock, flags); |
251 | 251 | ||
252 | /* Force a sync in case a previous config reset on this channel | ||
253 | * occurred. This is needed so subsequent writes to DMA registers | ||
254 | * are not spuriously lost/corrupted. Do it under irq lock and | ||
255 | * without the anomaly version (because we are atomic already). | ||
256 | */ | ||
257 | __builtin_bfin_ssync(); | ||
258 | |||
252 | if (bfin_read_MDMA_S0_CONFIG()) | 259 | if (bfin_read_MDMA_S0_CONFIG()) |
253 | while (!(bfin_read_MDMA_D0_IRQ_STATUS() & DMA_DONE)) | 260 | while (!(bfin_read_MDMA_D0_IRQ_STATUS() & DMA_DONE)) |
254 | continue; | 261 | continue; |
diff --git a/arch/blackfin/kernel/bfin_gpio.c b/arch/blackfin/kernel/bfin_gpio.c index 4c14331978f..51dac55c524 100644 --- a/arch/blackfin/kernel/bfin_gpio.c +++ b/arch/blackfin/kernel/bfin_gpio.c | |||
@@ -27,59 +27,6 @@ | |||
27 | * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | 27 | * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
28 | */ | 28 | */ |
29 | 29 | ||
30 | /* | ||
31 | * Number BF537/6/4 BF561 BF533/2/1 BF549/8/4/2 | ||
32 | * | ||
33 | * GPIO_0 PF0 PF0 PF0 PA0...PJ13 | ||
34 | * GPIO_1 PF1 PF1 PF1 | ||
35 | * GPIO_2 PF2 PF2 PF2 | ||
36 | * GPIO_3 PF3 PF3 PF3 | ||
37 | * GPIO_4 PF4 PF4 PF4 | ||
38 | * GPIO_5 PF5 PF5 PF5 | ||
39 | * GPIO_6 PF6 PF6 PF6 | ||
40 | * GPIO_7 PF7 PF7 PF7 | ||
41 | * GPIO_8 PF8 PF8 PF8 | ||
42 | * GPIO_9 PF9 PF9 PF9 | ||
43 | * GPIO_10 PF10 PF10 PF10 | ||
44 | * GPIO_11 PF11 PF11 PF11 | ||
45 | * GPIO_12 PF12 PF12 PF12 | ||
46 | * GPIO_13 PF13 PF13 PF13 | ||
47 | * GPIO_14 PF14 PF14 PF14 | ||
48 | * GPIO_15 PF15 PF15 PF15 | ||
49 | * GPIO_16 PG0 PF16 | ||
50 | * GPIO_17 PG1 PF17 | ||
51 | * GPIO_18 PG2 PF18 | ||
52 | * GPIO_19 PG3 PF19 | ||
53 | * GPIO_20 PG4 PF20 | ||
54 | * GPIO_21 PG5 PF21 | ||
55 | * GPIO_22 PG6 PF22 | ||
56 | * GPIO_23 PG7 PF23 | ||
57 | * GPIO_24 PG8 PF24 | ||
58 | * GPIO_25 PG9 PF25 | ||
59 | * GPIO_26 PG10 PF26 | ||
60 | * GPIO_27 PG11 PF27 | ||
61 | * GPIO_28 PG12 PF28 | ||
62 | * GPIO_29 PG13 PF29 | ||
63 | * GPIO_30 PG14 PF30 | ||
64 | * GPIO_31 PG15 PF31 | ||
65 | * GPIO_32 PH0 PF32 | ||
66 | * GPIO_33 PH1 PF33 | ||
67 | * GPIO_34 PH2 PF34 | ||
68 | * GPIO_35 PH3 PF35 | ||
69 | * GPIO_36 PH4 PF36 | ||
70 | * GPIO_37 PH5 PF37 | ||
71 | * GPIO_38 PH6 PF38 | ||
72 | * GPIO_39 PH7 PF39 | ||
73 | * GPIO_40 PH8 PF40 | ||
74 | * GPIO_41 PH9 PF41 | ||
75 | * GPIO_42 PH10 PF42 | ||
76 | * GPIO_43 PH11 PF43 | ||
77 | * GPIO_44 PH12 PF44 | ||
78 | * GPIO_45 PH13 PF45 | ||
79 | * GPIO_46 PH14 PF46 | ||
80 | * GPIO_47 PH15 PF47 | ||
81 | */ | ||
82 | |||
83 | #include <linux/delay.h> | 30 | #include <linux/delay.h> |
84 | #include <linux/module.h> | 31 | #include <linux/module.h> |
85 | #include <linux/err.h> | 32 | #include <linux/err.h> |
@@ -119,62 +66,61 @@ enum { | |||
119 | #define AWA_DUMMY_READ(...) do { } while (0) | 66 | #define AWA_DUMMY_READ(...) do { } while (0) |
120 | #endif | 67 | #endif |
121 | 68 | ||
69 | static struct gpio_port_t * const gpio_array[] = { | ||
122 | #if defined(BF533_FAMILY) || defined(BF538_FAMILY) | 70 | #if defined(BF533_FAMILY) || defined(BF538_FAMILY) |
123 | static struct gpio_port_t *gpio_bankb[] = { | ||
124 | (struct gpio_port_t *) FIO_FLAG_D, | 71 | (struct gpio_port_t *) FIO_FLAG_D, |
125 | }; | 72 | #elif defined(BF527_FAMILY) || defined(BF537_FAMILY) || defined(BF518_FAMILY) |
126 | #endif | ||
127 | |||
128 | #if defined(BF527_FAMILY) || defined(BF537_FAMILY) || defined(BF518_FAMILY) | ||
129 | static struct gpio_port_t *gpio_bankb[] = { | ||
130 | (struct gpio_port_t *) PORTFIO, | 73 | (struct gpio_port_t *) PORTFIO, |
131 | (struct gpio_port_t *) PORTGIO, | 74 | (struct gpio_port_t *) PORTGIO, |
132 | (struct gpio_port_t *) PORTHIO, | 75 | (struct gpio_port_t *) PORTHIO, |
76 | #elif defined(BF561_FAMILY) | ||
77 | (struct gpio_port_t *) FIO0_FLAG_D, | ||
78 | (struct gpio_port_t *) FIO1_FLAG_D, | ||
79 | (struct gpio_port_t *) FIO2_FLAG_D, | ||
80 | #elif defined(BF548_FAMILY) | ||
81 | (struct gpio_port_t *)PORTA_FER, | ||
82 | (struct gpio_port_t *)PORTB_FER, | ||
83 | (struct gpio_port_t *)PORTC_FER, | ||
84 | (struct gpio_port_t *)PORTD_FER, | ||
85 | (struct gpio_port_t *)PORTE_FER, | ||
86 | (struct gpio_port_t *)PORTF_FER, | ||
87 | (struct gpio_port_t *)PORTG_FER, | ||
88 | (struct gpio_port_t *)PORTH_FER, | ||
89 | (struct gpio_port_t *)PORTI_FER, | ||
90 | (struct gpio_port_t *)PORTJ_FER, | ||
91 | #else | ||
92 | # error no gpio arrays defined | ||
93 | #endif | ||
133 | }; | 94 | }; |
134 | 95 | ||
135 | static unsigned short *port_fer[] = { | 96 | #if defined(BF527_FAMILY) || defined(BF537_FAMILY) || defined(BF518_FAMILY) |
97 | static unsigned short * const port_fer[] = { | ||
136 | (unsigned short *) PORTF_FER, | 98 | (unsigned short *) PORTF_FER, |
137 | (unsigned short *) PORTG_FER, | 99 | (unsigned short *) PORTG_FER, |
138 | (unsigned short *) PORTH_FER, | 100 | (unsigned short *) PORTH_FER, |
139 | }; | 101 | }; |
140 | #endif | ||
141 | 102 | ||
142 | #if defined(BF527_FAMILY) || defined(BF518_FAMILY) | 103 | # if !defined(BF537_FAMILY) |
143 | static unsigned short *port_mux[] = { | 104 | static unsigned short * const port_mux[] = { |
144 | (unsigned short *) PORTF_MUX, | 105 | (unsigned short *) PORTF_MUX, |
145 | (unsigned short *) PORTG_MUX, | 106 | (unsigned short *) PORTG_MUX, |
146 | (unsigned short *) PORTH_MUX, | 107 | (unsigned short *) PORTH_MUX, |
147 | }; | 108 | }; |
148 | 109 | ||
149 | static const | 110 | static const |
150 | u8 pmux_offset[][16] = | 111 | u8 pmux_offset[][16] = { |
151 | {{ 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 4, 6, 8, 8, 10, 10 }, /* PORTF */ | 112 | # if defined(BF527_FAMILY) |
152 | { 0, 0, 0, 0, 0, 2, 2, 4, 4, 6, 8, 10, 10, 10, 12, 12 }, /* PORTG */ | 113 | { 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 4, 6, 8, 8, 10, 10 }, /* PORTF */ |
153 | { 0, 0, 0, 0, 0, 0, 0, 0, 2, 4, 4, 4, 4, 4, 4, 4 }, /* PORTH */ | 114 | { 0, 0, 0, 0, 0, 2, 2, 4, 4, 6, 8, 10, 10, 10, 12, 12 }, /* PORTG */ |
154 | }; | 115 | { 0, 0, 0, 0, 0, 0, 0, 0, 2, 4, 4, 4, 4, 4, 4, 4 }, /* PORTH */ |
155 | #endif | 116 | # elif defined(BF518_FAMILY) |
156 | 117 | { 0, 2, 2, 2, 2, 2, 2, 4, 6, 6, 6, 8, 8, 8, 8, 10 }, /* PORTF */ | |
157 | #ifdef BF561_FAMILY | 118 | { 0, 0, 0, 2, 4, 6, 6, 6, 8, 10, 10, 12, 14, 14, 14, 14 }, /* PORTG */ |
158 | static struct gpio_port_t *gpio_bankb[] = { | 119 | { 0, 0, 0, 0, 2, 2, 4, 6, 10, 10, 10, 10, 10, 10, 10, 10 }, /* PORTH */ |
159 | (struct gpio_port_t *) FIO0_FLAG_D, | 120 | # endif |
160 | (struct gpio_port_t *) FIO1_FLAG_D, | ||
161 | (struct gpio_port_t *) FIO2_FLAG_D, | ||
162 | }; | 121 | }; |
163 | #endif | 122 | # endif |
164 | 123 | ||
165 | #ifdef BF548_FAMILY | ||
166 | static struct gpio_port_t *gpio_array[] = { | ||
167 | (struct gpio_port_t *)PORTA_FER, | ||
168 | (struct gpio_port_t *)PORTB_FER, | ||
169 | (struct gpio_port_t *)PORTC_FER, | ||
170 | (struct gpio_port_t *)PORTD_FER, | ||
171 | (struct gpio_port_t *)PORTE_FER, | ||
172 | (struct gpio_port_t *)PORTF_FER, | ||
173 | (struct gpio_port_t *)PORTG_FER, | ||
174 | (struct gpio_port_t *)PORTH_FER, | ||
175 | (struct gpio_port_t *)PORTI_FER, | ||
176 | (struct gpio_port_t *)PORTJ_FER, | ||
177 | }; | ||
178 | #endif | 124 | #endif |
179 | 125 | ||
180 | static unsigned short reserved_gpio_map[GPIO_BANK_NUM]; | 126 | static unsigned short reserved_gpio_map[GPIO_BANK_NUM]; |
@@ -188,35 +134,9 @@ static struct str_ident { | |||
188 | } str_ident[MAX_RESOURCES]; | 134 | } str_ident[MAX_RESOURCES]; |
189 | 135 | ||
190 | #if defined(CONFIG_PM) | 136 | #if defined(CONFIG_PM) |
191 | #if defined(CONFIG_BF54x) | ||
192 | static struct gpio_port_s gpio_bank_saved[GPIO_BANK_NUM]; | ||
193 | #else | ||
194 | static unsigned short wakeup_map[GPIO_BANK_NUM]; | ||
195 | static unsigned char wakeup_flags_map[MAX_BLACKFIN_GPIOS]; | ||
196 | static struct gpio_port_s gpio_bank_saved[GPIO_BANK_NUM]; | 137 | static struct gpio_port_s gpio_bank_saved[GPIO_BANK_NUM]; |
197 | |||
198 | #ifdef BF533_FAMILY | ||
199 | static unsigned int sic_iwr_irqs[] = {IRQ_PROG_INTB}; | ||
200 | #endif | ||
201 | |||
202 | #ifdef BF537_FAMILY | ||
203 | static unsigned int sic_iwr_irqs[] = {IRQ_PROG_INTB, IRQ_PORTG_INTB, IRQ_MAC_TX}; | ||
204 | #endif | ||
205 | |||
206 | #ifdef BF538_FAMILY | ||
207 | static unsigned int sic_iwr_irqs[] = {IRQ_PORTF_INTB}; | ||
208 | #endif | 138 | #endif |
209 | 139 | ||
210 | #if defined(BF527_FAMILY) || defined(BF518_FAMILY) | ||
211 | static unsigned int sic_iwr_irqs[] = {IRQ_PORTF_INTB, IRQ_PORTG_INTB, IRQ_PORTH_INTB}; | ||
212 | #endif | ||
213 | |||
214 | #ifdef BF561_FAMILY | ||
215 | static unsigned int sic_iwr_irqs[] = {IRQ_PROG0_INTB, IRQ_PROG1_INTB, IRQ_PROG2_INTB}; | ||
216 | #endif | ||
217 | #endif | ||
218 | #endif /* CONFIG_PM */ | ||
219 | |||
220 | inline int check_gpio(unsigned gpio) | 140 | inline int check_gpio(unsigned gpio) |
221 | { | 141 | { |
222 | #if defined(BF548_FAMILY) | 142 | #if defined(BF548_FAMILY) |
@@ -330,9 +250,10 @@ static struct { | |||
330 | {.res = P_SPI0_SSEL3, .offset = 0}, | 250 | {.res = P_SPI0_SSEL3, .offset = 0}, |
331 | }; | 251 | }; |
332 | 252 | ||
333 | static void portmux_setup(unsigned short per, unsigned short function) | 253 | static void portmux_setup(unsigned short per) |
334 | { | 254 | { |
335 | u16 y, offset, muxreg; | 255 | u16 y, offset, muxreg; |
256 | u16 function = P_FUNCT2MUX(per); | ||
336 | 257 | ||
337 | for (y = 0; y < ARRAY_SIZE(port_mux_lut); y++) { | 258 | for (y = 0; y < ARRAY_SIZE(port_mux_lut); y++) { |
338 | if (port_mux_lut[y].res == per) { | 259 | if (port_mux_lut[y].res == per) { |
@@ -353,30 +274,33 @@ static void portmux_setup(unsigned short per, unsigned short function) | |||
353 | } | 274 | } |
354 | } | 275 | } |
355 | #elif defined(BF548_FAMILY) | 276 | #elif defined(BF548_FAMILY) |
356 | inline void portmux_setup(unsigned short portno, unsigned short function) | 277 | inline void portmux_setup(unsigned short per) |
357 | { | 278 | { |
358 | u32 pmux; | 279 | u32 pmux; |
280 | u16 ident = P_IDENT(per); | ||
281 | u16 function = P_FUNCT2MUX(per); | ||
359 | 282 | ||
360 | pmux = gpio_array[gpio_bank(portno)]->port_mux; | 283 | pmux = gpio_array[gpio_bank(ident)]->port_mux; |
361 | 284 | ||
362 | pmux &= ~(0x3 << (2 * gpio_sub_n(portno))); | 285 | pmux &= ~(0x3 << (2 * gpio_sub_n(ident))); |
363 | pmux |= (function & 0x3) << (2 * gpio_sub_n(portno)); | 286 | pmux |= (function & 0x3) << (2 * gpio_sub_n(ident)); |
364 | 287 | ||
365 | gpio_array[gpio_bank(portno)]->port_mux = pmux; | 288 | gpio_array[gpio_bank(ident)]->port_mux = pmux; |
366 | } | 289 | } |
367 | 290 | ||
368 | inline u16 get_portmux(unsigned short portno) | 291 | inline u16 get_portmux(unsigned short per) |
369 | { | 292 | { |
370 | u32 pmux; | 293 | u32 pmux; |
294 | u16 ident = P_IDENT(per); | ||
371 | 295 | ||
372 | pmux = gpio_array[gpio_bank(portno)]->port_mux; | 296 | pmux = gpio_array[gpio_bank(ident)]->port_mux; |
373 | 297 | ||
374 | return (pmux >> (2 * gpio_sub_n(portno)) & 0x3); | 298 | return (pmux >> (2 * gpio_sub_n(ident)) & 0x3); |
375 | } | 299 | } |
376 | #elif defined(BF527_FAMILY) || defined(BF518_FAMILY) | 300 | #elif defined(BF527_FAMILY) || defined(BF518_FAMILY) |
377 | inline void portmux_setup(unsigned short portno, unsigned short function) | 301 | inline void portmux_setup(unsigned short per) |
378 | { | 302 | { |
379 | u16 pmux, ident = P_IDENT(portno); | 303 | u16 pmux, ident = P_IDENT(per), function = P_FUNCT2MUX(per); |
380 | u8 offset = pmux_offset[gpio_bank(ident)][gpio_sub_n(ident)]; | 304 | u8 offset = pmux_offset[gpio_bank(ident)][gpio_sub_n(ident)]; |
381 | 305 | ||
382 | pmux = *port_mux[gpio_bank(ident)]; | 306 | pmux = *port_mux[gpio_bank(ident)]; |
@@ -424,90 +348,71 @@ void set_gpio_ ## name(unsigned gpio, unsigned short arg) \ | |||
424 | unsigned long flags; \ | 348 | unsigned long flags; \ |
425 | local_irq_save_hw(flags); \ | 349 | local_irq_save_hw(flags); \ |
426 | if (arg) \ | 350 | if (arg) \ |
427 | gpio_bankb[gpio_bank(gpio)]->name |= gpio_bit(gpio); \ | 351 | gpio_array[gpio_bank(gpio)]->name |= gpio_bit(gpio); \ |
428 | else \ | 352 | else \ |
429 | gpio_bankb[gpio_bank(gpio)]->name &= ~gpio_bit(gpio); \ | 353 | gpio_array[gpio_bank(gpio)]->name &= ~gpio_bit(gpio); \ |
430 | AWA_DUMMY_READ(name); \ | 354 | AWA_DUMMY_READ(name); \ |
431 | local_irq_restore_hw(flags); \ | 355 | local_irq_restore_hw(flags); \ |
432 | } \ | 356 | } \ |
433 | EXPORT_SYMBOL(set_gpio_ ## name); | 357 | EXPORT_SYMBOL(set_gpio_ ## name); |
434 | 358 | ||
435 | SET_GPIO(dir) | 359 | SET_GPIO(dir) /* set_gpio_dir() */ |
436 | SET_GPIO(inen) | 360 | SET_GPIO(inen) /* set_gpio_inen() */ |
437 | SET_GPIO(polar) | 361 | SET_GPIO(polar) /* set_gpio_polar() */ |
438 | SET_GPIO(edge) | 362 | SET_GPIO(edge) /* set_gpio_edge() */ |
439 | SET_GPIO(both) | 363 | SET_GPIO(both) /* set_gpio_both() */ |
440 | 364 | ||
441 | 365 | ||
442 | #if ANOMALY_05000311 || ANOMALY_05000323 | ||
443 | #define SET_GPIO_SC(name) \ | 366 | #define SET_GPIO_SC(name) \ |
444 | void set_gpio_ ## name(unsigned gpio, unsigned short arg) \ | 367 | void set_gpio_ ## name(unsigned gpio, unsigned short arg) \ |
445 | { \ | 368 | { \ |
446 | unsigned long flags; \ | 369 | unsigned long flags; \ |
447 | local_irq_save_hw(flags); \ | 370 | if (ANOMALY_05000311 || ANOMALY_05000323) \ |
448 | if (arg) \ | 371 | local_irq_save_hw(flags); \ |
449 | gpio_bankb[gpio_bank(gpio)]->name ## _set = gpio_bit(gpio); \ | ||
450 | else \ | ||
451 | gpio_bankb[gpio_bank(gpio)]->name ## _clear = gpio_bit(gpio); \ | ||
452 | AWA_DUMMY_READ(name); \ | ||
453 | local_irq_restore_hw(flags); \ | ||
454 | } \ | ||
455 | EXPORT_SYMBOL(set_gpio_ ## name); | ||
456 | #else | ||
457 | #define SET_GPIO_SC(name) \ | ||
458 | void set_gpio_ ## name(unsigned gpio, unsigned short arg) \ | ||
459 | { \ | ||
460 | if (arg) \ | 372 | if (arg) \ |
461 | gpio_bankb[gpio_bank(gpio)]->name ## _set = gpio_bit(gpio); \ | 373 | gpio_array[gpio_bank(gpio)]->name ## _set = gpio_bit(gpio); \ |
462 | else \ | 374 | else \ |
463 | gpio_bankb[gpio_bank(gpio)]->name ## _clear = gpio_bit(gpio); \ | 375 | gpio_array[gpio_bank(gpio)]->name ## _clear = gpio_bit(gpio); \ |
376 | if (ANOMALY_05000311 || ANOMALY_05000323) { \ | ||
377 | AWA_DUMMY_READ(name); \ | ||
378 | local_irq_restore_hw(flags); \ | ||
379 | } \ | ||
464 | } \ | 380 | } \ |
465 | EXPORT_SYMBOL(set_gpio_ ## name); | 381 | EXPORT_SYMBOL(set_gpio_ ## name); |
466 | #endif | ||
467 | 382 | ||
468 | SET_GPIO_SC(maska) | 383 | SET_GPIO_SC(maska) |
469 | SET_GPIO_SC(maskb) | 384 | SET_GPIO_SC(maskb) |
470 | SET_GPIO_SC(data) | 385 | SET_GPIO_SC(data) |
471 | 386 | ||
472 | #if ANOMALY_05000311 || ANOMALY_05000323 | ||
473 | void set_gpio_toggle(unsigned gpio) | 387 | void set_gpio_toggle(unsigned gpio) |
474 | { | 388 | { |
475 | unsigned long flags; | 389 | unsigned long flags; |
476 | local_irq_save_hw(flags); | 390 | if (ANOMALY_05000311 || ANOMALY_05000323) |
477 | gpio_bankb[gpio_bank(gpio)]->toggle = gpio_bit(gpio); | 391 | local_irq_save_hw(flags); |
478 | AWA_DUMMY_READ(toggle); | 392 | gpio_array[gpio_bank(gpio)]->toggle = gpio_bit(gpio); |
479 | local_irq_restore_hw(flags); | 393 | if (ANOMALY_05000311 || ANOMALY_05000323) { |
480 | } | 394 | AWA_DUMMY_READ(toggle); |
481 | #else | 395 | local_irq_restore_hw(flags); |
482 | void set_gpio_toggle(unsigned gpio) | 396 | } |
483 | { | ||
484 | gpio_bankb[gpio_bank(gpio)]->toggle = gpio_bit(gpio); | ||
485 | } | 397 | } |
486 | #endif | ||
487 | EXPORT_SYMBOL(set_gpio_toggle); | 398 | EXPORT_SYMBOL(set_gpio_toggle); |
488 | 399 | ||
489 | 400 | ||
490 | /*Set current PORT date (16-bit word)*/ | 401 | /*Set current PORT date (16-bit word)*/ |
491 | 402 | ||
492 | #if ANOMALY_05000311 || ANOMALY_05000323 | ||
493 | #define SET_GPIO_P(name) \ | 403 | #define SET_GPIO_P(name) \ |
494 | void set_gpiop_ ## name(unsigned gpio, unsigned short arg) \ | 404 | void set_gpiop_ ## name(unsigned gpio, unsigned short arg) \ |
495 | { \ | 405 | { \ |
496 | unsigned long flags; \ | 406 | unsigned long flags; \ |
497 | local_irq_save_hw(flags); \ | 407 | if (ANOMALY_05000311 || ANOMALY_05000323) \ |
498 | gpio_bankb[gpio_bank(gpio)]->name = arg; \ | 408 | local_irq_save_hw(flags); \ |
499 | AWA_DUMMY_READ(name); \ | 409 | gpio_array[gpio_bank(gpio)]->name = arg; \ |
500 | local_irq_restore_hw(flags); \ | 410 | if (ANOMALY_05000311 || ANOMALY_05000323) { \ |
411 | AWA_DUMMY_READ(name); \ | ||
412 | local_irq_restore_hw(flags); \ | ||
413 | } \ | ||
501 | } \ | 414 | } \ |
502 | EXPORT_SYMBOL(set_gpiop_ ## name); | 415 | EXPORT_SYMBOL(set_gpiop_ ## name); |
503 | #else | ||
504 | #define SET_GPIO_P(name) \ | ||
505 | void set_gpiop_ ## name(unsigned gpio, unsigned short arg) \ | ||
506 | { \ | ||
507 | gpio_bankb[gpio_bank(gpio)]->name = arg; \ | ||
508 | } \ | ||
509 | EXPORT_SYMBOL(set_gpiop_ ## name); | ||
510 | #endif | ||
511 | 416 | ||
512 | SET_GPIO_P(data) | 417 | SET_GPIO_P(data) |
513 | SET_GPIO_P(dir) | 418 | SET_GPIO_P(dir) |
@@ -519,27 +424,21 @@ SET_GPIO_P(maska) | |||
519 | SET_GPIO_P(maskb) | 424 | SET_GPIO_P(maskb) |
520 | 425 | ||
521 | /* Get a specific bit */ | 426 | /* Get a specific bit */ |
522 | #if ANOMALY_05000311 || ANOMALY_05000323 | ||
523 | #define GET_GPIO(name) \ | 427 | #define GET_GPIO(name) \ |
524 | unsigned short get_gpio_ ## name(unsigned gpio) \ | 428 | unsigned short get_gpio_ ## name(unsigned gpio) \ |
525 | { \ | 429 | { \ |
526 | unsigned long flags; \ | 430 | unsigned long flags; \ |
527 | unsigned short ret; \ | 431 | unsigned short ret; \ |
528 | local_irq_save_hw(flags); \ | 432 | if (ANOMALY_05000311 || ANOMALY_05000323) \ |
529 | ret = 0x01 & (gpio_bankb[gpio_bank(gpio)]->name >> gpio_sub_n(gpio)); \ | 433 | local_irq_save_hw(flags); \ |
530 | AWA_DUMMY_READ(name); \ | 434 | ret = 0x01 & (gpio_array[gpio_bank(gpio)]->name >> gpio_sub_n(gpio)); \ |
531 | local_irq_restore_hw(flags); \ | 435 | if (ANOMALY_05000311 || ANOMALY_05000323) { \ |
436 | AWA_DUMMY_READ(name); \ | ||
437 | local_irq_restore_hw(flags); \ | ||
438 | } \ | ||
532 | return ret; \ | 439 | return ret; \ |
533 | } \ | 440 | } \ |
534 | EXPORT_SYMBOL(get_gpio_ ## name); | 441 | EXPORT_SYMBOL(get_gpio_ ## name); |
535 | #else | ||
536 | #define GET_GPIO(name) \ | ||
537 | unsigned short get_gpio_ ## name(unsigned gpio) \ | ||
538 | { \ | ||
539 | return (0x01 & (gpio_bankb[gpio_bank(gpio)]->name >> gpio_sub_n(gpio))); \ | ||
540 | } \ | ||
541 | EXPORT_SYMBOL(get_gpio_ ## name); | ||
542 | #endif | ||
543 | 442 | ||
544 | GET_GPIO(data) | 443 | GET_GPIO(data) |
545 | GET_GPIO(dir) | 444 | GET_GPIO(dir) |
@@ -552,27 +451,21 @@ GET_GPIO(maskb) | |||
552 | 451 | ||
553 | /*Get current PORT date (16-bit word)*/ | 452 | /*Get current PORT date (16-bit word)*/ |
554 | 453 | ||
555 | #if ANOMALY_05000311 || ANOMALY_05000323 | ||
556 | #define GET_GPIO_P(name) \ | 454 | #define GET_GPIO_P(name) \ |
557 | unsigned short get_gpiop_ ## name(unsigned gpio) \ | 455 | unsigned short get_gpiop_ ## name(unsigned gpio) \ |
558 | { \ | 456 | { \ |
559 | unsigned long flags; \ | 457 | unsigned long flags; \ |
560 | unsigned short ret; \ | 458 | unsigned short ret; \ |
561 | local_irq_save_hw(flags); \ | 459 | if (ANOMALY_05000311 || ANOMALY_05000323) \ |
562 | ret = (gpio_bankb[gpio_bank(gpio)]->name); \ | 460 | local_irq_save_hw(flags); \ |
563 | AWA_DUMMY_READ(name); \ | 461 | ret = (gpio_array[gpio_bank(gpio)]->name); \ |
564 | local_irq_restore_hw(flags); \ | 462 | if (ANOMALY_05000311 || ANOMALY_05000323) { \ |
463 | AWA_DUMMY_READ(name); \ | ||
464 | local_irq_restore_hw(flags); \ | ||
465 | } \ | ||
565 | return ret; \ | 466 | return ret; \ |
566 | } \ | 467 | } \ |
567 | EXPORT_SYMBOL(get_gpiop_ ## name); | 468 | EXPORT_SYMBOL(get_gpiop_ ## name); |
568 | #else | ||
569 | #define GET_GPIO_P(name) \ | ||
570 | unsigned short get_gpiop_ ## name(unsigned gpio) \ | ||
571 | { \ | ||
572 | return (gpio_bankb[gpio_bank(gpio)]->name);\ | ||
573 | } \ | ||
574 | EXPORT_SYMBOL(get_gpiop_ ## name); | ||
575 | #endif | ||
576 | 469 | ||
577 | GET_GPIO_P(data) | 470 | GET_GPIO_P(data) |
578 | GET_GPIO_P(dir) | 471 | GET_GPIO_P(dir) |
@@ -585,6 +478,26 @@ GET_GPIO_P(maskb) | |||
585 | 478 | ||
586 | 479 | ||
587 | #ifdef CONFIG_PM | 480 | #ifdef CONFIG_PM |
481 | |||
482 | static unsigned short wakeup_map[GPIO_BANK_NUM]; | ||
483 | static unsigned char wakeup_flags_map[MAX_BLACKFIN_GPIOS]; | ||
484 | |||
485 | static const unsigned int sic_iwr_irqs[] = { | ||
486 | #if defined(BF533_FAMILY) | ||
487 | IRQ_PROG_INTB | ||
488 | #elif defined(BF537_FAMILY) | ||
489 | IRQ_PROG_INTB, IRQ_PORTG_INTB, IRQ_MAC_TX | ||
490 | #elif defined(BF538_FAMILY) | ||
491 | IRQ_PORTF_INTB | ||
492 | #elif defined(BF527_FAMILY) || defined(BF518_FAMILY) | ||
493 | IRQ_PORTF_INTB, IRQ_PORTG_INTB, IRQ_PORTH_INTB | ||
494 | #elif defined(BF561_FAMILY) | ||
495 | IRQ_PROG0_INTB, IRQ_PROG1_INTB, IRQ_PROG2_INTB | ||
496 | #else | ||
497 | # error no SIC_IWR defined | ||
498 | #endif | ||
499 | }; | ||
500 | |||
588 | /*********************************************************** | 501 | /*********************************************************** |
589 | * | 502 | * |
590 | * FUNCTIONS: Blackfin PM Setup API | 503 | * FUNCTIONS: Blackfin PM Setup API |
@@ -669,18 +582,18 @@ u32 bfin_pm_standby_setup(void) | |||
669 | mask = wakeup_map[gpio_bank(i)]; | 582 | mask = wakeup_map[gpio_bank(i)]; |
670 | bank = gpio_bank(i); | 583 | bank = gpio_bank(i); |
671 | 584 | ||
672 | gpio_bank_saved[bank].maskb = gpio_bankb[bank]->maskb; | 585 | gpio_bank_saved[bank].maskb = gpio_array[bank]->maskb; |
673 | gpio_bankb[bank]->maskb = 0; | 586 | gpio_array[bank]->maskb = 0; |
674 | 587 | ||
675 | if (mask) { | 588 | if (mask) { |
676 | #if defined(BF527_FAMILY) || defined(BF537_FAMILY) || defined(BF518_FAMILY) | 589 | #if defined(BF527_FAMILY) || defined(BF537_FAMILY) || defined(BF518_FAMILY) |
677 | gpio_bank_saved[bank].fer = *port_fer[bank]; | 590 | gpio_bank_saved[bank].fer = *port_fer[bank]; |
678 | #endif | 591 | #endif |
679 | gpio_bank_saved[bank].inen = gpio_bankb[bank]->inen; | 592 | gpio_bank_saved[bank].inen = gpio_array[bank]->inen; |
680 | gpio_bank_saved[bank].polar = gpio_bankb[bank]->polar; | 593 | gpio_bank_saved[bank].polar = gpio_array[bank]->polar; |
681 | gpio_bank_saved[bank].dir = gpio_bankb[bank]->dir; | 594 | gpio_bank_saved[bank].dir = gpio_array[bank]->dir; |
682 | gpio_bank_saved[bank].edge = gpio_bankb[bank]->edge; | 595 | gpio_bank_saved[bank].edge = gpio_array[bank]->edge; |
683 | gpio_bank_saved[bank].both = gpio_bankb[bank]->both; | 596 | gpio_bank_saved[bank].both = gpio_array[bank]->both; |
684 | gpio_bank_saved[bank].reserved = | 597 | gpio_bank_saved[bank].reserved = |
685 | reserved_gpio_map[bank]; | 598 | reserved_gpio_map[bank]; |
686 | 599 | ||
@@ -700,7 +613,7 @@ u32 bfin_pm_standby_setup(void) | |||
700 | } | 613 | } |
701 | 614 | ||
702 | bfin_internal_set_wake(sic_iwr_irqs[bank], 1); | 615 | bfin_internal_set_wake(sic_iwr_irqs[bank], 1); |
703 | gpio_bankb[bank]->maskb_set = wakeup_map[gpio_bank(i)]; | 616 | gpio_array[bank]->maskb_set = wakeup_map[gpio_bank(i)]; |
704 | } | 617 | } |
705 | } | 618 | } |
706 | 619 | ||
@@ -721,18 +634,18 @@ void bfin_pm_standby_restore(void) | |||
721 | #if defined(BF527_FAMILY) || defined(BF537_FAMILY) || defined(BF518_FAMILY) | 634 | #if defined(BF527_FAMILY) || defined(BF537_FAMILY) || defined(BF518_FAMILY) |
722 | *port_fer[bank] = gpio_bank_saved[bank].fer; | 635 | *port_fer[bank] = gpio_bank_saved[bank].fer; |
723 | #endif | 636 | #endif |
724 | gpio_bankb[bank]->inen = gpio_bank_saved[bank].inen; | 637 | gpio_array[bank]->inen = gpio_bank_saved[bank].inen; |
725 | gpio_bankb[bank]->dir = gpio_bank_saved[bank].dir; | 638 | gpio_array[bank]->dir = gpio_bank_saved[bank].dir; |
726 | gpio_bankb[bank]->polar = gpio_bank_saved[bank].polar; | 639 | gpio_array[bank]->polar = gpio_bank_saved[bank].polar; |
727 | gpio_bankb[bank]->edge = gpio_bank_saved[bank].edge; | 640 | gpio_array[bank]->edge = gpio_bank_saved[bank].edge; |
728 | gpio_bankb[bank]->both = gpio_bank_saved[bank].both; | 641 | gpio_array[bank]->both = gpio_bank_saved[bank].both; |
729 | 642 | ||
730 | reserved_gpio_map[bank] = | 643 | reserved_gpio_map[bank] = |
731 | gpio_bank_saved[bank].reserved; | 644 | gpio_bank_saved[bank].reserved; |
732 | bfin_internal_set_wake(sic_iwr_irqs[bank], 0); | 645 | bfin_internal_set_wake(sic_iwr_irqs[bank], 0); |
733 | } | 646 | } |
734 | 647 | ||
735 | gpio_bankb[bank]->maskb = gpio_bank_saved[bank].maskb; | 648 | gpio_array[bank]->maskb = gpio_bank_saved[bank].maskb; |
736 | } | 649 | } |
737 | AWA_DUMMY_READ(maskb); | 650 | AWA_DUMMY_READ(maskb); |
738 | } | 651 | } |
@@ -745,21 +658,21 @@ void bfin_gpio_pm_hibernate_suspend(void) | |||
745 | bank = gpio_bank(i); | 658 | bank = gpio_bank(i); |
746 | 659 | ||
747 | #if defined(BF527_FAMILY) || defined(BF537_FAMILY) || defined(BF518_FAMILY) | 660 | #if defined(BF527_FAMILY) || defined(BF537_FAMILY) || defined(BF518_FAMILY) |
748 | gpio_bank_saved[bank].fer = *port_fer[bank]; | 661 | gpio_bank_saved[bank].fer = *port_fer[bank]; |
749 | #if defined(BF527_FAMILY) || defined(BF518_FAMILY) | 662 | #if defined(BF527_FAMILY) || defined(BF518_FAMILY) |
750 | gpio_bank_saved[bank].mux = *port_mux[bank]; | 663 | gpio_bank_saved[bank].mux = *port_mux[bank]; |
751 | #else | 664 | #else |
752 | if (bank == 0) | 665 | if (bank == 0) |
753 | gpio_bank_saved[bank].mux = bfin_read_PORT_MUX(); | 666 | gpio_bank_saved[bank].mux = bfin_read_PORT_MUX(); |
754 | #endif | 667 | #endif |
755 | #endif | 668 | #endif |
756 | gpio_bank_saved[bank].data = gpio_bankb[bank]->data; | 669 | gpio_bank_saved[bank].data = gpio_array[bank]->data; |
757 | gpio_bank_saved[bank].inen = gpio_bankb[bank]->inen; | 670 | gpio_bank_saved[bank].inen = gpio_array[bank]->inen; |
758 | gpio_bank_saved[bank].polar = gpio_bankb[bank]->polar; | 671 | gpio_bank_saved[bank].polar = gpio_array[bank]->polar; |
759 | gpio_bank_saved[bank].dir = gpio_bankb[bank]->dir; | 672 | gpio_bank_saved[bank].dir = gpio_array[bank]->dir; |
760 | gpio_bank_saved[bank].edge = gpio_bankb[bank]->edge; | 673 | gpio_bank_saved[bank].edge = gpio_array[bank]->edge; |
761 | gpio_bank_saved[bank].both = gpio_bankb[bank]->both; | 674 | gpio_bank_saved[bank].both = gpio_array[bank]->both; |
762 | gpio_bank_saved[bank].maska = gpio_bankb[bank]->maska; | 675 | gpio_bank_saved[bank].maska = gpio_array[bank]->maska; |
763 | } | 676 | } |
764 | 677 | ||
765 | AWA_DUMMY_READ(maska); | 678 | AWA_DUMMY_READ(maska); |
@@ -770,27 +683,27 @@ void bfin_gpio_pm_hibernate_restore(void) | |||
770 | int i, bank; | 683 | int i, bank; |
771 | 684 | ||
772 | for (i = 0; i < MAX_BLACKFIN_GPIOS; i += GPIO_BANKSIZE) { | 685 | for (i = 0; i < MAX_BLACKFIN_GPIOS; i += GPIO_BANKSIZE) { |
773 | bank = gpio_bank(i); | 686 | bank = gpio_bank(i); |
774 | 687 | ||
775 | #if defined(BF527_FAMILY) || defined(BF537_FAMILY) || defined(BF518_FAMILY) | 688 | #if defined(BF527_FAMILY) || defined(BF537_FAMILY) || defined(BF518_FAMILY) |
776 | #if defined(BF527_FAMILY) || defined(BF518_FAMILY) | 689 | #if defined(BF527_FAMILY) || defined(BF518_FAMILY) |
777 | *port_mux[bank] = gpio_bank_saved[bank].mux; | 690 | *port_mux[bank] = gpio_bank_saved[bank].mux; |
778 | #else | 691 | #else |
779 | if (bank == 0) | 692 | if (bank == 0) |
780 | bfin_write_PORT_MUX(gpio_bank_saved[bank].mux); | 693 | bfin_write_PORT_MUX(gpio_bank_saved[bank].mux); |
781 | #endif | 694 | #endif |
782 | *port_fer[bank] = gpio_bank_saved[bank].fer; | 695 | *port_fer[bank] = gpio_bank_saved[bank].fer; |
783 | #endif | 696 | #endif |
784 | gpio_bankb[bank]->inen = gpio_bank_saved[bank].inen; | 697 | gpio_array[bank]->inen = gpio_bank_saved[bank].inen; |
785 | gpio_bankb[bank]->dir = gpio_bank_saved[bank].dir; | 698 | gpio_array[bank]->dir = gpio_bank_saved[bank].dir; |
786 | gpio_bankb[bank]->polar = gpio_bank_saved[bank].polar; | 699 | gpio_array[bank]->polar = gpio_bank_saved[bank].polar; |
787 | gpio_bankb[bank]->edge = gpio_bank_saved[bank].edge; | 700 | gpio_array[bank]->edge = gpio_bank_saved[bank].edge; |
788 | gpio_bankb[bank]->both = gpio_bank_saved[bank].both; | 701 | gpio_array[bank]->both = gpio_bank_saved[bank].both; |
789 | 702 | ||
790 | gpio_bankb[bank]->data_set = gpio_bank_saved[bank].data | 703 | gpio_array[bank]->data_set = gpio_bank_saved[bank].data |
791 | | gpio_bank_saved[bank].dir; | 704 | | gpio_bank_saved[bank].dir; |
792 | 705 | ||
793 | gpio_bankb[bank]->maska = gpio_bank_saved[bank].maska; | 706 | gpio_array[bank]->maska = gpio_bank_saved[bank].maska; |
794 | } | 707 | } |
795 | AWA_DUMMY_READ(maska); | 708 | AWA_DUMMY_READ(maska); |
796 | } | 709 | } |
@@ -817,12 +730,12 @@ void bfin_gpio_pm_hibernate_suspend(void) | |||
817 | for (i = 0; i < MAX_BLACKFIN_GPIOS; i += GPIO_BANKSIZE) { | 730 | for (i = 0; i < MAX_BLACKFIN_GPIOS; i += GPIO_BANKSIZE) { |
818 | bank = gpio_bank(i); | 731 | bank = gpio_bank(i); |
819 | 732 | ||
820 | gpio_bank_saved[bank].fer = gpio_array[bank]->port_fer; | 733 | gpio_bank_saved[bank].fer = gpio_array[bank]->port_fer; |
821 | gpio_bank_saved[bank].mux = gpio_array[bank]->port_mux; | 734 | gpio_bank_saved[bank].mux = gpio_array[bank]->port_mux; |
822 | gpio_bank_saved[bank].data = gpio_array[bank]->port_data; | 735 | gpio_bank_saved[bank].data = gpio_array[bank]->data; |
823 | gpio_bank_saved[bank].data = gpio_array[bank]->port_data; | 736 | gpio_bank_saved[bank].data = gpio_array[bank]->data; |
824 | gpio_bank_saved[bank].inen = gpio_array[bank]->port_inen; | 737 | gpio_bank_saved[bank].inen = gpio_array[bank]->inen; |
825 | gpio_bank_saved[bank].dir = gpio_array[bank]->port_dir_set; | 738 | gpio_bank_saved[bank].dir = gpio_array[bank]->dir_set; |
826 | } | 739 | } |
827 | } | 740 | } |
828 | 741 | ||
@@ -831,21 +744,21 @@ void bfin_gpio_pm_hibernate_restore(void) | |||
831 | int i, bank; | 744 | int i, bank; |
832 | 745 | ||
833 | for (i = 0; i < MAX_BLACKFIN_GPIOS; i += GPIO_BANKSIZE) { | 746 | for (i = 0; i < MAX_BLACKFIN_GPIOS; i += GPIO_BANKSIZE) { |
834 | bank = gpio_bank(i); | 747 | bank = gpio_bank(i); |
835 | 748 | ||
836 | gpio_array[bank]->port_mux = gpio_bank_saved[bank].mux; | 749 | gpio_array[bank]->port_mux = gpio_bank_saved[bank].mux; |
837 | gpio_array[bank]->port_fer = gpio_bank_saved[bank].fer; | 750 | gpio_array[bank]->port_fer = gpio_bank_saved[bank].fer; |
838 | gpio_array[bank]->port_inen = gpio_bank_saved[bank].inen; | 751 | gpio_array[bank]->inen = gpio_bank_saved[bank].inen; |
839 | gpio_array[bank]->port_dir_set = gpio_bank_saved[bank].dir; | 752 | gpio_array[bank]->dir_set = gpio_bank_saved[bank].dir; |
840 | gpio_array[bank]->port_set = gpio_bank_saved[bank].data | 753 | gpio_array[bank]->data_set = gpio_bank_saved[bank].data |
841 | | gpio_bank_saved[bank].dir; | 754 | | gpio_bank_saved[bank].dir; |
842 | } | 755 | } |
843 | } | 756 | } |
844 | #endif | 757 | #endif |
845 | 758 | ||
846 | unsigned short get_gpio_dir(unsigned gpio) | 759 | unsigned short get_gpio_dir(unsigned gpio) |
847 | { | 760 | { |
848 | return (0x01 & (gpio_array[gpio_bank(gpio)]->port_dir_clear >> gpio_sub_n(gpio))); | 761 | return (0x01 & (gpio_array[gpio_bank(gpio)]->dir_clear >> gpio_sub_n(gpio))); |
849 | } | 762 | } |
850 | EXPORT_SYMBOL(get_gpio_dir); | 763 | EXPORT_SYMBOL(get_gpio_dir); |
851 | 764 | ||
@@ -905,9 +818,7 @@ int peripheral_request(unsigned short per, const char *label) | |||
905 | */ | 818 | */ |
906 | 819 | ||
907 | #ifdef BF548_FAMILY | 820 | #ifdef BF548_FAMILY |
908 | u16 funct = get_portmux(ident); | 821 | if (!((per & P_MAYSHARE) && get_portmux(per) == P_FUNCT2MUX(per))) { |
909 | |||
910 | if (!((per & P_MAYSHARE) && (funct == P_FUNCT2MUX(per)))) { | ||
911 | #else | 822 | #else |
912 | if (!(per & P_MAYSHARE)) { | 823 | if (!(per & P_MAYSHARE)) { |
913 | #endif | 824 | #endif |
@@ -931,11 +842,7 @@ int peripheral_request(unsigned short per, const char *label) | |||
931 | anyway: | 842 | anyway: |
932 | reserved_peri_map[gpio_bank(ident)] |= gpio_bit(ident); | 843 | reserved_peri_map[gpio_bank(ident)] |= gpio_bit(ident); |
933 | 844 | ||
934 | #ifdef BF548_FAMILY | 845 | portmux_setup(per); |
935 | portmux_setup(ident, P_FUNCT2MUX(per)); | ||
936 | #else | ||
937 | portmux_setup(per, P_FUNCT2MUX(per)); | ||
938 | #endif | ||
939 | port_setup(ident, PERIPHERAL_USAGE); | 846 | port_setup(ident, PERIPHERAL_USAGE); |
940 | 847 | ||
941 | local_irq_restore_hw(flags); | 848 | local_irq_restore_hw(flags); |
@@ -977,9 +884,6 @@ void peripheral_free(unsigned short per) | |||
977 | if (!(per & P_DEFINED)) | 884 | if (!(per & P_DEFINED)) |
978 | return; | 885 | return; |
979 | 886 | ||
980 | if (check_gpio(ident) < 0) | ||
981 | return; | ||
982 | |||
983 | local_irq_save_hw(flags); | 887 | local_irq_save_hw(flags); |
984 | 888 | ||
985 | if (unlikely(!(reserved_peri_map[gpio_bank(ident)] & gpio_bit(ident)))) { | 889 | if (unlikely(!(reserved_peri_map[gpio_bank(ident)] & gpio_bit(ident)))) { |
@@ -1056,9 +960,15 @@ int bfin_gpio_request(unsigned gpio, const char *label) | |||
1056 | local_irq_restore_hw(flags); | 960 | local_irq_restore_hw(flags); |
1057 | return -EBUSY; | 961 | return -EBUSY; |
1058 | } | 962 | } |
1059 | if (unlikely(reserved_gpio_irq_map[gpio_bank(gpio)] & gpio_bit(gpio))) | 963 | if (unlikely(reserved_gpio_irq_map[gpio_bank(gpio)] & gpio_bit(gpio))) { |
1060 | printk(KERN_NOTICE "bfin-gpio: GPIO %d is already reserved as gpio-irq!" | 964 | printk(KERN_NOTICE "bfin-gpio: GPIO %d is already reserved as gpio-irq!" |
1061 | " (Documentation/blackfin/bfin-gpio-notes.txt)\n", gpio); | 965 | " (Documentation/blackfin/bfin-gpio-notes.txt)\n", gpio); |
966 | } | ||
967 | #ifndef BF548_FAMILY | ||
968 | else { /* Reset POLAR setting when acquiring a gpio for the first time */ | ||
969 | set_gpio_polar(gpio, 0); | ||
970 | } | ||
971 | #endif | ||
1062 | 972 | ||
1063 | reserved_gpio_map[gpio_bank(gpio)] |= gpio_bit(gpio); | 973 | reserved_gpio_map[gpio_bank(gpio)] |= gpio_bit(gpio); |
1064 | set_label(gpio, label); | 974 | set_label(gpio, label); |
@@ -1078,6 +988,8 @@ void bfin_gpio_free(unsigned gpio) | |||
1078 | if (check_gpio(gpio) < 0) | 988 | if (check_gpio(gpio) < 0) |
1079 | return; | 989 | return; |
1080 | 990 | ||
991 | might_sleep(); | ||
992 | |||
1081 | local_irq_save_hw(flags); | 993 | local_irq_save_hw(flags); |
1082 | 994 | ||
1083 | if (unlikely(!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio)))) { | 995 | if (unlikely(!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio)))) { |
@@ -1158,8 +1070,16 @@ void bfin_gpio_irq_free(unsigned gpio) | |||
1158 | local_irq_restore_hw(flags); | 1070 | local_irq_restore_hw(flags); |
1159 | } | 1071 | } |
1160 | 1072 | ||
1161 | 1073 | static inline void __bfin_gpio_direction_input(unsigned gpio) | |
1074 | { | ||
1162 | #ifdef BF548_FAMILY | 1075 | #ifdef BF548_FAMILY |
1076 | gpio_array[gpio_bank(gpio)]->dir_clear = gpio_bit(gpio); | ||
1077 | #else | ||
1078 | gpio_array[gpio_bank(gpio)]->dir &= ~gpio_bit(gpio); | ||
1079 | #endif | ||
1080 | gpio_array[gpio_bank(gpio)]->inen |= gpio_bit(gpio); | ||
1081 | } | ||
1082 | |||
1163 | int bfin_gpio_direction_input(unsigned gpio) | 1083 | int bfin_gpio_direction_input(unsigned gpio) |
1164 | { | 1084 | { |
1165 | unsigned long flags; | 1085 | unsigned long flags; |
@@ -1170,125 +1090,85 @@ int bfin_gpio_direction_input(unsigned gpio) | |||
1170 | } | 1090 | } |
1171 | 1091 | ||
1172 | local_irq_save_hw(flags); | 1092 | local_irq_save_hw(flags); |
1173 | gpio_array[gpio_bank(gpio)]->port_dir_clear = gpio_bit(gpio); | 1093 | __bfin_gpio_direction_input(gpio); |
1174 | gpio_array[gpio_bank(gpio)]->port_inen |= gpio_bit(gpio); | 1094 | AWA_DUMMY_READ(inen); |
1175 | local_irq_restore_hw(flags); | 1095 | local_irq_restore_hw(flags); |
1176 | 1096 | ||
1177 | return 0; | 1097 | return 0; |
1178 | } | 1098 | } |
1179 | EXPORT_SYMBOL(bfin_gpio_direction_input); | 1099 | EXPORT_SYMBOL(bfin_gpio_direction_input); |
1180 | 1100 | ||
1181 | int bfin_gpio_direction_output(unsigned gpio, int value) | 1101 | void bfin_gpio_irq_prepare(unsigned gpio) |
1182 | { | 1102 | { |
1103 | #ifdef BF548_FAMILY | ||
1183 | unsigned long flags; | 1104 | unsigned long flags; |
1105 | #endif | ||
1184 | 1106 | ||
1185 | if (!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio))) { | 1107 | port_setup(gpio, GPIO_USAGE); |
1186 | gpio_error(gpio); | ||
1187 | return -EINVAL; | ||
1188 | } | ||
1189 | 1108 | ||
1109 | #ifdef BF548_FAMILY | ||
1190 | local_irq_save_hw(flags); | 1110 | local_irq_save_hw(flags); |
1191 | gpio_array[gpio_bank(gpio)]->port_inen &= ~gpio_bit(gpio); | 1111 | __bfin_gpio_direction_input(gpio); |
1192 | gpio_set_value(gpio, value); | ||
1193 | gpio_array[gpio_bank(gpio)]->port_dir_set = gpio_bit(gpio); | ||
1194 | local_irq_restore_hw(flags); | 1112 | local_irq_restore_hw(flags); |
1195 | 1113 | #endif | |
1196 | return 0; | ||
1197 | } | 1114 | } |
1198 | EXPORT_SYMBOL(bfin_gpio_direction_output); | ||
1199 | 1115 | ||
1200 | void bfin_gpio_set_value(unsigned gpio, int arg) | 1116 | void bfin_gpio_set_value(unsigned gpio, int arg) |
1201 | { | 1117 | { |
1202 | if (arg) | 1118 | if (arg) |
1203 | gpio_array[gpio_bank(gpio)]->port_set = gpio_bit(gpio); | 1119 | gpio_array[gpio_bank(gpio)]->data_set = gpio_bit(gpio); |
1204 | else | 1120 | else |
1205 | gpio_array[gpio_bank(gpio)]->port_clear = gpio_bit(gpio); | 1121 | gpio_array[gpio_bank(gpio)]->data_clear = gpio_bit(gpio); |
1206 | } | 1122 | } |
1207 | EXPORT_SYMBOL(bfin_gpio_set_value); | 1123 | EXPORT_SYMBOL(bfin_gpio_set_value); |
1208 | 1124 | ||
1209 | int bfin_gpio_get_value(unsigned gpio) | 1125 | int bfin_gpio_direction_output(unsigned gpio, int value) |
1210 | { | ||
1211 | return (1 & (gpio_array[gpio_bank(gpio)]->port_data >> gpio_sub_n(gpio))); | ||
1212 | } | ||
1213 | EXPORT_SYMBOL(bfin_gpio_get_value); | ||
1214 | |||
1215 | void bfin_gpio_irq_prepare(unsigned gpio) | ||
1216 | { | 1126 | { |
1217 | unsigned long flags; | 1127 | unsigned long flags; |
1218 | 1128 | ||
1219 | port_setup(gpio, GPIO_USAGE); | 1129 | if (!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio))) { |
1130 | gpio_error(gpio); | ||
1131 | return -EINVAL; | ||
1132 | } | ||
1220 | 1133 | ||
1221 | local_irq_save_hw(flags); | 1134 | local_irq_save_hw(flags); |
1222 | gpio_array[gpio_bank(gpio)]->port_dir_clear = gpio_bit(gpio); | ||
1223 | gpio_array[gpio_bank(gpio)]->port_inen |= gpio_bit(gpio); | ||
1224 | local_irq_restore_hw(flags); | ||
1225 | } | ||
1226 | 1135 | ||
1136 | gpio_array[gpio_bank(gpio)]->inen &= ~gpio_bit(gpio); | ||
1137 | gpio_set_value(gpio, value); | ||
1138 | #ifdef BF548_FAMILY | ||
1139 | gpio_array[gpio_bank(gpio)]->dir_set = gpio_bit(gpio); | ||
1227 | #else | 1140 | #else |
1141 | gpio_array[gpio_bank(gpio)]->dir |= gpio_bit(gpio); | ||
1142 | #endif | ||
1143 | |||
1144 | AWA_DUMMY_READ(dir); | ||
1145 | local_irq_restore_hw(flags); | ||
1146 | |||
1147 | return 0; | ||
1148 | } | ||
1149 | EXPORT_SYMBOL(bfin_gpio_direction_output); | ||
1228 | 1150 | ||
1229 | int bfin_gpio_get_value(unsigned gpio) | 1151 | int bfin_gpio_get_value(unsigned gpio) |
1230 | { | 1152 | { |
1153 | #ifdef BF548_FAMILY | ||
1154 | return (1 & (gpio_array[gpio_bank(gpio)]->data >> gpio_sub_n(gpio))); | ||
1155 | #else | ||
1231 | unsigned long flags; | 1156 | unsigned long flags; |
1232 | int ret; | ||
1233 | 1157 | ||
1234 | if (unlikely(get_gpio_edge(gpio))) { | 1158 | if (unlikely(get_gpio_edge(gpio))) { |
1159 | int ret; | ||
1235 | local_irq_save_hw(flags); | 1160 | local_irq_save_hw(flags); |
1236 | set_gpio_edge(gpio, 0); | 1161 | set_gpio_edge(gpio, 0); |
1237 | ret = get_gpio_data(gpio); | 1162 | ret = get_gpio_data(gpio); |
1238 | set_gpio_edge(gpio, 1); | 1163 | set_gpio_edge(gpio, 1); |
1239 | local_irq_restore_hw(flags); | 1164 | local_irq_restore_hw(flags); |
1240 | |||
1241 | return ret; | 1165 | return ret; |
1242 | } else | 1166 | } else |
1243 | return get_gpio_data(gpio); | 1167 | return get_gpio_data(gpio); |
1168 | #endif | ||
1244 | } | 1169 | } |
1245 | EXPORT_SYMBOL(bfin_gpio_get_value); | 1170 | EXPORT_SYMBOL(bfin_gpio_get_value); |
1246 | 1171 | ||
1247 | |||
1248 | int bfin_gpio_direction_input(unsigned gpio) | ||
1249 | { | ||
1250 | unsigned long flags; | ||
1251 | |||
1252 | if (!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio))) { | ||
1253 | gpio_error(gpio); | ||
1254 | return -EINVAL; | ||
1255 | } | ||
1256 | |||
1257 | local_irq_save_hw(flags); | ||
1258 | gpio_bankb[gpio_bank(gpio)]->dir &= ~gpio_bit(gpio); | ||
1259 | gpio_bankb[gpio_bank(gpio)]->inen |= gpio_bit(gpio); | ||
1260 | AWA_DUMMY_READ(inen); | ||
1261 | local_irq_restore_hw(flags); | ||
1262 | |||
1263 | return 0; | ||
1264 | } | ||
1265 | EXPORT_SYMBOL(bfin_gpio_direction_input); | ||
1266 | |||
1267 | int bfin_gpio_direction_output(unsigned gpio, int value) | ||
1268 | { | ||
1269 | unsigned long flags; | ||
1270 | |||
1271 | if (!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio))) { | ||
1272 | gpio_error(gpio); | ||
1273 | return -EINVAL; | ||
1274 | } | ||
1275 | |||
1276 | local_irq_save_hw(flags); | ||
1277 | gpio_bankb[gpio_bank(gpio)]->inen &= ~gpio_bit(gpio); | ||
1278 | |||
1279 | if (value) | ||
1280 | gpio_bankb[gpio_bank(gpio)]->data_set = gpio_bit(gpio); | ||
1281 | else | ||
1282 | gpio_bankb[gpio_bank(gpio)]->data_clear = gpio_bit(gpio); | ||
1283 | |||
1284 | gpio_bankb[gpio_bank(gpio)]->dir |= gpio_bit(gpio); | ||
1285 | AWA_DUMMY_READ(dir); | ||
1286 | local_irq_restore_hw(flags); | ||
1287 | |||
1288 | return 0; | ||
1289 | } | ||
1290 | EXPORT_SYMBOL(bfin_gpio_direction_output); | ||
1291 | |||
1292 | /* If we are booting from SPI and our board lacks a strong enough pull up, | 1172 | /* If we are booting from SPI and our board lacks a strong enough pull up, |
1293 | * the core can reset and execute the bootrom faster than the resistor can | 1173 | * the core can reset and execute the bootrom faster than the resistor can |
1294 | * pull the signal logically high. To work around this (common) error in | 1174 | * pull the signal logically high. To work around this (common) error in |
@@ -1299,23 +1179,15 @@ EXPORT_SYMBOL(bfin_gpio_direction_output); | |||
1299 | * lives here as we need to force all the GPIO states w/out going through | 1179 | * lives here as we need to force all the GPIO states w/out going through |
1300 | * BUG() checks and such. | 1180 | * BUG() checks and such. |
1301 | */ | 1181 | */ |
1302 | void bfin_gpio_reset_spi0_ssel1(void) | 1182 | void bfin_reset_boot_spi_cs(unsigned short pin) |
1303 | { | 1183 | { |
1304 | u16 gpio = P_IDENT(P_SPI0_SSEL1); | 1184 | unsigned short gpio = P_IDENT(pin); |
1305 | |||
1306 | port_setup(gpio, GPIO_USAGE); | 1185 | port_setup(gpio, GPIO_USAGE); |
1307 | gpio_bankb[gpio_bank(gpio)]->data_set = gpio_bit(gpio); | 1186 | gpio_array[gpio_bank(gpio)]->data_set = gpio_bit(gpio); |
1308 | AWA_DUMMY_READ(data_set); | 1187 | AWA_DUMMY_READ(data_set); |
1309 | udelay(1); | 1188 | udelay(1); |
1310 | } | 1189 | } |
1311 | 1190 | ||
1312 | void bfin_gpio_irq_prepare(unsigned gpio) | ||
1313 | { | ||
1314 | port_setup(gpio, GPIO_USAGE); | ||
1315 | } | ||
1316 | |||
1317 | #endif /*BF548_FAMILY */ | ||
1318 | |||
1319 | #if defined(CONFIG_PROC_FS) | 1191 | #if defined(CONFIG_PROC_FS) |
1320 | static int gpio_proc_read(char *buf, char **start, off_t offset, | 1192 | static int gpio_proc_read(char *buf, char **start, off_t offset, |
1321 | int len, int *unused_i, void *unused_v) | 1193 | int len, int *unused_i, void *unused_v) |
@@ -1369,11 +1241,7 @@ int bfin_gpiolib_get_value(struct gpio_chip *chip, unsigned gpio) | |||
1369 | 1241 | ||
1370 | void bfin_gpiolib_set_value(struct gpio_chip *chip, unsigned gpio, int value) | 1242 | void bfin_gpiolib_set_value(struct gpio_chip *chip, unsigned gpio, int value) |
1371 | { | 1243 | { |
1372 | #ifdef BF548_FAMILY | ||
1373 | return bfin_gpio_set_value(gpio, value); | 1244 | return bfin_gpio_set_value(gpio, value); |
1374 | #else | ||
1375 | return set_gpio_data(gpio, value); | ||
1376 | #endif | ||
1377 | } | 1245 | } |
1378 | 1246 | ||
1379 | int bfin_gpiolib_gpio_request(struct gpio_chip *chip, unsigned gpio) | 1247 | int bfin_gpiolib_gpio_request(struct gpio_chip *chip, unsigned gpio) |
diff --git a/arch/blackfin/kernel/cplb-mpu/cplbinit.c b/arch/blackfin/kernel/cplb-mpu/cplbinit.c index bdb958486e7..3e329a6ce04 100644 --- a/arch/blackfin/kernel/cplb-mpu/cplbinit.c +++ b/arch/blackfin/kernel/cplb-mpu/cplbinit.c | |||
@@ -63,10 +63,8 @@ void __init generate_cplb_tables_cpu(unsigned int cpu) | |||
63 | dcplb_tbl[cpu][i_d].addr = 0; | 63 | dcplb_tbl[cpu][i_d].addr = 0; |
64 | dcplb_tbl[cpu][i_d++].data = SDRAM_OOPS | PAGE_SIZE_1KB; | 64 | dcplb_tbl[cpu][i_d++].data = SDRAM_OOPS | PAGE_SIZE_1KB; |
65 | 65 | ||
66 | #if 0 | ||
67 | icplb_tbl[cpu][i_i].addr = 0; | 66 | icplb_tbl[cpu][i_i].addr = 0; |
68 | icplb_tbl[cpu][i_i++].data = i_cache | CPLB_USER_RD | PAGE_SIZE_4KB; | 67 | icplb_tbl[cpu][i_i++].data = i_cache | CPLB_USER_RD | PAGE_SIZE_1KB; |
69 | #endif | ||
70 | 68 | ||
71 | /* Cover kernel memory with 4M pages. */ | 69 | /* Cover kernel memory with 4M pages. */ |
72 | addr = 0; | 70 | addr = 0; |
diff --git a/arch/blackfin/kernel/cplb-nompu/cplbmgr.c b/arch/blackfin/kernel/cplb-nompu/cplbmgr.c index 376249ab269..8cbb47c7b66 100644 --- a/arch/blackfin/kernel/cplb-nompu/cplbmgr.c +++ b/arch/blackfin/kernel/cplb-nompu/cplbmgr.c | |||
@@ -163,12 +163,14 @@ MGR_ATTR static int icplb_miss(int cpu) | |||
163 | nr_icplb_supv_miss[cpu]++; | 163 | nr_icplb_supv_miss[cpu]++; |
164 | 164 | ||
165 | base = 0; | 165 | base = 0; |
166 | for (idx = 0; idx < icplb_nr_bounds; idx++) { | 166 | idx = 0; |
167 | do { | ||
167 | eaddr = icplb_bounds[idx].eaddr; | 168 | eaddr = icplb_bounds[idx].eaddr; |
168 | if (addr < eaddr) | 169 | if (addr < eaddr) |
169 | break; | 170 | break; |
170 | base = eaddr; | 171 | base = eaddr; |
171 | } | 172 | } while (++idx < icplb_nr_bounds); |
173 | |||
172 | if (unlikely(idx == icplb_nr_bounds)) | 174 | if (unlikely(idx == icplb_nr_bounds)) |
173 | return CPLB_NO_ADDR_MATCH; | 175 | return CPLB_NO_ADDR_MATCH; |
174 | 176 | ||
@@ -208,12 +210,14 @@ MGR_ATTR static int dcplb_miss(int cpu) | |||
208 | nr_dcplb_supv_miss[cpu]++; | 210 | nr_dcplb_supv_miss[cpu]++; |
209 | 211 | ||
210 | base = 0; | 212 | base = 0; |
211 | for (idx = 0; idx < dcplb_nr_bounds; idx++) { | 213 | idx = 0; |
214 | do { | ||
212 | eaddr = dcplb_bounds[idx].eaddr; | 215 | eaddr = dcplb_bounds[idx].eaddr; |
213 | if (addr < eaddr) | 216 | if (addr < eaddr) |
214 | break; | 217 | break; |
215 | base = eaddr; | 218 | base = eaddr; |
216 | } | 219 | } while (++idx < dcplb_nr_bounds); |
220 | |||
217 | if (unlikely(idx == dcplb_nr_bounds)) | 221 | if (unlikely(idx == dcplb_nr_bounds)) |
218 | return CPLB_NO_ADDR_MATCH; | 222 | return CPLB_NO_ADDR_MATCH; |
219 | 223 | ||
diff --git a/arch/blackfin/kernel/irqchip.c b/arch/blackfin/kernel/irqchip.c index ab8209cbbad..75724eee649 100644 --- a/arch/blackfin/kernel/irqchip.c +++ b/arch/blackfin/kernel/irqchip.c | |||
@@ -35,6 +35,7 @@ | |||
35 | #include <linux/interrupt.h> | 35 | #include <linux/interrupt.h> |
36 | #include <linux/irq.h> | 36 | #include <linux/irq.h> |
37 | #include <asm/trace.h> | 37 | #include <asm/trace.h> |
38 | #include <asm/pda.h> | ||
38 | 39 | ||
39 | static atomic_t irq_err_count; | 40 | static atomic_t irq_err_count; |
40 | static spinlock_t irq_controller_lock; | 41 | static spinlock_t irq_controller_lock; |
@@ -91,8 +92,13 @@ int show_interrupts(struct seq_file *p, void *v) | |||
91 | seq_putc(p, '\n'); | 92 | seq_putc(p, '\n'); |
92 | skip: | 93 | skip: |
93 | spin_unlock_irqrestore(&irq_desc[i].lock, flags); | 94 | spin_unlock_irqrestore(&irq_desc[i].lock, flags); |
94 | } else if (i == NR_IRQS) | 95 | } else if (i == NR_IRQS) { |
96 | seq_printf(p, "NMI: "); | ||
97 | for_each_online_cpu(j) | ||
98 | seq_printf(p, "%10u ", cpu_pda[j].__nmi_count); | ||
99 | seq_printf(p, " CORE Non Maskable Interrupt\n"); | ||
95 | seq_printf(p, "Err: %10u\n", atomic_read(&irq_err_count)); | 100 | seq_printf(p, "Err: %10u\n", atomic_read(&irq_err_count)); |
101 | } | ||
96 | return 0; | 102 | return 0; |
97 | } | 103 | } |
98 | 104 | ||
diff --git a/arch/blackfin/kernel/reboot.c b/arch/blackfin/kernel/reboot.c index eeee8cb4336..53d08dee853 100644 --- a/arch/blackfin/kernel/reboot.c +++ b/arch/blackfin/kernel/reboot.c | |||
@@ -20,8 +20,8 @@ | |||
20 | * reset while the Core B bit (on dual core parts) is cleared by | 20 | * reset while the Core B bit (on dual core parts) is cleared by |
21 | * the core reset. | 21 | * the core reset. |
22 | */ | 22 | */ |
23 | __attribute__((l1_text)) | 23 | __attribute__ ((__l1_text__, __noreturn__)) |
24 | static void _bfin_reset(void) | 24 | static void bfin_reset(void) |
25 | { | 25 | { |
26 | /* Wait for completion of "system" events such as cache line | 26 | /* Wait for completion of "system" events such as cache line |
27 | * line fills so that we avoid infinite stalls later on as | 27 | * line fills so that we avoid infinite stalls later on as |
@@ -30,7 +30,11 @@ static void _bfin_reset(void) | |||
30 | */ | 30 | */ |
31 | __builtin_bfin_ssync(); | 31 | __builtin_bfin_ssync(); |
32 | 32 | ||
33 | while (1) { | 33 | /* The bootrom checks to see how it was reset and will |
34 | * automatically perform a software reset for us when | ||
35 | * it starts executing after the core reset. | ||
36 | */ | ||
37 | if (ANOMALY_05000353 || ANOMALY_05000386) { | ||
34 | /* Initiate System software reset. */ | 38 | /* Initiate System software reset. */ |
35 | bfin_write_SWRST(0x7); | 39 | bfin_write_SWRST(0x7); |
36 | 40 | ||
@@ -50,6 +54,11 @@ static void _bfin_reset(void) | |||
50 | /* Clear System software reset */ | 54 | /* Clear System software reset */ |
51 | bfin_write_SWRST(0); | 55 | bfin_write_SWRST(0); |
52 | 56 | ||
57 | /* The BF526 ROM will crash during reset */ | ||
58 | #if defined(__ADSPBF522__) || defined(__ADSPBF524__) || defined(__ADSPBF526__) | ||
59 | bfin_read_SWRST(); | ||
60 | #endif | ||
61 | |||
53 | /* Wait for the SWRST write to complete. Cannot rely on SSYNC | 62 | /* Wait for the SWRST write to complete. Cannot rely on SSYNC |
54 | * though as the System state is all reset now. | 63 | * though as the System state is all reset now. |
55 | */ | 64 | */ |
@@ -60,22 +69,11 @@ static void _bfin_reset(void) | |||
60 | : "a" (15 * 1) | 69 | : "a" (15 * 1) |
61 | : "LC1", "LB1", "LT1" | 70 | : "LC1", "LB1", "LT1" |
62 | ); | 71 | ); |
72 | } | ||
63 | 73 | ||
74 | while (1) | ||
64 | /* Issue core reset */ | 75 | /* Issue core reset */ |
65 | asm("raise 1"); | 76 | asm("raise 1"); |
66 | } | ||
67 | } | ||
68 | |||
69 | static void bfin_reset(void) | ||
70 | { | ||
71 | if (ANOMALY_05000353 || ANOMALY_05000386) | ||
72 | _bfin_reset(); | ||
73 | else | ||
74 | /* the bootrom checks to see how it was reset and will | ||
75 | * automatically perform a software reset for us when | ||
76 | * it starts executing boot | ||
77 | */ | ||
78 | asm("raise 1;"); | ||
79 | } | 77 | } |
80 | 78 | ||
81 | __attribute__((weak)) | 79 | __attribute__((weak)) |
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c index b2a811347b6..e5c11623080 100644 --- a/arch/blackfin/kernel/setup.c +++ b/arch/blackfin/kernel/setup.c | |||
@@ -60,7 +60,7 @@ void __initdata *init_retx, *init_saved_retx, *init_saved_seqstat, | |||
60 | #define BFIN_MEMMAP_MAX 128 /* number of entries in bfin_memmap */ | 60 | #define BFIN_MEMMAP_MAX 128 /* number of entries in bfin_memmap */ |
61 | #define BFIN_MEMMAP_RAM 1 | 61 | #define BFIN_MEMMAP_RAM 1 |
62 | #define BFIN_MEMMAP_RESERVED 2 | 62 | #define BFIN_MEMMAP_RESERVED 2 |
63 | struct bfin_memmap { | 63 | static struct bfin_memmap { |
64 | int nr_map; | 64 | int nr_map; |
65 | struct bfin_memmap_entry { | 65 | struct bfin_memmap_entry { |
66 | unsigned long long addr; /* start of memory segment */ | 66 | unsigned long long addr; /* start of memory segment */ |
@@ -824,7 +824,15 @@ void __init setup_arch(char **cmdline_p) | |||
824 | flash_probe(); | 824 | flash_probe(); |
825 | #endif | 825 | #endif |
826 | 826 | ||
827 | printk(KERN_INFO "Boot Mode: %i\n", bfin_read_SYSCR() & 0xF); | ||
828 | |||
829 | /* Newer parts mirror SWRST bits in SYSCR */ | ||
830 | #if defined(CONFIG_BF53x) || defined(CONFIG_BF561) || \ | ||
831 | defined(CONFIG_BF538) || defined(CONFIG_BF539) | ||
827 | _bfin_swrst = bfin_read_SWRST(); | 832 | _bfin_swrst = bfin_read_SWRST(); |
833 | #else | ||
834 | _bfin_swrst = bfin_read_SYSCR(); | ||
835 | #endif | ||
828 | 836 | ||
829 | #ifdef CONFIG_DEBUG_DOUBLEFAULT_PRINT | 837 | #ifdef CONFIG_DEBUG_DOUBLEFAULT_PRINT |
830 | bfin_write_SWRST(_bfin_swrst & ~DOUBLE_FAULT); | 838 | bfin_write_SWRST(_bfin_swrst & ~DOUBLE_FAULT); |
@@ -853,7 +861,7 @@ void __init setup_arch(char **cmdline_p) | |||
853 | else if (_bfin_swrst & RESET_SOFTWARE) | 861 | else if (_bfin_swrst & RESET_SOFTWARE) |
854 | printk(KERN_NOTICE "Reset caused by Software reset\n"); | 862 | printk(KERN_NOTICE "Reset caused by Software reset\n"); |
855 | 863 | ||
856 | printk(KERN_INFO "Blackfin support (C) 2004-2008 Analog Devices, Inc.\n"); | 864 | printk(KERN_INFO "Blackfin support (C) 2004-2009 Analog Devices, Inc.\n"); |
857 | if (bfin_compiled_revid() == 0xffff) | 865 | if (bfin_compiled_revid() == 0xffff) |
858 | printk(KERN_INFO "Compiled for ADSP-%s Rev any\n", CPU); | 866 | printk(KERN_INFO "Compiled for ADSP-%s Rev any\n", CPU); |
859 | else if (bfin_compiled_revid() == -1) | 867 | else if (bfin_compiled_revid() == -1) |
diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c index 5b0667da8d0..ffe7fb53ecc 100644 --- a/arch/blackfin/kernel/traps.c +++ b/arch/blackfin/kernel/traps.c | |||
@@ -673,6 +673,14 @@ static void decode_instruction(unsigned short *address) | |||
673 | verbose_printk("RTI"); | 673 | verbose_printk("RTI"); |
674 | else if (opcode == 0x0012) | 674 | else if (opcode == 0x0012) |
675 | verbose_printk("RTX"); | 675 | verbose_printk("RTX"); |
676 | else if (opcode == 0x0013) | ||
677 | verbose_printk("RTN"); | ||
678 | else if (opcode == 0x0014) | ||
679 | verbose_printk("RTE"); | ||
680 | else if (opcode == 0x0025) | ||
681 | verbose_printk("EMUEXCPT"); | ||
682 | else if (opcode == 0x0040 && opcode <= 0x0047) | ||
683 | verbose_printk("STI R%i", opcode & 7); | ||
676 | else if (opcode >= 0x0050 && opcode <= 0x0057) | 684 | else if (opcode >= 0x0050 && opcode <= 0x0057) |
677 | verbose_printk("JUMP (P%i)", opcode & 7); | 685 | verbose_printk("JUMP (P%i)", opcode & 7); |
678 | else if (opcode >= 0x0060 && opcode <= 0x0067) | 686 | else if (opcode >= 0x0060 && opcode <= 0x0067) |
@@ -681,6 +689,10 @@ static void decode_instruction(unsigned short *address) | |||
681 | verbose_printk("CALL (PC+P%i)", opcode & 7); | 689 | verbose_printk("CALL (PC+P%i)", opcode & 7); |
682 | else if (opcode >= 0x0080 && opcode <= 0x0087) | 690 | else if (opcode >= 0x0080 && opcode <= 0x0087) |
683 | verbose_printk("JUMP (PC+P%i)", opcode & 7); | 691 | verbose_printk("JUMP (PC+P%i)", opcode & 7); |
692 | else if (opcode >= 0x0090 && opcode <= 0x009F) | ||
693 | verbose_printk("RAISE 0x%x", opcode & 0xF); | ||
694 | else if (opcode >= 0x00A0 && opcode <= 0x00AF) | ||
695 | verbose_printk("EXCPT 0x%x", opcode & 0xF); | ||
684 | else if ((opcode >= 0x1000 && opcode <= 0x13FF) || (opcode >= 0x1800 && opcode <= 0x1BFF)) | 696 | else if ((opcode >= 0x1000 && opcode <= 0x13FF) || (opcode >= 0x1800 && opcode <= 0x1BFF)) |
685 | verbose_printk("IF !CC JUMP"); | 697 | verbose_printk("IF !CC JUMP"); |
686 | else if ((opcode >= 0x1400 && opcode <= 0x17ff) || (opcode >= 0x1c00 && opcode <= 0x1fff)) | 698 | else if ((opcode >= 0x1400 && opcode <= 0x17ff) || (opcode >= 0x1c00 && opcode <= 0x1fff)) |
@@ -820,11 +832,8 @@ void show_stack(struct task_struct *task, unsigned long *stack) | |||
820 | decode_address(buf, (unsigned int)stack); | 832 | decode_address(buf, (unsigned int)stack); |
821 | printk(KERN_NOTICE " SP: [0x%p] %s\n", stack, buf); | 833 | printk(KERN_NOTICE " SP: [0x%p] %s\n", stack, buf); |
822 | 834 | ||
823 | addr = (unsigned int *)((unsigned int)stack & ~0x3F); | ||
824 | |||
825 | /* First thing is to look for a frame pointer */ | 835 | /* First thing is to look for a frame pointer */ |
826 | for (addr = (unsigned int *)((unsigned int)stack & ~0xF), i = 0; | 836 | for (addr = (unsigned int *)((unsigned int)stack & ~0xF); addr < endstack; addr++) { |
827 | addr < endstack; addr++, i++) { | ||
828 | if (*addr & 0x1) | 837 | if (*addr & 0x1) |
829 | continue; | 838 | continue; |
830 | ins_addr = (unsigned short *)*addr; | 839 | ins_addr = (unsigned short *)*addr; |
@@ -834,7 +843,8 @@ void show_stack(struct task_struct *task, unsigned long *stack) | |||
834 | 843 | ||
835 | if (fp) { | 844 | if (fp) { |
836 | /* Let's check to see if it is a frame pointer */ | 845 | /* Let's check to see if it is a frame pointer */ |
837 | while (fp >= (addr - 1) && fp < endstack && fp) | 846 | while (fp >= (addr - 1) && fp < endstack |
847 | && fp && ((unsigned int) fp & 0x3) == 0) | ||
838 | fp = (unsigned int *)*fp; | 848 | fp = (unsigned int *)*fp; |
839 | if (fp == 0 || fp == endstack) { | 849 | if (fp == 0 || fp == endstack) { |
840 | fp = addr - 1; | 850 | fp = addr - 1; |
@@ -1052,8 +1062,9 @@ void show_regs(struct pt_regs *fp) | |||
1052 | char buf [150]; | 1062 | char buf [150]; |
1053 | struct irqaction *action; | 1063 | struct irqaction *action; |
1054 | unsigned int i; | 1064 | unsigned int i; |
1055 | unsigned long flags; | 1065 | unsigned long flags = 0; |
1056 | unsigned int cpu = smp_processor_id(); | 1066 | unsigned int cpu = smp_processor_id(); |
1067 | unsigned char in_atomic = (bfin_read_IPEND() & 0x10) || in_atomic(); | ||
1057 | 1068 | ||
1058 | verbose_printk(KERN_NOTICE "\n" KERN_NOTICE "SEQUENCER STATUS:\t\t%s\n", print_tainted()); | 1069 | verbose_printk(KERN_NOTICE "\n" KERN_NOTICE "SEQUENCER STATUS:\t\t%s\n", print_tainted()); |
1059 | verbose_printk(KERN_NOTICE " SEQSTAT: %08lx IPEND: %04lx SYSCFG: %04lx\n", | 1070 | verbose_printk(KERN_NOTICE " SEQSTAT: %08lx IPEND: %04lx SYSCFG: %04lx\n", |
@@ -1073,17 +1084,22 @@ void show_regs(struct pt_regs *fp) | |||
1073 | } | 1084 | } |
1074 | verbose_printk(KERN_NOTICE " EXCAUSE : 0x%lx\n", | 1085 | verbose_printk(KERN_NOTICE " EXCAUSE : 0x%lx\n", |
1075 | fp->seqstat & SEQSTAT_EXCAUSE); | 1086 | fp->seqstat & SEQSTAT_EXCAUSE); |
1076 | for (i = 6; i <= 15 ; i++) { | 1087 | for (i = 2; i <= 15 ; i++) { |
1077 | if (fp->ipend & (1 << i)) { | 1088 | if (fp->ipend & (1 << i)) { |
1078 | decode_address(buf, bfin_read32(EVT0 + 4*i)); | 1089 | if (i != 4) { |
1079 | verbose_printk(KERN_NOTICE " physical IVG%i asserted : %s\n", i, buf); | 1090 | decode_address(buf, bfin_read32(EVT0 + 4*i)); |
1091 | verbose_printk(KERN_NOTICE " physical IVG%i asserted : %s\n", i, buf); | ||
1092 | } else | ||
1093 | verbose_printk(KERN_NOTICE " interrupts disabled\n"); | ||
1080 | } | 1094 | } |
1081 | } | 1095 | } |
1082 | 1096 | ||
1083 | /* if no interrupts are going off, don't print this out */ | 1097 | /* if no interrupts are going off, don't print this out */ |
1084 | if (fp->ipend & ~0x3F) { | 1098 | if (fp->ipend & ~0x3F) { |
1085 | for (i = 0; i < (NR_IRQS - 1); i++) { | 1099 | for (i = 0; i < (NR_IRQS - 1); i++) { |
1086 | spin_lock_irqsave(&irq_desc[i].lock, flags); | 1100 | if (!in_atomic) |
1101 | spin_lock_irqsave(&irq_desc[i].lock, flags); | ||
1102 | |||
1087 | action = irq_desc[i].action; | 1103 | action = irq_desc[i].action; |
1088 | if (!action) | 1104 | if (!action) |
1089 | goto unlock; | 1105 | goto unlock; |
@@ -1096,7 +1112,8 @@ void show_regs(struct pt_regs *fp) | |||
1096 | } | 1112 | } |
1097 | verbose_printk("\n"); | 1113 | verbose_printk("\n"); |
1098 | unlock: | 1114 | unlock: |
1099 | spin_unlock_irqrestore(&irq_desc[i].lock, flags); | 1115 | if (!in_atomic) |
1116 | spin_unlock_irqrestore(&irq_desc[i].lock, flags); | ||
1100 | } | 1117 | } |
1101 | } | 1118 | } |
1102 | 1119 | ||
diff --git a/arch/blackfin/mach-bf518/boards/ezbrd.c b/arch/blackfin/mach-bf518/boards/ezbrd.c index 15f1351c864..0e175342112 100644 --- a/arch/blackfin/mach-bf518/boards/ezbrd.c +++ b/arch/blackfin/mach-bf518/boards/ezbrd.c | |||
@@ -46,6 +46,7 @@ | |||
46 | #include <asm/dpmc.h> | 46 | #include <asm/dpmc.h> |
47 | #include <asm/bfin_sdh.h> | 47 | #include <asm/bfin_sdh.h> |
48 | #include <linux/spi/ad7877.h> | 48 | #include <linux/spi/ad7877.h> |
49 | #include <net/dsa.h> | ||
49 | 50 | ||
50 | /* | 51 | /* |
51 | * Name the Board for the /proc/cpuinfo | 52 | * Name the Board for the /proc/cpuinfo |
@@ -104,8 +105,31 @@ static struct platform_device rtc_device = { | |||
104 | #endif | 105 | #endif |
105 | 106 | ||
106 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | 107 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) |
108 | static struct platform_device bfin_mii_bus = { | ||
109 | .name = "bfin_mii_bus", | ||
110 | }; | ||
111 | |||
107 | static struct platform_device bfin_mac_device = { | 112 | static struct platform_device bfin_mac_device = { |
108 | .name = "bfin_mac", | 113 | .name = "bfin_mac", |
114 | .dev.platform_data = &bfin_mii_bus, | ||
115 | }; | ||
116 | #endif | ||
117 | |||
118 | #if defined(CONFIG_NET_DSA_KSZ8893M) || defined(CONFIG_NET_DSA_KSZ8893M_MODULE) | ||
119 | static struct dsa_platform_data ksz8893m_switch_data = { | ||
120 | .mii_bus = &bfin_mii_bus.dev, | ||
121 | .netdev = &bfin_mac_device.dev, | ||
122 | .port_names[0] = NULL, | ||
123 | .port_names[1] = "eth%d", | ||
124 | .port_names[2] = "eth%d", | ||
125 | .port_names[3] = "cpu", | ||
126 | }; | ||
127 | |||
128 | static struct platform_device ksz8893m_switch_device = { | ||
129 | .name = "dsa", | ||
130 | .id = 0, | ||
131 | .num_resources = 0, | ||
132 | .dev.platform_data = &ksz8893m_switch_data, | ||
109 | }; | 133 | }; |
110 | #endif | 134 | #endif |
111 | 135 | ||
@@ -147,6 +171,15 @@ static struct bfin5xx_spi_chip spi_adc_chip_info = { | |||
147 | }; | 171 | }; |
148 | #endif | 172 | #endif |
149 | 173 | ||
174 | #if defined(CONFIG_NET_DSA_KSZ8893M) \ | ||
175 | || defined(CONFIG_NET_DSA_KSZ8893M_MODULE) | ||
176 | /* SPI SWITCH CHIP */ | ||
177 | static struct bfin5xx_spi_chip spi_switch_info = { | ||
178 | .enable_dma = 0, | ||
179 | .bits_per_word = 8, | ||
180 | }; | ||
181 | #endif | ||
182 | |||
150 | #if defined(CONFIG_SPI_MMC) || defined(CONFIG_SPI_MMC_MODULE) | 183 | #if defined(CONFIG_SPI_MMC) || defined(CONFIG_SPI_MMC_MODULE) |
151 | static struct bfin5xx_spi_chip spi_mmc_chip_info = { | 184 | static struct bfin5xx_spi_chip spi_mmc_chip_info = { |
152 | .enable_dma = 1, | 185 | .enable_dma = 1, |
@@ -226,6 +259,19 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
226 | }, | 259 | }, |
227 | #endif | 260 | #endif |
228 | 261 | ||
262 | #if defined(CONFIG_NET_DSA_KSZ8893M) \ | ||
263 | || defined(CONFIG_NET_DSA_KSZ8893M_MODULE) | ||
264 | { | ||
265 | .modalias = "ksz8893m", | ||
266 | .max_speed_hz = 5000000, | ||
267 | .bus_num = 0, | ||
268 | .chip_select = 1, | ||
269 | .platform_data = NULL, | ||
270 | .controller_data = &spi_switch_info, | ||
271 | .mode = SPI_MODE_3, | ||
272 | }, | ||
273 | #endif | ||
274 | |||
229 | #if defined(CONFIG_SPI_MMC) || defined(CONFIG_SPI_MMC_MODULE) | 275 | #if defined(CONFIG_SPI_MMC) || defined(CONFIG_SPI_MMC_MODULE) |
230 | { | 276 | { |
231 | .modalias = "spi_mmc_dummy", | 277 | .modalias = "spi_mmc_dummy", |
@@ -473,7 +519,6 @@ static struct platform_device i2c_bfin_twi_device = { | |||
473 | }; | 519 | }; |
474 | #endif | 520 | #endif |
475 | 521 | ||
476 | #ifdef CONFIG_I2C_BOARDINFO | ||
477 | static struct i2c_board_info __initdata bfin_i2c_board_info[] = { | 522 | static struct i2c_board_info __initdata bfin_i2c_board_info[] = { |
478 | #if defined(CONFIG_TWI_LCD) || defined(CONFIG_TWI_LCD_MODULE) | 523 | #if defined(CONFIG_TWI_LCD) || defined(CONFIG_TWI_LCD_MODULE) |
479 | { | 524 | { |
@@ -487,7 +532,6 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = { | |||
487 | }, | 532 | }, |
488 | #endif | 533 | #endif |
489 | }; | 534 | }; |
490 | #endif | ||
491 | 535 | ||
492 | #if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE) | 536 | #if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE) |
493 | static struct platform_device bfin_sport0_uart_device = { | 537 | static struct platform_device bfin_sport0_uart_device = { |
@@ -584,9 +628,14 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
584 | #endif | 628 | #endif |
585 | 629 | ||
586 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | 630 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) |
631 | &bfin_mii_bus, | ||
587 | &bfin_mac_device, | 632 | &bfin_mac_device, |
588 | #endif | 633 | #endif |
589 | 634 | ||
635 | #if defined(CONFIG_NET_DSA_KSZ8893M) || defined(CONFIG_NET_DSA_KSZ8893M_MODULE) | ||
636 | &ksz8893m_switch_device, | ||
637 | #endif | ||
638 | |||
590 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 639 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) |
591 | &bfin_spi0_device, | 640 | &bfin_spi0_device, |
592 | &bfin_spi1_device, | 641 | &bfin_spi1_device, |
@@ -632,12 +681,8 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
632 | static int __init ezbrd_init(void) | 681 | static int __init ezbrd_init(void) |
633 | { | 682 | { |
634 | printk(KERN_INFO "%s(): registering device resources\n", __func__); | 683 | printk(KERN_INFO "%s(): registering device resources\n", __func__); |
635 | |||
636 | #ifdef CONFIG_I2C_BOARDINFO | ||
637 | i2c_register_board_info(0, bfin_i2c_board_info, | 684 | i2c_register_board_info(0, bfin_i2c_board_info, |
638 | ARRAY_SIZE(bfin_i2c_board_info)); | 685 | ARRAY_SIZE(bfin_i2c_board_info)); |
639 | #endif | ||
640 | |||
641 | platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); | 686 | platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); |
642 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); | 687 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); |
643 | return 0; | 688 | return 0; |
@@ -649,7 +694,7 @@ void native_machine_restart(char *cmd) | |||
649 | { | 694 | { |
650 | /* workaround reboot hang when booting from SPI */ | 695 | /* workaround reboot hang when booting from SPI */ |
651 | if ((bfin_read_SYSCR() & 0x7) == 0x3) | 696 | if ((bfin_read_SYSCR() & 0x7) == 0x3) |
652 | bfin_gpio_reset_spi0_ssel1(); | 697 | bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS); |
653 | } | 698 | } |
654 | 699 | ||
655 | void bfin_get_ether_addr(char *addr) | 700 | void bfin_get_ether_addr(char *addr) |
diff --git a/arch/blackfin/mach-bf518/include/mach/portmux.h b/arch/blackfin/mach-bf518/include/mach/portmux.h index ac16d54734d..f618b487b2b 100644 --- a/arch/blackfin/mach-bf518/include/mach/portmux.h +++ b/arch/blackfin/mach-bf518/include/mach/portmux.h | |||
@@ -103,6 +103,8 @@ | |||
103 | #define P_SPI1_SSEL4 (P_DEFINED | P_IDENT(GPIO_PF8) | P_FUNCT(2)) | 103 | #define P_SPI1_SSEL4 (P_DEFINED | P_IDENT(GPIO_PF8) | P_FUNCT(2)) |
104 | #define P_SPI1_SSEL5 (P_DEFINED | P_IDENT(GPIO_PG11) | P_FUNCT(2)) | 104 | #define P_SPI1_SSEL5 (P_DEFINED | P_IDENT(GPIO_PG11) | P_FUNCT(2)) |
105 | 105 | ||
106 | #define P_DEFAULT_BOOT_SPI_CS P_SPI0_SSEL2 | ||
107 | |||
106 | /* SPORT Port Mux */ | 108 | /* SPORT Port Mux */ |
107 | #define P_SPORT0_DRPRI (P_DEFINED | P_IDENT(GPIO_PG3) | P_FUNCT(0)) | 109 | #define P_SPORT0_DRPRI (P_DEFINED | P_IDENT(GPIO_PG3) | P_FUNCT(0)) |
108 | #define P_SPORT0_RSCLK (P_DEFINED | P_IDENT(GPIO_PG4) | P_FUNCT(0)) | 110 | #define P_SPORT0_RSCLK (P_DEFINED | P_IDENT(GPIO_PG4) | P_FUNCT(0)) |
diff --git a/arch/blackfin/mach-bf527/boards/cm_bf527.c b/arch/blackfin/mach-bf527/boards/cm_bf527.c index a2c3578f4b6..856c097b531 100644 --- a/arch/blackfin/mach-bf527/boards/cm_bf527.c +++ b/arch/blackfin/mach-bf527/boards/cm_bf527.c | |||
@@ -403,8 +403,13 @@ static struct platform_device isp1362_hcd_device = { | |||
403 | #endif | 403 | #endif |
404 | 404 | ||
405 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | 405 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) |
406 | static struct platform_device bfin_mii_bus = { | ||
407 | .name = "bfin_mii_bus", | ||
408 | }; | ||
409 | |||
406 | static struct platform_device bfin_mac_device = { | 410 | static struct platform_device bfin_mac_device = { |
407 | .name = "bfin_mac", | 411 | .name = "bfin_mac", |
412 | .dev.platform_data = &bfin_mii_bus, | ||
408 | }; | 413 | }; |
409 | #endif | 414 | #endif |
410 | 415 | ||
@@ -793,7 +798,6 @@ static struct platform_device i2c_bfin_twi_device = { | |||
793 | }; | 798 | }; |
794 | #endif | 799 | #endif |
795 | 800 | ||
796 | #ifdef CONFIG_I2C_BOARDINFO | ||
797 | static struct i2c_board_info __initdata bfin_i2c_board_info[] = { | 801 | static struct i2c_board_info __initdata bfin_i2c_board_info[] = { |
798 | #if defined(CONFIG_TWI_LCD) || defined(CONFIG_TWI_LCD_MODULE) | 802 | #if defined(CONFIG_TWI_LCD) || defined(CONFIG_TWI_LCD_MODULE) |
799 | { | 803 | { |
@@ -809,7 +813,6 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = { | |||
809 | }, | 813 | }, |
810 | #endif | 814 | #endif |
811 | }; | 815 | }; |
812 | #endif | ||
813 | 816 | ||
814 | #if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE) | 817 | #if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE) |
815 | static struct platform_device bfin_sport0_uart_device = { | 818 | static struct platform_device bfin_sport0_uart_device = { |
@@ -920,6 +923,7 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
920 | #endif | 923 | #endif |
921 | 924 | ||
922 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | 925 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) |
926 | &bfin_mii_bus, | ||
923 | &bfin_mac_device, | 927 | &bfin_mac_device, |
924 | #endif | 928 | #endif |
925 | 929 | ||
@@ -968,27 +972,23 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
968 | &bfin_gpios_device, | 972 | &bfin_gpios_device, |
969 | }; | 973 | }; |
970 | 974 | ||
971 | static int __init stamp_init(void) | 975 | static int __init cm_init(void) |
972 | { | 976 | { |
973 | printk(KERN_INFO "%s(): registering device resources\n", __func__); | 977 | printk(KERN_INFO "%s(): registering device resources\n", __func__); |
974 | |||
975 | #ifdef CONFIG_I2C_BOARDINFO | ||
976 | i2c_register_board_info(0, bfin_i2c_board_info, | 978 | i2c_register_board_info(0, bfin_i2c_board_info, |
977 | ARRAY_SIZE(bfin_i2c_board_info)); | 979 | ARRAY_SIZE(bfin_i2c_board_info)); |
978 | #endif | ||
979 | |||
980 | platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); | 980 | platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); |
981 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); | 981 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); |
982 | return 0; | 982 | return 0; |
983 | } | 983 | } |
984 | 984 | ||
985 | arch_initcall(stamp_init); | 985 | arch_initcall(cm_init); |
986 | 986 | ||
987 | void native_machine_restart(char *cmd) | 987 | void native_machine_restart(char *cmd) |
988 | { | 988 | { |
989 | /* workaround reboot hang when booting from SPI */ | 989 | /* workaround reboot hang when booting from SPI */ |
990 | if ((bfin_read_SYSCR() & 0x7) == 0x3) | 990 | if ((bfin_read_SYSCR() & 0x7) == 0x3) |
991 | bfin_gpio_reset_spi0_ssel1(); | 991 | bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS); |
992 | } | 992 | } |
993 | 993 | ||
994 | void bfin_get_ether_addr(char *addr) | 994 | void bfin_get_ether_addr(char *addr) |
diff --git a/arch/blackfin/mach-bf527/boards/ezbrd.c b/arch/blackfin/mach-bf527/boards/ezbrd.c index 0314bd3355e..83606fcdde2 100644 --- a/arch/blackfin/mach-bf527/boards/ezbrd.c +++ b/arch/blackfin/mach-bf527/boards/ezbrd.c | |||
@@ -208,8 +208,13 @@ static struct platform_device rtc_device = { | |||
208 | 208 | ||
209 | 209 | ||
210 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | 210 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) |
211 | static struct platform_device bfin_mii_bus = { | ||
212 | .name = "bfin_mii_bus", | ||
213 | }; | ||
214 | |||
211 | static struct platform_device bfin_mac_device = { | 215 | static struct platform_device bfin_mac_device = { |
212 | .name = "bfin_mac", | 216 | .name = "bfin_mac", |
217 | .dev.platform_data = &bfin_mii_bus, | ||
213 | }; | 218 | }; |
214 | #endif | 219 | #endif |
215 | 220 | ||
@@ -590,7 +595,6 @@ static struct platform_device i2c_bfin_twi_device = { | |||
590 | }; | 595 | }; |
591 | #endif | 596 | #endif |
592 | 597 | ||
593 | #ifdef CONFIG_I2C_BOARDINFO | ||
594 | static struct i2c_board_info __initdata bfin_i2c_board_info[] = { | 598 | static struct i2c_board_info __initdata bfin_i2c_board_info[] = { |
595 | #if defined(CONFIG_TWI_LCD) || defined(CONFIG_TWI_LCD_MODULE) | 599 | #if defined(CONFIG_TWI_LCD) || defined(CONFIG_TWI_LCD_MODULE) |
596 | { | 600 | { |
@@ -604,7 +608,6 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = { | |||
604 | }, | 608 | }, |
605 | #endif | 609 | #endif |
606 | }; | 610 | }; |
607 | #endif | ||
608 | 611 | ||
609 | #if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE) | 612 | #if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE) |
610 | static struct platform_device bfin_sport0_uart_device = { | 613 | static struct platform_device bfin_sport0_uart_device = { |
@@ -720,6 +723,7 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
720 | #endif | 723 | #endif |
721 | 724 | ||
722 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | 725 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) |
726 | &bfin_mii_bus, | ||
723 | &bfin_mac_device, | 727 | &bfin_mac_device, |
724 | #endif | 728 | #endif |
725 | 729 | ||
@@ -764,27 +768,23 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
764 | &bfin_gpios_device, | 768 | &bfin_gpios_device, |
765 | }; | 769 | }; |
766 | 770 | ||
767 | static int __init stamp_init(void) | 771 | static int __init ezbrd_init(void) |
768 | { | 772 | { |
769 | printk(KERN_INFO "%s(): registering device resources\n", __func__); | 773 | printk(KERN_INFO "%s(): registering device resources\n", __func__); |
770 | |||
771 | #ifdef CONFIG_I2C_BOARDINFO | ||
772 | i2c_register_board_info(0, bfin_i2c_board_info, | 774 | i2c_register_board_info(0, bfin_i2c_board_info, |
773 | ARRAY_SIZE(bfin_i2c_board_info)); | 775 | ARRAY_SIZE(bfin_i2c_board_info)); |
774 | #endif | ||
775 | |||
776 | platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); | 776 | platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); |
777 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); | 777 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); |
778 | return 0; | 778 | return 0; |
779 | } | 779 | } |
780 | 780 | ||
781 | arch_initcall(stamp_init); | 781 | arch_initcall(ezbrd_init); |
782 | 782 | ||
783 | void native_machine_restart(char *cmd) | 783 | void native_machine_restart(char *cmd) |
784 | { | 784 | { |
785 | /* workaround reboot hang when booting from SPI */ | 785 | /* workaround reboot hang when booting from SPI */ |
786 | if ((bfin_read_SYSCR() & 0x7) == 0x3) | 786 | if ((bfin_read_SYSCR() & 0x7) == 0x3) |
787 | bfin_gpio_reset_spi0_ssel1(); | 787 | bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS); |
788 | } | 788 | } |
789 | 789 | ||
790 | void bfin_get_ether_addr(char *addr) | 790 | void bfin_get_ether_addr(char *addr) |
diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c index 9454fb7b18c..d0864111ef5 100644 --- a/arch/blackfin/mach-bf527/boards/ezkit.c +++ b/arch/blackfin/mach-bf527/boards/ezkit.c | |||
@@ -425,8 +425,13 @@ static struct platform_device isp1362_hcd_device = { | |||
425 | #endif | 425 | #endif |
426 | 426 | ||
427 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | 427 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) |
428 | static struct platform_device bfin_mii_bus = { | ||
429 | .name = "bfin_mii_bus", | ||
430 | }; | ||
431 | |||
428 | static struct platform_device bfin_mac_device = { | 432 | static struct platform_device bfin_mac_device = { |
429 | .name = "bfin_mac", | 433 | .name = "bfin_mac", |
434 | .dev.platform_data = &bfin_mii_bus, | ||
430 | }; | 435 | }; |
431 | #endif | 436 | #endif |
432 | 437 | ||
@@ -830,7 +835,6 @@ static struct platform_device i2c_bfin_twi_device = { | |||
830 | }; | 835 | }; |
831 | #endif | 836 | #endif |
832 | 837 | ||
833 | #ifdef CONFIG_I2C_BOARDINFO | ||
834 | static struct i2c_board_info __initdata bfin_i2c_board_info[] = { | 838 | static struct i2c_board_info __initdata bfin_i2c_board_info[] = { |
835 | #if defined(CONFIG_TWI_LCD) || defined(CONFIG_TWI_LCD_MODULE) | 839 | #if defined(CONFIG_TWI_LCD) || defined(CONFIG_TWI_LCD_MODULE) |
836 | { | 840 | { |
@@ -844,7 +848,6 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = { | |||
844 | }, | 848 | }, |
845 | #endif | 849 | #endif |
846 | }; | 850 | }; |
847 | #endif | ||
848 | 851 | ||
849 | #if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE) | 852 | #if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE) |
850 | static struct platform_device bfin_sport0_uart_device = { | 853 | static struct platform_device bfin_sport0_uart_device = { |
@@ -988,6 +991,7 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
988 | #endif | 991 | #endif |
989 | 992 | ||
990 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | 993 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) |
994 | &bfin_mii_bus, | ||
991 | &bfin_mac_device, | 995 | &bfin_mac_device, |
992 | #endif | 996 | #endif |
993 | 997 | ||
@@ -1048,27 +1052,23 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
1048 | &bfin_gpios_device, | 1052 | &bfin_gpios_device, |
1049 | }; | 1053 | }; |
1050 | 1054 | ||
1051 | static int __init stamp_init(void) | 1055 | static int __init ezkit_init(void) |
1052 | { | 1056 | { |
1053 | printk(KERN_INFO "%s(): registering device resources\n", __func__); | 1057 | printk(KERN_INFO "%s(): registering device resources\n", __func__); |
1054 | |||
1055 | #ifdef CONFIG_I2C_BOARDINFO | ||
1056 | i2c_register_board_info(0, bfin_i2c_board_info, | 1058 | i2c_register_board_info(0, bfin_i2c_board_info, |
1057 | ARRAY_SIZE(bfin_i2c_board_info)); | 1059 | ARRAY_SIZE(bfin_i2c_board_info)); |
1058 | #endif | ||
1059 | |||
1060 | platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); | 1060 | platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); |
1061 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); | 1061 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); |
1062 | return 0; | 1062 | return 0; |
1063 | } | 1063 | } |
1064 | 1064 | ||
1065 | arch_initcall(stamp_init); | 1065 | arch_initcall(ezkit_init); |
1066 | 1066 | ||
1067 | void native_machine_restart(char *cmd) | 1067 | void native_machine_restart(char *cmd) |
1068 | { | 1068 | { |
1069 | /* workaround reboot hang when booting from SPI */ | 1069 | /* workaround reboot hang when booting from SPI */ |
1070 | if ((bfin_read_SYSCR() & 0x7) == 0x3) | 1070 | if ((bfin_read_SYSCR() & 0x7) == 0x3) |
1071 | bfin_gpio_reset_spi0_ssel1(); | 1071 | bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS); |
1072 | } | 1072 | } |
1073 | 1073 | ||
1074 | void bfin_get_ether_addr(char *addr) | 1074 | void bfin_get_ether_addr(char *addr) |
diff --git a/arch/blackfin/mach-bf527/include/mach/portmux.h b/arch/blackfin/mach-bf527/include/mach/portmux.h index 7f6da2c386b..72b1652be4d 100644 --- a/arch/blackfin/mach-bf527/include/mach/portmux.h +++ b/arch/blackfin/mach-bf527/include/mach/portmux.h | |||
@@ -73,6 +73,8 @@ | |||
73 | 73 | ||
74 | #define P_HWAIT (P_DONTCARE) | 74 | #define P_HWAIT (P_DONTCARE) |
75 | 75 | ||
76 | #define P_DEFAULT_BOOT_SPI_CS P_SPI0_SSEL1 | ||
77 | |||
76 | #define P_SPI0_SS (P_DEFINED | P_IDENT(GPIO_PG1) | P_FUNCT(0)) | 78 | #define P_SPI0_SS (P_DEFINED | P_IDENT(GPIO_PG1) | P_FUNCT(0)) |
77 | #define P_SPI0_SSEL1 (P_DEFINED | P_IDENT(GPIO_PG1) | P_FUNCT(2)) | 79 | #define P_SPI0_SSEL1 (P_DEFINED | P_IDENT(GPIO_PG1) | P_FUNCT(2)) |
78 | #define P_SPI0_SCK (P_DEFINED | P_IDENT(GPIO_PG2) | P_FUNCT(2)) | 80 | #define P_SPI0_SCK (P_DEFINED | P_IDENT(GPIO_PG2) | P_FUNCT(2)) |
diff --git a/arch/blackfin/mach-bf533/boards/blackstamp.c b/arch/blackfin/mach-bf533/boards/blackstamp.c index 6ee607c259a..015c18f85e7 100644 --- a/arch/blackfin/mach-bf533/boards/blackstamp.c +++ b/arch/blackfin/mach-bf533/boards/blackstamp.c | |||
@@ -309,10 +309,8 @@ static struct platform_device i2c_gpio_device = { | |||
309 | }; | 309 | }; |
310 | #endif | 310 | #endif |
311 | 311 | ||
312 | #ifdef CONFIG_I2C_BOARDINFO | ||
313 | static struct i2c_board_info __initdata bfin_i2c_board_info[] = { | 312 | static struct i2c_board_info __initdata bfin_i2c_board_info[] = { |
314 | }; | 313 | }; |
315 | #endif | ||
316 | 314 | ||
317 | static const unsigned int cclk_vlev_datasheet[] = | 315 | static const unsigned int cclk_vlev_datasheet[] = |
318 | { | 316 | { |
@@ -390,10 +388,8 @@ static int __init blackstamp_init(void) | |||
390 | 388 | ||
391 | printk(KERN_INFO "%s(): registering device resources\n", __func__); | 389 | printk(KERN_INFO "%s(): registering device resources\n", __func__); |
392 | 390 | ||
393 | #ifdef CONFIG_I2C_BOARDINFO | ||
394 | i2c_register_board_info(0, bfin_i2c_board_info, | 391 | i2c_register_board_info(0, bfin_i2c_board_info, |
395 | ARRAY_SIZE(bfin_i2c_board_info)); | 392 | ARRAY_SIZE(bfin_i2c_board_info)); |
396 | #endif | ||
397 | 393 | ||
398 | ret = platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); | 394 | ret = platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); |
399 | if (ret < 0) | 395 | if (ret < 0) |
diff --git a/arch/blackfin/mach-bf533/boards/stamp.c b/arch/blackfin/mach-bf533/boards/stamp.c index 07f9ad1e189..db96f33f72e 100644 --- a/arch/blackfin/mach-bf533/boards/stamp.c +++ b/arch/blackfin/mach-bf533/boards/stamp.c | |||
@@ -441,7 +441,6 @@ static struct platform_device i2c_gpio_device = { | |||
441 | }; | 441 | }; |
442 | #endif | 442 | #endif |
443 | 443 | ||
444 | #ifdef CONFIG_I2C_BOARDINFO | ||
445 | static struct i2c_board_info __initdata bfin_i2c_board_info[] = { | 444 | static struct i2c_board_info __initdata bfin_i2c_board_info[] = { |
446 | #if defined(CONFIG_JOYSTICK_AD7142) || defined(CONFIG_JOYSTICK_AD7142_MODULE) | 445 | #if defined(CONFIG_JOYSTICK_AD7142) || defined(CONFIG_JOYSTICK_AD7142_MODULE) |
447 | { | 446 | { |
@@ -461,7 +460,6 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = { | |||
461 | }, | 460 | }, |
462 | #endif | 461 | #endif |
463 | }; | 462 | }; |
464 | #endif | ||
465 | 463 | ||
466 | static const unsigned int cclk_vlev_datasheet[] = | 464 | static const unsigned int cclk_vlev_datasheet[] = |
467 | { | 465 | { |
@@ -550,10 +548,8 @@ static int __init stamp_init(void) | |||
550 | 548 | ||
551 | printk(KERN_INFO "%s(): registering device resources\n", __func__); | 549 | printk(KERN_INFO "%s(): registering device resources\n", __func__); |
552 | 550 | ||
553 | #ifdef CONFIG_I2C_BOARDINFO | ||
554 | i2c_register_board_info(0, bfin_i2c_board_info, | 551 | i2c_register_board_info(0, bfin_i2c_board_info, |
555 | ARRAY_SIZE(bfin_i2c_board_info)); | 552 | ARRAY_SIZE(bfin_i2c_board_info)); |
556 | #endif | ||
557 | 553 | ||
558 | ret = platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); | 554 | ret = platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); |
559 | if (ret < 0) | 555 | if (ret < 0) |
diff --git a/arch/blackfin/mach-bf533/include/mach/portmux.h b/arch/blackfin/mach-bf533/include/mach/portmux.h index 685a2651dcd..2f59ce0b0cb 100644 --- a/arch/blackfin/mach-bf533/include/mach/portmux.h +++ b/arch/blackfin/mach-bf533/include/mach/portmux.h | |||
@@ -54,14 +54,11 @@ | |||
54 | #define P_SPI0_SSEL2 (P_DEFINED | P_IDENT(GPIO_PF2)) | 54 | #define P_SPI0_SSEL2 (P_DEFINED | P_IDENT(GPIO_PF2)) |
55 | #define P_SPI0_SSEL1 (P_DEFINED | P_IDENT(GPIO_PF1)) | 55 | #define P_SPI0_SSEL1 (P_DEFINED | P_IDENT(GPIO_PF1)) |
56 | #define P_SPI0_SS (P_DEFINED | P_IDENT(GPIO_PF0)) | 56 | #define P_SPI0_SS (P_DEFINED | P_IDENT(GPIO_PF0)) |
57 | #define P_DEFAULT_BOOT_SPI_CS P_SPI0_SSEL2 | ||
57 | 58 | ||
58 | #define P_TMR2 (P_DONTCARE) | 59 | #define P_TMR2 (P_DONTCARE) |
59 | #define P_TMR1 (P_DONTCARE) | 60 | #define P_TMR1 (P_DONTCARE) |
60 | #define P_TMR0 (P_DONTCARE) | 61 | #define P_TMR0 (P_DONTCARE) |
61 | #define P_TMRCLK (P_DEFINED | P_IDENT(GPIO_PF1)) | 62 | #define P_TMRCLK (P_DEFINED | P_IDENT(GPIO_PF1)) |
62 | 63 | ||
63 | |||
64 | |||
65 | |||
66 | |||
67 | #endif /* _MACH_PORTMUX_H_ */ | 64 | #endif /* _MACH_PORTMUX_H_ */ |
diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537.c b/arch/blackfin/mach-bf537/boards/cm_bf537.c index 6ac8e4d5bd3..9cd8fb2a30d 100644 --- a/arch/blackfin/mach-bf537/boards/cm_bf537.c +++ b/arch/blackfin/mach-bf537/boards/cm_bf537.c | |||
@@ -479,8 +479,13 @@ static struct platform_device bfin_sport1_uart_device = { | |||
479 | #endif | 479 | #endif |
480 | 480 | ||
481 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | 481 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) |
482 | static struct platform_device bfin_mii_bus = { | ||
483 | .name = "bfin_mii_bus", | ||
484 | }; | ||
485 | |||
482 | static struct platform_device bfin_mac_device = { | 486 | static struct platform_device bfin_mac_device = { |
483 | .name = "bfin_mac", | 487 | .name = "bfin_mac", |
488 | .dev.platform_data = &bfin_mii_bus, | ||
484 | }; | 489 | }; |
485 | #endif | 490 | #endif |
486 | 491 | ||
@@ -591,6 +596,7 @@ static struct platform_device *cm_bf537_devices[] __initdata = { | |||
591 | #endif | 596 | #endif |
592 | 597 | ||
593 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | 598 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) |
599 | &bfin_mii_bus, | ||
594 | &bfin_mac_device, | 600 | &bfin_mac_device, |
595 | #endif | 601 | #endif |
596 | 602 | ||
diff --git a/arch/blackfin/mach-bf537/boards/generic_board.c b/arch/blackfin/mach-bf537/boards/generic_board.c index dd6e6bfb98e..da710fdc456 100644 --- a/arch/blackfin/mach-bf537/boards/generic_board.c +++ b/arch/blackfin/mach-bf537/boards/generic_board.c | |||
@@ -262,8 +262,13 @@ static struct platform_device isp1362_hcd_device = { | |||
262 | #endif | 262 | #endif |
263 | 263 | ||
264 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | 264 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) |
265 | static struct platform_device bfin_mii_bus = { | ||
266 | .name = "bfin_mii_bus", | ||
267 | }; | ||
268 | |||
265 | static struct platform_device bfin_mac_device = { | 269 | static struct platform_device bfin_mac_device = { |
266 | .name = "bfin_mac", | 270 | .name = "bfin_mac", |
271 | .dev.platform_data = &bfin_mii_bus, | ||
267 | }; | 272 | }; |
268 | #endif | 273 | #endif |
269 | 274 | ||
@@ -662,6 +667,7 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
662 | #endif | 667 | #endif |
663 | 668 | ||
664 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | 669 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) |
670 | &bfin_mii_bus, | ||
665 | &bfin_mac_device, | 671 | &bfin_mac_device, |
666 | #endif | 672 | #endif |
667 | 673 | ||
@@ -708,7 +714,7 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
708 | #endif | 714 | #endif |
709 | }; | 715 | }; |
710 | 716 | ||
711 | static int __init stamp_init(void) | 717 | static int __init generic_init(void) |
712 | { | 718 | { |
713 | printk(KERN_INFO "%s(): registering device resources\n", __func__); | 719 | printk(KERN_INFO "%s(): registering device resources\n", __func__); |
714 | platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); | 720 | platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); |
@@ -720,13 +726,13 @@ static int __init stamp_init(void) | |||
720 | return 0; | 726 | return 0; |
721 | } | 727 | } |
722 | 728 | ||
723 | arch_initcall(stamp_init); | 729 | arch_initcall(generic_init); |
724 | 730 | ||
725 | void native_machine_restart(char *cmd) | 731 | void native_machine_restart(char *cmd) |
726 | { | 732 | { |
727 | /* workaround reboot hang when booting from SPI */ | 733 | /* workaround reboot hang when booting from SPI */ |
728 | if ((bfin_read_SYSCR() & 0x7) == 0x3) | 734 | if ((bfin_read_SYSCR() & 0x7) == 0x3) |
729 | bfin_gpio_reset_spi0_ssel1(); | 735 | bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS); |
730 | } | 736 | } |
731 | 737 | ||
732 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | 738 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) |
diff --git a/arch/blackfin/mach-bf537/boards/minotaur.c b/arch/blackfin/mach-bf537/boards/minotaur.c index bb795341cb1..db7d3a385e4 100644 --- a/arch/blackfin/mach-bf537/boards/minotaur.c +++ b/arch/blackfin/mach-bf537/boards/minotaur.c | |||
@@ -61,8 +61,13 @@ static struct platform_device rtc_device = { | |||
61 | #endif | 61 | #endif |
62 | 62 | ||
63 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | 63 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) |
64 | static struct platform_device bfin_mii_bus = { | ||
65 | .name = "bfin_mii_bus", | ||
66 | }; | ||
67 | |||
64 | static struct platform_device bfin_mac_device = { | 68 | static struct platform_device bfin_mac_device = { |
65 | .name = "bfin_mac", | 69 | .name = "bfin_mac", |
70 | .dev.platform_data = &bfin_mii_bus, | ||
66 | }; | 71 | }; |
67 | #endif | 72 | #endif |
68 | 73 | ||
@@ -324,6 +329,7 @@ static struct platform_device *minotaur_devices[] __initdata = { | |||
324 | #endif | 329 | #endif |
325 | 330 | ||
326 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | 331 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) |
332 | &bfin_mii_bus, | ||
327 | &bfin_mac_device, | 333 | &bfin_mac_device, |
328 | #endif | 334 | #endif |
329 | 335 | ||
@@ -377,5 +383,5 @@ void native_machine_restart(char *cmd) | |||
377 | { | 383 | { |
378 | /* workaround reboot hang when booting from SPI */ | 384 | /* workaround reboot hang when booting from SPI */ |
379 | if ((bfin_read_SYSCR() & 0x7) == 0x3) | 385 | if ((bfin_read_SYSCR() & 0x7) == 0x3) |
380 | bfin_gpio_reset_spi0_ssel1(); | 386 | bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS); |
381 | } | 387 | } |
diff --git a/arch/blackfin/mach-bf537/boards/pnav10.c b/arch/blackfin/mach-bf537/boards/pnav10.c index 89de94f4545..590eb3a139b 100644 --- a/arch/blackfin/mach-bf537/boards/pnav10.c +++ b/arch/blackfin/mach-bf537/boards/pnav10.c | |||
@@ -198,8 +198,13 @@ static struct platform_device isp1362_hcd_device = { | |||
198 | #endif | 198 | #endif |
199 | 199 | ||
200 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | 200 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) |
201 | static struct platform_device bfin_mii_bus = { | ||
202 | .name = "bfin_mii_bus", | ||
203 | }; | ||
204 | |||
201 | static struct platform_device bfin_mac_device = { | 205 | static struct platform_device bfin_mac_device = { |
202 | .name = "bfin_mac", | 206 | .name = "bfin_mac", |
207 | .dev.platform_data = &bfin_mii_bus, | ||
203 | }; | 208 | }; |
204 | #endif | 209 | #endif |
205 | 210 | ||
@@ -529,6 +534,7 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
529 | #endif | 534 | #endif |
530 | 535 | ||
531 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | 536 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) |
537 | &bfin_mii_bus, | ||
532 | &bfin_mac_device, | 538 | &bfin_mac_device, |
533 | #endif | 539 | #endif |
534 | 540 | ||
@@ -558,7 +564,7 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
558 | #endif | 564 | #endif |
559 | }; | 565 | }; |
560 | 566 | ||
561 | static int __init stamp_init(void) | 567 | static int __init pnav_init(void) |
562 | { | 568 | { |
563 | printk(KERN_INFO "%s(): registering device resources\n", __func__); | 569 | printk(KERN_INFO "%s(): registering device resources\n", __func__); |
564 | platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); | 570 | platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); |
@@ -569,7 +575,7 @@ static int __init stamp_init(void) | |||
569 | return 0; | 575 | return 0; |
570 | } | 576 | } |
571 | 577 | ||
572 | arch_initcall(stamp_init); | 578 | arch_initcall(pnav_init); |
573 | 579 | ||
574 | void bfin_get_ether_addr(char *addr) | 580 | void bfin_get_ether_addr(char *addr) |
575 | { | 581 | { |
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c index d812e2514a2..cd04c5e4487 100644 --- a/arch/blackfin/mach-bf537/boards/stamp.c +++ b/arch/blackfin/mach-bf537/boards/stamp.c | |||
@@ -321,8 +321,13 @@ static struct platform_device isp1362_hcd_device = { | |||
321 | #endif | 321 | #endif |
322 | 322 | ||
323 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | 323 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) |
324 | static struct platform_device bfin_mii_bus = { | ||
325 | .name = "bfin_mii_bus", | ||
326 | }; | ||
327 | |||
324 | static struct platform_device bfin_mac_device = { | 328 | static struct platform_device bfin_mac_device = { |
325 | .name = "bfin_mac", | 329 | .name = "bfin_mac", |
330 | .dev.platform_data = &bfin_mii_bus, | ||
326 | }; | 331 | }; |
327 | #endif | 332 | #endif |
328 | 333 | ||
@@ -1068,7 +1073,6 @@ static struct adp5588_kpad_platform_data adp5588_kpad_data = { | |||
1068 | }; | 1073 | }; |
1069 | #endif | 1074 | #endif |
1070 | 1075 | ||
1071 | #ifdef CONFIG_I2C_BOARDINFO | ||
1072 | static struct i2c_board_info __initdata bfin_i2c_board_info[] = { | 1076 | static struct i2c_board_info __initdata bfin_i2c_board_info[] = { |
1073 | #if defined(CONFIG_JOYSTICK_AD7142) || defined(CONFIG_JOYSTICK_AD7142_MODULE) | 1077 | #if defined(CONFIG_JOYSTICK_AD7142) || defined(CONFIG_JOYSTICK_AD7142_MODULE) |
1074 | { | 1078 | { |
@@ -1102,7 +1106,6 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = { | |||
1102 | }, | 1106 | }, |
1103 | #endif | 1107 | #endif |
1104 | }; | 1108 | }; |
1105 | #endif | ||
1106 | 1109 | ||
1107 | #if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE) | 1110 | #if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE) |
1108 | static struct platform_device bfin_sport0_uart_device = { | 1111 | static struct platform_device bfin_sport0_uart_device = { |
@@ -1217,6 +1220,7 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
1217 | #endif | 1220 | #endif |
1218 | 1221 | ||
1219 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | 1222 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) |
1223 | &bfin_mii_bus, | ||
1220 | &bfin_mac_device, | 1224 | &bfin_mac_device, |
1221 | #endif | 1225 | #endif |
1222 | 1226 | ||
@@ -1284,12 +1288,8 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
1284 | static int __init stamp_init(void) | 1288 | static int __init stamp_init(void) |
1285 | { | 1289 | { |
1286 | printk(KERN_INFO "%s(): registering device resources\n", __func__); | 1290 | printk(KERN_INFO "%s(): registering device resources\n", __func__); |
1287 | |||
1288 | #ifdef CONFIG_I2C_BOARDINFO | ||
1289 | i2c_register_board_info(0, bfin_i2c_board_info, | 1291 | i2c_register_board_info(0, bfin_i2c_board_info, |
1290 | ARRAY_SIZE(bfin_i2c_board_info)); | 1292 | ARRAY_SIZE(bfin_i2c_board_info)); |
1291 | #endif | ||
1292 | |||
1293 | bfin_plat_nand_init(); | 1293 | bfin_plat_nand_init(); |
1294 | platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); | 1294 | platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); |
1295 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); | 1295 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); |
@@ -1307,7 +1307,7 @@ void native_machine_restart(char *cmd) | |||
1307 | { | 1307 | { |
1308 | /* workaround reboot hang when booting from SPI */ | 1308 | /* workaround reboot hang when booting from SPI */ |
1309 | if ((bfin_read_SYSCR() & 0x7) == 0x3) | 1309 | if ((bfin_read_SYSCR() & 0x7) == 0x3) |
1310 | bfin_gpio_reset_spi0_ssel1(); | 1310 | bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS); |
1311 | } | 1311 | } |
1312 | 1312 | ||
1313 | /* | 1313 | /* |
diff --git a/arch/blackfin/mach-bf537/boards/tcm_bf537.c b/arch/blackfin/mach-bf537/boards/tcm_bf537.c index 2f4b066153c..3f4f203a06e 100644 --- a/arch/blackfin/mach-bf537/boards/tcm_bf537.c +++ b/arch/blackfin/mach-bf537/boards/tcm_bf537.c | |||
@@ -481,8 +481,13 @@ static struct platform_device bfin_sport1_uart_device = { | |||
481 | #endif | 481 | #endif |
482 | 482 | ||
483 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | 483 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) |
484 | static struct platform_device bfin_mii_bus = { | ||
485 | .name = "bfin_mii_bus", | ||
486 | }; | ||
487 | |||
484 | static struct platform_device bfin_mac_device = { | 488 | static struct platform_device bfin_mac_device = { |
485 | .name = "bfin_mac", | 489 | .name = "bfin_mac", |
490 | .dev.platform_data = &bfin_mii_bus, | ||
486 | }; | 491 | }; |
487 | #endif | 492 | #endif |
488 | 493 | ||
@@ -593,6 +598,7 @@ static struct platform_device *cm_bf537_devices[] __initdata = { | |||
593 | #endif | 598 | #endif |
594 | 599 | ||
595 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) | 600 | #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) |
601 | &bfin_mii_bus, | ||
596 | &bfin_mac_device, | 602 | &bfin_mac_device, |
597 | #endif | 603 | #endif |
598 | 604 | ||
@@ -615,7 +621,7 @@ static struct platform_device *cm_bf537_devices[] __initdata = { | |||
615 | &bfin_gpios_device, | 621 | &bfin_gpios_device, |
616 | }; | 622 | }; |
617 | 623 | ||
618 | static int __init cm_bf537_init(void) | 624 | static int __init tcm_bf537_init(void) |
619 | { | 625 | { |
620 | printk(KERN_INFO "%s(): registering device resources\n", __func__); | 626 | printk(KERN_INFO "%s(): registering device resources\n", __func__); |
621 | platform_add_devices(cm_bf537_devices, ARRAY_SIZE(cm_bf537_devices)); | 627 | platform_add_devices(cm_bf537_devices, ARRAY_SIZE(cm_bf537_devices)); |
@@ -629,7 +635,7 @@ static int __init cm_bf537_init(void) | |||
629 | return 0; | 635 | return 0; |
630 | } | 636 | } |
631 | 637 | ||
632 | arch_initcall(cm_bf537_init); | 638 | arch_initcall(tcm_bf537_init); |
633 | 639 | ||
634 | void bfin_get_ether_addr(char *addr) | 640 | void bfin_get_ether_addr(char *addr) |
635 | { | 641 | { |
diff --git a/arch/blackfin/mach-bf537/include/mach/portmux.h b/arch/blackfin/mach-bf537/include/mach/portmux.h index 78fee6e0f23..87285e75e90 100644 --- a/arch/blackfin/mach-bf537/include/mach/portmux.h +++ b/arch/blackfin/mach-bf537/include/mach/portmux.h | |||
@@ -31,6 +31,7 @@ | |||
31 | #define P_PPI0_FS1 (P_DEFINED | P_IDENT(GPIO_PF9) | P_FUNCT(1)) | 31 | #define P_PPI0_FS1 (P_DEFINED | P_IDENT(GPIO_PF9) | P_FUNCT(1)) |
32 | #define P_TACLK0 (P_DEFINED | P_IDENT(GPIO_PF14) | P_FUNCT(1)) | 32 | #define P_TACLK0 (P_DEFINED | P_IDENT(GPIO_PF14) | P_FUNCT(1)) |
33 | #define P_TMRCLK (P_DEFINED | P_IDENT(GPIO_PF15) | P_FUNCT(1)) | 33 | #define P_TMRCLK (P_DEFINED | P_IDENT(GPIO_PF15) | P_FUNCT(1)) |
34 | #define P_DEFAULT_BOOT_SPI_CS P_SPI0_SSEL1 | ||
34 | 35 | ||
35 | #define P_PPI0_D0 (P_DEFINED | P_IDENT(GPIO_PG0) | P_FUNCT(0)) | 36 | #define P_PPI0_D0 (P_DEFINED | P_IDENT(GPIO_PG0) | P_FUNCT(0)) |
36 | #define P_PPI0_D1 (P_DEFINED | P_IDENT(GPIO_PG1) | P_FUNCT(0)) | 37 | #define P_PPI0_D1 (P_DEFINED | P_IDENT(GPIO_PG1) | P_FUNCT(0)) |
diff --git a/arch/blackfin/mach-bf538/include/mach/portmux.h b/arch/blackfin/mach-bf538/include/mach/portmux.h index 1e031b588b4..c8db264e3e4 100644 --- a/arch/blackfin/mach-bf538/include/mach/portmux.h +++ b/arch/blackfin/mach-bf538/include/mach/portmux.h | |||
@@ -102,5 +102,6 @@ | |||
102 | #define P_SPI0_SSEL2 (P_DEFINED | P_IDENT(GPIO_PF2)) | 102 | #define P_SPI0_SSEL2 (P_DEFINED | P_IDENT(GPIO_PF2)) |
103 | #define P_SPI0_SSEL1 (P_DEFINED | P_IDENT(GPIO_PF1)) | 103 | #define P_SPI0_SSEL1 (P_DEFINED | P_IDENT(GPIO_PF1)) |
104 | #define P_SPI0_SS (P_DEFINED | P_IDENT(GPIO_PF0)) | 104 | #define P_SPI0_SS (P_DEFINED | P_IDENT(GPIO_PF0)) |
105 | #define P_DEFAULT_BOOT_SPI_CS P_SPI0_SSEL2 | ||
105 | 106 | ||
106 | #endif /* _MACH_PORTMUX_H_ */ | 107 | #endif /* _MACH_PORTMUX_H_ */ |
diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c index 309c16014ca..096e661700a 100644 --- a/arch/blackfin/mach-bf548/boards/ezkit.c +++ b/arch/blackfin/mach-bf548/boards/ezkit.c | |||
@@ -781,7 +781,6 @@ static struct platform_device i2c_bfin_twi1_device = { | |||
781 | #endif | 781 | #endif |
782 | #endif | 782 | #endif |
783 | 783 | ||
784 | #ifdef CONFIG_I2C_BOARDINFO | ||
785 | static struct i2c_board_info __initdata bfin_i2c_board_info0[] = { | 784 | static struct i2c_board_info __initdata bfin_i2c_board_info0[] = { |
786 | }; | 785 | }; |
787 | 786 | ||
@@ -800,7 +799,6 @@ static struct i2c_board_info __initdata bfin_i2c_board_info1[] = { | |||
800 | #endif | 799 | #endif |
801 | }; | 800 | }; |
802 | #endif | 801 | #endif |
803 | #endif | ||
804 | 802 | ||
805 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) | 803 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) |
806 | #include <linux/gpio_keys.h> | 804 | #include <linux/gpio_keys.h> |
@@ -956,14 +954,12 @@ static int __init ezkit_init(void) | |||
956 | { | 954 | { |
957 | printk(KERN_INFO "%s(): registering device resources\n", __func__); | 955 | printk(KERN_INFO "%s(): registering device resources\n", __func__); |
958 | 956 | ||
959 | #ifdef CONFIG_I2C_BOARDINFO | ||
960 | i2c_register_board_info(0, bfin_i2c_board_info0, | 957 | i2c_register_board_info(0, bfin_i2c_board_info0, |
961 | ARRAY_SIZE(bfin_i2c_board_info0)); | 958 | ARRAY_SIZE(bfin_i2c_board_info0)); |
962 | #if !defined(CONFIG_BF542) /* The BF542 only has 1 TWI */ | 959 | #if !defined(CONFIG_BF542) /* The BF542 only has 1 TWI */ |
963 | i2c_register_board_info(1, bfin_i2c_board_info1, | 960 | i2c_register_board_info(1, bfin_i2c_board_info1, |
964 | ARRAY_SIZE(bfin_i2c_board_info1)); | 961 | ARRAY_SIZE(bfin_i2c_board_info1)); |
965 | #endif | 962 | #endif |
966 | #endif | ||
967 | 963 | ||
968 | platform_add_devices(ezkit_devices, ARRAY_SIZE(ezkit_devices)); | 964 | platform_add_devices(ezkit_devices, ARRAY_SIZE(ezkit_devices)); |
969 | 965 | ||
diff --git a/arch/blackfin/mach-bf548/include/mach/anomaly.h b/arch/blackfin/mach-bf548/include/mach/anomaly.h index 3b5430999f4..23d03c52f4b 100644 --- a/arch/blackfin/mach-bf548/include/mach/anomaly.h +++ b/arch/blackfin/mach-bf548/include/mach/anomaly.h | |||
@@ -175,6 +175,7 @@ | |||
175 | #define ANOMALY_05000311 (0) | 175 | #define ANOMALY_05000311 (0) |
176 | #define ANOMALY_05000323 (0) | 176 | #define ANOMALY_05000323 (0) |
177 | #define ANOMALY_05000363 (0) | 177 | #define ANOMALY_05000363 (0) |
178 | #define ANOMALY_05000380 (0) | ||
178 | #define ANOMALY_05000412 (0) | 179 | #define ANOMALY_05000412 (0) |
179 | #define ANOMALY_05000432 (0) | 180 | #define ANOMALY_05000432 (0) |
180 | #define ANOMALY_05000435 (0) | 181 | #define ANOMALY_05000435 (0) |
diff --git a/arch/blackfin/mach-bf548/include/mach/bf548.h b/arch/blackfin/mach-bf548/include/mach/bf548.h index f0e56998481..cd31f72bdd8 100644 --- a/arch/blackfin/mach-bf548/include/mach/bf548.h +++ b/arch/blackfin/mach-bf548/include/mach/bf548.h | |||
@@ -104,6 +104,18 @@ | |||
104 | 104 | ||
105 | #define AMGCTLVAL (V_AMBEN | V_AMCKEN) | 105 | #define AMGCTLVAL (V_AMBEN | V_AMCKEN) |
106 | 106 | ||
107 | #if defined(CONFIG_BF542M) | ||
108 | # define CONFIG_BF542 | ||
109 | #elif defined(CONFIG_BF544M) | ||
110 | # define CONFIG_BF544 | ||
111 | #elif defined(CONFIG_BF547M) | ||
112 | # define CONFIG_BF547 | ||
113 | #elif defined(CONFIG_BF548M) | ||
114 | # define CONFIG_BF548 | ||
115 | #elif defined(CONFIG_BF549M) | ||
116 | # define CONFIG_BF549 | ||
117 | #endif | ||
118 | |||
107 | #if defined(CONFIG_BF542) | 119 | #if defined(CONFIG_BF542) |
108 | # define CPU "BF542" | 120 | # define CPU "BF542" |
109 | # define CPUID 0x27de | 121 | # define CPUID 0x27de |
diff --git a/arch/blackfin/mach-bf548/include/mach/gpio.h b/arch/blackfin/mach-bf548/include/mach/gpio.h index bba82dc75f1..3a205170978 100644 --- a/arch/blackfin/mach-bf548/include/mach/gpio.h +++ b/arch/blackfin/mach-bf548/include/mach/gpio.h | |||
@@ -195,17 +195,17 @@ | |||
195 | struct gpio_port_t { | 195 | struct gpio_port_t { |
196 | unsigned short port_fer; | 196 | unsigned short port_fer; |
197 | unsigned short dummy1; | 197 | unsigned short dummy1; |
198 | unsigned short port_data; | 198 | unsigned short data; |
199 | unsigned short dummy2; | 199 | unsigned short dummy2; |
200 | unsigned short port_set; | 200 | unsigned short data_set; |
201 | unsigned short dummy3; | 201 | unsigned short dummy3; |
202 | unsigned short port_clear; | 202 | unsigned short data_clear; |
203 | unsigned short dummy4; | 203 | unsigned short dummy4; |
204 | unsigned short port_dir_set; | 204 | unsigned short dir_set; |
205 | unsigned short dummy5; | 205 | unsigned short dummy5; |
206 | unsigned short port_dir_clear; | 206 | unsigned short dir_clear; |
207 | unsigned short dummy6; | 207 | unsigned short dummy6; |
208 | unsigned short port_inen; | 208 | unsigned short inen; |
209 | unsigned short dummy7; | 209 | unsigned short dummy7; |
210 | unsigned int port_mux; | 210 | unsigned int port_mux; |
211 | }; | 211 | }; |
diff --git a/arch/blackfin/mach-bf548/include/mach/portmux.h b/arch/blackfin/mach-bf548/include/mach/portmux.h index 8177a567dcd..ffb1d0a44b4 100644 --- a/arch/blackfin/mach-bf548/include/mach/portmux.h +++ b/arch/blackfin/mach-bf548/include/mach/portmux.h | |||
@@ -125,6 +125,7 @@ | |||
125 | #define P_KEY_COL2 (P_DEFINED | P_IDENT(GPIO_PD14) | P_FUNCT(3)) | 125 | #define P_KEY_COL2 (P_DEFINED | P_IDENT(GPIO_PD14) | P_FUNCT(3)) |
126 | #define P_KEY_COL3 (P_DEFINED | P_IDENT(GPIO_PD15) | P_FUNCT(3)) | 126 | #define P_KEY_COL3 (P_DEFINED | P_IDENT(GPIO_PD15) | P_FUNCT(3)) |
127 | 127 | ||
128 | #define P_DEFAULT_BOOT_SPI_CS P_SPI0_SSEL1 | ||
128 | #define P_SPI0_SCK (P_DEFINED | P_IDENT(GPIO_PE0) | P_FUNCT(0)) | 129 | #define P_SPI0_SCK (P_DEFINED | P_IDENT(GPIO_PE0) | P_FUNCT(0)) |
129 | #define P_SPI0_MISO (P_DEFINED | P_IDENT(GPIO_PE1) | P_FUNCT(0)) | 130 | #define P_SPI0_MISO (P_DEFINED | P_IDENT(GPIO_PE1) | P_FUNCT(0)) |
130 | #define P_SPI0_MOSI (P_DEFINED | P_IDENT(GPIO_PE2) | P_FUNCT(0)) | 131 | #define P_SPI0_MOSI (P_DEFINED | P_IDENT(GPIO_PE2) | P_FUNCT(0)) |
diff --git a/arch/blackfin/mach-bf561/include/mach/defBF561.h b/arch/blackfin/mach-bf561/include/mach/defBF561.h index d7c50975965..cf922295f4c 100644 --- a/arch/blackfin/mach-bf561/include/mach/defBF561.h +++ b/arch/blackfin/mach-bf561/include/mach/defBF561.h | |||
@@ -1106,6 +1106,8 @@ | |||
1106 | #define DLEN_8 0x0 /* PPI Data Length mask for DLEN=8 */ | 1106 | #define DLEN_8 0x0 /* PPI Data Length mask for DLEN=8 */ |
1107 | #define DLEN(x) (((x-9) & 0x07) << 11) /* PPI Data Length (only works for x=10-->x=16) */ | 1107 | #define DLEN(x) (((x-9) & 0x07) << 11) /* PPI Data Length (only works for x=10-->x=16) */ |
1108 | #define POL 0x0000C000 /* PPI Signal Polarities */ | 1108 | #define POL 0x0000C000 /* PPI Signal Polarities */ |
1109 | #define POLC 0x4000 /* PPI Clock Polarity */ | ||
1110 | #define POLS 0x8000 /* PPI Frame Sync Polarity */ | ||
1109 | 1111 | ||
1110 | /* PPI_STATUS Masks */ | 1112 | /* PPI_STATUS Masks */ |
1111 | #define FLD 0x00000400 /* Field Indicator */ | 1113 | #define FLD 0x00000400 /* Field Indicator */ |
diff --git a/arch/blackfin/mach-bf561/include/mach/portmux.h b/arch/blackfin/mach-bf561/include/mach/portmux.h index a6ee8206efb..2e5ad6347de 100644 --- a/arch/blackfin/mach-bf561/include/mach/portmux.h +++ b/arch/blackfin/mach-bf561/include/mach/portmux.h | |||
@@ -85,5 +85,6 @@ | |||
85 | #define P_SPI0_MOSI (P_DONTCARE) | 85 | #define P_SPI0_MOSI (P_DONTCARE) |
86 | #define P_SPI0_MISO (P_DONTCARE) | 86 | #define P_SPI0_MISO (P_DONTCARE) |
87 | #define P_SPI0_SCK (P_DONTCARE) | 87 | #define P_SPI0_SCK (P_DONTCARE) |
88 | #define P_DEFAULT_BOOT_SPI_CS P_SPI0_SSEL2 | ||
88 | 89 | ||
89 | #endif /* _MACH_PORTMUX_H_ */ | 90 | #endif /* _MACH_PORTMUX_H_ */ |
diff --git a/arch/blackfin/mach-common/clocks-init.c b/arch/blackfin/mach-common/clocks-init.c index 5d182abefc7..9dddb6f8cc8 100644 --- a/arch/blackfin/mach-common/clocks-init.c +++ b/arch/blackfin/mach-common/clocks-init.c | |||
@@ -14,6 +14,7 @@ | |||
14 | #include <asm/clocks.h> | 14 | #include <asm/clocks.h> |
15 | #include <asm/mem_init.h> | 15 | #include <asm/mem_init.h> |
16 | 16 | ||
17 | #define SDGCTL_WIDTH (1 << 31) /* SDRAM external data path width */ | ||
17 | #define PLL_CTL_VAL \ | 18 | #define PLL_CTL_VAL \ |
18 | (((CONFIG_VCO_MULT & 63) << 9) | CLKIN_HALF | \ | 19 | (((CONFIG_VCO_MULT & 63) << 9) | CLKIN_HALF | \ |
19 | (PLL_BYPASS << 8) | (ANOMALY_05000265 ? 0x8000 : 0)) | 20 | (PLL_BYPASS << 8) | (ANOMALY_05000265 ? 0x8000 : 0)) |
@@ -76,7 +77,7 @@ void init_clocks(void) | |||
76 | bfin_write_PLL_DIV(CONFIG_CCLK_ACT_DIV | CONFIG_SCLK_DIV); | 77 | bfin_write_PLL_DIV(CONFIG_CCLK_ACT_DIV | CONFIG_SCLK_DIV); |
77 | #ifdef EBIU_SDGCTL | 78 | #ifdef EBIU_SDGCTL |
78 | bfin_write_EBIU_SDRRC(mem_SDRRC); | 79 | bfin_write_EBIU_SDRRC(mem_SDRRC); |
79 | bfin_write_EBIU_SDGCTL(mem_SDGCTL); | 80 | bfin_write_EBIU_SDGCTL((bfin_read_EBIU_SDGCTL() & SDGCTL_WIDTH) | mem_SDGCTL); |
80 | #else | 81 | #else |
81 | bfin_write_EBIU_RSTCTL(bfin_read_EBIU_RSTCTL() & ~(SRREQ)); | 82 | bfin_write_EBIU_RSTCTL(bfin_read_EBIU_RSTCTL() & ~(SRREQ)); |
82 | do_sync(); | 83 | do_sync(); |
diff --git a/arch/blackfin/mach-common/entry.S b/arch/blackfin/mach-common/entry.S index fae77465137..88de053bbe8 100644 --- a/arch/blackfin/mach-common/entry.S +++ b/arch/blackfin/mach-common/entry.S | |||
@@ -151,13 +151,6 @@ ENTRY(_ex_syscall) | |||
151 | jump.s _bfin_return_from_exception; | 151 | jump.s _bfin_return_from_exception; |
152 | ENDPROC(_ex_syscall) | 152 | ENDPROC(_ex_syscall) |
153 | 153 | ||
154 | ENTRY(_ex_soft_bp) | ||
155 | r7 = retx; | ||
156 | r7 += -2; | ||
157 | retx = r7; | ||
158 | jump.s _ex_trap_c; | ||
159 | ENDPROC(_ex_soft_bp) | ||
160 | |||
161 | ENTRY(_ex_single_step) | 154 | ENTRY(_ex_single_step) |
162 | /* If we just returned from an interrupt, the single step event is | 155 | /* If we just returned from an interrupt, the single step event is |
163 | for the RTI instruction. */ | 156 | for the RTI instruction. */ |
@@ -1087,7 +1080,7 @@ ENTRY(_ex_table) | |||
1087 | * EXCPT instruction can provide 4 bits of EXCAUSE, allowing 16 to be user defined | 1080 | * EXCPT instruction can provide 4 bits of EXCAUSE, allowing 16 to be user defined |
1088 | */ | 1081 | */ |
1089 | .long _ex_syscall /* 0x00 - User Defined - Linux Syscall */ | 1082 | .long _ex_syscall /* 0x00 - User Defined - Linux Syscall */ |
1090 | .long _ex_soft_bp /* 0x01 - User Defined - Software breakpoint */ | 1083 | .long _ex_trap_c /* 0x01 - User Defined - Software breakpoint */ |
1091 | #ifdef CONFIG_KGDB | 1084 | #ifdef CONFIG_KGDB |
1092 | .long _ex_trap_c /* 0x02 - User Defined - KGDB initial connection | 1085 | .long _ex_trap_c /* 0x02 - User Defined - KGDB initial connection |
1093 | and break signal trap */ | 1086 | and break signal trap */ |
diff --git a/arch/blackfin/mach-common/head.S b/arch/blackfin/mach-common/head.S index e1e42c029e1..698d4c05947 100644 --- a/arch/blackfin/mach-common/head.S +++ b/arch/blackfin/mach-common/head.S | |||
@@ -17,6 +17,19 @@ | |||
17 | 17 | ||
18 | __INIT | 18 | __INIT |
19 | 19 | ||
20 | ENTRY(__init_clear_bss) | ||
21 | r2 = r2 - r1; | ||
22 | cc = r2 == 0; | ||
23 | if cc jump .L_bss_done; | ||
24 | r2 >>= 2; | ||
25 | p1 = r1; | ||
26 | p2 = r2; | ||
27 | lsetup (1f, 1f) lc0 = p2; | ||
28 | 1: [p1++] = r0; | ||
29 | .L_bss_done: | ||
30 | rts; | ||
31 | ENDPROC(__init_clear_bss) | ||
32 | |||
20 | #define INITIAL_STACK (L1_SCRATCH_START + L1_SCRATCH_LENGTH - 12) | 33 | #define INITIAL_STACK (L1_SCRATCH_START + L1_SCRATCH_LENGTH - 12) |
21 | 34 | ||
22 | ENTRY(__start) | 35 | ENTRY(__start) |
@@ -144,6 +157,35 @@ ENTRY(__start) | |||
144 | call _init_early_exception_vectors; | 157 | call _init_early_exception_vectors; |
145 | #endif | 158 | #endif |
146 | 159 | ||
160 | r0 = 0 (x); | ||
161 | /* Zero out all of the fun bss regions */ | ||
162 | #if L1_DATA_A_LENGTH > 0 | ||
163 | r1.l = __sbss_l1; | ||
164 | r1.h = __sbss_l1; | ||
165 | r2.l = __ebss_l1; | ||
166 | r2.h = __ebss_l1; | ||
167 | call __init_clear_bss | ||
168 | #endif | ||
169 | #if L1_DATA_B_LENGTH > 0 | ||
170 | r1.l = __sbss_b_l1; | ||
171 | r1.h = __sbss_b_l1; | ||
172 | r2.l = __ebss_b_l1; | ||
173 | r2.h = __ebss_b_l1; | ||
174 | call __init_clear_bss | ||
175 | #endif | ||
176 | #if L2_LENGTH > 0 | ||
177 | r1.l = __sbss_l2; | ||
178 | r1.h = __sbss_l2; | ||
179 | r2.l = __ebss_l2; | ||
180 | r2.h = __ebss_l2; | ||
181 | call __init_clear_bss | ||
182 | #endif | ||
183 | r1.l = ___bss_start; | ||
184 | r1.h = ___bss_start; | ||
185 | r2.l = ___bss_stop; | ||
186 | r2.h = ___bss_stop; | ||
187 | call __init_clear_bss | ||
188 | |||
147 | /* Put The Code for PLL Programming and SDRAM Programming in L1 ISRAM */ | 189 | /* Put The Code for PLL Programming and SDRAM Programming in L1 ISRAM */ |
148 | call _bfin_relocate_l1_mem; | 190 | call _bfin_relocate_l1_mem; |
149 | #ifdef CONFIG_BFIN_KERNEL_CLOCK | 191 | #ifdef CONFIG_BFIN_KERNEL_CLOCK |
@@ -185,19 +227,6 @@ ENDPROC(__start) | |||
185 | # define WDOG_CTL WDOGA_CTL | 227 | # define WDOG_CTL WDOGA_CTL |
186 | #endif | 228 | #endif |
187 | 229 | ||
188 | ENTRY(__init_clear_bss) | ||
189 | r2 = r2 - r1; | ||
190 | cc = r2 == 0; | ||
191 | if cc jump .L_bss_done; | ||
192 | r2 >>= 2; | ||
193 | p1 = r1; | ||
194 | p2 = r2; | ||
195 | lsetup (1f, 1f) lc0 = p2; | ||
196 | 1: [p1++] = r0; | ||
197 | .L_bss_done: | ||
198 | rts; | ||
199 | ENDPROC(__init_clear_bss) | ||
200 | |||
201 | ENTRY(_real_start) | 230 | ENTRY(_real_start) |
202 | /* Enable nested interrupts */ | 231 | /* Enable nested interrupts */ |
203 | [--sp] = reti; | 232 | [--sp] = reti; |
@@ -209,35 +238,6 @@ ENTRY(_real_start) | |||
209 | w[p0] = r0; | 238 | w[p0] = r0; |
210 | ssync; | 239 | ssync; |
211 | 240 | ||
212 | r0 = 0 (x); | ||
213 | /* Zero out all of the fun bss regions */ | ||
214 | #if L1_DATA_A_LENGTH > 0 | ||
215 | r1.l = __sbss_l1; | ||
216 | r1.h = __sbss_l1; | ||
217 | r2.l = __ebss_l1; | ||
218 | r2.h = __ebss_l1; | ||
219 | call __init_clear_bss | ||
220 | #endif | ||
221 | #if L1_DATA_B_LENGTH > 0 | ||
222 | r1.l = __sbss_b_l1; | ||
223 | r1.h = __sbss_b_l1; | ||
224 | r2.l = __ebss_b_l1; | ||
225 | r2.h = __ebss_b_l1; | ||
226 | call __init_clear_bss | ||
227 | #endif | ||
228 | #if L2_LENGTH > 0 | ||
229 | r1.l = __sbss_l2; | ||
230 | r1.h = __sbss_l2; | ||
231 | r2.l = __ebss_l2; | ||
232 | r2.h = __ebss_l2; | ||
233 | call __init_clear_bss | ||
234 | #endif | ||
235 | r1.l = ___bss_start; | ||
236 | r1.h = ___bss_start; | ||
237 | r2.l = ___bss_stop; | ||
238 | r2.h = ___bss_stop; | ||
239 | call __init_clear_bss | ||
240 | |||
241 | /* Pass the u-boot arguments to the global value command line */ | 241 | /* Pass the u-boot arguments to the global value command line */ |
242 | R0 = R7; | 242 | R0 = R7; |
243 | call _cmdline_init; | 243 | call _cmdline_init; |
diff --git a/arch/blackfin/mach-common/interrupt.S b/arch/blackfin/mach-common/interrupt.S index 473df0f7fa7..43c4eb9acb6 100644 --- a/arch/blackfin/mach-common/interrupt.S +++ b/arch/blackfin/mach-common/interrupt.S | |||
@@ -195,7 +195,7 @@ ENDPROC(_evt_ivhw) | |||
195 | /* Interrupt routine for evt2 (NMI). | 195 | /* Interrupt routine for evt2 (NMI). |
196 | * We don't actually use this, so just return. | 196 | * We don't actually use this, so just return. |
197 | * For inner circle type details, please see: | 197 | * For inner circle type details, please see: |
198 | * http://docs.blackfin.uclinux.org/doku.php?id=linux:nmi | 198 | * http://docs.blackfin.uclinux.org/doku.php?id=linux-kernel:nmi |
199 | */ | 199 | */ |
200 | ENTRY(_evt_nmi) | 200 | ENTRY(_evt_nmi) |
201 | .weak _evt_nmi | 201 | .weak _evt_nmi |
diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c index 1bba6030dce..202494568c6 100644 --- a/arch/blackfin/mach-common/ints-priority.c +++ b/arch/blackfin/mach-common/ints-priority.c | |||
@@ -1101,10 +1101,9 @@ int __init init_arch_irq(void) | |||
1101 | IMASK_IVG14 | IMASK_IVG13 | IMASK_IVG12 | IMASK_IVG11 | | 1101 | IMASK_IVG14 | IMASK_IVG13 | IMASK_IVG12 | IMASK_IVG11 | |
1102 | IMASK_IVG10 | IMASK_IVG9 | IMASK_IVG8 | IMASK_IVG7 | IMASK_IVGHW; | 1102 | IMASK_IVG10 | IMASK_IVG9 | IMASK_IVG8 | IMASK_IVG7 | IMASK_IVGHW; |
1103 | 1103 | ||
1104 | #if defined(CONFIG_BF54x) || defined(CONFIG_BF52x) || defined(CONFIG_BF561) \ | 1104 | #ifdef SIC_IWR0 |
1105 | || defined(BF538_FAMILY) || defined(CONFIG_BF51x) | ||
1106 | bfin_write_SIC_IWR0(IWR_DISABLE_ALL); | 1105 | bfin_write_SIC_IWR0(IWR_DISABLE_ALL); |
1107 | #if defined(CONFIG_BF52x) || defined(CONFIG_BF51x) | 1106 | # ifdef SIC_IWR1 |
1108 | /* BF52x/BF51x system reset does not properly reset SIC_IWR1 which | 1107 | /* BF52x/BF51x system reset does not properly reset SIC_IWR1 which |
1109 | * will screw up the bootrom as it relies on MDMA0/1 waking it | 1108 | * will screw up the bootrom as it relies on MDMA0/1 waking it |
1110 | * up from IDLE instructions. See this report for more info: | 1109 | * up from IDLE instructions. See this report for more info: |
@@ -1114,10 +1113,8 @@ int __init init_arch_irq(void) | |||
1114 | bfin_write_SIC_IWR1(IWR_ENABLE(10) | IWR_ENABLE(11)); | 1113 | bfin_write_SIC_IWR1(IWR_ENABLE(10) | IWR_ENABLE(11)); |
1115 | else | 1114 | else |
1116 | bfin_write_SIC_IWR1(IWR_DISABLE_ALL); | 1115 | bfin_write_SIC_IWR1(IWR_DISABLE_ALL); |
1117 | #else | 1116 | # endif |
1118 | bfin_write_SIC_IWR1(IWR_DISABLE_ALL); | 1117 | # ifdef SIC_IWR2 |
1119 | #endif | ||
1120 | # ifdef CONFIG_BF54x | ||
1121 | bfin_write_SIC_IWR2(IWR_DISABLE_ALL); | 1118 | bfin_write_SIC_IWR2(IWR_DISABLE_ALL); |
1122 | # endif | 1119 | # endif |
1123 | #else | 1120 | #else |
diff --git a/arch/blackfin/mach-common/pm.c b/arch/blackfin/mach-common/pm.c index d3d70fd67c1..f48a6aebb49 100644 --- a/arch/blackfin/mach-common/pm.c +++ b/arch/blackfin/mach-common/pm.c | |||
@@ -82,10 +82,9 @@ void bfin_pm_suspend_standby_enter(void) | |||
82 | 82 | ||
83 | bfin_pm_standby_restore(); | 83 | bfin_pm_standby_restore(); |
84 | 84 | ||
85 | #if defined(CONFIG_BF54x) || defined(CONFIG_BF52x) || defined(CONFIG_BF561) || \ | 85 | #ifdef SIC_IWR0 |
86 | defined(CONFIG_BF538) || defined(CONFIG_BF539) || defined(CONFIG_BF51x) | ||
87 | bfin_write_SIC_IWR0(IWR_DISABLE_ALL); | 86 | bfin_write_SIC_IWR0(IWR_DISABLE_ALL); |
88 | #if defined(CONFIG_BF52x) || defined(CONFIG_BF51x) | 87 | # ifdef SIC_IWR1 |
89 | /* BF52x system reset does not properly reset SIC_IWR1 which | 88 | /* BF52x system reset does not properly reset SIC_IWR1 which |
90 | * will screw up the bootrom as it relies on MDMA0/1 waking it | 89 | * will screw up the bootrom as it relies on MDMA0/1 waking it |
91 | * up from IDLE instructions. See this report for more info: | 90 | * up from IDLE instructions. See this report for more info: |
@@ -95,10 +94,8 @@ void bfin_pm_suspend_standby_enter(void) | |||
95 | bfin_write_SIC_IWR1(IWR_ENABLE(10) | IWR_ENABLE(11)); | 94 | bfin_write_SIC_IWR1(IWR_ENABLE(10) | IWR_ENABLE(11)); |
96 | else | 95 | else |
97 | bfin_write_SIC_IWR1(IWR_DISABLE_ALL); | 96 | bfin_write_SIC_IWR1(IWR_DISABLE_ALL); |
98 | #else | 97 | # endif |
99 | bfin_write_SIC_IWR1(IWR_DISABLE_ALL); | 98 | # ifdef SIC_IWR2 |
100 | #endif | ||
101 | # ifdef CONFIG_BF54x | ||
102 | bfin_write_SIC_IWR2(IWR_DISABLE_ALL); | 99 | bfin_write_SIC_IWR2(IWR_DISABLE_ALL); |
103 | # endif | 100 | # endif |
104 | #else | 101 | #else |
diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c index d98f0f4ff83..6d5e6c5630e 100644 --- a/arch/ia64/hp/common/sba_iommu.c +++ b/arch/ia64/hp/common/sba_iommu.c | |||
@@ -906,7 +906,7 @@ sba_mark_invalid(struct ioc *ioc, dma_addr_t iova, size_t byte_cnt) | |||
906 | * @dir: R/W or both. | 906 | * @dir: R/W or both. |
907 | * @attrs: optional dma attributes | 907 | * @attrs: optional dma attributes |
908 | * | 908 | * |
909 | * See Documentation/DMA-mapping.txt | 909 | * See Documentation/PCI/PCI-DMA-mapping.txt |
910 | */ | 910 | */ |
911 | dma_addr_t | 911 | dma_addr_t |
912 | sba_map_single_attrs(struct device *dev, void *addr, size_t size, int dir, | 912 | sba_map_single_attrs(struct device *dev, void *addr, size_t size, int dir, |
@@ -1024,7 +1024,7 @@ sba_mark_clean(struct ioc *ioc, dma_addr_t iova, size_t size) | |||
1024 | * @dir: R/W or both. | 1024 | * @dir: R/W or both. |
1025 | * @attrs: optional dma attributes | 1025 | * @attrs: optional dma attributes |
1026 | * | 1026 | * |
1027 | * See Documentation/DMA-mapping.txt | 1027 | * See Documentation/PCI/PCI-DMA-mapping.txt |
1028 | */ | 1028 | */ |
1029 | void sba_unmap_single_attrs(struct device *dev, dma_addr_t iova, size_t size, | 1029 | void sba_unmap_single_attrs(struct device *dev, dma_addr_t iova, size_t size, |
1030 | int dir, struct dma_attrs *attrs) | 1030 | int dir, struct dma_attrs *attrs) |
@@ -1102,7 +1102,7 @@ EXPORT_SYMBOL(sba_unmap_single_attrs); | |||
1102 | * @size: number of bytes mapped in driver buffer. | 1102 | * @size: number of bytes mapped in driver buffer. |
1103 | * @dma_handle: IOVA of new buffer. | 1103 | * @dma_handle: IOVA of new buffer. |
1104 | * | 1104 | * |
1105 | * See Documentation/DMA-mapping.txt | 1105 | * See Documentation/PCI/PCI-DMA-mapping.txt |
1106 | */ | 1106 | */ |
1107 | void * | 1107 | void * |
1108 | sba_alloc_coherent (struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flags) | 1108 | sba_alloc_coherent (struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flags) |
@@ -1165,7 +1165,7 @@ sba_alloc_coherent (struct device *dev, size_t size, dma_addr_t *dma_handle, gfp | |||
1165 | * @vaddr: virtual address IOVA of "consistent" buffer. | 1165 | * @vaddr: virtual address IOVA of "consistent" buffer. |
1166 | * @dma_handler: IO virtual address of "consistent" buffer. | 1166 | * @dma_handler: IO virtual address of "consistent" buffer. |
1167 | * | 1167 | * |
1168 | * See Documentation/DMA-mapping.txt | 1168 | * See Documentation/PCI/PCI-DMA-mapping.txt |
1169 | */ | 1169 | */ |
1170 | void sba_free_coherent (struct device *dev, size_t size, void *vaddr, dma_addr_t dma_handle) | 1170 | void sba_free_coherent (struct device *dev, size_t size, void *vaddr, dma_addr_t dma_handle) |
1171 | { | 1171 | { |
@@ -1420,7 +1420,7 @@ sba_coalesce_chunks(struct ioc *ioc, struct device *dev, | |||
1420 | * @dir: R/W or both. | 1420 | * @dir: R/W or both. |
1421 | * @attrs: optional dma attributes | 1421 | * @attrs: optional dma attributes |
1422 | * | 1422 | * |
1423 | * See Documentation/DMA-mapping.txt | 1423 | * See Documentation/PCI/PCI-DMA-mapping.txt |
1424 | */ | 1424 | */ |
1425 | int sba_map_sg_attrs(struct device *dev, struct scatterlist *sglist, int nents, | 1425 | int sba_map_sg_attrs(struct device *dev, struct scatterlist *sglist, int nents, |
1426 | int dir, struct dma_attrs *attrs) | 1426 | int dir, struct dma_attrs *attrs) |
@@ -1512,7 +1512,7 @@ EXPORT_SYMBOL(sba_map_sg_attrs); | |||
1512 | * @dir: R/W or both. | 1512 | * @dir: R/W or both. |
1513 | * @attrs: optional dma attributes | 1513 | * @attrs: optional dma attributes |
1514 | * | 1514 | * |
1515 | * See Documentation/DMA-mapping.txt | 1515 | * See Documentation/PCI/PCI-DMA-mapping.txt |
1516 | */ | 1516 | */ |
1517 | void sba_unmap_sg_attrs(struct device *dev, struct scatterlist *sglist, | 1517 | void sba_unmap_sg_attrs(struct device *dev, struct scatterlist *sglist, |
1518 | int nents, int dir, struct dma_attrs *attrs) | 1518 | int nents, int dir, struct dma_attrs *attrs) |
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 52c80c2a57f..600eef3f3ac 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -351,7 +351,7 @@ config SGI_IP27 | |||
351 | select ARC64 | 351 | select ARC64 |
352 | select BOOT_ELF64 | 352 | select BOOT_ELF64 |
353 | select DEFAULT_SGI_PARTITION | 353 | select DEFAULT_SGI_PARTITION |
354 | select DMA_IP27 | 354 | select DMA_COHERENT |
355 | select SYS_HAS_EARLY_PRINTK | 355 | select SYS_HAS_EARLY_PRINTK |
356 | select HW_HAS_PCI | 356 | select HW_HAS_PCI |
357 | select NR_CPUS_DEFAULT_64 | 357 | select NR_CPUS_DEFAULT_64 |
@@ -761,9 +761,6 @@ config CFE | |||
761 | config DMA_COHERENT | 761 | config DMA_COHERENT |
762 | bool | 762 | bool |
763 | 763 | ||
764 | config DMA_IP27 | ||
765 | bool | ||
766 | |||
767 | config DMA_NONCOHERENT | 764 | config DMA_NONCOHERENT |
768 | bool | 765 | bool |
769 | select DMA_NEED_PCI_MAP_STATE | 766 | select DMA_NEED_PCI_MAP_STATE |
@@ -1368,7 +1365,7 @@ config CPU_SUPPORTS_64BIT_KERNEL | |||
1368 | # | 1365 | # |
1369 | config HARDWARE_WATCHPOINTS | 1366 | config HARDWARE_WATCHPOINTS |
1370 | bool | 1367 | bool |
1371 | default y if CPU_MIPS32 || CPU_MIPS64 | 1368 | default y if CPU_MIPSR1 || CPU_MIPSR2 |
1372 | 1369 | ||
1373 | menu "Kernel type" | 1370 | menu "Kernel type" |
1374 | 1371 | ||
diff --git a/arch/mips/alchemy/common/time.c b/arch/mips/alchemy/common/time.c index 32880146cbc..6fd441d16af 100644 --- a/arch/mips/alchemy/common/time.c +++ b/arch/mips/alchemy/common/time.c | |||
@@ -89,7 +89,7 @@ static struct clock_event_device au1x_rtcmatch2_clockdev = { | |||
89 | .irq = AU1000_RTC_MATCH2_INT, | 89 | .irq = AU1000_RTC_MATCH2_INT, |
90 | .set_next_event = au1x_rtcmatch2_set_next_event, | 90 | .set_next_event = au1x_rtcmatch2_set_next_event, |
91 | .set_mode = au1x_rtcmatch2_set_mode, | 91 | .set_mode = au1x_rtcmatch2_set_mode, |
92 | .cpumask = CPU_MASK_ALL, | 92 | .cpumask = CPU_MASK_ALL_PTR, |
93 | }; | 93 | }; |
94 | 94 | ||
95 | static struct irqaction au1x_rtcmatch2_irqaction = { | 95 | static struct irqaction au1x_rtcmatch2_irqaction = { |
diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c index e085feddb4a..5f4e49ba471 100644 --- a/arch/mips/cavium-octeon/setup.c +++ b/arch/mips/cavium-octeon/setup.c | |||
@@ -15,13 +15,11 @@ | |||
15 | #include <linux/serial.h> | 15 | #include <linux/serial.h> |
16 | #include <linux/types.h> | 16 | #include <linux/types.h> |
17 | #include <linux/string.h> /* for memset */ | 17 | #include <linux/string.h> /* for memset */ |
18 | #include <linux/serial.h> | ||
19 | #include <linux/tty.h> | 18 | #include <linux/tty.h> |
20 | #include <linux/time.h> | 19 | #include <linux/time.h> |
21 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
22 | #include <linux/serial_core.h> | 21 | #include <linux/serial_core.h> |
23 | #include <linux/serial_8250.h> | 22 | #include <linux/serial_8250.h> |
24 | #include <linux/string.h> | ||
25 | 23 | ||
26 | #include <asm/processor.h> | 24 | #include <asm/processor.h> |
27 | #include <asm/reboot.h> | 25 | #include <asm/reboot.h> |
diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig index 34ea319be94..f2baea3039b 100644 --- a/arch/mips/configs/ip27_defconfig +++ b/arch/mips/configs/ip27_defconfig | |||
@@ -53,7 +53,7 @@ CONFIG_GENERIC_TIME=y | |||
53 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 53 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
54 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 54 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
55 | CONFIG_ARC=y | 55 | CONFIG_ARC=y |
56 | CONFIG_DMA_IP27=y | 56 | CONFIG_DMA_COHERENT=y |
57 | CONFIG_EARLY_PRINTK=y | 57 | CONFIG_EARLY_PRINTK=y |
58 | CONFIG_SYS_HAS_EARLY_PRINTK=y | 58 | CONFIG_SYS_HAS_EARLY_PRINTK=y |
59 | # CONFIG_NO_IOPORT is not set | 59 | # CONFIG_NO_IOPORT is not set |
diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h index c996c3b4d07..1b332e15ab5 100644 --- a/arch/mips/include/asm/atomic.h +++ b/arch/mips/include/asm/atomic.h | |||
@@ -50,7 +50,7 @@ | |||
50 | static __inline__ void atomic_add(int i, atomic_t * v) | 50 | static __inline__ void atomic_add(int i, atomic_t * v) |
51 | { | 51 | { |
52 | if (cpu_has_llsc && R10000_LLSC_WAR) { | 52 | if (cpu_has_llsc && R10000_LLSC_WAR) { |
53 | unsigned long temp; | 53 | int temp; |
54 | 54 | ||
55 | __asm__ __volatile__( | 55 | __asm__ __volatile__( |
56 | " .set mips3 \n" | 56 | " .set mips3 \n" |
@@ -62,7 +62,7 @@ static __inline__ void atomic_add(int i, atomic_t * v) | |||
62 | : "=&r" (temp), "=m" (v->counter) | 62 | : "=&r" (temp), "=m" (v->counter) |
63 | : "Ir" (i), "m" (v->counter)); | 63 | : "Ir" (i), "m" (v->counter)); |
64 | } else if (cpu_has_llsc) { | 64 | } else if (cpu_has_llsc) { |
65 | unsigned long temp; | 65 | int temp; |
66 | 66 | ||
67 | __asm__ __volatile__( | 67 | __asm__ __volatile__( |
68 | " .set mips3 \n" | 68 | " .set mips3 \n" |
@@ -95,7 +95,7 @@ static __inline__ void atomic_add(int i, atomic_t * v) | |||
95 | static __inline__ void atomic_sub(int i, atomic_t * v) | 95 | static __inline__ void atomic_sub(int i, atomic_t * v) |
96 | { | 96 | { |
97 | if (cpu_has_llsc && R10000_LLSC_WAR) { | 97 | if (cpu_has_llsc && R10000_LLSC_WAR) { |
98 | unsigned long temp; | 98 | int temp; |
99 | 99 | ||
100 | __asm__ __volatile__( | 100 | __asm__ __volatile__( |
101 | " .set mips3 \n" | 101 | " .set mips3 \n" |
@@ -107,7 +107,7 @@ static __inline__ void atomic_sub(int i, atomic_t * v) | |||
107 | : "=&r" (temp), "=m" (v->counter) | 107 | : "=&r" (temp), "=m" (v->counter) |
108 | : "Ir" (i), "m" (v->counter)); | 108 | : "Ir" (i), "m" (v->counter)); |
109 | } else if (cpu_has_llsc) { | 109 | } else if (cpu_has_llsc) { |
110 | unsigned long temp; | 110 | int temp; |
111 | 111 | ||
112 | __asm__ __volatile__( | 112 | __asm__ __volatile__( |
113 | " .set mips3 \n" | 113 | " .set mips3 \n" |
@@ -135,12 +135,12 @@ static __inline__ void atomic_sub(int i, atomic_t * v) | |||
135 | */ | 135 | */ |
136 | static __inline__ int atomic_add_return(int i, atomic_t * v) | 136 | static __inline__ int atomic_add_return(int i, atomic_t * v) |
137 | { | 137 | { |
138 | unsigned long result; | 138 | int result; |
139 | 139 | ||
140 | smp_llsc_mb(); | 140 | smp_llsc_mb(); |
141 | 141 | ||
142 | if (cpu_has_llsc && R10000_LLSC_WAR) { | 142 | if (cpu_has_llsc && R10000_LLSC_WAR) { |
143 | unsigned long temp; | 143 | int temp; |
144 | 144 | ||
145 | __asm__ __volatile__( | 145 | __asm__ __volatile__( |
146 | " .set mips3 \n" | 146 | " .set mips3 \n" |
@@ -154,7 +154,7 @@ static __inline__ int atomic_add_return(int i, atomic_t * v) | |||
154 | : "Ir" (i), "m" (v->counter) | 154 | : "Ir" (i), "m" (v->counter) |
155 | : "memory"); | 155 | : "memory"); |
156 | } else if (cpu_has_llsc) { | 156 | } else if (cpu_has_llsc) { |
157 | unsigned long temp; | 157 | int temp; |
158 | 158 | ||
159 | __asm__ __volatile__( | 159 | __asm__ __volatile__( |
160 | " .set mips3 \n" | 160 | " .set mips3 \n" |
@@ -187,12 +187,12 @@ static __inline__ int atomic_add_return(int i, atomic_t * v) | |||
187 | 187 | ||
188 | static __inline__ int atomic_sub_return(int i, atomic_t * v) | 188 | static __inline__ int atomic_sub_return(int i, atomic_t * v) |
189 | { | 189 | { |
190 | unsigned long result; | 190 | int result; |
191 | 191 | ||
192 | smp_llsc_mb(); | 192 | smp_llsc_mb(); |
193 | 193 | ||
194 | if (cpu_has_llsc && R10000_LLSC_WAR) { | 194 | if (cpu_has_llsc && R10000_LLSC_WAR) { |
195 | unsigned long temp; | 195 | int temp; |
196 | 196 | ||
197 | __asm__ __volatile__( | 197 | __asm__ __volatile__( |
198 | " .set mips3 \n" | 198 | " .set mips3 \n" |
@@ -206,7 +206,7 @@ static __inline__ int atomic_sub_return(int i, atomic_t * v) | |||
206 | : "Ir" (i), "m" (v->counter) | 206 | : "Ir" (i), "m" (v->counter) |
207 | : "memory"); | 207 | : "memory"); |
208 | } else if (cpu_has_llsc) { | 208 | } else if (cpu_has_llsc) { |
209 | unsigned long temp; | 209 | int temp; |
210 | 210 | ||
211 | __asm__ __volatile__( | 211 | __asm__ __volatile__( |
212 | " .set mips3 \n" | 212 | " .set mips3 \n" |
@@ -247,12 +247,12 @@ static __inline__ int atomic_sub_return(int i, atomic_t * v) | |||
247 | */ | 247 | */ |
248 | static __inline__ int atomic_sub_if_positive(int i, atomic_t * v) | 248 | static __inline__ int atomic_sub_if_positive(int i, atomic_t * v) |
249 | { | 249 | { |
250 | unsigned long result; | 250 | int result; |
251 | 251 | ||
252 | smp_llsc_mb(); | 252 | smp_llsc_mb(); |
253 | 253 | ||
254 | if (cpu_has_llsc && R10000_LLSC_WAR) { | 254 | if (cpu_has_llsc && R10000_LLSC_WAR) { |
255 | unsigned long temp; | 255 | int temp; |
256 | 256 | ||
257 | __asm__ __volatile__( | 257 | __asm__ __volatile__( |
258 | " .set mips3 \n" | 258 | " .set mips3 \n" |
@@ -270,7 +270,7 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v) | |||
270 | : "Ir" (i), "m" (v->counter) | 270 | : "Ir" (i), "m" (v->counter) |
271 | : "memory"); | 271 | : "memory"); |
272 | } else if (cpu_has_llsc) { | 272 | } else if (cpu_has_llsc) { |
273 | unsigned long temp; | 273 | int temp; |
274 | 274 | ||
275 | __asm__ __volatile__( | 275 | __asm__ __volatile__( |
276 | " .set mips3 \n" | 276 | " .set mips3 \n" |
@@ -429,7 +429,7 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u) | |||
429 | static __inline__ void atomic64_add(long i, atomic64_t * v) | 429 | static __inline__ void atomic64_add(long i, atomic64_t * v) |
430 | { | 430 | { |
431 | if (cpu_has_llsc && R10000_LLSC_WAR) { | 431 | if (cpu_has_llsc && R10000_LLSC_WAR) { |
432 | unsigned long temp; | 432 | long temp; |
433 | 433 | ||
434 | __asm__ __volatile__( | 434 | __asm__ __volatile__( |
435 | " .set mips3 \n" | 435 | " .set mips3 \n" |
@@ -441,7 +441,7 @@ static __inline__ void atomic64_add(long i, atomic64_t * v) | |||
441 | : "=&r" (temp), "=m" (v->counter) | 441 | : "=&r" (temp), "=m" (v->counter) |
442 | : "Ir" (i), "m" (v->counter)); | 442 | : "Ir" (i), "m" (v->counter)); |
443 | } else if (cpu_has_llsc) { | 443 | } else if (cpu_has_llsc) { |
444 | unsigned long temp; | 444 | long temp; |
445 | 445 | ||
446 | __asm__ __volatile__( | 446 | __asm__ __volatile__( |
447 | " .set mips3 \n" | 447 | " .set mips3 \n" |
@@ -474,7 +474,7 @@ static __inline__ void atomic64_add(long i, atomic64_t * v) | |||
474 | static __inline__ void atomic64_sub(long i, atomic64_t * v) | 474 | static __inline__ void atomic64_sub(long i, atomic64_t * v) |
475 | { | 475 | { |
476 | if (cpu_has_llsc && R10000_LLSC_WAR) { | 476 | if (cpu_has_llsc && R10000_LLSC_WAR) { |
477 | unsigned long temp; | 477 | long temp; |
478 | 478 | ||
479 | __asm__ __volatile__( | 479 | __asm__ __volatile__( |
480 | " .set mips3 \n" | 480 | " .set mips3 \n" |
@@ -486,7 +486,7 @@ static __inline__ void atomic64_sub(long i, atomic64_t * v) | |||
486 | : "=&r" (temp), "=m" (v->counter) | 486 | : "=&r" (temp), "=m" (v->counter) |
487 | : "Ir" (i), "m" (v->counter)); | 487 | : "Ir" (i), "m" (v->counter)); |
488 | } else if (cpu_has_llsc) { | 488 | } else if (cpu_has_llsc) { |
489 | unsigned long temp; | 489 | long temp; |
490 | 490 | ||
491 | __asm__ __volatile__( | 491 | __asm__ __volatile__( |
492 | " .set mips3 \n" | 492 | " .set mips3 \n" |
@@ -514,12 +514,12 @@ static __inline__ void atomic64_sub(long i, atomic64_t * v) | |||
514 | */ | 514 | */ |
515 | static __inline__ long atomic64_add_return(long i, atomic64_t * v) | 515 | static __inline__ long atomic64_add_return(long i, atomic64_t * v) |
516 | { | 516 | { |
517 | unsigned long result; | 517 | long result; |
518 | 518 | ||
519 | smp_llsc_mb(); | 519 | smp_llsc_mb(); |
520 | 520 | ||
521 | if (cpu_has_llsc && R10000_LLSC_WAR) { | 521 | if (cpu_has_llsc && R10000_LLSC_WAR) { |
522 | unsigned long temp; | 522 | long temp; |
523 | 523 | ||
524 | __asm__ __volatile__( | 524 | __asm__ __volatile__( |
525 | " .set mips3 \n" | 525 | " .set mips3 \n" |
@@ -533,7 +533,7 @@ static __inline__ long atomic64_add_return(long i, atomic64_t * v) | |||
533 | : "Ir" (i), "m" (v->counter) | 533 | : "Ir" (i), "m" (v->counter) |
534 | : "memory"); | 534 | : "memory"); |
535 | } else if (cpu_has_llsc) { | 535 | } else if (cpu_has_llsc) { |
536 | unsigned long temp; | 536 | long temp; |
537 | 537 | ||
538 | __asm__ __volatile__( | 538 | __asm__ __volatile__( |
539 | " .set mips3 \n" | 539 | " .set mips3 \n" |
@@ -566,12 +566,12 @@ static __inline__ long atomic64_add_return(long i, atomic64_t * v) | |||
566 | 566 | ||
567 | static __inline__ long atomic64_sub_return(long i, atomic64_t * v) | 567 | static __inline__ long atomic64_sub_return(long i, atomic64_t * v) |
568 | { | 568 | { |
569 | unsigned long result; | 569 | long result; |
570 | 570 | ||
571 | smp_llsc_mb(); | 571 | smp_llsc_mb(); |
572 | 572 | ||
573 | if (cpu_has_llsc && R10000_LLSC_WAR) { | 573 | if (cpu_has_llsc && R10000_LLSC_WAR) { |
574 | unsigned long temp; | 574 | long temp; |
575 | 575 | ||
576 | __asm__ __volatile__( | 576 | __asm__ __volatile__( |
577 | " .set mips3 \n" | 577 | " .set mips3 \n" |
@@ -585,7 +585,7 @@ static __inline__ long atomic64_sub_return(long i, atomic64_t * v) | |||
585 | : "Ir" (i), "m" (v->counter) | 585 | : "Ir" (i), "m" (v->counter) |
586 | : "memory"); | 586 | : "memory"); |
587 | } else if (cpu_has_llsc) { | 587 | } else if (cpu_has_llsc) { |
588 | unsigned long temp; | 588 | long temp; |
589 | 589 | ||
590 | __asm__ __volatile__( | 590 | __asm__ __volatile__( |
591 | " .set mips3 \n" | 591 | " .set mips3 \n" |
@@ -626,12 +626,12 @@ static __inline__ long atomic64_sub_return(long i, atomic64_t * v) | |||
626 | */ | 626 | */ |
627 | static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v) | 627 | static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v) |
628 | { | 628 | { |
629 | unsigned long result; | 629 | long result; |
630 | 630 | ||
631 | smp_llsc_mb(); | 631 | smp_llsc_mb(); |
632 | 632 | ||
633 | if (cpu_has_llsc && R10000_LLSC_WAR) { | 633 | if (cpu_has_llsc && R10000_LLSC_WAR) { |
634 | unsigned long temp; | 634 | long temp; |
635 | 635 | ||
636 | __asm__ __volatile__( | 636 | __asm__ __volatile__( |
637 | " .set mips3 \n" | 637 | " .set mips3 \n" |
@@ -649,7 +649,7 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v) | |||
649 | : "Ir" (i), "m" (v->counter) | 649 | : "Ir" (i), "m" (v->counter) |
650 | : "memory"); | 650 | : "memory"); |
651 | } else if (cpu_has_llsc) { | 651 | } else if (cpu_has_llsc) { |
652 | unsigned long temp; | 652 | long temp; |
653 | 653 | ||
654 | __asm__ __volatile__( | 654 | __asm__ __volatile__( |
655 | " .set mips3 \n" | 655 | " .set mips3 \n" |
diff --git a/arch/mips/include/asm/mach-rc32434/gpio.h b/arch/mips/include/asm/mach-rc32434/gpio.h index b5cf6457305..3cb50d17b62 100644 --- a/arch/mips/include/asm/mach-rc32434/gpio.h +++ b/arch/mips/include/asm/mach-rc32434/gpio.h | |||
@@ -80,11 +80,8 @@ struct rb532_gpio_reg { | |||
80 | /* Compact Flash GPIO pin */ | 80 | /* Compact Flash GPIO pin */ |
81 | #define CF_GPIO_NUM 13 | 81 | #define CF_GPIO_NUM 13 |
82 | 82 | ||
83 | extern void set_434_reg(unsigned reg_offs, unsigned bit, unsigned len, unsigned val); | ||
84 | extern unsigned get_434_reg(unsigned reg_offs); | ||
85 | extern void set_latch_u5(unsigned char or_mask, unsigned char nand_mask); | ||
86 | extern unsigned char get_latch_u5(void); | ||
87 | extern void rb532_gpio_set_ilevel(int bit, unsigned gpio); | 83 | extern void rb532_gpio_set_ilevel(int bit, unsigned gpio); |
88 | extern void rb532_gpio_set_istat(int bit, unsigned gpio); | 84 | extern void rb532_gpio_set_istat(int bit, unsigned gpio); |
85 | extern void rb532_gpio_set_func(unsigned gpio); | ||
89 | 86 | ||
90 | #endif /* _RC32434_GPIO_H_ */ | 87 | #endif /* _RC32434_GPIO_H_ */ |
diff --git a/arch/mips/include/asm/mach-rc32434/irq.h b/arch/mips/include/asm/mach-rc32434/irq.h index 56738d8ec4e..023a5b100ed 100644 --- a/arch/mips/include/asm/mach-rc32434/irq.h +++ b/arch/mips/include/asm/mach-rc32434/irq.h | |||
@@ -30,4 +30,7 @@ | |||
30 | #define ETH0_RX_OVR_IRQ (GROUP3_IRQ_BASE + 9) | 30 | #define ETH0_RX_OVR_IRQ (GROUP3_IRQ_BASE + 9) |
31 | #define ETH0_TX_UND_IRQ (GROUP3_IRQ_BASE + 10) | 31 | #define ETH0_TX_UND_IRQ (GROUP3_IRQ_BASE + 10) |
32 | 32 | ||
33 | #define GPIO_MAPPED_IRQ_BASE GROUP4_IRQ_BASE | ||
34 | #define GPIO_MAPPED_IRQ_GROUP 4 | ||
35 | |||
33 | #endif /* __ASM_RC32434_IRQ_H */ | 36 | #endif /* __ASM_RC32434_IRQ_H */ |
diff --git a/arch/mips/include/asm/mach-rc32434/rb.h b/arch/mips/include/asm/mach-rc32434/rb.h index f25a8491670..6dc5f8df1f3 100644 --- a/arch/mips/include/asm/mach-rc32434/rb.h +++ b/arch/mips/include/asm/mach-rc32434/rb.h | |||
@@ -83,4 +83,7 @@ struct mpmc_device { | |||
83 | void __iomem *base; | 83 | void __iomem *base; |
84 | }; | 84 | }; |
85 | 85 | ||
86 | extern void set_latch_u5(unsigned char or_mask, unsigned char nand_mask); | ||
87 | extern unsigned char get_latch_u5(void); | ||
88 | |||
86 | #endif /* __ASM_RC32434_RB_H */ | 89 | #endif /* __ASM_RC32434_RB_H */ |
diff --git a/arch/mips/include/asm/ptrace.h b/arch/mips/include/asm/ptrace.h index 1f30d16d466..ce47118e52b 100644 --- a/arch/mips/include/asm/ptrace.h +++ b/arch/mips/include/asm/ptrace.h | |||
@@ -105,7 +105,7 @@ struct pt_watch_regs { | |||
105 | enum pt_watch_style style; | 105 | enum pt_watch_style style; |
106 | union { | 106 | union { |
107 | struct mips32_watch_regs mips32; | 107 | struct mips32_watch_regs mips32; |
108 | struct mips32_watch_regs mips64; | 108 | struct mips64_watch_regs mips64; |
109 | }; | 109 | }; |
110 | }; | 110 | }; |
111 | 111 | ||
diff --git a/arch/mips/include/asm/termios.h b/arch/mips/include/asm/termios.h index a275661fa7e..8f77f774a2a 100644 --- a/arch/mips/include/asm/termios.h +++ b/arch/mips/include/asm/termios.h | |||
@@ -9,6 +9,7 @@ | |||
9 | #ifndef _ASM_TERMIOS_H | 9 | #ifndef _ASM_TERMIOS_H |
10 | #define _ASM_TERMIOS_H | 10 | #define _ASM_TERMIOS_H |
11 | 11 | ||
12 | #include <linux/errno.h> | ||
12 | #include <asm/termbits.h> | 13 | #include <asm/termbits.h> |
13 | #include <asm/ioctls.h> | 14 | #include <asm/ioctls.h> |
14 | 15 | ||
@@ -94,38 +95,81 @@ struct termio { | |||
94 | /* | 95 | /* |
95 | * Translate a "termio" structure into a "termios". Ugh. | 96 | * Translate a "termio" structure into a "termios". Ugh. |
96 | */ | 97 | */ |
97 | #define user_termio_to_kernel_termios(termios, termio) \ | 98 | static inline int user_termio_to_kernel_termios(struct ktermios *termios, |
98 | ({ \ | 99 | struct termio __user *termio) |
99 | unsigned short tmp; \ | 100 | { |
100 | get_user(tmp, &(termio)->c_iflag); \ | 101 | unsigned short iflag, oflag, cflag, lflag; |
101 | (termios)->c_iflag = (0xffff0000 & ((termios)->c_iflag)) | tmp; \ | 102 | unsigned int err; |
102 | get_user(tmp, &(termio)->c_oflag); \ | 103 | |
103 | (termios)->c_oflag = (0xffff0000 & ((termios)->c_oflag)) | tmp; \ | 104 | if (!access_ok(VERIFY_READ, termio, sizeof(struct termio))) |
104 | get_user(tmp, &(termio)->c_cflag); \ | 105 | return -EFAULT; |
105 | (termios)->c_cflag = (0xffff0000 & ((termios)->c_cflag)) | tmp; \ | 106 | |
106 | get_user(tmp, &(termio)->c_lflag); \ | 107 | err = __get_user(iflag, &termio->c_iflag); |
107 | (termios)->c_lflag = (0xffff0000 & ((termios)->c_lflag)) | tmp; \ | 108 | termios->c_iflag = (termios->c_iflag & 0xffff0000) | iflag; |
108 | get_user((termios)->c_line, &(termio)->c_line); \ | 109 | err |=__get_user(oflag, &termio->c_oflag); |
109 | copy_from_user((termios)->c_cc, (termio)->c_cc, NCC); \ | 110 | termios->c_oflag = (termios->c_oflag & 0xffff0000) | oflag; |
110 | }) | 111 | err |=__get_user(cflag, &termio->c_cflag); |
112 | termios->c_cflag = (termios->c_cflag & 0xffff0000) | cflag; | ||
113 | err |=__get_user(lflag, &termio->c_lflag); | ||
114 | termios->c_lflag = (termios->c_lflag & 0xffff0000) | lflag; | ||
115 | err |=__get_user(termios->c_line, &termio->c_line); | ||
116 | if (err) | ||
117 | return -EFAULT; | ||
118 | |||
119 | if (__copy_from_user(termios->c_cc, termio->c_cc, NCC)) | ||
120 | return -EFAULT; | ||
121 | |||
122 | return 0; | ||
123 | } | ||
111 | 124 | ||
112 | /* | 125 | /* |
113 | * Translate a "termios" structure into a "termio". Ugh. | 126 | * Translate a "termios" structure into a "termio". Ugh. |
114 | */ | 127 | */ |
115 | #define kernel_termios_to_user_termio(termio, termios) \ | 128 | static inline int kernel_termios_to_user_termio(struct termio __user *termio, |
116 | ({ \ | 129 | struct ktermios *termios) |
117 | put_user((termios)->c_iflag, &(termio)->c_iflag); \ | 130 | { |
118 | put_user((termios)->c_oflag, &(termio)->c_oflag); \ | 131 | int err; |
119 | put_user((termios)->c_cflag, &(termio)->c_cflag); \ | 132 | |
120 | put_user((termios)->c_lflag, &(termio)->c_lflag); \ | 133 | if (!access_ok(VERIFY_WRITE, termio, sizeof(struct termio))) |
121 | put_user((termios)->c_line, &(termio)->c_line); \ | 134 | return -EFAULT; |
122 | copy_to_user((termio)->c_cc, (termios)->c_cc, NCC); \ | 135 | |
123 | }) | 136 | err = __put_user(termios->c_iflag, &termio->c_iflag); |
124 | 137 | err |= __put_user(termios->c_oflag, &termio->c_oflag); | |
125 | #define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios2)) | 138 | err |= __put_user(termios->c_cflag, &termio->c_cflag); |
126 | #define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios2)) | 139 | err |= __put_user(termios->c_lflag, &termio->c_lflag); |
127 | #define user_termios_to_kernel_termios_1(k, u) copy_from_user(k, u, sizeof(struct termios)) | 140 | err |= __put_user(termios->c_line, &termio->c_line); |
128 | #define kernel_termios_to_user_termios_1(u, k) copy_to_user(u, k, sizeof(struct termios)) | 141 | if (err) |
142 | return -EFAULT; | ||
143 | |||
144 | if (__copy_to_user(termio->c_cc, termios->c_cc, NCC)) | ||
145 | return -EFAULT; | ||
146 | |||
147 | return 0; | ||
148 | } | ||
149 | |||
150 | static inline int user_termios_to_kernel_termios(struct ktermios __user *k, | ||
151 | struct termios2 *u) | ||
152 | { | ||
153 | return copy_from_user(k, u, sizeof(struct termios2)) ? -EFAULT : 0; | ||
154 | } | ||
155 | |||
156 | static inline int kernel_termios_to_user_termios(struct termios2 __user *u, | ||
157 | struct ktermios *k) | ||
158 | { | ||
159 | return copy_to_user(u, k, sizeof(struct termios2)) ? -EFAULT : 0; | ||
160 | } | ||
161 | |||
162 | static inline int user_termios_to_kernel_termios_1(struct ktermios *k, | ||
163 | struct termios __user *u) | ||
164 | { | ||
165 | return copy_from_user(k, u, sizeof(struct termios)) ? -EFAULT : 0; | ||
166 | } | ||
167 | |||
168 | static inline int kernel_termios_to_user_termios_1(struct termios __user *u, | ||
169 | struct ktermios *k) | ||
170 | { | ||
171 | return copy_to_user(u, k, sizeof(struct termios)) ? -EFAULT : 0; | ||
172 | } | ||
129 | 173 | ||
130 | #endif /* defined(__KERNEL__) */ | 174 | #endif /* defined(__KERNEL__) */ |
131 | 175 | ||
diff --git a/arch/mips/include/asm/txx9/tx4939.h b/arch/mips/include/asm/txx9/tx4939.h index 88badb42301..964ef7ede26 100644 --- a/arch/mips/include/asm/txx9/tx4939.h +++ b/arch/mips/include/asm/txx9/tx4939.h | |||
@@ -541,5 +541,6 @@ void tx4939_irq_init(void); | |||
541 | int tx4939_irq(void); | 541 | int tx4939_irq(void); |
542 | void tx4939_mtd_init(int ch); | 542 | void tx4939_mtd_init(int ch); |
543 | void tx4939_ata_init(void); | 543 | void tx4939_ata_init(void); |
544 | void tx4939_rtc_init(void); | ||
544 | 545 | ||
545 | #endif /* __ASM_TXX9_TX4939_H */ | 546 | #endif /* __ASM_TXX9_TX4939_H */ |
diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S index fb6f73148df..8882e5766f2 100644 --- a/arch/mips/kernel/genex.S +++ b/arch/mips/kernel/genex.S | |||
@@ -458,7 +458,11 @@ NESTED(nmi_handler, PT_SIZE, sp) | |||
458 | BUILD_HANDLER fpe fpe fpe silent /* #15 */ | 458 | BUILD_HANDLER fpe fpe fpe silent /* #15 */ |
459 | BUILD_HANDLER mdmx mdmx sti silent /* #22 */ | 459 | BUILD_HANDLER mdmx mdmx sti silent /* #22 */ |
460 | #ifdef CONFIG_HARDWARE_WATCHPOINTS | 460 | #ifdef CONFIG_HARDWARE_WATCHPOINTS |
461 | BUILD_HANDLER watch watch sti silent /* #23 */ | 461 | /* |
462 | * For watch, interrupts will be enabled after the watch | ||
463 | * registers are read. | ||
464 | */ | ||
465 | BUILD_HANDLER watch watch cli silent /* #23 */ | ||
462 | #else | 466 | #else |
463 | BUILD_HANDLER watch watch sti verbose /* #23 */ | 467 | BUILD_HANDLER watch watch sti verbose /* #23 */ |
464 | #endif | 468 | #endif |
diff --git a/arch/mips/kernel/mips-mt-fpaff.c b/arch/mips/kernel/mips-mt-fpaff.c index 5e77a3a21f9..42461310b18 100644 --- a/arch/mips/kernel/mips-mt-fpaff.c +++ b/arch/mips/kernel/mips-mt-fpaff.c | |||
@@ -79,7 +79,8 @@ asmlinkage long mipsmt_sys_sched_setaffinity(pid_t pid, unsigned int len, | |||
79 | 79 | ||
80 | euid = current_euid(); | 80 | euid = current_euid(); |
81 | retval = -EPERM; | 81 | retval = -EPERM; |
82 | if (euid != p->euid && euid != p->uid && !capable(CAP_SYS_NICE)) { | 82 | if (euid != p->cred->euid && euid != p->cred->uid && |
83 | !capable(CAP_SYS_NICE)) { | ||
83 | read_unlock(&tasklist_lock); | 84 | read_unlock(&tasklist_lock); |
84 | goto out_unlock; | 85 | goto out_unlock; |
85 | } | 86 | } |
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c index f6083c6bfaa..b2d7041341b 100644 --- a/arch/mips/kernel/traps.c +++ b/arch/mips/kernel/traps.c | |||
@@ -944,6 +944,9 @@ asmlinkage void do_mdmx(struct pt_regs *regs) | |||
944 | force_sig(SIGILL, current); | 944 | force_sig(SIGILL, current); |
945 | } | 945 | } |
946 | 946 | ||
947 | /* | ||
948 | * Called with interrupts disabled. | ||
949 | */ | ||
947 | asmlinkage void do_watch(struct pt_regs *regs) | 950 | asmlinkage void do_watch(struct pt_regs *regs) |
948 | { | 951 | { |
949 | u32 cause; | 952 | u32 cause; |
@@ -963,9 +966,12 @@ asmlinkage void do_watch(struct pt_regs *regs) | |||
963 | */ | 966 | */ |
964 | if (test_tsk_thread_flag(current, TIF_LOAD_WATCH)) { | 967 | if (test_tsk_thread_flag(current, TIF_LOAD_WATCH)) { |
965 | mips_read_watch_registers(); | 968 | mips_read_watch_registers(); |
969 | local_irq_enable(); | ||
966 | force_sig(SIGTRAP, current); | 970 | force_sig(SIGTRAP, current); |
967 | } else | 971 | } else { |
968 | mips_clear_watch_registers(); | 972 | mips_clear_watch_registers(); |
973 | local_irq_enable(); | ||
974 | } | ||
969 | } | 975 | } |
970 | 976 | ||
971 | asmlinkage void do_mcheck(struct pt_regs *regs) | 977 | asmlinkage void do_mcheck(struct pt_regs *regs) |
@@ -1582,7 +1588,11 @@ void __init set_handler(unsigned long offset, void *addr, unsigned long size) | |||
1582 | static char panic_null_cerr[] __cpuinitdata = | 1588 | static char panic_null_cerr[] __cpuinitdata = |
1583 | "Trying to set NULL cache error exception handler"; | 1589 | "Trying to set NULL cache error exception handler"; |
1584 | 1590 | ||
1585 | /* Install uncached CPU exception handler */ | 1591 | /* |
1592 | * Install uncached CPU exception handler. | ||
1593 | * This is suitable only for the cache error exception which is the only | ||
1594 | * exception handler that is being run uncached. | ||
1595 | */ | ||
1586 | void __cpuinit set_uncached_handler(unsigned long offset, void *addr, | 1596 | void __cpuinit set_uncached_handler(unsigned long offset, void *addr, |
1587 | unsigned long size) | 1597 | unsigned long size) |
1588 | { | 1598 | { |
@@ -1593,7 +1603,7 @@ void __cpuinit set_uncached_handler(unsigned long offset, void *addr, | |||
1593 | unsigned long uncached_ebase = TO_UNCAC(ebase); | 1603 | unsigned long uncached_ebase = TO_UNCAC(ebase); |
1594 | #endif | 1604 | #endif |
1595 | if (cpu_has_mips_r2) | 1605 | if (cpu_has_mips_r2) |
1596 | ebase += (read_c0_ebase() & 0x3ffff000); | 1606 | uncached_ebase += (read_c0_ebase() & 0x3ffff000); |
1597 | 1607 | ||
1598 | if (!addr) | 1608 | if (!addr) |
1599 | panic(panic_null_cerr); | 1609 | panic(panic_null_cerr); |
diff --git a/arch/mips/lib/memcpy-inatomic.S b/arch/mips/lib/memcpy-inatomic.S index 736d0fb56a9..68853a038d3 100644 --- a/arch/mips/lib/memcpy-inatomic.S +++ b/arch/mips/lib/memcpy-inatomic.S | |||
@@ -21,7 +21,7 @@ | |||
21 | * end of memory on some systems. It's also a seriously bad idea on non | 21 | * end of memory on some systems. It's also a seriously bad idea on non |
22 | * dma-coherent systems. | 22 | * dma-coherent systems. |
23 | */ | 23 | */ |
24 | #if !defined(CONFIG_DMA_COHERENT) || !defined(CONFIG_DMA_IP27) | 24 | #ifdef CONFIG_DMA_NONCOHERENT |
25 | #undef CONFIG_CPU_HAS_PREFETCH | 25 | #undef CONFIG_CPU_HAS_PREFETCH |
26 | #endif | 26 | #endif |
27 | #ifdef CONFIG_MIPS_MALTA | 27 | #ifdef CONFIG_MIPS_MALTA |
diff --git a/arch/mips/lib/memcpy.S b/arch/mips/lib/memcpy.S index c06cccf60be..56a1f85a1ce 100644 --- a/arch/mips/lib/memcpy.S +++ b/arch/mips/lib/memcpy.S | |||
@@ -21,7 +21,7 @@ | |||
21 | * end of memory on some systems. It's also a seriously bad idea on non | 21 | * end of memory on some systems. It's also a seriously bad idea on non |
22 | * dma-coherent systems. | 22 | * dma-coherent systems. |
23 | */ | 23 | */ |
24 | #if !defined(CONFIG_DMA_COHERENT) || !defined(CONFIG_DMA_IP27) | 24 | #ifdef CONFIG_DMA_NONCOHERENT |
25 | #undef CONFIG_CPU_HAS_PREFETCH | 25 | #undef CONFIG_CPU_HAS_PREFETCH |
26 | #endif | 26 | #endif |
27 | #ifdef CONFIG_MIPS_MALTA | 27 | #ifdef CONFIG_MIPS_MALTA |
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c index 6e99665ae86..c43f4b26a69 100644 --- a/arch/mips/mm/c-r4k.c +++ b/arch/mips/mm/c-r4k.c | |||
@@ -618,15 +618,35 @@ static void r4k_dma_cache_inv(unsigned long addr, unsigned long size) | |||
618 | if (cpu_has_inclusive_pcaches) { | 618 | if (cpu_has_inclusive_pcaches) { |
619 | if (size >= scache_size) | 619 | if (size >= scache_size) |
620 | r4k_blast_scache(); | 620 | r4k_blast_scache(); |
621 | else | 621 | else { |
622 | unsigned long lsize = cpu_scache_line_size(); | ||
623 | unsigned long almask = ~(lsize - 1); | ||
624 | |||
625 | /* | ||
626 | * There is no clearly documented alignment requirement | ||
627 | * for the cache instruction on MIPS processors and | ||
628 | * some processors, among them the RM5200 and RM7000 | ||
629 | * QED processors will throw an address error for cache | ||
630 | * hit ops with insufficient alignment. Solved by | ||
631 | * aligning the address to cache line size. | ||
632 | */ | ||
633 | cache_op(Hit_Writeback_Inv_SD, addr & almask); | ||
634 | cache_op(Hit_Writeback_Inv_SD, | ||
635 | (addr + size - 1) & almask); | ||
622 | blast_inv_scache_range(addr, addr + size); | 636 | blast_inv_scache_range(addr, addr + size); |
637 | } | ||
623 | return; | 638 | return; |
624 | } | 639 | } |
625 | 640 | ||
626 | if (cpu_has_safe_index_cacheops && size >= dcache_size) { | 641 | if (cpu_has_safe_index_cacheops && size >= dcache_size) { |
627 | r4k_blast_dcache(); | 642 | r4k_blast_dcache(); |
628 | } else { | 643 | } else { |
644 | unsigned long lsize = cpu_dcache_line_size(); | ||
645 | unsigned long almask = ~(lsize - 1); | ||
646 | |||
629 | R4600_HIT_CACHEOP_WAR_IMPL; | 647 | R4600_HIT_CACHEOP_WAR_IMPL; |
648 | cache_op(Hit_Writeback_Inv_D, addr & almask); | ||
649 | cache_op(Hit_Writeback_Inv_D, (addr + size - 1) & almask); | ||
630 | blast_inv_dcache_range(addr, addr + size); | 650 | blast_inv_dcache_range(addr, addr + size); |
631 | } | 651 | } |
632 | 652 | ||
diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c index fa636fc6b7b..55767ad9f00 100644 --- a/arch/mips/mm/fault.c +++ b/arch/mips/mm/fault.c | |||
@@ -97,7 +97,6 @@ good_area: | |||
97 | goto bad_area; | 97 | goto bad_area; |
98 | } | 98 | } |
99 | 99 | ||
100 | survive: | ||
101 | /* | 100 | /* |
102 | * If for any reason at all we couldn't handle the fault, | 101 | * If for any reason at all we couldn't handle the fault, |
103 | * make sure we exit gracefully rather than endlessly redo | 102 | * make sure we exit gracefully rather than endlessly redo |
@@ -167,21 +166,13 @@ no_context: | |||
167 | field, regs->regs[31]); | 166 | field, regs->regs[31]); |
168 | die("Oops", regs); | 167 | die("Oops", regs); |
169 | 168 | ||
170 | /* | ||
171 | * We ran out of memory, or some other thing happened to us that made | ||
172 | * us unable to handle the page fault gracefully. | ||
173 | */ | ||
174 | out_of_memory: | 169 | out_of_memory: |
175 | up_read(&mm->mmap_sem); | 170 | /* |
176 | if (is_global_init(tsk)) { | 171 | * We ran out of memory, call the OOM killer, and return the userspace |
177 | yield(); | 172 | * (which will retry the fault, or kill us if we got oom-killed). |
178 | down_read(&mm->mmap_sem); | 173 | */ |
179 | goto survive; | 174 | pagefault_out_of_memory(); |
180 | } | 175 | return; |
181 | printk("VM: killing process %s\n", tsk->comm); | ||
182 | if (user_mode(regs)) | ||
183 | do_group_exit(SIGKILL); | ||
184 | goto no_context; | ||
185 | 176 | ||
186 | do_sigbus: | 177 | do_sigbus: |
187 | up_read(&mm->mmap_sem); | 178 | up_read(&mm->mmap_sem); |
diff --git a/arch/mips/pci/pci-rc32434.c b/arch/mips/pci/pci-rc32434.c index 1c2821e2f49..71f7d27b0d4 100644 --- a/arch/mips/pci/pci-rc32434.c +++ b/arch/mips/pci/pci-rc32434.c | |||
@@ -205,6 +205,8 @@ static int __init rc32434_pcibridge_init(void) | |||
205 | 205 | ||
206 | static int __init rc32434_pci_init(void) | 206 | static int __init rc32434_pci_init(void) |
207 | { | 207 | { |
208 | void __iomem *io_map_base; | ||
209 | |||
208 | pr_info("PCI: Initializing PCI\n"); | 210 | pr_info("PCI: Initializing PCI\n"); |
209 | 211 | ||
210 | ioport_resource.start = rc32434_res_pci_io1.start; | 212 | ioport_resource.start = rc32434_res_pci_io1.start; |
@@ -212,6 +214,15 @@ static int __init rc32434_pci_init(void) | |||
212 | 214 | ||
213 | rc32434_pcibridge_init(); | 215 | rc32434_pcibridge_init(); |
214 | 216 | ||
217 | io_map_base = ioremap(rc32434_res_pci_io1.start, | ||
218 | rc32434_res_pci_io1.end - rc32434_res_pci_io1.start + 1); | ||
219 | |||
220 | if (!io_map_base) | ||
221 | return -ENOMEM; | ||
222 | |||
223 | rc32434_controller.io_map_base = | ||
224 | (unsigned long)io_map_base - rc32434_res_pci_io1.start; | ||
225 | |||
215 | register_pci_controller(&rc32434_controller); | 226 | register_pci_controller(&rc32434_controller); |
216 | rc32434_sync(); | 227 | rc32434_sync(); |
217 | 228 | ||
diff --git a/arch/mips/rb532/devices.c b/arch/mips/rb532/devices.c index c1c29181bd4..4a5f05b662a 100644 --- a/arch/mips/rb532/devices.c +++ b/arch/mips/rb532/devices.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <linux/mtd/partitions.h> | 24 | #include <linux/mtd/partitions.h> |
25 | #include <linux/gpio_keys.h> | 25 | #include <linux/gpio_keys.h> |
26 | #include <linux/input.h> | 26 | #include <linux/input.h> |
27 | #include <linux/serial_8250.h> | ||
27 | 28 | ||
28 | #include <asm/bootinfo.h> | 29 | #include <asm/bootinfo.h> |
29 | 30 | ||
@@ -39,6 +40,29 @@ | |||
39 | #define ETH0_RX_DMA_ADDR (DMA0_BASE_ADDR + 0 * DMA_CHAN_OFFSET) | 40 | #define ETH0_RX_DMA_ADDR (DMA0_BASE_ADDR + 0 * DMA_CHAN_OFFSET) |
40 | #define ETH0_TX_DMA_ADDR (DMA0_BASE_ADDR + 1 * DMA_CHAN_OFFSET) | 41 | #define ETH0_TX_DMA_ADDR (DMA0_BASE_ADDR + 1 * DMA_CHAN_OFFSET) |
41 | 42 | ||
43 | extern unsigned int idt_cpu_freq; | ||
44 | |||
45 | static struct mpmc_device dev3; | ||
46 | |||
47 | void set_latch_u5(unsigned char or_mask, unsigned char nand_mask) | ||
48 | { | ||
49 | unsigned long flags; | ||
50 | |||
51 | spin_lock_irqsave(&dev3.lock, flags); | ||
52 | |||
53 | dev3.state = (dev3.state | or_mask) & ~nand_mask; | ||
54 | writeb(dev3.state, dev3.base); | ||
55 | |||
56 | spin_unlock_irqrestore(&dev3.lock, flags); | ||
57 | } | ||
58 | EXPORT_SYMBOL(set_latch_u5); | ||
59 | |||
60 | unsigned char get_latch_u5(void) | ||
61 | { | ||
62 | return dev3.state; | ||
63 | } | ||
64 | EXPORT_SYMBOL(get_latch_u5); | ||
65 | |||
42 | static struct resource korina_dev0_res[] = { | 66 | static struct resource korina_dev0_res[] = { |
43 | { | 67 | { |
44 | .name = "korina_regs", | 68 | .name = "korina_regs", |
@@ -86,7 +110,7 @@ static struct korina_device korina_dev0_data = { | |||
86 | static struct platform_device korina_dev0 = { | 110 | static struct platform_device korina_dev0 = { |
87 | .id = -1, | 111 | .id = -1, |
88 | .name = "korina", | 112 | .name = "korina", |
89 | .dev.platform_data = &korina_dev0_data, | 113 | .dev.driver_data = &korina_dev0_data, |
90 | .resource = korina_dev0_res, | 114 | .resource = korina_dev0_res, |
91 | .num_resources = ARRAY_SIZE(korina_dev0_res), | 115 | .num_resources = ARRAY_SIZE(korina_dev0_res), |
92 | }; | 116 | }; |
@@ -214,12 +238,32 @@ static struct platform_device rb532_wdt = { | |||
214 | .num_resources = ARRAY_SIZE(rb532_wdt_res), | 238 | .num_resources = ARRAY_SIZE(rb532_wdt_res), |
215 | }; | 239 | }; |
216 | 240 | ||
241 | static struct plat_serial8250_port rb532_uart_res[] = { | ||
242 | { | ||
243 | .membase = (char *)KSEG1ADDR(REGBASE + UART0BASE), | ||
244 | .irq = UART0_IRQ, | ||
245 | .regshift = 2, | ||
246 | .iotype = UPIO_MEM, | ||
247 | .flags = UPF_BOOT_AUTOCONF, | ||
248 | }, | ||
249 | { | ||
250 | .flags = 0, | ||
251 | } | ||
252 | }; | ||
253 | |||
254 | static struct platform_device rb532_uart = { | ||
255 | .name = "serial8250", | ||
256 | .id = PLAT8250_DEV_PLATFORM, | ||
257 | .dev.platform_data = &rb532_uart_res, | ||
258 | }; | ||
259 | |||
217 | static struct platform_device *rb532_devs[] = { | 260 | static struct platform_device *rb532_devs[] = { |
218 | &korina_dev0, | 261 | &korina_dev0, |
219 | &nand_slot0, | 262 | &nand_slot0, |
220 | &cf_slot0, | 263 | &cf_slot0, |
221 | &rb532_led, | 264 | &rb532_led, |
222 | &rb532_button, | 265 | &rb532_button, |
266 | &rb532_uart, | ||
223 | &rb532_wdt | 267 | &rb532_wdt |
224 | }; | 268 | }; |
225 | 269 | ||
@@ -291,9 +335,20 @@ static int __init plat_setup_devices(void) | |||
291 | nand_slot0_res[0].start = readl(IDT434_REG_BASE + DEV2BASE); | 335 | nand_slot0_res[0].start = readl(IDT434_REG_BASE + DEV2BASE); |
292 | nand_slot0_res[0].end = nand_slot0_res[0].start + 0x1000; | 336 | nand_slot0_res[0].end = nand_slot0_res[0].start + 0x1000; |
293 | 337 | ||
338 | /* Read and map device controller 3 */ | ||
339 | dev3.base = ioremap_nocache(readl(IDT434_REG_BASE + DEV3BASE), 1); | ||
340 | |||
341 | if (!dev3.base) { | ||
342 | printk(KERN_ERR "rb532: cannot remap device controller 3\n"); | ||
343 | return -ENXIO; | ||
344 | } | ||
345 | |||
294 | /* Initialise the NAND device */ | 346 | /* Initialise the NAND device */ |
295 | rb532_nand_setup(); | 347 | rb532_nand_setup(); |
296 | 348 | ||
349 | /* set the uart clock to the current cpu frequency */ | ||
350 | rb532_uart_res[0].uartclk = idt_cpu_freq; | ||
351 | |||
297 | return platform_add_devices(rb532_devs, ARRAY_SIZE(rb532_devs)); | 352 | return platform_add_devices(rb532_devs, ARRAY_SIZE(rb532_devs)); |
298 | } | 353 | } |
299 | 354 | ||
diff --git a/arch/mips/rb532/gpio.c b/arch/mips/rb532/gpio.c index 0e84c8ab6a3..37de05d595e 100644 --- a/arch/mips/rb532/gpio.c +++ b/arch/mips/rb532/gpio.c | |||
@@ -41,8 +41,6 @@ struct rb532_gpio_chip { | |||
41 | void __iomem *regbase; | 41 | void __iomem *regbase; |
42 | }; | 42 | }; |
43 | 43 | ||
44 | struct mpmc_device dev3; | ||
45 | |||
46 | static struct resource rb532_gpio_reg0_res[] = { | 44 | static struct resource rb532_gpio_reg0_res[] = { |
47 | { | 45 | { |
48 | .name = "gpio_reg0", | 46 | .name = "gpio_reg0", |
@@ -52,61 +50,6 @@ static struct resource rb532_gpio_reg0_res[] = { | |||
52 | } | 50 | } |
53 | }; | 51 | }; |
54 | 52 | ||
55 | static struct resource rb532_dev3_ctl_res[] = { | ||
56 | { | ||
57 | .name = "dev3_ctl", | ||
58 | .start = REGBASE + DEV3BASE, | ||
59 | .end = REGBASE + DEV3BASE + sizeof(struct dev_reg) - 1, | ||
60 | .flags = IORESOURCE_MEM, | ||
61 | } | ||
62 | }; | ||
63 | |||
64 | void set_434_reg(unsigned reg_offs, unsigned bit, unsigned len, unsigned val) | ||
65 | { | ||
66 | unsigned long flags; | ||
67 | unsigned data; | ||
68 | unsigned i = 0; | ||
69 | |||
70 | spin_lock_irqsave(&dev3.lock, flags); | ||
71 | |||
72 | data = readl(IDT434_REG_BASE + reg_offs); | ||
73 | for (i = 0; i != len; ++i) { | ||
74 | if (val & (1 << i)) | ||
75 | data |= (1 << (i + bit)); | ||
76 | else | ||
77 | data &= ~(1 << (i + bit)); | ||
78 | } | ||
79 | writel(data, (IDT434_REG_BASE + reg_offs)); | ||
80 | |||
81 | spin_unlock_irqrestore(&dev3.lock, flags); | ||
82 | } | ||
83 | EXPORT_SYMBOL(set_434_reg); | ||
84 | |||
85 | unsigned get_434_reg(unsigned reg_offs) | ||
86 | { | ||
87 | return readl(IDT434_REG_BASE + reg_offs); | ||
88 | } | ||
89 | EXPORT_SYMBOL(get_434_reg); | ||
90 | |||
91 | void set_latch_u5(unsigned char or_mask, unsigned char nand_mask) | ||
92 | { | ||
93 | unsigned long flags; | ||
94 | |||
95 | spin_lock_irqsave(&dev3.lock, flags); | ||
96 | |||
97 | dev3.state = (dev3.state | or_mask) & ~nand_mask; | ||
98 | writel(dev3.state, &dev3.base); | ||
99 | |||
100 | spin_unlock_irqrestore(&dev3.lock, flags); | ||
101 | } | ||
102 | EXPORT_SYMBOL(set_latch_u5); | ||
103 | |||
104 | unsigned char get_latch_u5(void) | ||
105 | { | ||
106 | return dev3.state; | ||
107 | } | ||
108 | EXPORT_SYMBOL(get_latch_u5); | ||
109 | |||
110 | /* rb532_set_bit - sanely set a bit | 53 | /* rb532_set_bit - sanely set a bit |
111 | * | 54 | * |
112 | * bitval: new value for the bit | 55 | * bitval: new value for the bit |
@@ -119,13 +62,11 @@ static inline void rb532_set_bit(unsigned bitval, | |||
119 | unsigned long flags; | 62 | unsigned long flags; |
120 | u32 val; | 63 | u32 val; |
121 | 64 | ||
122 | bitval = !!bitval; /* map parameter to {0,1} */ | ||
123 | |||
124 | local_irq_save(flags); | 65 | local_irq_save(flags); |
125 | 66 | ||
126 | val = readl(ioaddr); | 67 | val = readl(ioaddr); |
127 | val &= ~( ~bitval << offset ); /* unset bit if bitval == 0 */ | 68 | val &= ~(!bitval << offset); /* unset bit if bitval == 0 */ |
128 | val |= ( bitval << offset ); /* set bit if bitval == 1 */ | 69 | val |= (!!bitval << offset); /* set bit if bitval == 1 */ |
129 | writel(val, ioaddr); | 70 | writel(val, ioaddr); |
130 | 71 | ||
131 | local_irq_restore(flags); | 72 | local_irq_restore(flags); |
@@ -171,8 +112,8 @@ static int rb532_gpio_direction_input(struct gpio_chip *chip, unsigned offset) | |||
171 | 112 | ||
172 | gpch = container_of(chip, struct rb532_gpio_chip, chip); | 113 | gpch = container_of(chip, struct rb532_gpio_chip, chip); |
173 | 114 | ||
174 | if (rb532_get_bit(offset, gpch->regbase + GPIOFUNC)) | 115 | /* disable alternate function in case it's set */ |
175 | return 1; /* alternate function, GPIOCFG is ignored */ | 116 | rb532_set_bit(0, offset, gpch->regbase + GPIOFUNC); |
176 | 117 | ||
177 | rb532_set_bit(0, offset, gpch->regbase + GPIOCFG); | 118 | rb532_set_bit(0, offset, gpch->regbase + GPIOCFG); |
178 | return 0; | 119 | return 0; |
@@ -188,8 +129,8 @@ static int rb532_gpio_direction_output(struct gpio_chip *chip, | |||
188 | 129 | ||
189 | gpch = container_of(chip, struct rb532_gpio_chip, chip); | 130 | gpch = container_of(chip, struct rb532_gpio_chip, chip); |
190 | 131 | ||
191 | if (rb532_get_bit(offset, gpch->regbase + GPIOFUNC)) | 132 | /* disable alternate function in case it's set */ |
192 | return 1; /* alternate function, GPIOCFG is ignored */ | 133 | rb532_set_bit(0, offset, gpch->regbase + GPIOFUNC); |
193 | 134 | ||
194 | /* set the initial output value */ | 135 | /* set the initial output value */ |
195 | rb532_set_bit(value, offset, gpch->regbase + GPIOD); | 136 | rb532_set_bit(value, offset, gpch->regbase + GPIOD); |
@@ -233,10 +174,11 @@ EXPORT_SYMBOL(rb532_gpio_set_istat); | |||
233 | /* | 174 | /* |
234 | * Configure GPIO alternate function | 175 | * Configure GPIO alternate function |
235 | */ | 176 | */ |
236 | static void rb532_gpio_set_func(int bit, unsigned gpio) | 177 | void rb532_gpio_set_func(unsigned gpio) |
237 | { | 178 | { |
238 | rb532_set_bit(bit, gpio, rb532_gpio_chip->regbase + GPIOFUNC); | 179 | rb532_set_bit(1, gpio, rb532_gpio_chip->regbase + GPIOFUNC); |
239 | } | 180 | } |
181 | EXPORT_SYMBOL(rb532_gpio_set_func); | ||
240 | 182 | ||
241 | int __init rb532_gpio_init(void) | 183 | int __init rb532_gpio_init(void) |
242 | { | 184 | { |
@@ -253,20 +195,6 @@ int __init rb532_gpio_init(void) | |||
253 | /* Register our GPIO chip */ | 195 | /* Register our GPIO chip */ |
254 | gpiochip_add(&rb532_gpio_chip->chip); | 196 | gpiochip_add(&rb532_gpio_chip->chip); |
255 | 197 | ||
256 | r = rb532_dev3_ctl_res; | ||
257 | dev3.base = ioremap_nocache(r->start, r->end - r->start); | ||
258 | |||
259 | if (!dev3.base) { | ||
260 | printk(KERN_ERR "rb532: cannot remap device controller 3\n"); | ||
261 | return -ENXIO; | ||
262 | } | ||
263 | |||
264 | /* configure CF_GPIO_NUM as CFRDY IRQ source */ | ||
265 | rb532_gpio_set_func(0, CF_GPIO_NUM); | ||
266 | rb532_gpio_direction_input(&rb532_gpio_chip->chip, CF_GPIO_NUM); | ||
267 | rb532_gpio_set_ilevel(1, CF_GPIO_NUM); | ||
268 | rb532_gpio_set_istat(0, CF_GPIO_NUM); | ||
269 | |||
270 | return 0; | 198 | return 0; |
271 | } | 199 | } |
272 | arch_initcall(rb532_gpio_init); | 200 | arch_initcall(rb532_gpio_init); |
diff --git a/arch/mips/rb532/irq.c b/arch/mips/rb532/irq.c index 549b46d2fce..53eeb5e7bc5 100644 --- a/arch/mips/rb532/irq.c +++ b/arch/mips/rb532/irq.c | |||
@@ -46,6 +46,7 @@ | |||
46 | #include <asm/system.h> | 46 | #include <asm/system.h> |
47 | 47 | ||
48 | #include <asm/mach-rc32434/irq.h> | 48 | #include <asm/mach-rc32434/irq.h> |
49 | #include <asm/mach-rc32434/gpio.h> | ||
49 | 50 | ||
50 | struct intr_group { | 51 | struct intr_group { |
51 | u32 mask; /* mask of valid bits in pending/mask registers */ | 52 | u32 mask; /* mask of valid bits in pending/mask registers */ |
@@ -150,6 +151,9 @@ static void rb532_disable_irq(unsigned int irq_nr) | |||
150 | mask |= intr_bit; | 151 | mask |= intr_bit; |
151 | WRITE_MASK(addr, mask); | 152 | WRITE_MASK(addr, mask); |
152 | 153 | ||
154 | if (group == GPIO_MAPPED_IRQ_GROUP) | ||
155 | rb532_gpio_set_istat(0, irq_nr - GPIO_MAPPED_IRQ_BASE); | ||
156 | |||
153 | /* | 157 | /* |
154 | * if there are no more interrupts enabled in this | 158 | * if there are no more interrupts enabled in this |
155 | * group, disable corresponding IP | 159 | * group, disable corresponding IP |
@@ -165,12 +169,35 @@ static void rb532_mask_and_ack_irq(unsigned int irq_nr) | |||
165 | ack_local_irq(group_to_ip(irq_to_group(irq_nr))); | 169 | ack_local_irq(group_to_ip(irq_to_group(irq_nr))); |
166 | } | 170 | } |
167 | 171 | ||
172 | static int rb532_set_type(unsigned int irq_nr, unsigned type) | ||
173 | { | ||
174 | int gpio = irq_nr - GPIO_MAPPED_IRQ_BASE; | ||
175 | int group = irq_to_group(irq_nr); | ||
176 | |||
177 | if (group != GPIO_MAPPED_IRQ_GROUP) | ||
178 | return (type == IRQ_TYPE_LEVEL_HIGH) ? 0 : -EINVAL; | ||
179 | |||
180 | switch (type) { | ||
181 | case IRQ_TYPE_LEVEL_HIGH: | ||
182 | rb532_gpio_set_ilevel(1, gpio); | ||
183 | break; | ||
184 | case IRQ_TYPE_LEVEL_LOW: | ||
185 | rb532_gpio_set_ilevel(0, gpio); | ||
186 | break; | ||
187 | default: | ||
188 | return -EINVAL; | ||
189 | } | ||
190 | |||
191 | return 0; | ||
192 | } | ||
193 | |||
168 | static struct irq_chip rc32434_irq_type = { | 194 | static struct irq_chip rc32434_irq_type = { |
169 | .name = "RB532", | 195 | .name = "RB532", |
170 | .ack = rb532_disable_irq, | 196 | .ack = rb532_disable_irq, |
171 | .mask = rb532_disable_irq, | 197 | .mask = rb532_disable_irq, |
172 | .mask_ack = rb532_mask_and_ack_irq, | 198 | .mask_ack = rb532_mask_and_ack_irq, |
173 | .unmask = rb532_enable_irq, | 199 | .unmask = rb532_enable_irq, |
200 | .set_type = rb532_set_type, | ||
174 | }; | 201 | }; |
175 | 202 | ||
176 | void __init arch_init_irq(void) | 203 | void __init arch_init_irq(void) |
diff --git a/arch/mips/rb532/serial.c b/arch/mips/rb532/serial.c index 3e0d7ec3a57..00ed19f0bdb 100644 --- a/arch/mips/rb532/serial.c +++ b/arch/mips/rb532/serial.c | |||
@@ -36,7 +36,7 @@ | |||
36 | extern unsigned int idt_cpu_freq; | 36 | extern unsigned int idt_cpu_freq; |
37 | 37 | ||
38 | static struct uart_port rb532_uart = { | 38 | static struct uart_port rb532_uart = { |
39 | .type = PORT_16550A, | 39 | .flags = UPF_BOOT_AUTOCONF, |
40 | .line = 0, | 40 | .line = 0, |
41 | .irq = UART0_IRQ, | 41 | .irq = UART0_IRQ, |
42 | .iotype = UPIO_MEM, | 42 | .iotype = UPIO_MEM, |
diff --git a/arch/mips/txx9/generic/setup_tx4939.c b/arch/mips/txx9/generic/setup_tx4939.c index 6c0049a5bbc..55440967b3a 100644 --- a/arch/mips/txx9/generic/setup_tx4939.c +++ b/arch/mips/txx9/generic/setup_tx4939.c | |||
@@ -435,6 +435,28 @@ void __init tx4939_ata_init(void) | |||
435 | platform_device_register(&ata1_dev); | 435 | platform_device_register(&ata1_dev); |
436 | } | 436 | } |
437 | 437 | ||
438 | void __init tx4939_rtc_init(void) | ||
439 | { | ||
440 | static struct resource res[] = { | ||
441 | { | ||
442 | .start = TX4939_RTC_REG & 0xfffffffffULL, | ||
443 | .end = (TX4939_RTC_REG & 0xfffffffffULL) + 0x100 - 1, | ||
444 | .flags = IORESOURCE_MEM, | ||
445 | }, { | ||
446 | .start = TXX9_IRQ_BASE + TX4939_IR_RTC, | ||
447 | .flags = IORESOURCE_IRQ, | ||
448 | }, | ||
449 | }; | ||
450 | static struct platform_device rtc_dev = { | ||
451 | .name = "tx4939rtc", | ||
452 | .id = -1, | ||
453 | .num_resources = ARRAY_SIZE(res), | ||
454 | .resource = res, | ||
455 | }; | ||
456 | |||
457 | platform_device_register(&rtc_dev); | ||
458 | } | ||
459 | |||
438 | static void __init tx4939_stop_unused_modules(void) | 460 | static void __init tx4939_stop_unused_modules(void) |
439 | { | 461 | { |
440 | __u64 pcfg, rst = 0, ckd = 0; | 462 | __u64 pcfg, rst = 0, ckd = 0; |
diff --git a/arch/mips/txx9/rbtx4939/setup.c b/arch/mips/txx9/rbtx4939/setup.c index 98fbd9391bf..656603b85b7 100644 --- a/arch/mips/txx9/rbtx4939/setup.c +++ b/arch/mips/txx9/rbtx4939/setup.c | |||
@@ -336,6 +336,7 @@ static void __init rbtx4939_device_init(void) | |||
336 | rbtx4939_led_setup(); | 336 | rbtx4939_led_setup(); |
337 | tx4939_wdt_init(); | 337 | tx4939_wdt_init(); |
338 | tx4939_ata_init(); | 338 | tx4939_ata_init(); |
339 | tx4939_rtc_init(); | ||
339 | } | 340 | } |
340 | 341 | ||
341 | static void __init rbtx4939_setup(void) | 342 | static void __init rbtx4939_setup(void) |
diff --git a/arch/parisc/include/asm/dma-mapping.h b/arch/parisc/include/asm/dma-mapping.h index 53af696f23d..da694338090 100644 --- a/arch/parisc/include/asm/dma-mapping.h +++ b/arch/parisc/include/asm/dma-mapping.h | |||
@@ -5,7 +5,7 @@ | |||
5 | #include <asm/cacheflush.h> | 5 | #include <asm/cacheflush.h> |
6 | #include <asm/scatterlist.h> | 6 | #include <asm/scatterlist.h> |
7 | 7 | ||
8 | /* See Documentation/DMA-mapping.txt */ | 8 | /* See Documentation/PCI/PCI-DMA-mapping.txt */ |
9 | struct hppa_dma_ops { | 9 | struct hppa_dma_ops { |
10 | int (*dma_supported)(struct device *dev, u64 mask); | 10 | int (*dma_supported)(struct device *dev, u64 mask); |
11 | void *(*alloc_consistent)(struct device *dev, size_t size, dma_addr_t *iova, gfp_t flag); | 11 | void *(*alloc_consistent)(struct device *dev, size_t size, dma_addr_t *iova, gfp_t flag); |
diff --git a/arch/parisc/kernel/pci-dma.c b/arch/parisc/kernel/pci-dma.c index ccd61b9567a..df47895db82 100644 --- a/arch/parisc/kernel/pci-dma.c +++ b/arch/parisc/kernel/pci-dma.c | |||
@@ -2,7 +2,7 @@ | |||
2 | ** PARISC 1.1 Dynamic DMA mapping support. | 2 | ** PARISC 1.1 Dynamic DMA mapping support. |
3 | ** This implementation is for PA-RISC platforms that do not support | 3 | ** This implementation is for PA-RISC platforms that do not support |
4 | ** I/O TLBs (aka DMA address translation hardware). | 4 | ** I/O TLBs (aka DMA address translation hardware). |
5 | ** See Documentation/DMA-mapping.txt for interface definitions. | 5 | ** See Documentation/PCI/PCI-DMA-mapping.txt for interface definitions. |
6 | ** | 6 | ** |
7 | ** (c) Copyright 1999,2000 Hewlett-Packard Company | 7 | ** (c) Copyright 1999,2000 Hewlett-Packard Company |
8 | ** (c) Copyright 2000 Grant Grundler | 8 | ** (c) Copyright 2000 Grant Grundler |
diff --git a/arch/powerpc/configs/52xx/cm5200_defconfig b/arch/powerpc/configs/52xx/cm5200_defconfig index 99c495ad9c7..1239c6132b4 100644 --- a/arch/powerpc/configs/52xx/cm5200_defconfig +++ b/arch/powerpc/configs/52xx/cm5200_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.28-rc4 | 3 | # Linux kernel version: 2.6.29-rc2 |
4 | # Thu Nov 13 02:12:40 2008 | 4 | # Mon Jan 26 21:41:58 2009 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -43,7 +43,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y | |||
43 | CONFIG_PPC=y | 43 | CONFIG_PPC=y |
44 | CONFIG_EARLY_PRINTK=y | 44 | CONFIG_EARLY_PRINTK=y |
45 | CONFIG_GENERIC_NVRAM=y | 45 | CONFIG_GENERIC_NVRAM=y |
46 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 46 | CONFIG_SCHED_OMIT_FRAME_POINTER=y |
47 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 47 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
48 | CONFIG_PPC_OF=y | 48 | CONFIG_PPC_OF=y |
49 | CONFIG_OF=y | 49 | CONFIG_OF=y |
@@ -71,14 +71,23 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
71 | # CONFIG_BSD_PROCESS_ACCT is not set | 71 | # CONFIG_BSD_PROCESS_ACCT is not set |
72 | # CONFIG_TASKSTATS is not set | 72 | # CONFIG_TASKSTATS is not set |
73 | # CONFIG_AUDIT is not set | 73 | # CONFIG_AUDIT is not set |
74 | |||
75 | # | ||
76 | # RCU Subsystem | ||
77 | # | ||
78 | CONFIG_CLASSIC_RCU=y | ||
79 | # CONFIG_TREE_RCU is not set | ||
80 | # CONFIG_PREEMPT_RCU is not set | ||
81 | # CONFIG_TREE_RCU_TRACE is not set | ||
82 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
74 | # CONFIG_IKCONFIG is not set | 83 | # CONFIG_IKCONFIG is not set |
75 | CONFIG_LOG_BUF_SHIFT=14 | 84 | CONFIG_LOG_BUF_SHIFT=14 |
76 | # CONFIG_CGROUPS is not set | ||
77 | CONFIG_GROUP_SCHED=y | 85 | CONFIG_GROUP_SCHED=y |
78 | CONFIG_FAIR_GROUP_SCHED=y | 86 | CONFIG_FAIR_GROUP_SCHED=y |
79 | # CONFIG_RT_GROUP_SCHED is not set | 87 | # CONFIG_RT_GROUP_SCHED is not set |
80 | CONFIG_USER_SCHED=y | 88 | CONFIG_USER_SCHED=y |
81 | # CONFIG_CGROUP_SCHED is not set | 89 | # CONFIG_CGROUP_SCHED is not set |
90 | # CONFIG_CGROUPS is not set | ||
82 | CONFIG_SYSFS_DEPRECATED=y | 91 | CONFIG_SYSFS_DEPRECATED=y |
83 | CONFIG_SYSFS_DEPRECATED_V2=y | 92 | CONFIG_SYSFS_DEPRECATED_V2=y |
84 | # CONFIG_RELAY is not set | 93 | # CONFIG_RELAY is not set |
@@ -110,7 +119,6 @@ CONFIG_SLUB_DEBUG=y | |||
110 | CONFIG_SLUB=y | 119 | CONFIG_SLUB=y |
111 | # CONFIG_SLOB is not set | 120 | # CONFIG_SLOB is not set |
112 | # CONFIG_PROFILING is not set | 121 | # CONFIG_PROFILING is not set |
113 | # CONFIG_MARKERS is not set | ||
114 | CONFIG_HAVE_OPROFILE=y | 122 | CONFIG_HAVE_OPROFILE=y |
115 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | 123 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y |
116 | CONFIG_HAVE_IOREMAP_PROT=y | 124 | CONFIG_HAVE_IOREMAP_PROT=y |
@@ -121,13 +129,11 @@ CONFIG_HAVE_CLK=y | |||
121 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 129 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
122 | CONFIG_SLABINFO=y | 130 | CONFIG_SLABINFO=y |
123 | CONFIG_RT_MUTEXES=y | 131 | CONFIG_RT_MUTEXES=y |
124 | # CONFIG_TINY_SHMEM is not set | ||
125 | CONFIG_BASE_SMALL=0 | 132 | CONFIG_BASE_SMALL=0 |
126 | # CONFIG_MODULES is not set | 133 | # CONFIG_MODULES is not set |
127 | CONFIG_BLOCK=y | 134 | CONFIG_BLOCK=y |
128 | # CONFIG_LBD is not set | 135 | # CONFIG_LBD is not set |
129 | # CONFIG_BLK_DEV_IO_TRACE is not set | 136 | # CONFIG_BLK_DEV_IO_TRACE is not set |
130 | # CONFIG_LSF is not set | ||
131 | # CONFIG_BLK_DEV_BSG is not set | 137 | # CONFIG_BLK_DEV_BSG is not set |
132 | # CONFIG_BLK_DEV_INTEGRITY is not set | 138 | # CONFIG_BLK_DEV_INTEGRITY is not set |
133 | 139 | ||
@@ -143,7 +149,6 @@ CONFIG_DEFAULT_AS=y | |||
143 | # CONFIG_DEFAULT_CFQ is not set | 149 | # CONFIG_DEFAULT_CFQ is not set |
144 | # CONFIG_DEFAULT_NOOP is not set | 150 | # CONFIG_DEFAULT_NOOP is not set |
145 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 151 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
146 | CONFIG_CLASSIC_RCU=y | ||
147 | # CONFIG_FREEZER is not set | 152 | # CONFIG_FREEZER is not set |
148 | 153 | ||
149 | # | 154 | # |
@@ -182,9 +187,8 @@ CONFIG_PPC_MPC5200_SIMPLE=y | |||
182 | # CONFIG_TAU is not set | 187 | # CONFIG_TAU is not set |
183 | # CONFIG_FSL_ULI1575 is not set | 188 | # CONFIG_FSL_ULI1575 is not set |
184 | CONFIG_PPC_BESTCOMM=y | 189 | CONFIG_PPC_BESTCOMM=y |
185 | # CONFIG_PPC_BESTCOMM_ATA is not set | ||
186 | CONFIG_PPC_BESTCOMM_FEC=y | 190 | CONFIG_PPC_BESTCOMM_FEC=y |
187 | # CONFIG_PPC_BESTCOMM_GEN_BD is not set | 191 | # CONFIG_SIMPLE_GPIO is not set |
188 | 192 | ||
189 | # | 193 | # |
190 | # Kernel options | 194 | # Kernel options |
@@ -211,6 +215,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | |||
211 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 215 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
212 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 216 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
213 | # CONFIG_KEXEC is not set | 217 | # CONFIG_KEXEC is not set |
218 | # CONFIG_CRASH_DUMP is not set | ||
214 | CONFIG_ARCH_FLATMEM_ENABLE=y | 219 | CONFIG_ARCH_FLATMEM_ENABLE=y |
215 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 220 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
216 | CONFIG_SELECT_MEMORY_MODEL=y | 221 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -222,12 +227,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
222 | CONFIG_PAGEFLAGS_EXTENDED=y | 227 | CONFIG_PAGEFLAGS_EXTENDED=y |
223 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 228 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
224 | CONFIG_MIGRATION=y | 229 | CONFIG_MIGRATION=y |
225 | # CONFIG_RESOURCES_64BIT is not set | ||
226 | # CONFIG_PHYS_ADDR_T_64BIT is not set | 230 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
227 | CONFIG_ZONE_DMA_FLAG=1 | 231 | CONFIG_ZONE_DMA_FLAG=1 |
228 | CONFIG_BOUNCE=y | 232 | CONFIG_BOUNCE=y |
229 | CONFIG_VIRT_TO_BUS=y | 233 | CONFIG_VIRT_TO_BUS=y |
230 | CONFIG_UNEVICTABLE_LRU=y | 234 | CONFIG_UNEVICTABLE_LRU=y |
235 | CONFIG_PPC_4K_PAGES=y | ||
236 | # CONFIG_PPC_16K_PAGES is not set | ||
237 | # CONFIG_PPC_64K_PAGES is not set | ||
231 | CONFIG_FORCE_MAX_ZONEORDER=11 | 238 | CONFIG_FORCE_MAX_ZONEORDER=11 |
232 | CONFIG_PROC_DEVICETREE=y | 239 | CONFIG_PROC_DEVICETREE=y |
233 | # CONFIG_CMDLINE_BOOL is not set | 240 | # CONFIG_CMDLINE_BOOL is not set |
@@ -268,6 +275,7 @@ CONFIG_NET=y | |||
268 | # | 275 | # |
269 | # Networking options | 276 | # Networking options |
270 | # | 277 | # |
278 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
271 | CONFIG_PACKET=y | 279 | CONFIG_PACKET=y |
272 | # CONFIG_PACKET_MMAP is not set | 280 | # CONFIG_PACKET_MMAP is not set |
273 | CONFIG_UNIX=y | 281 | CONFIG_UNIX=y |
@@ -324,6 +332,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
324 | # CONFIG_ECONET is not set | 332 | # CONFIG_ECONET is not set |
325 | # CONFIG_WAN_ROUTER is not set | 333 | # CONFIG_WAN_ROUTER is not set |
326 | # CONFIG_NET_SCHED is not set | 334 | # CONFIG_NET_SCHED is not set |
335 | # CONFIG_DCB is not set | ||
327 | 336 | ||
328 | # | 337 | # |
329 | # Network testing | 338 | # Network testing |
@@ -336,6 +345,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
336 | # CONFIG_AF_RXRPC is not set | 345 | # CONFIG_AF_RXRPC is not set |
337 | # CONFIG_PHONET is not set | 346 | # CONFIG_PHONET is not set |
338 | # CONFIG_WIRELESS is not set | 347 | # CONFIG_WIRELESS is not set |
348 | # CONFIG_WIMAX is not set | ||
339 | # CONFIG_RFKILL is not set | 349 | # CONFIG_RFKILL is not set |
340 | # CONFIG_NET_9P is not set | 350 | # CONFIG_NET_9P is not set |
341 | 351 | ||
@@ -427,6 +437,12 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
427 | # CONFIG_MTD_ONENAND is not set | 437 | # CONFIG_MTD_ONENAND is not set |
428 | 438 | ||
429 | # | 439 | # |
440 | # LPDDR flash memory drivers | ||
441 | # | ||
442 | # CONFIG_MTD_LPDDR is not set | ||
443 | # CONFIG_MTD_QINFO_PROBE is not set | ||
444 | |||
445 | # | ||
430 | # UBI - Unsorted block images | 446 | # UBI - Unsorted block images |
431 | # | 447 | # |
432 | # CONFIG_MTD_UBI is not set | 448 | # CONFIG_MTD_UBI is not set |
@@ -514,6 +530,9 @@ CONFIG_LXT_PHY=y | |||
514 | # CONFIG_BROADCOM_PHY is not set | 530 | # CONFIG_BROADCOM_PHY is not set |
515 | # CONFIG_ICPLUS_PHY is not set | 531 | # CONFIG_ICPLUS_PHY is not set |
516 | # CONFIG_REALTEK_PHY is not set | 532 | # CONFIG_REALTEK_PHY is not set |
533 | # CONFIG_NATIONAL_PHY is not set | ||
534 | # CONFIG_STE10XP is not set | ||
535 | # CONFIG_LSI_ET1011C_PHY is not set | ||
517 | # CONFIG_FIXED_PHY is not set | 536 | # CONFIG_FIXED_PHY is not set |
518 | # CONFIG_MDIO_BITBANG is not set | 537 | # CONFIG_MDIO_BITBANG is not set |
519 | CONFIG_NET_ETHERNET=y | 538 | CONFIG_NET_ETHERNET=y |
@@ -539,6 +558,10 @@ CONFIG_FEC_MPC52xx_MDIO=y | |||
539 | # CONFIG_IWLWIFI_LEDS is not set | 558 | # CONFIG_IWLWIFI_LEDS is not set |
540 | 559 | ||
541 | # | 560 | # |
561 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
562 | # | ||
563 | |||
564 | # | ||
542 | # USB Network Adapters | 565 | # USB Network Adapters |
543 | # | 566 | # |
544 | # CONFIG_USB_CATC is not set | 567 | # CONFIG_USB_CATC is not set |
@@ -588,8 +611,10 @@ CONFIG_SERIAL_MPC52xx=y | |||
588 | CONFIG_SERIAL_MPC52xx_CONSOLE=y | 611 | CONFIG_SERIAL_MPC52xx_CONSOLE=y |
589 | CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=57600 | 612 | CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=57600 |
590 | CONFIG_UNIX98_PTYS=y | 613 | CONFIG_UNIX98_PTYS=y |
614 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | ||
591 | CONFIG_LEGACY_PTYS=y | 615 | CONFIG_LEGACY_PTYS=y |
592 | CONFIG_LEGACY_PTY_COUNT=256 | 616 | CONFIG_LEGACY_PTY_COUNT=256 |
617 | # CONFIG_HVC_UDBG is not set | ||
593 | # CONFIG_IPMI_HANDLER is not set | 618 | # CONFIG_IPMI_HANDLER is not set |
594 | # CONFIG_HW_RANDOM is not set | 619 | # CONFIG_HW_RANDOM is not set |
595 | # CONFIG_NVRAM is not set | 620 | # CONFIG_NVRAM is not set |
@@ -629,8 +654,6 @@ CONFIG_I2C_MPC=y | |||
629 | # Miscellaneous I2C Chip support | 654 | # Miscellaneous I2C Chip support |
630 | # | 655 | # |
631 | # CONFIG_DS1682 is not set | 656 | # CONFIG_DS1682 is not set |
632 | # CONFIG_EEPROM_AT24 is not set | ||
633 | # CONFIG_EEPROM_LEGACY is not set | ||
634 | # CONFIG_SENSORS_PCF8574 is not set | 657 | # CONFIG_SENSORS_PCF8574 is not set |
635 | # CONFIG_PCF8575 is not set | 658 | # CONFIG_PCF8575 is not set |
636 | # CONFIG_SENSORS_PCA9539 is not set | 659 | # CONFIG_SENSORS_PCA9539 is not set |
@@ -675,10 +698,12 @@ CONFIG_SSB_POSSIBLE=y | |||
675 | # CONFIG_MFD_CORE is not set | 698 | # CONFIG_MFD_CORE is not set |
676 | # CONFIG_MFD_SM501 is not set | 699 | # CONFIG_MFD_SM501 is not set |
677 | # CONFIG_HTC_PASIC3 is not set | 700 | # CONFIG_HTC_PASIC3 is not set |
701 | # CONFIG_TWL4030_CORE is not set | ||
678 | # CONFIG_MFD_TMIO is not set | 702 | # CONFIG_MFD_TMIO is not set |
679 | # CONFIG_PMIC_DA903X is not set | 703 | # CONFIG_PMIC_DA903X is not set |
680 | # CONFIG_MFD_WM8400 is not set | 704 | # CONFIG_MFD_WM8400 is not set |
681 | # CONFIG_MFD_WM8350_I2C is not set | 705 | # CONFIG_MFD_WM8350_I2C is not set |
706 | # CONFIG_MFD_PCF50633 is not set | ||
682 | # CONFIG_REGULATOR is not set | 707 | # CONFIG_REGULATOR is not set |
683 | 708 | ||
684 | # | 709 | # |
@@ -736,6 +761,7 @@ CONFIG_USB_DEVICEFS=y | |||
736 | # USB Host Controller Drivers | 761 | # USB Host Controller Drivers |
737 | # | 762 | # |
738 | # CONFIG_USB_C67X00_HCD is not set | 763 | # CONFIG_USB_C67X00_HCD is not set |
764 | # CONFIG_USB_OXU210HP_HCD is not set | ||
739 | # CONFIG_USB_ISP116X_HCD is not set | 765 | # CONFIG_USB_ISP116X_HCD is not set |
740 | # CONFIG_USB_ISP1760_HCD is not set | 766 | # CONFIG_USB_ISP1760_HCD is not set |
741 | CONFIG_USB_OHCI_HCD=y | 767 | CONFIG_USB_OHCI_HCD=y |
@@ -760,18 +786,17 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | |||
760 | # CONFIG_USB_TMC is not set | 786 | # CONFIG_USB_TMC is not set |
761 | 787 | ||
762 | # | 788 | # |
763 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 789 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; |
764 | # | 790 | # |
765 | 791 | ||
766 | # | 792 | # |
767 | # may also be needed; see USB_STORAGE Help for more information | 793 | # see USB_STORAGE Help for more information |
768 | # | 794 | # |
769 | CONFIG_USB_STORAGE=y | 795 | CONFIG_USB_STORAGE=y |
770 | # CONFIG_USB_STORAGE_DEBUG is not set | 796 | # CONFIG_USB_STORAGE_DEBUG is not set |
771 | # CONFIG_USB_STORAGE_DATAFAB is not set | 797 | # CONFIG_USB_STORAGE_DATAFAB is not set |
772 | # CONFIG_USB_STORAGE_FREECOM is not set | 798 | # CONFIG_USB_STORAGE_FREECOM is not set |
773 | # CONFIG_USB_STORAGE_ISD200 is not set | 799 | # CONFIG_USB_STORAGE_ISD200 is not set |
774 | # CONFIG_USB_STORAGE_DPCM is not set | ||
775 | # CONFIG_USB_STORAGE_USBAT is not set | 800 | # CONFIG_USB_STORAGE_USBAT is not set |
776 | # CONFIG_USB_STORAGE_SDDR09 is not set | 801 | # CONFIG_USB_STORAGE_SDDR09 is not set |
777 | # CONFIG_USB_STORAGE_SDDR55 is not set | 802 | # CONFIG_USB_STORAGE_SDDR55 is not set |
@@ -817,6 +842,10 @@ CONFIG_USB_STORAGE=y | |||
817 | # CONFIG_USB_ISIGHTFW is not set | 842 | # CONFIG_USB_ISIGHTFW is not set |
818 | # CONFIG_USB_VST is not set | 843 | # CONFIG_USB_VST is not set |
819 | # CONFIG_USB_GADGET is not set | 844 | # CONFIG_USB_GADGET is not set |
845 | |||
846 | # | ||
847 | # OTG and related infrastructure | ||
848 | # | ||
820 | # CONFIG_MMC is not set | 849 | # CONFIG_MMC is not set |
821 | # CONFIG_MEMSTICK is not set | 850 | # CONFIG_MEMSTICK is not set |
822 | # CONFIG_NEW_LEDS is not set | 851 | # CONFIG_NEW_LEDS is not set |
@@ -826,7 +855,6 @@ CONFIG_USB_STORAGE=y | |||
826 | # CONFIG_DMADEVICES is not set | 855 | # CONFIG_DMADEVICES is not set |
827 | # CONFIG_UIO is not set | 856 | # CONFIG_UIO is not set |
828 | # CONFIG_STAGING is not set | 857 | # CONFIG_STAGING is not set |
829 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
830 | 858 | ||
831 | # | 859 | # |
832 | # File systems | 860 | # File systems |
@@ -847,6 +875,7 @@ CONFIG_FS_MBCACHE=y | |||
847 | CONFIG_FILE_LOCKING=y | 875 | CONFIG_FILE_LOCKING=y |
848 | # CONFIG_XFS_FS is not set | 876 | # CONFIG_XFS_FS is not set |
849 | # CONFIG_OCFS2_FS is not set | 877 | # CONFIG_OCFS2_FS is not set |
878 | # CONFIG_BTRFS_FS is not set | ||
850 | CONFIG_DNOTIFY=y | 879 | CONFIG_DNOTIFY=y |
851 | CONFIG_INOTIFY=y | 880 | CONFIG_INOTIFY=y |
852 | CONFIG_INOTIFY_USER=y | 881 | CONFIG_INOTIFY_USER=y |
@@ -883,10 +912,7 @@ CONFIG_TMPFS=y | |||
883 | # CONFIG_TMPFS_POSIX_ACL is not set | 912 | # CONFIG_TMPFS_POSIX_ACL is not set |
884 | # CONFIG_HUGETLB_PAGE is not set | 913 | # CONFIG_HUGETLB_PAGE is not set |
885 | # CONFIG_CONFIGFS_FS is not set | 914 | # CONFIG_CONFIGFS_FS is not set |
886 | 915 | CONFIG_MISC_FILESYSTEMS=y | |
887 | # | ||
888 | # Miscellaneous filesystems | ||
889 | # | ||
890 | # CONFIG_ADFS_FS is not set | 916 | # CONFIG_ADFS_FS is not set |
891 | # CONFIG_AFFS_FS is not set | 917 | # CONFIG_AFFS_FS is not set |
892 | # CONFIG_HFS_FS is not set | 918 | # CONFIG_HFS_FS is not set |
@@ -906,6 +932,7 @@ CONFIG_JFFS2_ZLIB=y | |||
906 | CONFIG_JFFS2_RTIME=y | 932 | CONFIG_JFFS2_RTIME=y |
907 | # CONFIG_JFFS2_RUBIN is not set | 933 | # CONFIG_JFFS2_RUBIN is not set |
908 | CONFIG_CRAMFS=y | 934 | CONFIG_CRAMFS=y |
935 | # CONFIG_SQUASHFS is not set | ||
909 | # CONFIG_VXFS_FS is not set | 936 | # CONFIG_VXFS_FS is not set |
910 | # CONFIG_MINIX_FS is not set | 937 | # CONFIG_MINIX_FS is not set |
911 | # CONFIG_OMFS_FS is not set | 938 | # CONFIG_OMFS_FS is not set |
@@ -1002,6 +1029,7 @@ CONFIG_NLS_ISO8859_1=y | |||
1002 | # Library routines | 1029 | # Library routines |
1003 | # | 1030 | # |
1004 | CONFIG_BITREVERSE=y | 1031 | CONFIG_BITREVERSE=y |
1032 | CONFIG_GENERIC_FIND_LAST_BIT=y | ||
1005 | # CONFIG_CRC_CCITT is not set | 1033 | # CONFIG_CRC_CCITT is not set |
1006 | # CONFIG_CRC16 is not set | 1034 | # CONFIG_CRC16 is not set |
1007 | # CONFIG_CRC_T10DIF is not set | 1035 | # CONFIG_CRC_T10DIF is not set |
@@ -1053,6 +1081,7 @@ CONFIG_SCHED_DEBUG=y | |||
1053 | # CONFIG_DEBUG_MEMORY_INIT is not set | 1081 | # CONFIG_DEBUG_MEMORY_INIT is not set |
1054 | # CONFIG_DEBUG_LIST is not set | 1082 | # CONFIG_DEBUG_LIST is not set |
1055 | # CONFIG_DEBUG_SG is not set | 1083 | # CONFIG_DEBUG_SG is not set |
1084 | # CONFIG_DEBUG_NOTIFIERS is not set | ||
1056 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1085 | # CONFIG_BOOT_PRINTK_DELAY is not set |
1057 | # CONFIG_RCU_TORTURE_TEST is not set | 1086 | # CONFIG_RCU_TORTURE_TEST is not set |
1058 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1087 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
@@ -1061,6 +1090,8 @@ CONFIG_SCHED_DEBUG=y | |||
1061 | # CONFIG_FAULT_INJECTION is not set | 1090 | # CONFIG_FAULT_INJECTION is not set |
1062 | # CONFIG_LATENCYTOP is not set | 1091 | # CONFIG_LATENCYTOP is not set |
1063 | CONFIG_HAVE_FUNCTION_TRACER=y | 1092 | CONFIG_HAVE_FUNCTION_TRACER=y |
1093 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1094 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | ||
1064 | 1095 | ||
1065 | # | 1096 | # |
1066 | # Tracers | 1097 | # Tracers |
@@ -1069,11 +1100,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y | |||
1069 | # CONFIG_SCHED_TRACER is not set | 1100 | # CONFIG_SCHED_TRACER is not set |
1070 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1101 | # CONFIG_CONTEXT_SWITCH_TRACER is not set |
1071 | # CONFIG_BOOT_TRACER is not set | 1102 | # CONFIG_BOOT_TRACER is not set |
1103 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
1072 | # CONFIG_STACK_TRACER is not set | 1104 | # CONFIG_STACK_TRACER is not set |
1073 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | 1105 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set |
1074 | # CONFIG_SAMPLES is not set | 1106 | # CONFIG_SAMPLES is not set |
1075 | CONFIG_HAVE_ARCH_KGDB=y | 1107 | CONFIG_HAVE_ARCH_KGDB=y |
1076 | # CONFIG_KGDB is not set | 1108 | # CONFIG_KGDB is not set |
1109 | CONFIG_PRINT_STACK_DEPTH=64 | ||
1077 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1110 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1078 | # CONFIG_DEBUG_STACK_USAGE is not set | 1111 | # CONFIG_DEBUG_STACK_USAGE is not set |
1079 | # CONFIG_DEBUG_PAGEALLOC is not set | 1112 | # CONFIG_DEBUG_PAGEALLOC is not set |
@@ -1100,11 +1133,15 @@ CONFIG_CRYPTO=y | |||
1100 | # | 1133 | # |
1101 | # CONFIG_CRYPTO_FIPS is not set | 1134 | # CONFIG_CRYPTO_FIPS is not set |
1102 | CONFIG_CRYPTO_ALGAPI=y | 1135 | CONFIG_CRYPTO_ALGAPI=y |
1103 | CONFIG_CRYPTO_AEAD=y | 1136 | CONFIG_CRYPTO_ALGAPI2=y |
1137 | CONFIG_CRYPTO_AEAD2=y | ||
1104 | CONFIG_CRYPTO_BLKCIPHER=y | 1138 | CONFIG_CRYPTO_BLKCIPHER=y |
1139 | CONFIG_CRYPTO_BLKCIPHER2=y | ||
1105 | CONFIG_CRYPTO_HASH=y | 1140 | CONFIG_CRYPTO_HASH=y |
1106 | CONFIG_CRYPTO_RNG=y | 1141 | CONFIG_CRYPTO_HASH2=y |
1142 | CONFIG_CRYPTO_RNG2=y | ||
1107 | CONFIG_CRYPTO_MANAGER=y | 1143 | CONFIG_CRYPTO_MANAGER=y |
1144 | CONFIG_CRYPTO_MANAGER2=y | ||
1108 | # CONFIG_CRYPTO_GF128MUL is not set | 1145 | # CONFIG_CRYPTO_GF128MUL is not set |
1109 | # CONFIG_CRYPTO_NULL is not set | 1146 | # CONFIG_CRYPTO_NULL is not set |
1110 | # CONFIG_CRYPTO_CRYPTD is not set | 1147 | # CONFIG_CRYPTO_CRYPTD is not set |
diff --git a/arch/powerpc/configs/52xx/lite5200b_defconfig b/arch/powerpc/configs/52xx/lite5200b_defconfig index 9796220032f..b7b88056290 100644 --- a/arch/powerpc/configs/52xx/lite5200b_defconfig +++ b/arch/powerpc/configs/52xx/lite5200b_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.28-rc4 | 3 | # Linux kernel version: 2.6.29-rc2 |
4 | # Thu Nov 13 02:10:16 2008 | 4 | # Mon Jan 26 21:41:14 2009 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -43,7 +43,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y | |||
43 | CONFIG_PPC=y | 43 | CONFIG_PPC=y |
44 | CONFIG_EARLY_PRINTK=y | 44 | CONFIG_EARLY_PRINTK=y |
45 | CONFIG_GENERIC_NVRAM=y | 45 | CONFIG_GENERIC_NVRAM=y |
46 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 46 | CONFIG_SCHED_OMIT_FRAME_POINTER=y |
47 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 47 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
48 | CONFIG_PPC_OF=y | 48 | CONFIG_PPC_OF=y |
49 | CONFIG_OF=y | 49 | CONFIG_OF=y |
@@ -72,14 +72,23 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
72 | # CONFIG_BSD_PROCESS_ACCT is not set | 72 | # CONFIG_BSD_PROCESS_ACCT is not set |
73 | # CONFIG_TASKSTATS is not set | 73 | # CONFIG_TASKSTATS is not set |
74 | # CONFIG_AUDIT is not set | 74 | # CONFIG_AUDIT is not set |
75 | |||
76 | # | ||
77 | # RCU Subsystem | ||
78 | # | ||
79 | CONFIG_CLASSIC_RCU=y | ||
80 | # CONFIG_TREE_RCU is not set | ||
81 | # CONFIG_PREEMPT_RCU is not set | ||
82 | # CONFIG_TREE_RCU_TRACE is not set | ||
83 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
75 | # CONFIG_IKCONFIG is not set | 84 | # CONFIG_IKCONFIG is not set |
76 | CONFIG_LOG_BUF_SHIFT=14 | 85 | CONFIG_LOG_BUF_SHIFT=14 |
77 | # CONFIG_CGROUPS is not set | ||
78 | CONFIG_GROUP_SCHED=y | 86 | CONFIG_GROUP_SCHED=y |
79 | # CONFIG_FAIR_GROUP_SCHED is not set | 87 | # CONFIG_FAIR_GROUP_SCHED is not set |
80 | # CONFIG_RT_GROUP_SCHED is not set | 88 | # CONFIG_RT_GROUP_SCHED is not set |
81 | CONFIG_USER_SCHED=y | 89 | CONFIG_USER_SCHED=y |
82 | # CONFIG_CGROUP_SCHED is not set | 90 | # CONFIG_CGROUP_SCHED is not set |
91 | # CONFIG_CGROUPS is not set | ||
83 | CONFIG_SYSFS_DEPRECATED=y | 92 | CONFIG_SYSFS_DEPRECATED=y |
84 | CONFIG_SYSFS_DEPRECATED_V2=y | 93 | CONFIG_SYSFS_DEPRECATED_V2=y |
85 | # CONFIG_RELAY is not set | 94 | # CONFIG_RELAY is not set |
@@ -112,7 +121,6 @@ CONFIG_SLUB_DEBUG=y | |||
112 | CONFIG_SLUB=y | 121 | CONFIG_SLUB=y |
113 | # CONFIG_SLOB is not set | 122 | # CONFIG_SLOB is not set |
114 | # CONFIG_PROFILING is not set | 123 | # CONFIG_PROFILING is not set |
115 | # CONFIG_MARKERS is not set | ||
116 | CONFIG_HAVE_OPROFILE=y | 124 | CONFIG_HAVE_OPROFILE=y |
117 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | 125 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y |
118 | CONFIG_HAVE_IOREMAP_PROT=y | 126 | CONFIG_HAVE_IOREMAP_PROT=y |
@@ -123,7 +131,6 @@ CONFIG_HAVE_CLK=y | |||
123 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 131 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
124 | CONFIG_SLABINFO=y | 132 | CONFIG_SLABINFO=y |
125 | CONFIG_RT_MUTEXES=y | 133 | CONFIG_RT_MUTEXES=y |
126 | # CONFIG_TINY_SHMEM is not set | ||
127 | CONFIG_BASE_SMALL=0 | 134 | CONFIG_BASE_SMALL=0 |
128 | CONFIG_MODULES=y | 135 | CONFIG_MODULES=y |
129 | # CONFIG_MODULE_FORCE_LOAD is not set | 136 | # CONFIG_MODULE_FORCE_LOAD is not set |
@@ -131,11 +138,9 @@ CONFIG_MODULE_UNLOAD=y | |||
131 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 138 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
132 | # CONFIG_MODVERSIONS is not set | 139 | # CONFIG_MODVERSIONS is not set |
133 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 140 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
134 | CONFIG_KMOD=y | ||
135 | CONFIG_BLOCK=y | 141 | CONFIG_BLOCK=y |
136 | # CONFIG_LBD is not set | 142 | # CONFIG_LBD is not set |
137 | # CONFIG_BLK_DEV_IO_TRACE is not set | 143 | # CONFIG_BLK_DEV_IO_TRACE is not set |
138 | # CONFIG_LSF is not set | ||
139 | # CONFIG_BLK_DEV_BSG is not set | 144 | # CONFIG_BLK_DEV_BSG is not set |
140 | # CONFIG_BLK_DEV_INTEGRITY is not set | 145 | # CONFIG_BLK_DEV_INTEGRITY is not set |
141 | 146 | ||
@@ -151,7 +156,6 @@ CONFIG_DEFAULT_AS=y | |||
151 | # CONFIG_DEFAULT_CFQ is not set | 156 | # CONFIG_DEFAULT_CFQ is not set |
152 | # CONFIG_DEFAULT_NOOP is not set | 157 | # CONFIG_DEFAULT_NOOP is not set |
153 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 158 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
154 | CONFIG_CLASSIC_RCU=y | ||
155 | CONFIG_FREEZER=y | 159 | CONFIG_FREEZER=y |
156 | 160 | ||
157 | # | 161 | # |
@@ -192,7 +196,7 @@ CONFIG_PPC_LITE5200=y | |||
192 | CONFIG_PPC_BESTCOMM=y | 196 | CONFIG_PPC_BESTCOMM=y |
193 | CONFIG_PPC_BESTCOMM_ATA=y | 197 | CONFIG_PPC_BESTCOMM_ATA=y |
194 | CONFIG_PPC_BESTCOMM_FEC=y | 198 | CONFIG_PPC_BESTCOMM_FEC=y |
195 | CONFIG_PPC_BESTCOMM_GEN_BD=y | 199 | # CONFIG_SIMPLE_GPIO is not set |
196 | 200 | ||
197 | # | 201 | # |
198 | # Kernel options | 202 | # Kernel options |
@@ -220,6 +224,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | |||
220 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 224 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
221 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 225 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
222 | # CONFIG_KEXEC is not set | 226 | # CONFIG_KEXEC is not set |
227 | # CONFIG_CRASH_DUMP is not set | ||
223 | CONFIG_ARCH_FLATMEM_ENABLE=y | 228 | CONFIG_ARCH_FLATMEM_ENABLE=y |
224 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 229 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
225 | CONFIG_SELECT_MEMORY_MODEL=y | 230 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -231,12 +236,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
231 | CONFIG_PAGEFLAGS_EXTENDED=y | 236 | CONFIG_PAGEFLAGS_EXTENDED=y |
232 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 237 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
233 | CONFIG_MIGRATION=y | 238 | CONFIG_MIGRATION=y |
234 | # CONFIG_RESOURCES_64BIT is not set | ||
235 | # CONFIG_PHYS_ADDR_T_64BIT is not set | 239 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
236 | CONFIG_ZONE_DMA_FLAG=1 | 240 | CONFIG_ZONE_DMA_FLAG=1 |
237 | CONFIG_BOUNCE=y | 241 | CONFIG_BOUNCE=y |
238 | CONFIG_VIRT_TO_BUS=y | 242 | CONFIG_VIRT_TO_BUS=y |
239 | CONFIG_UNEVICTABLE_LRU=y | 243 | CONFIG_UNEVICTABLE_LRU=y |
244 | CONFIG_PPC_4K_PAGES=y | ||
245 | # CONFIG_PPC_16K_PAGES is not set | ||
246 | # CONFIG_PPC_64K_PAGES is not set | ||
240 | CONFIG_FORCE_MAX_ZONEORDER=11 | 247 | CONFIG_FORCE_MAX_ZONEORDER=11 |
241 | CONFIG_PROC_DEVICETREE=y | 248 | CONFIG_PROC_DEVICETREE=y |
242 | # CONFIG_CMDLINE_BOOL is not set | 249 | # CONFIG_CMDLINE_BOOL is not set |
@@ -264,6 +271,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
264 | # CONFIG_PCI_MSI is not set | 271 | # CONFIG_PCI_MSI is not set |
265 | CONFIG_PCI_LEGACY=y | 272 | CONFIG_PCI_LEGACY=y |
266 | # CONFIG_PCI_DEBUG is not set | 273 | # CONFIG_PCI_DEBUG is not set |
274 | # CONFIG_PCI_STUB is not set | ||
267 | # CONFIG_PCCARD is not set | 275 | # CONFIG_PCCARD is not set |
268 | # CONFIG_HOTPLUG_PCI is not set | 276 | # CONFIG_HOTPLUG_PCI is not set |
269 | # CONFIG_HAS_RAPIDIO is not set | 277 | # CONFIG_HAS_RAPIDIO is not set |
@@ -286,6 +294,7 @@ CONFIG_NET=y | |||
286 | # | 294 | # |
287 | # Networking options | 295 | # Networking options |
288 | # | 296 | # |
297 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
289 | CONFIG_PACKET=y | 298 | CONFIG_PACKET=y |
290 | # CONFIG_PACKET_MMAP is not set | 299 | # CONFIG_PACKET_MMAP is not set |
291 | CONFIG_UNIX=y | 300 | CONFIG_UNIX=y |
@@ -342,6 +351,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
342 | # CONFIG_ECONET is not set | 351 | # CONFIG_ECONET is not set |
343 | # CONFIG_WAN_ROUTER is not set | 352 | # CONFIG_WAN_ROUTER is not set |
344 | # CONFIG_NET_SCHED is not set | 353 | # CONFIG_NET_SCHED is not set |
354 | # CONFIG_DCB is not set | ||
345 | 355 | ||
346 | # | 356 | # |
347 | # Network testing | 357 | # Network testing |
@@ -354,6 +364,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
354 | # CONFIG_AF_RXRPC is not set | 364 | # CONFIG_AF_RXRPC is not set |
355 | # CONFIG_PHONET is not set | 365 | # CONFIG_PHONET is not set |
356 | # CONFIG_WIRELESS is not set | 366 | # CONFIG_WIRELESS is not set |
367 | # CONFIG_WIMAX is not set | ||
357 | # CONFIG_RFKILL is not set | 368 | # CONFIG_RFKILL is not set |
358 | # CONFIG_NET_9P is not set | 369 | # CONFIG_NET_9P is not set |
359 | 370 | ||
@@ -396,13 +407,19 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
396 | # CONFIG_BLK_DEV_HD is not set | 407 | # CONFIG_BLK_DEV_HD is not set |
397 | CONFIG_MISC_DEVICES=y | 408 | CONFIG_MISC_DEVICES=y |
398 | # CONFIG_PHANTOM is not set | 409 | # CONFIG_PHANTOM is not set |
399 | # CONFIG_EEPROM_93CX6 is not set | ||
400 | # CONFIG_SGI_IOC4 is not set | 410 | # CONFIG_SGI_IOC4 is not set |
401 | # CONFIG_TIFM_CORE is not set | 411 | # CONFIG_TIFM_CORE is not set |
402 | # CONFIG_ICS932S401 is not set | 412 | # CONFIG_ICS932S401 is not set |
403 | # CONFIG_ENCLOSURE_SERVICES is not set | 413 | # CONFIG_ENCLOSURE_SERVICES is not set |
404 | # CONFIG_HP_ILO is not set | 414 | # CONFIG_HP_ILO is not set |
405 | # CONFIG_C2PORT is not set | 415 | # CONFIG_C2PORT is not set |
416 | |||
417 | # | ||
418 | # EEPROM support | ||
419 | # | ||
420 | # CONFIG_EEPROM_AT24 is not set | ||
421 | # CONFIG_EEPROM_LEGACY is not set | ||
422 | # CONFIG_EEPROM_93CX6 is not set | ||
406 | CONFIG_HAVE_IDE=y | 423 | CONFIG_HAVE_IDE=y |
407 | # CONFIG_IDE is not set | 424 | # CONFIG_IDE is not set |
408 | 425 | ||
@@ -445,6 +462,7 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
445 | # CONFIG_SCSI_SRP_ATTRS is not set | 462 | # CONFIG_SCSI_SRP_ATTRS is not set |
446 | CONFIG_SCSI_LOWLEVEL=y | 463 | CONFIG_SCSI_LOWLEVEL=y |
447 | # CONFIG_ISCSI_TCP is not set | 464 | # CONFIG_ISCSI_TCP is not set |
465 | # CONFIG_SCSI_CXGB3_ISCSI is not set | ||
448 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 466 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
449 | # CONFIG_SCSI_3W_9XXX is not set | 467 | # CONFIG_SCSI_3W_9XXX is not set |
450 | # CONFIG_SCSI_ACARD is not set | 468 | # CONFIG_SCSI_ACARD is not set |
@@ -461,6 +479,8 @@ CONFIG_SCSI_LOWLEVEL=y | |||
461 | # CONFIG_MEGARAID_SAS is not set | 479 | # CONFIG_MEGARAID_SAS is not set |
462 | # CONFIG_SCSI_HPTIOP is not set | 480 | # CONFIG_SCSI_HPTIOP is not set |
463 | # CONFIG_SCSI_BUSLOGIC is not set | 481 | # CONFIG_SCSI_BUSLOGIC is not set |
482 | # CONFIG_LIBFC is not set | ||
483 | # CONFIG_FCOE is not set | ||
464 | # CONFIG_SCSI_DMX3191D is not set | 484 | # CONFIG_SCSI_DMX3191D is not set |
465 | # CONFIG_SCSI_EATA is not set | 485 | # CONFIG_SCSI_EATA is not set |
466 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | 486 | # CONFIG_SCSI_FUTURE_DOMAIN is not set |
@@ -580,6 +600,9 @@ CONFIG_LXT_PHY=y | |||
580 | # CONFIG_BROADCOM_PHY is not set | 600 | # CONFIG_BROADCOM_PHY is not set |
581 | # CONFIG_ICPLUS_PHY is not set | 601 | # CONFIG_ICPLUS_PHY is not set |
582 | # CONFIG_REALTEK_PHY is not set | 602 | # CONFIG_REALTEK_PHY is not set |
603 | # CONFIG_NATIONAL_PHY is not set | ||
604 | # CONFIG_STE10XP is not set | ||
605 | # CONFIG_LSI_ET1011C_PHY is not set | ||
583 | # CONFIG_FIXED_PHY is not set | 606 | # CONFIG_FIXED_PHY is not set |
584 | # CONFIG_MDIO_BITBANG is not set | 607 | # CONFIG_MDIO_BITBANG is not set |
585 | CONFIG_NET_ETHERNET=y | 608 | CONFIG_NET_ETHERNET=y |
@@ -626,6 +649,7 @@ CONFIG_NETDEV_1000=y | |||
626 | # CONFIG_JME is not set | 649 | # CONFIG_JME is not set |
627 | CONFIG_NETDEV_10000=y | 650 | CONFIG_NETDEV_10000=y |
628 | # CONFIG_CHELSIO_T1 is not set | 651 | # CONFIG_CHELSIO_T1 is not set |
652 | CONFIG_CHELSIO_T3_DEPENDS=y | ||
629 | # CONFIG_CHELSIO_T3 is not set | 653 | # CONFIG_CHELSIO_T3 is not set |
630 | # CONFIG_ENIC is not set | 654 | # CONFIG_ENIC is not set |
631 | # CONFIG_IXGBE is not set | 655 | # CONFIG_IXGBE is not set |
@@ -648,6 +672,10 @@ CONFIG_NETDEV_10000=y | |||
648 | # CONFIG_WLAN_PRE80211 is not set | 672 | # CONFIG_WLAN_PRE80211 is not set |
649 | # CONFIG_WLAN_80211 is not set | 673 | # CONFIG_WLAN_80211 is not set |
650 | # CONFIG_IWLWIFI_LEDS is not set | 674 | # CONFIG_IWLWIFI_LEDS is not set |
675 | |||
676 | # | ||
677 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
678 | # | ||
651 | # CONFIG_WAN is not set | 679 | # CONFIG_WAN is not set |
652 | # CONFIG_FDDI is not set | 680 | # CONFIG_FDDI is not set |
653 | # CONFIG_HIPPI is not set | 681 | # CONFIG_HIPPI is not set |
@@ -695,8 +723,10 @@ CONFIG_SERIAL_MPC52xx_CONSOLE=y | |||
695 | CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200 | 723 | CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200 |
696 | # CONFIG_SERIAL_JSM is not set | 724 | # CONFIG_SERIAL_JSM is not set |
697 | CONFIG_UNIX98_PTYS=y | 725 | CONFIG_UNIX98_PTYS=y |
726 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | ||
698 | CONFIG_LEGACY_PTYS=y | 727 | CONFIG_LEGACY_PTYS=y |
699 | CONFIG_LEGACY_PTY_COUNT=256 | 728 | CONFIG_LEGACY_PTY_COUNT=256 |
729 | # CONFIG_HVC_UDBG is not set | ||
700 | # CONFIG_IPMI_HANDLER is not set | 730 | # CONFIG_IPMI_HANDLER is not set |
701 | # CONFIG_HW_RANDOM is not set | 731 | # CONFIG_HW_RANDOM is not set |
702 | # CONFIG_NVRAM is not set | 732 | # CONFIG_NVRAM is not set |
@@ -762,8 +792,6 @@ CONFIG_I2C_MPC=y | |||
762 | # Miscellaneous I2C Chip support | 792 | # Miscellaneous I2C Chip support |
763 | # | 793 | # |
764 | # CONFIG_DS1682 is not set | 794 | # CONFIG_DS1682 is not set |
765 | # CONFIG_EEPROM_AT24 is not set | ||
766 | # CONFIG_EEPROM_LEGACY is not set | ||
767 | # CONFIG_SENSORS_PCF8574 is not set | 795 | # CONFIG_SENSORS_PCF8574 is not set |
768 | # CONFIG_PCF8575 is not set | 796 | # CONFIG_PCF8575 is not set |
769 | # CONFIG_SENSORS_PCA9539 is not set | 797 | # CONFIG_SENSORS_PCA9539 is not set |
@@ -796,10 +824,12 @@ CONFIG_SSB_POSSIBLE=y | |||
796 | # CONFIG_MFD_CORE is not set | 824 | # CONFIG_MFD_CORE is not set |
797 | # CONFIG_MFD_SM501 is not set | 825 | # CONFIG_MFD_SM501 is not set |
798 | # CONFIG_HTC_PASIC3 is not set | 826 | # CONFIG_HTC_PASIC3 is not set |
827 | # CONFIG_TWL4030_CORE is not set | ||
799 | # CONFIG_MFD_TMIO is not set | 828 | # CONFIG_MFD_TMIO is not set |
800 | # CONFIG_PMIC_DA903X is not set | 829 | # CONFIG_PMIC_DA903X is not set |
801 | # CONFIG_MFD_WM8400 is not set | 830 | # CONFIG_MFD_WM8400 is not set |
802 | # CONFIG_MFD_WM8350_I2C is not set | 831 | # CONFIG_MFD_WM8350_I2C is not set |
832 | # CONFIG_MFD_PCF50633 is not set | ||
803 | # CONFIG_REGULATOR is not set | 833 | # CONFIG_REGULATOR is not set |
804 | 834 | ||
805 | # | 835 | # |
@@ -846,9 +876,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
846 | # | 876 | # |
847 | 877 | ||
848 | # | 878 | # |
849 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 879 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; |
850 | # | 880 | # |
851 | # CONFIG_USB_GADGET is not set | 881 | # CONFIG_USB_GADGET is not set |
882 | |||
883 | # | ||
884 | # OTG and related infrastructure | ||
885 | # | ||
852 | # CONFIG_UWB is not set | 886 | # CONFIG_UWB is not set |
853 | # CONFIG_MMC is not set | 887 | # CONFIG_MMC is not set |
854 | # CONFIG_MEMSTICK is not set | 888 | # CONFIG_MEMSTICK is not set |
@@ -860,7 +894,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
860 | # CONFIG_DMADEVICES is not set | 894 | # CONFIG_DMADEVICES is not set |
861 | # CONFIG_UIO is not set | 895 | # CONFIG_UIO is not set |
862 | # CONFIG_STAGING is not set | 896 | # CONFIG_STAGING is not set |
863 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
864 | 897 | ||
865 | # | 898 | # |
866 | # File systems | 899 | # File systems |
@@ -881,6 +914,7 @@ CONFIG_FS_MBCACHE=y | |||
881 | CONFIG_FILE_LOCKING=y | 914 | CONFIG_FILE_LOCKING=y |
882 | # CONFIG_XFS_FS is not set | 915 | # CONFIG_XFS_FS is not set |
883 | # CONFIG_OCFS2_FS is not set | 916 | # CONFIG_OCFS2_FS is not set |
917 | # CONFIG_BTRFS_FS is not set | ||
884 | CONFIG_DNOTIFY=y | 918 | CONFIG_DNOTIFY=y |
885 | CONFIG_INOTIFY=y | 919 | CONFIG_INOTIFY=y |
886 | CONFIG_INOTIFY_USER=y | 920 | CONFIG_INOTIFY_USER=y |
@@ -914,10 +948,7 @@ CONFIG_TMPFS=y | |||
914 | # CONFIG_TMPFS_POSIX_ACL is not set | 948 | # CONFIG_TMPFS_POSIX_ACL is not set |
915 | # CONFIG_HUGETLB_PAGE is not set | 949 | # CONFIG_HUGETLB_PAGE is not set |
916 | # CONFIG_CONFIGFS_FS is not set | 950 | # CONFIG_CONFIGFS_FS is not set |
917 | 951 | CONFIG_MISC_FILESYSTEMS=y | |
918 | # | ||
919 | # Miscellaneous filesystems | ||
920 | # | ||
921 | # CONFIG_ADFS_FS is not set | 952 | # CONFIG_ADFS_FS is not set |
922 | # CONFIG_AFFS_FS is not set | 953 | # CONFIG_AFFS_FS is not set |
923 | # CONFIG_HFS_FS is not set | 954 | # CONFIG_HFS_FS is not set |
@@ -926,6 +957,7 @@ CONFIG_TMPFS=y | |||
926 | # CONFIG_BFS_FS is not set | 957 | # CONFIG_BFS_FS is not set |
927 | # CONFIG_EFS_FS is not set | 958 | # CONFIG_EFS_FS is not set |
928 | # CONFIG_CRAMFS is not set | 959 | # CONFIG_CRAMFS is not set |
960 | # CONFIG_SQUASHFS is not set | ||
929 | # CONFIG_VXFS_FS is not set | 961 | # CONFIG_VXFS_FS is not set |
930 | # CONFIG_MINIX_FS is not set | 962 | # CONFIG_MINIX_FS is not set |
931 | # CONFIG_OMFS_FS is not set | 963 | # CONFIG_OMFS_FS is not set |
@@ -967,6 +999,7 @@ CONFIG_MSDOS_PARTITION=y | |||
967 | # Library routines | 999 | # Library routines |
968 | # | 1000 | # |
969 | CONFIG_BITREVERSE=y | 1001 | CONFIG_BITREVERSE=y |
1002 | CONFIG_GENERIC_FIND_LAST_BIT=y | ||
970 | # CONFIG_CRC_CCITT is not set | 1003 | # CONFIG_CRC_CCITT is not set |
971 | # CONFIG_CRC16 is not set | 1004 | # CONFIG_CRC16 is not set |
972 | # CONFIG_CRC_T10DIF is not set | 1005 | # CONFIG_CRC_T10DIF is not set |
@@ -1016,6 +1049,7 @@ CONFIG_DEBUG_INFO=y | |||
1016 | # CONFIG_DEBUG_MEMORY_INIT is not set | 1049 | # CONFIG_DEBUG_MEMORY_INIT is not set |
1017 | # CONFIG_DEBUG_LIST is not set | 1050 | # CONFIG_DEBUG_LIST is not set |
1018 | # CONFIG_DEBUG_SG is not set | 1051 | # CONFIG_DEBUG_SG is not set |
1052 | # CONFIG_DEBUG_NOTIFIERS is not set | ||
1019 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1053 | # CONFIG_BOOT_PRINTK_DELAY is not set |
1020 | # CONFIG_RCU_TORTURE_TEST is not set | 1054 | # CONFIG_RCU_TORTURE_TEST is not set |
1021 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1055 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
@@ -1024,6 +1058,8 @@ CONFIG_DEBUG_INFO=y | |||
1024 | # CONFIG_FAULT_INJECTION is not set | 1058 | # CONFIG_FAULT_INJECTION is not set |
1025 | # CONFIG_LATENCYTOP is not set | 1059 | # CONFIG_LATENCYTOP is not set |
1026 | CONFIG_HAVE_FUNCTION_TRACER=y | 1060 | CONFIG_HAVE_FUNCTION_TRACER=y |
1061 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1062 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | ||
1027 | 1063 | ||
1028 | # | 1064 | # |
1029 | # Tracers | 1065 | # Tracers |
@@ -1032,11 +1068,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y | |||
1032 | # CONFIG_SCHED_TRACER is not set | 1068 | # CONFIG_SCHED_TRACER is not set |
1033 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1069 | # CONFIG_CONTEXT_SWITCH_TRACER is not set |
1034 | # CONFIG_BOOT_TRACER is not set | 1070 | # CONFIG_BOOT_TRACER is not set |
1071 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
1035 | # CONFIG_STACK_TRACER is not set | 1072 | # CONFIG_STACK_TRACER is not set |
1036 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | 1073 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set |
1037 | # CONFIG_SAMPLES is not set | 1074 | # CONFIG_SAMPLES is not set |
1038 | CONFIG_HAVE_ARCH_KGDB=y | 1075 | CONFIG_HAVE_ARCH_KGDB=y |
1039 | # CONFIG_KGDB is not set | 1076 | # CONFIG_KGDB is not set |
1077 | CONFIG_PRINT_STACK_DEPTH=64 | ||
1040 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1078 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1041 | # CONFIG_DEBUG_STACK_USAGE is not set | 1079 | # CONFIG_DEBUG_STACK_USAGE is not set |
1042 | # CONFIG_DEBUG_PAGEALLOC is not set | 1080 | # CONFIG_DEBUG_PAGEALLOC is not set |
@@ -1063,11 +1101,15 @@ CONFIG_CRYPTO=y | |||
1063 | # | 1101 | # |
1064 | # CONFIG_CRYPTO_FIPS is not set | 1102 | # CONFIG_CRYPTO_FIPS is not set |
1065 | CONFIG_CRYPTO_ALGAPI=y | 1103 | CONFIG_CRYPTO_ALGAPI=y |
1066 | CONFIG_CRYPTO_AEAD=y | 1104 | CONFIG_CRYPTO_ALGAPI2=y |
1105 | CONFIG_CRYPTO_AEAD2=y | ||
1067 | CONFIG_CRYPTO_BLKCIPHER=y | 1106 | CONFIG_CRYPTO_BLKCIPHER=y |
1107 | CONFIG_CRYPTO_BLKCIPHER2=y | ||
1068 | CONFIG_CRYPTO_HASH=y | 1108 | CONFIG_CRYPTO_HASH=y |
1069 | CONFIG_CRYPTO_RNG=y | 1109 | CONFIG_CRYPTO_HASH2=y |
1110 | CONFIG_CRYPTO_RNG2=y | ||
1070 | CONFIG_CRYPTO_MANAGER=y | 1111 | CONFIG_CRYPTO_MANAGER=y |
1112 | CONFIG_CRYPTO_MANAGER2=y | ||
1071 | # CONFIG_CRYPTO_GF128MUL is not set | 1113 | # CONFIG_CRYPTO_GF128MUL is not set |
1072 | # CONFIG_CRYPTO_NULL is not set | 1114 | # CONFIG_CRYPTO_NULL is not set |
1073 | # CONFIG_CRYPTO_CRYPTD is not set | 1115 | # CONFIG_CRYPTO_CRYPTD is not set |
diff --git a/arch/powerpc/configs/52xx/motionpro_defconfig b/arch/powerpc/configs/52xx/motionpro_defconfig index d081e003105..fb10f22fd0d 100644 --- a/arch/powerpc/configs/52xx/motionpro_defconfig +++ b/arch/powerpc/configs/52xx/motionpro_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.28-rc4 | 3 | # Linux kernel version: 2.6.29-rc2 |
4 | # Thu Nov 13 02:11:02 2008 | 4 | # Mon Jan 26 21:42:29 2009 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -43,7 +43,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y | |||
43 | CONFIG_PPC=y | 43 | CONFIG_PPC=y |
44 | CONFIG_EARLY_PRINTK=y | 44 | CONFIG_EARLY_PRINTK=y |
45 | CONFIG_GENERIC_NVRAM=y | 45 | CONFIG_GENERIC_NVRAM=y |
46 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 46 | CONFIG_SCHED_OMIT_FRAME_POINTER=y |
47 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 47 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
48 | CONFIG_PPC_OF=y | 48 | CONFIG_PPC_OF=y |
49 | CONFIG_OF=y | 49 | CONFIG_OF=y |
@@ -71,14 +71,23 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
71 | # CONFIG_BSD_PROCESS_ACCT is not set | 71 | # CONFIG_BSD_PROCESS_ACCT is not set |
72 | # CONFIG_TASKSTATS is not set | 72 | # CONFIG_TASKSTATS is not set |
73 | # CONFIG_AUDIT is not set | 73 | # CONFIG_AUDIT is not set |
74 | |||
75 | # | ||
76 | # RCU Subsystem | ||
77 | # | ||
78 | CONFIG_CLASSIC_RCU=y | ||
79 | # CONFIG_TREE_RCU is not set | ||
80 | # CONFIG_PREEMPT_RCU is not set | ||
81 | # CONFIG_TREE_RCU_TRACE is not set | ||
82 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
74 | # CONFIG_IKCONFIG is not set | 83 | # CONFIG_IKCONFIG is not set |
75 | CONFIG_LOG_BUF_SHIFT=14 | 84 | CONFIG_LOG_BUF_SHIFT=14 |
76 | # CONFIG_CGROUPS is not set | ||
77 | CONFIG_GROUP_SCHED=y | 85 | CONFIG_GROUP_SCHED=y |
78 | CONFIG_FAIR_GROUP_SCHED=y | 86 | CONFIG_FAIR_GROUP_SCHED=y |
79 | # CONFIG_RT_GROUP_SCHED is not set | 87 | # CONFIG_RT_GROUP_SCHED is not set |
80 | CONFIG_USER_SCHED=y | 88 | CONFIG_USER_SCHED=y |
81 | # CONFIG_CGROUP_SCHED is not set | 89 | # CONFIG_CGROUP_SCHED is not set |
90 | # CONFIG_CGROUPS is not set | ||
82 | CONFIG_SYSFS_DEPRECATED=y | 91 | CONFIG_SYSFS_DEPRECATED=y |
83 | CONFIG_SYSFS_DEPRECATED_V2=y | 92 | CONFIG_SYSFS_DEPRECATED_V2=y |
84 | # CONFIG_RELAY is not set | 93 | # CONFIG_RELAY is not set |
@@ -110,7 +119,6 @@ CONFIG_SLUB_DEBUG=y | |||
110 | CONFIG_SLUB=y | 119 | CONFIG_SLUB=y |
111 | # CONFIG_SLOB is not set | 120 | # CONFIG_SLOB is not set |
112 | # CONFIG_PROFILING is not set | 121 | # CONFIG_PROFILING is not set |
113 | # CONFIG_MARKERS is not set | ||
114 | CONFIG_HAVE_OPROFILE=y | 122 | CONFIG_HAVE_OPROFILE=y |
115 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | 123 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y |
116 | CONFIG_HAVE_IOREMAP_PROT=y | 124 | CONFIG_HAVE_IOREMAP_PROT=y |
@@ -121,13 +129,11 @@ CONFIG_HAVE_CLK=y | |||
121 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 129 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
122 | CONFIG_SLABINFO=y | 130 | CONFIG_SLABINFO=y |
123 | CONFIG_RT_MUTEXES=y | 131 | CONFIG_RT_MUTEXES=y |
124 | # CONFIG_TINY_SHMEM is not set | ||
125 | CONFIG_BASE_SMALL=0 | 132 | CONFIG_BASE_SMALL=0 |
126 | # CONFIG_MODULES is not set | 133 | # CONFIG_MODULES is not set |
127 | CONFIG_BLOCK=y | 134 | CONFIG_BLOCK=y |
128 | # CONFIG_LBD is not set | 135 | # CONFIG_LBD is not set |
129 | # CONFIG_BLK_DEV_IO_TRACE is not set | 136 | # CONFIG_BLK_DEV_IO_TRACE is not set |
130 | # CONFIG_LSF is not set | ||
131 | # CONFIG_BLK_DEV_BSG is not set | 137 | # CONFIG_BLK_DEV_BSG is not set |
132 | # CONFIG_BLK_DEV_INTEGRITY is not set | 138 | # CONFIG_BLK_DEV_INTEGRITY is not set |
133 | 139 | ||
@@ -143,7 +149,6 @@ CONFIG_DEFAULT_AS=y | |||
143 | # CONFIG_DEFAULT_CFQ is not set | 149 | # CONFIG_DEFAULT_CFQ is not set |
144 | # CONFIG_DEFAULT_NOOP is not set | 150 | # CONFIG_DEFAULT_NOOP is not set |
145 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 151 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
146 | CONFIG_CLASSIC_RCU=y | ||
147 | # CONFIG_FREEZER is not set | 152 | # CONFIG_FREEZER is not set |
148 | 153 | ||
149 | # | 154 | # |
@@ -182,9 +187,9 @@ CONFIG_PPC_MPC5200_SIMPLE=y | |||
182 | # CONFIG_TAU is not set | 187 | # CONFIG_TAU is not set |
183 | # CONFIG_FSL_ULI1575 is not set | 188 | # CONFIG_FSL_ULI1575 is not set |
184 | CONFIG_PPC_BESTCOMM=y | 189 | CONFIG_PPC_BESTCOMM=y |
185 | # CONFIG_PPC_BESTCOMM_ATA is not set | 190 | CONFIG_PPC_BESTCOMM_ATA=y |
186 | CONFIG_PPC_BESTCOMM_FEC=y | 191 | CONFIG_PPC_BESTCOMM_FEC=y |
187 | # CONFIG_PPC_BESTCOMM_GEN_BD is not set | 192 | # CONFIG_SIMPLE_GPIO is not set |
188 | 193 | ||
189 | # | 194 | # |
190 | # Kernel options | 195 | # Kernel options |
@@ -211,6 +216,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | |||
211 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 216 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
212 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 217 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
213 | # CONFIG_KEXEC is not set | 218 | # CONFIG_KEXEC is not set |
219 | # CONFIG_CRASH_DUMP is not set | ||
214 | CONFIG_ARCH_FLATMEM_ENABLE=y | 220 | CONFIG_ARCH_FLATMEM_ENABLE=y |
215 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 221 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
216 | CONFIG_SELECT_MEMORY_MODEL=y | 222 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -222,12 +228,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
222 | CONFIG_PAGEFLAGS_EXTENDED=y | 228 | CONFIG_PAGEFLAGS_EXTENDED=y |
223 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 229 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
224 | CONFIG_MIGRATION=y | 230 | CONFIG_MIGRATION=y |
225 | # CONFIG_RESOURCES_64BIT is not set | ||
226 | # CONFIG_PHYS_ADDR_T_64BIT is not set | 231 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
227 | CONFIG_ZONE_DMA_FLAG=1 | 232 | CONFIG_ZONE_DMA_FLAG=1 |
228 | CONFIG_BOUNCE=y | 233 | CONFIG_BOUNCE=y |
229 | CONFIG_VIRT_TO_BUS=y | 234 | CONFIG_VIRT_TO_BUS=y |
230 | CONFIG_UNEVICTABLE_LRU=y | 235 | CONFIG_UNEVICTABLE_LRU=y |
236 | CONFIG_PPC_4K_PAGES=y | ||
237 | # CONFIG_PPC_16K_PAGES is not set | ||
238 | # CONFIG_PPC_64K_PAGES is not set | ||
231 | CONFIG_FORCE_MAX_ZONEORDER=11 | 239 | CONFIG_FORCE_MAX_ZONEORDER=11 |
232 | CONFIG_PROC_DEVICETREE=y | 240 | CONFIG_PROC_DEVICETREE=y |
233 | # CONFIG_CMDLINE_BOOL is not set | 241 | # CONFIG_CMDLINE_BOOL is not set |
@@ -268,6 +276,7 @@ CONFIG_NET=y | |||
268 | # | 276 | # |
269 | # Networking options | 277 | # Networking options |
270 | # | 278 | # |
279 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
271 | CONFIG_PACKET=y | 280 | CONFIG_PACKET=y |
272 | # CONFIG_PACKET_MMAP is not set | 281 | # CONFIG_PACKET_MMAP is not set |
273 | CONFIG_UNIX=y | 282 | CONFIG_UNIX=y |
@@ -324,6 +333,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
324 | # CONFIG_ECONET is not set | 333 | # CONFIG_ECONET is not set |
325 | # CONFIG_WAN_ROUTER is not set | 334 | # CONFIG_WAN_ROUTER is not set |
326 | # CONFIG_NET_SCHED is not set | 335 | # CONFIG_NET_SCHED is not set |
336 | # CONFIG_DCB is not set | ||
327 | 337 | ||
328 | # | 338 | # |
329 | # Network testing | 339 | # Network testing |
@@ -336,6 +346,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
336 | # CONFIG_AF_RXRPC is not set | 346 | # CONFIG_AF_RXRPC is not set |
337 | # CONFIG_PHONET is not set | 347 | # CONFIG_PHONET is not set |
338 | # CONFIG_WIRELESS is not set | 348 | # CONFIG_WIRELESS is not set |
349 | # CONFIG_WIMAX is not set | ||
339 | # CONFIG_RFKILL is not set | 350 | # CONFIG_RFKILL is not set |
340 | # CONFIG_NET_9P is not set | 351 | # CONFIG_NET_9P is not set |
341 | 352 | ||
@@ -427,6 +438,12 @@ CONFIG_MTD_ROM=y | |||
427 | # CONFIG_MTD_ONENAND is not set | 438 | # CONFIG_MTD_ONENAND is not set |
428 | 439 | ||
429 | # | 440 | # |
441 | # LPDDR flash memory drivers | ||
442 | # | ||
443 | # CONFIG_MTD_LPDDR is not set | ||
444 | # CONFIG_MTD_QINFO_PROBE is not set | ||
445 | |||
446 | # | ||
430 | # UBI - Unsorted block images | 447 | # UBI - Unsorted block images |
431 | # | 448 | # |
432 | # CONFIG_MTD_UBI is not set | 449 | # CONFIG_MTD_UBI is not set |
@@ -447,10 +464,16 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
447 | # CONFIG_ATA_OVER_ETH is not set | 464 | # CONFIG_ATA_OVER_ETH is not set |
448 | # CONFIG_BLK_DEV_HD is not set | 465 | # CONFIG_BLK_DEV_HD is not set |
449 | CONFIG_MISC_DEVICES=y | 466 | CONFIG_MISC_DEVICES=y |
450 | # CONFIG_EEPROM_93CX6 is not set | ||
451 | # CONFIG_ICS932S401 is not set | 467 | # CONFIG_ICS932S401 is not set |
452 | # CONFIG_ENCLOSURE_SERVICES is not set | 468 | # CONFIG_ENCLOSURE_SERVICES is not set |
453 | # CONFIG_C2PORT is not set | 469 | # CONFIG_C2PORT is not set |
470 | |||
471 | # | ||
472 | # EEPROM support | ||
473 | # | ||
474 | # CONFIG_EEPROM_AT24 is not set | ||
475 | CONFIG_EEPROM_LEGACY=y | ||
476 | # CONFIG_EEPROM_93CX6 is not set | ||
454 | CONFIG_HAVE_IDE=y | 477 | CONFIG_HAVE_IDE=y |
455 | # CONFIG_IDE is not set | 478 | # CONFIG_IDE is not set |
456 | 479 | ||
@@ -492,6 +515,7 @@ CONFIG_CHR_DEV_SG=y | |||
492 | # CONFIG_SCSI_SRP_ATTRS is not set | 515 | # CONFIG_SCSI_SRP_ATTRS is not set |
493 | CONFIG_SCSI_LOWLEVEL=y | 516 | CONFIG_SCSI_LOWLEVEL=y |
494 | # CONFIG_ISCSI_TCP is not set | 517 | # CONFIG_ISCSI_TCP is not set |
518 | # CONFIG_LIBFC is not set | ||
495 | # CONFIG_SCSI_DEBUG is not set | 519 | # CONFIG_SCSI_DEBUG is not set |
496 | # CONFIG_SCSI_DH is not set | 520 | # CONFIG_SCSI_DH is not set |
497 | CONFIG_ATA=y | 521 | CONFIG_ATA=y |
@@ -525,6 +549,9 @@ CONFIG_SMSC_PHY=y | |||
525 | CONFIG_BROADCOM_PHY=y | 549 | CONFIG_BROADCOM_PHY=y |
526 | CONFIG_ICPLUS_PHY=y | 550 | CONFIG_ICPLUS_PHY=y |
527 | # CONFIG_REALTEK_PHY is not set | 551 | # CONFIG_REALTEK_PHY is not set |
552 | # CONFIG_NATIONAL_PHY is not set | ||
553 | # CONFIG_STE10XP is not set | ||
554 | # CONFIG_LSI_ET1011C_PHY is not set | ||
528 | # CONFIG_FIXED_PHY is not set | 555 | # CONFIG_FIXED_PHY is not set |
529 | CONFIG_MDIO_BITBANG=y | 556 | CONFIG_MDIO_BITBANG=y |
530 | CONFIG_NET_ETHERNET=y | 557 | CONFIG_NET_ETHERNET=y |
@@ -548,6 +575,10 @@ CONFIG_FEC_MPC52xx_MDIO=y | |||
548 | # CONFIG_WLAN_PRE80211 is not set | 575 | # CONFIG_WLAN_PRE80211 is not set |
549 | # CONFIG_WLAN_80211 is not set | 576 | # CONFIG_WLAN_80211 is not set |
550 | # CONFIG_IWLWIFI_LEDS is not set | 577 | # CONFIG_IWLWIFI_LEDS is not set |
578 | |||
579 | # | ||
580 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
581 | # | ||
551 | # CONFIG_WAN is not set | 582 | # CONFIG_WAN is not set |
552 | # CONFIG_PPP is not set | 583 | # CONFIG_PPP is not set |
553 | # CONFIG_SLIP is not set | 584 | # CONFIG_SLIP is not set |
@@ -590,8 +621,10 @@ CONFIG_SERIAL_MPC52xx=y | |||
590 | CONFIG_SERIAL_MPC52xx_CONSOLE=y | 621 | CONFIG_SERIAL_MPC52xx_CONSOLE=y |
591 | CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200 | 622 | CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200 |
592 | CONFIG_UNIX98_PTYS=y | 623 | CONFIG_UNIX98_PTYS=y |
624 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | ||
593 | CONFIG_LEGACY_PTYS=y | 625 | CONFIG_LEGACY_PTYS=y |
594 | CONFIG_LEGACY_PTY_COUNT=256 | 626 | CONFIG_LEGACY_PTY_COUNT=256 |
627 | # CONFIG_HVC_UDBG is not set | ||
595 | # CONFIG_IPMI_HANDLER is not set | 628 | # CONFIG_IPMI_HANDLER is not set |
596 | # CONFIG_HW_RANDOM is not set | 629 | # CONFIG_HW_RANDOM is not set |
597 | # CONFIG_NVRAM is not set | 630 | # CONFIG_NVRAM is not set |
@@ -629,8 +662,6 @@ CONFIG_I2C_MPC=y | |||
629 | # Miscellaneous I2C Chip support | 662 | # Miscellaneous I2C Chip support |
630 | # | 663 | # |
631 | # CONFIG_DS1682 is not set | 664 | # CONFIG_DS1682 is not set |
632 | # CONFIG_EEPROM_AT24 is not set | ||
633 | CONFIG_EEPROM_LEGACY=y | ||
634 | # CONFIG_SENSORS_PCF8574 is not set | 665 | # CONFIG_SENSORS_PCF8574 is not set |
635 | # CONFIG_PCF8575 is not set | 666 | # CONFIG_PCF8575 is not set |
636 | # CONFIG_SENSORS_PCA9539 is not set | 667 | # CONFIG_SENSORS_PCA9539 is not set |
@@ -659,6 +690,7 @@ CONFIG_HWMON=y | |||
659 | # CONFIG_SENSORS_ADT7462 is not set | 690 | # CONFIG_SENSORS_ADT7462 is not set |
660 | # CONFIG_SENSORS_ADT7470 is not set | 691 | # CONFIG_SENSORS_ADT7470 is not set |
661 | # CONFIG_SENSORS_ADT7473 is not set | 692 | # CONFIG_SENSORS_ADT7473 is not set |
693 | # CONFIG_SENSORS_ADT7475 is not set | ||
662 | # CONFIG_SENSORS_ATXP1 is not set | 694 | # CONFIG_SENSORS_ATXP1 is not set |
663 | # CONFIG_SENSORS_DS1621 is not set | 695 | # CONFIG_SENSORS_DS1621 is not set |
664 | # CONFIG_SENSORS_F71805F is not set | 696 | # CONFIG_SENSORS_F71805F is not set |
@@ -678,6 +710,7 @@ CONFIG_HWMON=y | |||
678 | # CONFIG_SENSORS_LM90 is not set | 710 | # CONFIG_SENSORS_LM90 is not set |
679 | # CONFIG_SENSORS_LM92 is not set | 711 | # CONFIG_SENSORS_LM92 is not set |
680 | # CONFIG_SENSORS_LM93 is not set | 712 | # CONFIG_SENSORS_LM93 is not set |
713 | # CONFIG_SENSORS_LTC4245 is not set | ||
681 | # CONFIG_SENSORS_MAX1619 is not set | 714 | # CONFIG_SENSORS_MAX1619 is not set |
682 | # CONFIG_SENSORS_MAX6650 is not set | 715 | # CONFIG_SENSORS_MAX6650 is not set |
683 | # CONFIG_SENSORS_PC87360 is not set | 716 | # CONFIG_SENSORS_PC87360 is not set |
@@ -721,10 +754,12 @@ CONFIG_SSB_POSSIBLE=y | |||
721 | # CONFIG_MFD_CORE is not set | 754 | # CONFIG_MFD_CORE is not set |
722 | # CONFIG_MFD_SM501 is not set | 755 | # CONFIG_MFD_SM501 is not set |
723 | # CONFIG_HTC_PASIC3 is not set | 756 | # CONFIG_HTC_PASIC3 is not set |
757 | # CONFIG_TWL4030_CORE is not set | ||
724 | # CONFIG_MFD_TMIO is not set | 758 | # CONFIG_MFD_TMIO is not set |
725 | # CONFIG_PMIC_DA903X is not set | 759 | # CONFIG_PMIC_DA903X is not set |
726 | # CONFIG_MFD_WM8400 is not set | 760 | # CONFIG_MFD_WM8400 is not set |
727 | # CONFIG_MFD_WM8350_I2C is not set | 761 | # CONFIG_MFD_WM8350_I2C is not set |
762 | # CONFIG_MFD_PCF50633 is not set | ||
728 | # CONFIG_REGULATOR is not set | 763 | # CONFIG_REGULATOR is not set |
729 | 764 | ||
730 | # | 765 | # |
@@ -835,7 +870,6 @@ CONFIG_RTC_DRV_DS1307=y | |||
835 | # CONFIG_DMADEVICES is not set | 870 | # CONFIG_DMADEVICES is not set |
836 | # CONFIG_UIO is not set | 871 | # CONFIG_UIO is not set |
837 | # CONFIG_STAGING is not set | 872 | # CONFIG_STAGING is not set |
838 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
839 | 873 | ||
840 | # | 874 | # |
841 | # File systems | 875 | # File systems |
@@ -856,6 +890,7 @@ CONFIG_FS_MBCACHE=y | |||
856 | CONFIG_FILE_LOCKING=y | 890 | CONFIG_FILE_LOCKING=y |
857 | # CONFIG_XFS_FS is not set | 891 | # CONFIG_XFS_FS is not set |
858 | # CONFIG_OCFS2_FS is not set | 892 | # CONFIG_OCFS2_FS is not set |
893 | # CONFIG_BTRFS_FS is not set | ||
859 | CONFIG_DNOTIFY=y | 894 | CONFIG_DNOTIFY=y |
860 | CONFIG_INOTIFY=y | 895 | CONFIG_INOTIFY=y |
861 | CONFIG_INOTIFY_USER=y | 896 | CONFIG_INOTIFY_USER=y |
@@ -892,10 +927,7 @@ CONFIG_TMPFS=y | |||
892 | # CONFIG_TMPFS_POSIX_ACL is not set | 927 | # CONFIG_TMPFS_POSIX_ACL is not set |
893 | # CONFIG_HUGETLB_PAGE is not set | 928 | # CONFIG_HUGETLB_PAGE is not set |
894 | # CONFIG_CONFIGFS_FS is not set | 929 | # CONFIG_CONFIGFS_FS is not set |
895 | 930 | CONFIG_MISC_FILESYSTEMS=y | |
896 | # | ||
897 | # Miscellaneous filesystems | ||
898 | # | ||
899 | # CONFIG_ADFS_FS is not set | 931 | # CONFIG_ADFS_FS is not set |
900 | # CONFIG_AFFS_FS is not set | 932 | # CONFIG_AFFS_FS is not set |
901 | # CONFIG_HFS_FS is not set | 933 | # CONFIG_HFS_FS is not set |
@@ -915,6 +947,7 @@ CONFIG_JFFS2_ZLIB=y | |||
915 | CONFIG_JFFS2_RTIME=y | 947 | CONFIG_JFFS2_RTIME=y |
916 | # CONFIG_JFFS2_RUBIN is not set | 948 | # CONFIG_JFFS2_RUBIN is not set |
917 | CONFIG_CRAMFS=y | 949 | CONFIG_CRAMFS=y |
950 | # CONFIG_SQUASHFS is not set | ||
918 | # CONFIG_VXFS_FS is not set | 951 | # CONFIG_VXFS_FS is not set |
919 | # CONFIG_MINIX_FS is not set | 952 | # CONFIG_MINIX_FS is not set |
920 | # CONFIG_OMFS_FS is not set | 953 | # CONFIG_OMFS_FS is not set |
@@ -1011,6 +1044,7 @@ CONFIG_NLS_ISO8859_1=y | |||
1011 | # Library routines | 1044 | # Library routines |
1012 | # | 1045 | # |
1013 | CONFIG_BITREVERSE=y | 1046 | CONFIG_BITREVERSE=y |
1047 | CONFIG_GENERIC_FIND_LAST_BIT=y | ||
1014 | # CONFIG_CRC_CCITT is not set | 1048 | # CONFIG_CRC_CCITT is not set |
1015 | # CONFIG_CRC16 is not set | 1049 | # CONFIG_CRC16 is not set |
1016 | # CONFIG_CRC_T10DIF is not set | 1050 | # CONFIG_CRC_T10DIF is not set |
@@ -1062,6 +1096,7 @@ CONFIG_DEBUG_INFO=y | |||
1062 | # CONFIG_DEBUG_MEMORY_INIT is not set | 1096 | # CONFIG_DEBUG_MEMORY_INIT is not set |
1063 | # CONFIG_DEBUG_LIST is not set | 1097 | # CONFIG_DEBUG_LIST is not set |
1064 | # CONFIG_DEBUG_SG is not set | 1098 | # CONFIG_DEBUG_SG is not set |
1099 | # CONFIG_DEBUG_NOTIFIERS is not set | ||
1065 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1100 | # CONFIG_BOOT_PRINTK_DELAY is not set |
1066 | # CONFIG_RCU_TORTURE_TEST is not set | 1101 | # CONFIG_RCU_TORTURE_TEST is not set |
1067 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1102 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
@@ -1070,6 +1105,8 @@ CONFIG_DEBUG_INFO=y | |||
1070 | # CONFIG_FAULT_INJECTION is not set | 1105 | # CONFIG_FAULT_INJECTION is not set |
1071 | # CONFIG_LATENCYTOP is not set | 1106 | # CONFIG_LATENCYTOP is not set |
1072 | CONFIG_HAVE_FUNCTION_TRACER=y | 1107 | CONFIG_HAVE_FUNCTION_TRACER=y |
1108 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1109 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | ||
1073 | 1110 | ||
1074 | # | 1111 | # |
1075 | # Tracers | 1112 | # Tracers |
@@ -1078,11 +1115,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y | |||
1078 | # CONFIG_SCHED_TRACER is not set | 1115 | # CONFIG_SCHED_TRACER is not set |
1079 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1116 | # CONFIG_CONTEXT_SWITCH_TRACER is not set |
1080 | # CONFIG_BOOT_TRACER is not set | 1117 | # CONFIG_BOOT_TRACER is not set |
1118 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
1081 | # CONFIG_STACK_TRACER is not set | 1119 | # CONFIG_STACK_TRACER is not set |
1082 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | 1120 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set |
1083 | # CONFIG_SAMPLES is not set | 1121 | # CONFIG_SAMPLES is not set |
1084 | CONFIG_HAVE_ARCH_KGDB=y | 1122 | CONFIG_HAVE_ARCH_KGDB=y |
1085 | # CONFIG_KGDB is not set | 1123 | # CONFIG_KGDB is not set |
1124 | CONFIG_PRINT_STACK_DEPTH=64 | ||
1086 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1125 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1087 | # CONFIG_DEBUG_STACK_USAGE is not set | 1126 | # CONFIG_DEBUG_STACK_USAGE is not set |
1088 | # CONFIG_DEBUG_PAGEALLOC is not set | 1127 | # CONFIG_DEBUG_PAGEALLOC is not set |
@@ -1109,11 +1148,15 @@ CONFIG_CRYPTO=y | |||
1109 | # | 1148 | # |
1110 | # CONFIG_CRYPTO_FIPS is not set | 1149 | # CONFIG_CRYPTO_FIPS is not set |
1111 | CONFIG_CRYPTO_ALGAPI=y | 1150 | CONFIG_CRYPTO_ALGAPI=y |
1112 | CONFIG_CRYPTO_AEAD=y | 1151 | CONFIG_CRYPTO_ALGAPI2=y |
1152 | CONFIG_CRYPTO_AEAD2=y | ||
1113 | CONFIG_CRYPTO_BLKCIPHER=y | 1153 | CONFIG_CRYPTO_BLKCIPHER=y |
1154 | CONFIG_CRYPTO_BLKCIPHER2=y | ||
1114 | CONFIG_CRYPTO_HASH=y | 1155 | CONFIG_CRYPTO_HASH=y |
1115 | CONFIG_CRYPTO_RNG=y | 1156 | CONFIG_CRYPTO_HASH2=y |
1157 | CONFIG_CRYPTO_RNG2=y | ||
1116 | CONFIG_CRYPTO_MANAGER=y | 1158 | CONFIG_CRYPTO_MANAGER=y |
1159 | CONFIG_CRYPTO_MANAGER2=y | ||
1117 | # CONFIG_CRYPTO_GF128MUL is not set | 1160 | # CONFIG_CRYPTO_GF128MUL is not set |
1118 | # CONFIG_CRYPTO_NULL is not set | 1161 | # CONFIG_CRYPTO_NULL is not set |
1119 | # CONFIG_CRYPTO_CRYPTD is not set | 1162 | # CONFIG_CRYPTO_CRYPTD is not set |
diff --git a/arch/powerpc/configs/52xx/pcm030_defconfig b/arch/powerpc/configs/52xx/pcm030_defconfig index b21b8e8c3a7..00944c09a0a 100644 --- a/arch/powerpc/configs/52xx/pcm030_defconfig +++ b/arch/powerpc/configs/52xx/pcm030_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.28-rc4 | 3 | # Linux kernel version: 2.6.29-rc2 |
4 | # Thu Nov 13 02:13:16 2008 | 4 | # Mon Jan 26 21:41:33 2009 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -43,7 +43,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y | |||
43 | CONFIG_PPC=y | 43 | CONFIG_PPC=y |
44 | CONFIG_EARLY_PRINTK=y | 44 | CONFIG_EARLY_PRINTK=y |
45 | CONFIG_GENERIC_NVRAM=y | 45 | CONFIG_GENERIC_NVRAM=y |
46 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 46 | CONFIG_SCHED_OMIT_FRAME_POINTER=y |
47 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 47 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
48 | CONFIG_PPC_OF=y | 48 | CONFIG_PPC_OF=y |
49 | CONFIG_OF=y | 49 | CONFIG_OF=y |
@@ -72,15 +72,24 @@ CONFIG_POSIX_MQUEUE=y | |||
72 | # CONFIG_BSD_PROCESS_ACCT is not set | 72 | # CONFIG_BSD_PROCESS_ACCT is not set |
73 | # CONFIG_TASKSTATS is not set | 73 | # CONFIG_TASKSTATS is not set |
74 | # CONFIG_AUDIT is not set | 74 | # CONFIG_AUDIT is not set |
75 | |||
76 | # | ||
77 | # RCU Subsystem | ||
78 | # | ||
79 | CONFIG_CLASSIC_RCU=y | ||
80 | # CONFIG_TREE_RCU is not set | ||
81 | # CONFIG_PREEMPT_RCU is not set | ||
82 | # CONFIG_TREE_RCU_TRACE is not set | ||
83 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
75 | CONFIG_IKCONFIG=y | 84 | CONFIG_IKCONFIG=y |
76 | CONFIG_IKCONFIG_PROC=y | 85 | CONFIG_IKCONFIG_PROC=y |
77 | CONFIG_LOG_BUF_SHIFT=14 | 86 | CONFIG_LOG_BUF_SHIFT=14 |
78 | # CONFIG_CGROUPS is not set | ||
79 | CONFIG_GROUP_SCHED=y | 87 | CONFIG_GROUP_SCHED=y |
80 | CONFIG_FAIR_GROUP_SCHED=y | 88 | CONFIG_FAIR_GROUP_SCHED=y |
81 | # CONFIG_RT_GROUP_SCHED is not set | 89 | # CONFIG_RT_GROUP_SCHED is not set |
82 | CONFIG_USER_SCHED=y | 90 | CONFIG_USER_SCHED=y |
83 | # CONFIG_CGROUP_SCHED is not set | 91 | # CONFIG_CGROUP_SCHED is not set |
92 | # CONFIG_CGROUPS is not set | ||
84 | CONFIG_SYSFS_DEPRECATED=y | 93 | CONFIG_SYSFS_DEPRECATED=y |
85 | CONFIG_SYSFS_DEPRECATED_V2=y | 94 | CONFIG_SYSFS_DEPRECATED_V2=y |
86 | # CONFIG_RELAY is not set | 95 | # CONFIG_RELAY is not set |
@@ -112,7 +121,6 @@ CONFIG_SLAB=y | |||
112 | # CONFIG_SLUB is not set | 121 | # CONFIG_SLUB is not set |
113 | # CONFIG_SLOB is not set | 122 | # CONFIG_SLOB is not set |
114 | # CONFIG_PROFILING is not set | 123 | # CONFIG_PROFILING is not set |
115 | # CONFIG_MARKERS is not set | ||
116 | CONFIG_HAVE_OPROFILE=y | 124 | CONFIG_HAVE_OPROFILE=y |
117 | # CONFIG_KPROBES is not set | 125 | # CONFIG_KPROBES is not set |
118 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | 126 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y |
@@ -124,7 +132,6 @@ CONFIG_HAVE_CLK=y | |||
124 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 132 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
125 | CONFIG_SLABINFO=y | 133 | CONFIG_SLABINFO=y |
126 | CONFIG_RT_MUTEXES=y | 134 | CONFIG_RT_MUTEXES=y |
127 | # CONFIG_TINY_SHMEM is not set | ||
128 | CONFIG_BASE_SMALL=0 | 135 | CONFIG_BASE_SMALL=0 |
129 | CONFIG_MODULES=y | 136 | CONFIG_MODULES=y |
130 | # CONFIG_MODULE_FORCE_LOAD is not set | 137 | # CONFIG_MODULE_FORCE_LOAD is not set |
@@ -132,11 +139,9 @@ CONFIG_MODULE_UNLOAD=y | |||
132 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 139 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
133 | # CONFIG_MODVERSIONS is not set | 140 | # CONFIG_MODVERSIONS is not set |
134 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 141 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
135 | CONFIG_KMOD=y | ||
136 | CONFIG_BLOCK=y | 142 | CONFIG_BLOCK=y |
137 | # CONFIG_LBD is not set | 143 | # CONFIG_LBD is not set |
138 | # CONFIG_BLK_DEV_IO_TRACE is not set | 144 | # CONFIG_BLK_DEV_IO_TRACE is not set |
139 | # CONFIG_LSF is not set | ||
140 | # CONFIG_BLK_DEV_BSG is not set | 145 | # CONFIG_BLK_DEV_BSG is not set |
141 | # CONFIG_BLK_DEV_INTEGRITY is not set | 146 | # CONFIG_BLK_DEV_INTEGRITY is not set |
142 | 147 | ||
@@ -152,7 +157,6 @@ CONFIG_IOSCHED_NOOP=y | |||
152 | # CONFIG_DEFAULT_CFQ is not set | 157 | # CONFIG_DEFAULT_CFQ is not set |
153 | CONFIG_DEFAULT_NOOP=y | 158 | CONFIG_DEFAULT_NOOP=y |
154 | CONFIG_DEFAULT_IOSCHED="noop" | 159 | CONFIG_DEFAULT_IOSCHED="noop" |
155 | CONFIG_CLASSIC_RCU=y | ||
156 | # CONFIG_FREEZER is not set | 160 | # CONFIG_FREEZER is not set |
157 | 161 | ||
158 | # | 162 | # |
@@ -191,9 +195,9 @@ CONFIG_PPC_MPC5200_SIMPLE=y | |||
191 | # CONFIG_TAU is not set | 195 | # CONFIG_TAU is not set |
192 | # CONFIG_FSL_ULI1575 is not set | 196 | # CONFIG_FSL_ULI1575 is not set |
193 | CONFIG_PPC_BESTCOMM=y | 197 | CONFIG_PPC_BESTCOMM=y |
194 | CONFIG_PPC_BESTCOMM_ATA=y | 198 | CONFIG_PPC_BESTCOMM_ATA=m |
195 | CONFIG_PPC_BESTCOMM_FEC=y | 199 | CONFIG_PPC_BESTCOMM_FEC=y |
196 | CONFIG_PPC_BESTCOMM_GEN_BD=y | 200 | # CONFIG_SIMPLE_GPIO is not set |
197 | 201 | ||
198 | # | 202 | # |
199 | # Kernel options | 203 | # Kernel options |
@@ -212,7 +216,6 @@ CONFIG_SCHED_HRTICK=y | |||
212 | # CONFIG_PREEMPT_NONE is not set | 216 | # CONFIG_PREEMPT_NONE is not set |
213 | # CONFIG_PREEMPT_VOLUNTARY is not set | 217 | # CONFIG_PREEMPT_VOLUNTARY is not set |
214 | CONFIG_PREEMPT=y | 218 | CONFIG_PREEMPT=y |
215 | # CONFIG_PREEMPT_RCU is not set | ||
216 | CONFIG_BINFMT_ELF=y | 219 | CONFIG_BINFMT_ELF=y |
217 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | 220 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set |
218 | # CONFIG_HAVE_AOUT is not set | 221 | # CONFIG_HAVE_AOUT is not set |
@@ -222,6 +225,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | |||
222 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 225 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
223 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 226 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
224 | # CONFIG_KEXEC is not set | 227 | # CONFIG_KEXEC is not set |
228 | # CONFIG_CRASH_DUMP is not set | ||
225 | CONFIG_ARCH_FLATMEM_ENABLE=y | 229 | CONFIG_ARCH_FLATMEM_ENABLE=y |
226 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 230 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
227 | CONFIG_SELECT_MEMORY_MODEL=y | 231 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -233,12 +237,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
233 | CONFIG_PAGEFLAGS_EXTENDED=y | 237 | CONFIG_PAGEFLAGS_EXTENDED=y |
234 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 238 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
235 | CONFIG_MIGRATION=y | 239 | CONFIG_MIGRATION=y |
236 | # CONFIG_RESOURCES_64BIT is not set | ||
237 | # CONFIG_PHYS_ADDR_T_64BIT is not set | 240 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
238 | CONFIG_ZONE_DMA_FLAG=1 | 241 | CONFIG_ZONE_DMA_FLAG=1 |
239 | CONFIG_BOUNCE=y | 242 | CONFIG_BOUNCE=y |
240 | CONFIG_VIRT_TO_BUS=y | 243 | CONFIG_VIRT_TO_BUS=y |
241 | CONFIG_UNEVICTABLE_LRU=y | 244 | CONFIG_UNEVICTABLE_LRU=y |
245 | CONFIG_PPC_4K_PAGES=y | ||
246 | # CONFIG_PPC_16K_PAGES is not set | ||
247 | # CONFIG_PPC_64K_PAGES is not set | ||
242 | CONFIG_FORCE_MAX_ZONEORDER=11 | 248 | CONFIG_FORCE_MAX_ZONEORDER=11 |
243 | CONFIG_PROC_DEVICETREE=y | 249 | CONFIG_PROC_DEVICETREE=y |
244 | # CONFIG_CMDLINE_BOOL is not set | 250 | # CONFIG_CMDLINE_BOOL is not set |
@@ -261,6 +267,7 @@ CONFIG_PCI_SYSCALL=y | |||
261 | CONFIG_ARCH_SUPPORTS_MSI=y | 267 | CONFIG_ARCH_SUPPORTS_MSI=y |
262 | # CONFIG_PCI_MSI is not set | 268 | # CONFIG_PCI_MSI is not set |
263 | CONFIG_PCI_LEGACY=y | 269 | CONFIG_PCI_LEGACY=y |
270 | # CONFIG_PCI_STUB is not set | ||
264 | # CONFIG_PCCARD is not set | 271 | # CONFIG_PCCARD is not set |
265 | # CONFIG_HOTPLUG_PCI is not set | 272 | # CONFIG_HOTPLUG_PCI is not set |
266 | # CONFIG_HAS_RAPIDIO is not set | 273 | # CONFIG_HAS_RAPIDIO is not set |
@@ -283,6 +290,7 @@ CONFIG_NET=y | |||
283 | # | 290 | # |
284 | # Networking options | 291 | # Networking options |
285 | # | 292 | # |
293 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
286 | CONFIG_PACKET=y | 294 | CONFIG_PACKET=y |
287 | # CONFIG_PACKET_MMAP is not set | 295 | # CONFIG_PACKET_MMAP is not set |
288 | CONFIG_UNIX=y | 296 | CONFIG_UNIX=y |
@@ -333,6 +341,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
333 | # CONFIG_ECONET is not set | 341 | # CONFIG_ECONET is not set |
334 | # CONFIG_WAN_ROUTER is not set | 342 | # CONFIG_WAN_ROUTER is not set |
335 | # CONFIG_NET_SCHED is not set | 343 | # CONFIG_NET_SCHED is not set |
344 | # CONFIG_DCB is not set | ||
336 | 345 | ||
337 | # | 346 | # |
338 | # Network testing | 347 | # Network testing |
@@ -345,6 +354,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
345 | # CONFIG_AF_RXRPC is not set | 354 | # CONFIG_AF_RXRPC is not set |
346 | # CONFIG_PHONET is not set | 355 | # CONFIG_PHONET is not set |
347 | # CONFIG_WIRELESS is not set | 356 | # CONFIG_WIRELESS is not set |
357 | # CONFIG_WIMAX is not set | ||
348 | # CONFIG_RFKILL is not set | 358 | # CONFIG_RFKILL is not set |
349 | # CONFIG_NET_9P is not set | 359 | # CONFIG_NET_9P is not set |
350 | 360 | ||
@@ -365,6 +375,7 @@ CONFIG_MTD=y | |||
365 | # CONFIG_MTD_DEBUG is not set | 375 | # CONFIG_MTD_DEBUG is not set |
366 | # CONFIG_MTD_CONCAT is not set | 376 | # CONFIG_MTD_CONCAT is not set |
367 | CONFIG_MTD_PARTITIONS=y | 377 | CONFIG_MTD_PARTITIONS=y |
378 | # CONFIG_MTD_TESTS is not set | ||
368 | # CONFIG_MTD_REDBOOT_PARTS is not set | 379 | # CONFIG_MTD_REDBOOT_PARTS is not set |
369 | CONFIG_MTD_CMDLINE_PARTS=y | 380 | CONFIG_MTD_CMDLINE_PARTS=y |
370 | # CONFIG_MTD_OF_PARTS is not set | 381 | # CONFIG_MTD_OF_PARTS is not set |
@@ -413,9 +424,7 @@ CONFIG_MTD_CFI_UTIL=y | |||
413 | # | 424 | # |
414 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | 425 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set |
415 | CONFIG_MTD_PHYSMAP=y | 426 | CONFIG_MTD_PHYSMAP=y |
416 | CONFIG_MTD_PHYSMAP_START=0x0 | 427 | # CONFIG_MTD_PHYSMAP_COMPAT is not set |
417 | CONFIG_MTD_PHYSMAP_LEN=0x0 | ||
418 | CONFIG_MTD_PHYSMAP_BANKWIDTH=1 | ||
419 | # CONFIG_MTD_PHYSMAP_OF is not set | 428 | # CONFIG_MTD_PHYSMAP_OF is not set |
420 | # CONFIG_MTD_INTEL_VR_NOR is not set | 429 | # CONFIG_MTD_INTEL_VR_NOR is not set |
421 | # CONFIG_MTD_PLATRAM is not set | 430 | # CONFIG_MTD_PLATRAM is not set |
@@ -439,6 +448,12 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=1 | |||
439 | # CONFIG_MTD_ONENAND is not set | 448 | # CONFIG_MTD_ONENAND is not set |
440 | 449 | ||
441 | # | 450 | # |
451 | # LPDDR flash memory drivers | ||
452 | # | ||
453 | # CONFIG_MTD_LPDDR is not set | ||
454 | # CONFIG_MTD_QINFO_PROBE is not set | ||
455 | |||
456 | # | ||
442 | # UBI - Unsorted block images | 457 | # UBI - Unsorted block images |
443 | # | 458 | # |
444 | # CONFIG_MTD_UBI is not set | 459 | # CONFIG_MTD_UBI is not set |
@@ -587,6 +602,9 @@ CONFIG_PHYLIB=y | |||
587 | # CONFIG_BROADCOM_PHY is not set | 602 | # CONFIG_BROADCOM_PHY is not set |
588 | # CONFIG_ICPLUS_PHY is not set | 603 | # CONFIG_ICPLUS_PHY is not set |
589 | # CONFIG_REALTEK_PHY is not set | 604 | # CONFIG_REALTEK_PHY is not set |
605 | # CONFIG_NATIONAL_PHY is not set | ||
606 | # CONFIG_STE10XP is not set | ||
607 | # CONFIG_LSI_ET1011C_PHY is not set | ||
590 | # CONFIG_FIXED_PHY is not set | 608 | # CONFIG_FIXED_PHY is not set |
591 | # CONFIG_MDIO_BITBANG is not set | 609 | # CONFIG_MDIO_BITBANG is not set |
592 | CONFIG_NET_ETHERNET=y | 610 | CONFIG_NET_ETHERNET=y |
@@ -621,6 +639,10 @@ CONFIG_FEC_MPC52xx_MDIO=y | |||
621 | # CONFIG_IWLWIFI_LEDS is not set | 639 | # CONFIG_IWLWIFI_LEDS is not set |
622 | 640 | ||
623 | # | 641 | # |
642 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
643 | # | ||
644 | |||
645 | # | ||
624 | # USB Network Adapters | 646 | # USB Network Adapters |
625 | # | 647 | # |
626 | # CONFIG_USB_CATC is not set | 648 | # CONFIG_USB_CATC is not set |
@@ -675,7 +697,9 @@ CONFIG_SERIAL_MPC52xx_CONSOLE=y | |||
675 | CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=9600 | 697 | CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=9600 |
676 | # CONFIG_SERIAL_JSM is not set | 698 | # CONFIG_SERIAL_JSM is not set |
677 | CONFIG_UNIX98_PTYS=y | 699 | CONFIG_UNIX98_PTYS=y |
700 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | ||
678 | # CONFIG_LEGACY_PTYS is not set | 701 | # CONFIG_LEGACY_PTYS is not set |
702 | # CONFIG_HVC_UDBG is not set | ||
679 | # CONFIG_IPMI_HANDLER is not set | 703 | # CONFIG_IPMI_HANDLER is not set |
680 | CONFIG_HW_RANDOM=y | 704 | CONFIG_HW_RANDOM=y |
681 | # CONFIG_NVRAM is not set | 705 | # CONFIG_NVRAM is not set |
@@ -740,8 +764,6 @@ CONFIG_I2C_MPC=y | |||
740 | # Miscellaneous I2C Chip support | 764 | # Miscellaneous I2C Chip support |
741 | # | 765 | # |
742 | # CONFIG_DS1682 is not set | 766 | # CONFIG_DS1682 is not set |
743 | # CONFIG_EEPROM_AT24 is not set | ||
744 | CONFIG_EEPROM_LEGACY=m | ||
745 | # CONFIG_SENSORS_PCF8574 is not set | 767 | # CONFIG_SENSORS_PCF8574 is not set |
746 | # CONFIG_PCF8575 is not set | 768 | # CONFIG_PCF8575 is not set |
747 | # CONFIG_SENSORS_PCA9539 is not set | 769 | # CONFIG_SENSORS_PCA9539 is not set |
@@ -774,10 +796,12 @@ CONFIG_SSB_POSSIBLE=y | |||
774 | # CONFIG_MFD_CORE is not set | 796 | # CONFIG_MFD_CORE is not set |
775 | # CONFIG_MFD_SM501 is not set | 797 | # CONFIG_MFD_SM501 is not set |
776 | # CONFIG_HTC_PASIC3 is not set | 798 | # CONFIG_HTC_PASIC3 is not set |
799 | # CONFIG_TWL4030_CORE is not set | ||
777 | # CONFIG_MFD_TMIO is not set | 800 | # CONFIG_MFD_TMIO is not set |
778 | # CONFIG_PMIC_DA903X is not set | 801 | # CONFIG_PMIC_DA903X is not set |
779 | # CONFIG_MFD_WM8400 is not set | 802 | # CONFIG_MFD_WM8400 is not set |
780 | # CONFIG_MFD_WM8350_I2C is not set | 803 | # CONFIG_MFD_WM8350_I2C is not set |
804 | # CONFIG_MFD_PCF50633 is not set | ||
781 | # CONFIG_REGULATOR is not set | 805 | # CONFIG_REGULATOR is not set |
782 | 806 | ||
783 | # | 807 | # |
@@ -837,6 +861,7 @@ CONFIG_USB_DEVICEFS=y | |||
837 | # | 861 | # |
838 | # CONFIG_USB_C67X00_HCD is not set | 862 | # CONFIG_USB_C67X00_HCD is not set |
839 | # CONFIG_USB_EHCI_HCD is not set | 863 | # CONFIG_USB_EHCI_HCD is not set |
864 | # CONFIG_USB_OXU210HP_HCD is not set | ||
840 | # CONFIG_USB_ISP116X_HCD is not set | 865 | # CONFIG_USB_ISP116X_HCD is not set |
841 | # CONFIG_USB_ISP1760_HCD is not set | 866 | # CONFIG_USB_ISP1760_HCD is not set |
842 | CONFIG_USB_OHCI_HCD=m | 867 | CONFIG_USB_OHCI_HCD=m |
@@ -864,18 +889,17 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | |||
864 | # CONFIG_USB_TMC is not set | 889 | # CONFIG_USB_TMC is not set |
865 | 890 | ||
866 | # | 891 | # |
867 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 892 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; |
868 | # | 893 | # |
869 | 894 | ||
870 | # | 895 | # |
871 | # may also be needed; see USB_STORAGE Help for more information | 896 | # see USB_STORAGE Help for more information |
872 | # | 897 | # |
873 | CONFIG_USB_STORAGE=m | 898 | CONFIG_USB_STORAGE=m |
874 | # CONFIG_USB_STORAGE_DEBUG is not set | 899 | # CONFIG_USB_STORAGE_DEBUG is not set |
875 | # CONFIG_USB_STORAGE_DATAFAB is not set | 900 | # CONFIG_USB_STORAGE_DATAFAB is not set |
876 | # CONFIG_USB_STORAGE_FREECOM is not set | 901 | # CONFIG_USB_STORAGE_FREECOM is not set |
877 | # CONFIG_USB_STORAGE_ISD200 is not set | 902 | # CONFIG_USB_STORAGE_ISD200 is not set |
878 | # CONFIG_USB_STORAGE_DPCM is not set | ||
879 | # CONFIG_USB_STORAGE_USBAT is not set | 903 | # CONFIG_USB_STORAGE_USBAT is not set |
880 | # CONFIG_USB_STORAGE_SDDR09 is not set | 904 | # CONFIG_USB_STORAGE_SDDR09 is not set |
881 | # CONFIG_USB_STORAGE_SDDR55 is not set | 905 | # CONFIG_USB_STORAGE_SDDR55 is not set |
@@ -921,6 +945,10 @@ CONFIG_USB_STORAGE=m | |||
921 | # CONFIG_USB_ISIGHTFW is not set | 945 | # CONFIG_USB_ISIGHTFW is not set |
922 | # CONFIG_USB_VST is not set | 946 | # CONFIG_USB_VST is not set |
923 | # CONFIG_USB_GADGET is not set | 947 | # CONFIG_USB_GADGET is not set |
948 | |||
949 | # | ||
950 | # OTG and related infrastructure | ||
951 | # | ||
924 | # CONFIG_UWB is not set | 952 | # CONFIG_UWB is not set |
925 | # CONFIG_MMC is not set | 953 | # CONFIG_MMC is not set |
926 | # CONFIG_MEMSTICK is not set | 954 | # CONFIG_MEMSTICK is not set |
@@ -983,7 +1011,6 @@ CONFIG_RTC_DRV_PCF8563=m | |||
983 | # CONFIG_DMADEVICES is not set | 1011 | # CONFIG_DMADEVICES is not set |
984 | # CONFIG_UIO is not set | 1012 | # CONFIG_UIO is not set |
985 | # CONFIG_STAGING is not set | 1013 | # CONFIG_STAGING is not set |
986 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
987 | 1014 | ||
988 | # | 1015 | # |
989 | # File systems | 1016 | # File systems |
@@ -1004,6 +1031,7 @@ CONFIG_FS_MBCACHE=m | |||
1004 | CONFIG_FILE_LOCKING=y | 1031 | CONFIG_FILE_LOCKING=y |
1005 | # CONFIG_XFS_FS is not set | 1032 | # CONFIG_XFS_FS is not set |
1006 | # CONFIG_OCFS2_FS is not set | 1033 | # CONFIG_OCFS2_FS is not set |
1034 | # CONFIG_BTRFS_FS is not set | ||
1007 | # CONFIG_DNOTIFY is not set | 1035 | # CONFIG_DNOTIFY is not set |
1008 | # CONFIG_INOTIFY is not set | 1036 | # CONFIG_INOTIFY is not set |
1009 | # CONFIG_QUOTA is not set | 1037 | # CONFIG_QUOTA is not set |
@@ -1039,10 +1067,7 @@ CONFIG_TMPFS=y | |||
1039 | # CONFIG_TMPFS_POSIX_ACL is not set | 1067 | # CONFIG_TMPFS_POSIX_ACL is not set |
1040 | # CONFIG_HUGETLB_PAGE is not set | 1068 | # CONFIG_HUGETLB_PAGE is not set |
1041 | # CONFIG_CONFIGFS_FS is not set | 1069 | # CONFIG_CONFIGFS_FS is not set |
1042 | 1070 | CONFIG_MISC_FILESYSTEMS=y | |
1043 | # | ||
1044 | # Miscellaneous filesystems | ||
1045 | # | ||
1046 | # CONFIG_ADFS_FS is not set | 1071 | # CONFIG_ADFS_FS is not set |
1047 | # CONFIG_AFFS_FS is not set | 1072 | # CONFIG_AFFS_FS is not set |
1048 | # CONFIG_HFS_FS is not set | 1073 | # CONFIG_HFS_FS is not set |
@@ -1062,6 +1087,7 @@ CONFIG_JFFS2_ZLIB=y | |||
1062 | CONFIG_JFFS2_RTIME=y | 1087 | CONFIG_JFFS2_RTIME=y |
1063 | # CONFIG_JFFS2_RUBIN is not set | 1088 | # CONFIG_JFFS2_RUBIN is not set |
1064 | # CONFIG_CRAMFS is not set | 1089 | # CONFIG_CRAMFS is not set |
1090 | # CONFIG_SQUASHFS is not set | ||
1065 | # CONFIG_VXFS_FS is not set | 1091 | # CONFIG_VXFS_FS is not set |
1066 | # CONFIG_MINIX_FS is not set | 1092 | # CONFIG_MINIX_FS is not set |
1067 | # CONFIG_OMFS_FS is not set | 1093 | # CONFIG_OMFS_FS is not set |
@@ -1141,6 +1167,7 @@ CONFIG_NLS_ISO8859_1=y | |||
1141 | # Library routines | 1167 | # Library routines |
1142 | # | 1168 | # |
1143 | CONFIG_BITREVERSE=y | 1169 | CONFIG_BITREVERSE=y |
1170 | CONFIG_GENERIC_FIND_LAST_BIT=y | ||
1144 | # CONFIG_CRC_CCITT is not set | 1171 | # CONFIG_CRC_CCITT is not set |
1145 | # CONFIG_CRC16 is not set | 1172 | # CONFIG_CRC16 is not set |
1146 | # CONFIG_CRC_T10DIF is not set | 1173 | # CONFIG_CRC_T10DIF is not set |
@@ -1173,6 +1200,8 @@ CONFIG_FRAME_WARN=1024 | |||
1173 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1200 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
1174 | # CONFIG_LATENCYTOP is not set | 1201 | # CONFIG_LATENCYTOP is not set |
1175 | CONFIG_HAVE_FUNCTION_TRACER=y | 1202 | CONFIG_HAVE_FUNCTION_TRACER=y |
1203 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1204 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | ||
1176 | 1205 | ||
1177 | # | 1206 | # |
1178 | # Tracers | 1207 | # Tracers |
@@ -1180,6 +1209,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y | |||
1180 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | 1209 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set |
1181 | # CONFIG_SAMPLES is not set | 1210 | # CONFIG_SAMPLES is not set |
1182 | CONFIG_HAVE_ARCH_KGDB=y | 1211 | CONFIG_HAVE_ARCH_KGDB=y |
1212 | CONFIG_PRINT_STACK_DEPTH=64 | ||
1183 | # CONFIG_IRQSTACKS is not set | 1213 | # CONFIG_IRQSTACKS is not set |
1184 | # CONFIG_BOOTX_TEXT is not set | 1214 | # CONFIG_BOOTX_TEXT is not set |
1185 | # CONFIG_PPC_EARLY_DEBUG is not set | 1215 | # CONFIG_PPC_EARLY_DEBUG is not set |
diff --git a/arch/powerpc/configs/52xx/tqm5200_defconfig b/arch/powerpc/configs/52xx/tqm5200_defconfig index 79954579f5e..65237ad6f07 100644 --- a/arch/powerpc/configs/52xx/tqm5200_defconfig +++ b/arch/powerpc/configs/52xx/tqm5200_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.28-rc4 | 3 | # Linux kernel version: 2.6.29-rc2 |
4 | # Thu Nov 13 02:09:30 2008 | 4 | # Mon Jan 26 21:42:58 2009 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -43,7 +43,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y | |||
43 | CONFIG_PPC=y | 43 | CONFIG_PPC=y |
44 | CONFIG_EARLY_PRINTK=y | 44 | CONFIG_EARLY_PRINTK=y |
45 | CONFIG_GENERIC_NVRAM=y | 45 | CONFIG_GENERIC_NVRAM=y |
46 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 46 | CONFIG_SCHED_OMIT_FRAME_POINTER=y |
47 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 47 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
48 | CONFIG_PPC_OF=y | 48 | CONFIG_PPC_OF=y |
49 | CONFIG_OF=y | 49 | CONFIG_OF=y |
@@ -71,14 +71,23 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
71 | # CONFIG_BSD_PROCESS_ACCT is not set | 71 | # CONFIG_BSD_PROCESS_ACCT is not set |
72 | # CONFIG_TASKSTATS is not set | 72 | # CONFIG_TASKSTATS is not set |
73 | # CONFIG_AUDIT is not set | 73 | # CONFIG_AUDIT is not set |
74 | |||
75 | # | ||
76 | # RCU Subsystem | ||
77 | # | ||
78 | CONFIG_CLASSIC_RCU=y | ||
79 | # CONFIG_TREE_RCU is not set | ||
80 | # CONFIG_PREEMPT_RCU is not set | ||
81 | # CONFIG_TREE_RCU_TRACE is not set | ||
82 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
74 | # CONFIG_IKCONFIG is not set | 83 | # CONFIG_IKCONFIG is not set |
75 | CONFIG_LOG_BUF_SHIFT=14 | 84 | CONFIG_LOG_BUF_SHIFT=14 |
76 | # CONFIG_CGROUPS is not set | ||
77 | CONFIG_GROUP_SCHED=y | 85 | CONFIG_GROUP_SCHED=y |
78 | CONFIG_FAIR_GROUP_SCHED=y | 86 | CONFIG_FAIR_GROUP_SCHED=y |
79 | # CONFIG_RT_GROUP_SCHED is not set | 87 | # CONFIG_RT_GROUP_SCHED is not set |
80 | CONFIG_USER_SCHED=y | 88 | CONFIG_USER_SCHED=y |
81 | # CONFIG_CGROUP_SCHED is not set | 89 | # CONFIG_CGROUP_SCHED is not set |
90 | # CONFIG_CGROUPS is not set | ||
82 | CONFIG_SYSFS_DEPRECATED=y | 91 | CONFIG_SYSFS_DEPRECATED=y |
83 | CONFIG_SYSFS_DEPRECATED_V2=y | 92 | CONFIG_SYSFS_DEPRECATED_V2=y |
84 | # CONFIG_RELAY is not set | 93 | # CONFIG_RELAY is not set |
@@ -110,7 +119,6 @@ CONFIG_SLUB_DEBUG=y | |||
110 | CONFIG_SLUB=y | 119 | CONFIG_SLUB=y |
111 | # CONFIG_SLOB is not set | 120 | # CONFIG_SLOB is not set |
112 | # CONFIG_PROFILING is not set | 121 | # CONFIG_PROFILING is not set |
113 | # CONFIG_MARKERS is not set | ||
114 | CONFIG_HAVE_OPROFILE=y | 122 | CONFIG_HAVE_OPROFILE=y |
115 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | 123 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y |
116 | CONFIG_HAVE_IOREMAP_PROT=y | 124 | CONFIG_HAVE_IOREMAP_PROT=y |
@@ -121,7 +129,6 @@ CONFIG_HAVE_CLK=y | |||
121 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 129 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
122 | CONFIG_SLABINFO=y | 130 | CONFIG_SLABINFO=y |
123 | CONFIG_RT_MUTEXES=y | 131 | CONFIG_RT_MUTEXES=y |
124 | # CONFIG_TINY_SHMEM is not set | ||
125 | CONFIG_BASE_SMALL=0 | 132 | CONFIG_BASE_SMALL=0 |
126 | CONFIG_MODULES=y | 133 | CONFIG_MODULES=y |
127 | # CONFIG_MODULE_FORCE_LOAD is not set | 134 | # CONFIG_MODULE_FORCE_LOAD is not set |
@@ -129,11 +136,9 @@ CONFIG_MODULE_UNLOAD=y | |||
129 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 136 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
130 | CONFIG_MODVERSIONS=y | 137 | CONFIG_MODVERSIONS=y |
131 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 138 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
132 | CONFIG_KMOD=y | ||
133 | CONFIG_BLOCK=y | 139 | CONFIG_BLOCK=y |
134 | # CONFIG_LBD is not set | 140 | # CONFIG_LBD is not set |
135 | # CONFIG_BLK_DEV_IO_TRACE is not set | 141 | # CONFIG_BLK_DEV_IO_TRACE is not set |
136 | # CONFIG_LSF is not set | ||
137 | # CONFIG_BLK_DEV_BSG is not set | 142 | # CONFIG_BLK_DEV_BSG is not set |
138 | # CONFIG_BLK_DEV_INTEGRITY is not set | 143 | # CONFIG_BLK_DEV_INTEGRITY is not set |
139 | 144 | ||
@@ -149,7 +154,6 @@ CONFIG_DEFAULT_AS=y | |||
149 | # CONFIG_DEFAULT_CFQ is not set | 154 | # CONFIG_DEFAULT_CFQ is not set |
150 | # CONFIG_DEFAULT_NOOP is not set | 155 | # CONFIG_DEFAULT_NOOP is not set |
151 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 156 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
152 | CONFIG_CLASSIC_RCU=y | ||
153 | # CONFIG_FREEZER is not set | 157 | # CONFIG_FREEZER is not set |
154 | 158 | ||
155 | # | 159 | # |
@@ -188,9 +192,9 @@ CONFIG_PPC_MPC5200_BUGFIX=y | |||
188 | # CONFIG_TAU is not set | 192 | # CONFIG_TAU is not set |
189 | # CONFIG_FSL_ULI1575 is not set | 193 | # CONFIG_FSL_ULI1575 is not set |
190 | CONFIG_PPC_BESTCOMM=y | 194 | CONFIG_PPC_BESTCOMM=y |
191 | # CONFIG_PPC_BESTCOMM_ATA is not set | 195 | CONFIG_PPC_BESTCOMM_ATA=y |
192 | CONFIG_PPC_BESTCOMM_FEC=y | 196 | CONFIG_PPC_BESTCOMM_FEC=y |
193 | # CONFIG_PPC_BESTCOMM_GEN_BD is not set | 197 | # CONFIG_SIMPLE_GPIO is not set |
194 | 198 | ||
195 | # | 199 | # |
196 | # Kernel options | 200 | # Kernel options |
@@ -217,6 +221,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | |||
217 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 221 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
218 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 222 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
219 | # CONFIG_KEXEC is not set | 223 | # CONFIG_KEXEC is not set |
224 | # CONFIG_CRASH_DUMP is not set | ||
220 | CONFIG_ARCH_FLATMEM_ENABLE=y | 225 | CONFIG_ARCH_FLATMEM_ENABLE=y |
221 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 226 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
222 | CONFIG_SELECT_MEMORY_MODEL=y | 227 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -228,12 +233,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
228 | CONFIG_PAGEFLAGS_EXTENDED=y | 233 | CONFIG_PAGEFLAGS_EXTENDED=y |
229 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 234 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
230 | CONFIG_MIGRATION=y | 235 | CONFIG_MIGRATION=y |
231 | # CONFIG_RESOURCES_64BIT is not set | ||
232 | # CONFIG_PHYS_ADDR_T_64BIT is not set | 236 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
233 | CONFIG_ZONE_DMA_FLAG=1 | 237 | CONFIG_ZONE_DMA_FLAG=1 |
234 | CONFIG_BOUNCE=y | 238 | CONFIG_BOUNCE=y |
235 | CONFIG_VIRT_TO_BUS=y | 239 | CONFIG_VIRT_TO_BUS=y |
236 | CONFIG_UNEVICTABLE_LRU=y | 240 | CONFIG_UNEVICTABLE_LRU=y |
241 | CONFIG_PPC_4K_PAGES=y | ||
242 | # CONFIG_PPC_16K_PAGES is not set | ||
243 | # CONFIG_PPC_64K_PAGES is not set | ||
237 | CONFIG_FORCE_MAX_ZONEORDER=11 | 244 | CONFIG_FORCE_MAX_ZONEORDER=11 |
238 | CONFIG_PROC_DEVICETREE=y | 245 | CONFIG_PROC_DEVICETREE=y |
239 | # CONFIG_CMDLINE_BOOL is not set | 246 | # CONFIG_CMDLINE_BOOL is not set |
@@ -274,6 +281,7 @@ CONFIG_NET=y | |||
274 | # | 281 | # |
275 | # Networking options | 282 | # Networking options |
276 | # | 283 | # |
284 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
277 | CONFIG_PACKET=y | 285 | CONFIG_PACKET=y |
278 | # CONFIG_PACKET_MMAP is not set | 286 | # CONFIG_PACKET_MMAP is not set |
279 | CONFIG_UNIX=y | 287 | CONFIG_UNIX=y |
@@ -330,6 +338,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
330 | # CONFIG_ECONET is not set | 338 | # CONFIG_ECONET is not set |
331 | # CONFIG_WAN_ROUTER is not set | 339 | # CONFIG_WAN_ROUTER is not set |
332 | # CONFIG_NET_SCHED is not set | 340 | # CONFIG_NET_SCHED is not set |
341 | # CONFIG_DCB is not set | ||
333 | 342 | ||
334 | # | 343 | # |
335 | # Network testing | 344 | # Network testing |
@@ -342,6 +351,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
342 | # CONFIG_AF_RXRPC is not set | 351 | # CONFIG_AF_RXRPC is not set |
343 | # CONFIG_PHONET is not set | 352 | # CONFIG_PHONET is not set |
344 | # CONFIG_WIRELESS is not set | 353 | # CONFIG_WIRELESS is not set |
354 | # CONFIG_WIMAX is not set | ||
345 | # CONFIG_RFKILL is not set | 355 | # CONFIG_RFKILL is not set |
346 | # CONFIG_NET_9P is not set | 356 | # CONFIG_NET_9P is not set |
347 | 357 | ||
@@ -364,6 +374,7 @@ CONFIG_MTD=y | |||
364 | # CONFIG_MTD_DEBUG is not set | 374 | # CONFIG_MTD_DEBUG is not set |
365 | CONFIG_MTD_CONCAT=y | 375 | CONFIG_MTD_CONCAT=y |
366 | CONFIG_MTD_PARTITIONS=y | 376 | CONFIG_MTD_PARTITIONS=y |
377 | # CONFIG_MTD_TESTS is not set | ||
367 | # CONFIG_MTD_REDBOOT_PARTS is not set | 378 | # CONFIG_MTD_REDBOOT_PARTS is not set |
368 | CONFIG_MTD_CMDLINE_PARTS=y | 379 | CONFIG_MTD_CMDLINE_PARTS=y |
369 | # CONFIG_MTD_OF_PARTS is not set | 380 | # CONFIG_MTD_OF_PARTS is not set |
@@ -433,6 +444,12 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
433 | # CONFIG_MTD_ONENAND is not set | 444 | # CONFIG_MTD_ONENAND is not set |
434 | 445 | ||
435 | # | 446 | # |
447 | # LPDDR flash memory drivers | ||
448 | # | ||
449 | # CONFIG_MTD_LPDDR is not set | ||
450 | # CONFIG_MTD_QINFO_PROBE is not set | ||
451 | |||
452 | # | ||
436 | # UBI - Unsorted block images | 453 | # UBI - Unsorted block images |
437 | # | 454 | # |
438 | # CONFIG_MTD_UBI is not set | 455 | # CONFIG_MTD_UBI is not set |
@@ -496,6 +513,7 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
496 | # CONFIG_SCSI_SRP_ATTRS is not set | 513 | # CONFIG_SCSI_SRP_ATTRS is not set |
497 | CONFIG_SCSI_LOWLEVEL=y | 514 | CONFIG_SCSI_LOWLEVEL=y |
498 | # CONFIG_ISCSI_TCP is not set | 515 | # CONFIG_ISCSI_TCP is not set |
516 | # CONFIG_LIBFC is not set | ||
499 | # CONFIG_SCSI_DEBUG is not set | 517 | # CONFIG_SCSI_DEBUG is not set |
500 | # CONFIG_SCSI_DH is not set | 518 | # CONFIG_SCSI_DH is not set |
501 | CONFIG_ATA=y | 519 | CONFIG_ATA=y |
@@ -530,6 +548,9 @@ CONFIG_LXT_PHY=y | |||
530 | # CONFIG_BROADCOM_PHY is not set | 548 | # CONFIG_BROADCOM_PHY is not set |
531 | # CONFIG_ICPLUS_PHY is not set | 549 | # CONFIG_ICPLUS_PHY is not set |
532 | # CONFIG_REALTEK_PHY is not set | 550 | # CONFIG_REALTEK_PHY is not set |
551 | # CONFIG_NATIONAL_PHY is not set | ||
552 | # CONFIG_STE10XP is not set | ||
553 | # CONFIG_LSI_ET1011C_PHY is not set | ||
533 | # CONFIG_FIXED_PHY is not set | 554 | # CONFIG_FIXED_PHY is not set |
534 | # CONFIG_MDIO_BITBANG is not set | 555 | # CONFIG_MDIO_BITBANG is not set |
535 | CONFIG_NET_ETHERNET=y | 556 | CONFIG_NET_ETHERNET=y |
@@ -555,6 +576,10 @@ CONFIG_FEC_MPC52xx_MDIO=y | |||
555 | # CONFIG_IWLWIFI_LEDS is not set | 576 | # CONFIG_IWLWIFI_LEDS is not set |
556 | 577 | ||
557 | # | 578 | # |
579 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
580 | # | ||
581 | |||
582 | # | ||
558 | # USB Network Adapters | 583 | # USB Network Adapters |
559 | # | 584 | # |
560 | # CONFIG_USB_CATC is not set | 585 | # CONFIG_USB_CATC is not set |
@@ -604,8 +629,10 @@ CONFIG_SERIAL_MPC52xx=y | |||
604 | CONFIG_SERIAL_MPC52xx_CONSOLE=y | 629 | CONFIG_SERIAL_MPC52xx_CONSOLE=y |
605 | CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200 | 630 | CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200 |
606 | CONFIG_UNIX98_PTYS=y | 631 | CONFIG_UNIX98_PTYS=y |
632 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | ||
607 | CONFIG_LEGACY_PTYS=y | 633 | CONFIG_LEGACY_PTYS=y |
608 | CONFIG_LEGACY_PTY_COUNT=256 | 634 | CONFIG_LEGACY_PTY_COUNT=256 |
635 | # CONFIG_HVC_UDBG is not set | ||
609 | # CONFIG_IPMI_HANDLER is not set | 636 | # CONFIG_IPMI_HANDLER is not set |
610 | # CONFIG_HW_RANDOM is not set | 637 | # CONFIG_HW_RANDOM is not set |
611 | # CONFIG_NVRAM is not set | 638 | # CONFIG_NVRAM is not set |
@@ -645,8 +672,6 @@ CONFIG_I2C_MPC=y | |||
645 | # Miscellaneous I2C Chip support | 672 | # Miscellaneous I2C Chip support |
646 | # | 673 | # |
647 | # CONFIG_DS1682 is not set | 674 | # CONFIG_DS1682 is not set |
648 | # CONFIG_EEPROM_AT24 is not set | ||
649 | # CONFIG_EEPROM_LEGACY is not set | ||
650 | # CONFIG_SENSORS_PCF8574 is not set | 675 | # CONFIG_SENSORS_PCF8574 is not set |
651 | # CONFIG_PCF8575 is not set | 676 | # CONFIG_PCF8575 is not set |
652 | # CONFIG_SENSORS_PCA9539 is not set | 677 | # CONFIG_SENSORS_PCA9539 is not set |
@@ -675,6 +700,7 @@ CONFIG_HWMON=y | |||
675 | # CONFIG_SENSORS_ADT7462 is not set | 700 | # CONFIG_SENSORS_ADT7462 is not set |
676 | # CONFIG_SENSORS_ADT7470 is not set | 701 | # CONFIG_SENSORS_ADT7470 is not set |
677 | # CONFIG_SENSORS_ADT7473 is not set | 702 | # CONFIG_SENSORS_ADT7473 is not set |
703 | # CONFIG_SENSORS_ADT7475 is not set | ||
678 | # CONFIG_SENSORS_ATXP1 is not set | 704 | # CONFIG_SENSORS_ATXP1 is not set |
679 | # CONFIG_SENSORS_DS1621 is not set | 705 | # CONFIG_SENSORS_DS1621 is not set |
680 | # CONFIG_SENSORS_F71805F is not set | 706 | # CONFIG_SENSORS_F71805F is not set |
@@ -694,6 +720,7 @@ CONFIG_HWMON=y | |||
694 | # CONFIG_SENSORS_LM90 is not set | 720 | # CONFIG_SENSORS_LM90 is not set |
695 | # CONFIG_SENSORS_LM92 is not set | 721 | # CONFIG_SENSORS_LM92 is not set |
696 | # CONFIG_SENSORS_LM93 is not set | 722 | # CONFIG_SENSORS_LM93 is not set |
723 | # CONFIG_SENSORS_LTC4245 is not set | ||
697 | # CONFIG_SENSORS_MAX1619 is not set | 724 | # CONFIG_SENSORS_MAX1619 is not set |
698 | # CONFIG_SENSORS_MAX6650 is not set | 725 | # CONFIG_SENSORS_MAX6650 is not set |
699 | # CONFIG_SENSORS_PC87360 is not set | 726 | # CONFIG_SENSORS_PC87360 is not set |
@@ -742,10 +769,12 @@ CONFIG_SSB_POSSIBLE=y | |||
742 | # CONFIG_MFD_CORE is not set | 769 | # CONFIG_MFD_CORE is not set |
743 | # CONFIG_MFD_SM501 is not set | 770 | # CONFIG_MFD_SM501 is not set |
744 | # CONFIG_HTC_PASIC3 is not set | 771 | # CONFIG_HTC_PASIC3 is not set |
772 | # CONFIG_TWL4030_CORE is not set | ||
745 | # CONFIG_MFD_TMIO is not set | 773 | # CONFIG_MFD_TMIO is not set |
746 | # CONFIG_PMIC_DA903X is not set | 774 | # CONFIG_PMIC_DA903X is not set |
747 | # CONFIG_MFD_WM8400 is not set | 775 | # CONFIG_MFD_WM8400 is not set |
748 | # CONFIG_MFD_WM8350_I2C is not set | 776 | # CONFIG_MFD_WM8350_I2C is not set |
777 | # CONFIG_MFD_PCF50633 is not set | ||
749 | # CONFIG_REGULATOR is not set | 778 | # CONFIG_REGULATOR is not set |
750 | 779 | ||
751 | # | 780 | # |
@@ -803,6 +832,7 @@ CONFIG_USB_MON=y | |||
803 | # USB Host Controller Drivers | 832 | # USB Host Controller Drivers |
804 | # | 833 | # |
805 | # CONFIG_USB_C67X00_HCD is not set | 834 | # CONFIG_USB_C67X00_HCD is not set |
835 | # CONFIG_USB_OXU210HP_HCD is not set | ||
806 | # CONFIG_USB_ISP116X_HCD is not set | 836 | # CONFIG_USB_ISP116X_HCD is not set |
807 | # CONFIG_USB_ISP1760_HCD is not set | 837 | # CONFIG_USB_ISP1760_HCD is not set |
808 | CONFIG_USB_OHCI_HCD=y | 838 | CONFIG_USB_OHCI_HCD=y |
@@ -827,18 +857,17 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | |||
827 | # CONFIG_USB_TMC is not set | 857 | # CONFIG_USB_TMC is not set |
828 | 858 | ||
829 | # | 859 | # |
830 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 860 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; |
831 | # | 861 | # |
832 | 862 | ||
833 | # | 863 | # |
834 | # may also be needed; see USB_STORAGE Help for more information | 864 | # see USB_STORAGE Help for more information |
835 | # | 865 | # |
836 | CONFIG_USB_STORAGE=y | 866 | CONFIG_USB_STORAGE=y |
837 | # CONFIG_USB_STORAGE_DEBUG is not set | 867 | # CONFIG_USB_STORAGE_DEBUG is not set |
838 | # CONFIG_USB_STORAGE_DATAFAB is not set | 868 | # CONFIG_USB_STORAGE_DATAFAB is not set |
839 | # CONFIG_USB_STORAGE_FREECOM is not set | 869 | # CONFIG_USB_STORAGE_FREECOM is not set |
840 | # CONFIG_USB_STORAGE_ISD200 is not set | 870 | # CONFIG_USB_STORAGE_ISD200 is not set |
841 | # CONFIG_USB_STORAGE_DPCM is not set | ||
842 | # CONFIG_USB_STORAGE_USBAT is not set | 871 | # CONFIG_USB_STORAGE_USBAT is not set |
843 | # CONFIG_USB_STORAGE_SDDR09 is not set | 872 | # CONFIG_USB_STORAGE_SDDR09 is not set |
844 | # CONFIG_USB_STORAGE_SDDR55 is not set | 873 | # CONFIG_USB_STORAGE_SDDR55 is not set |
@@ -884,6 +913,10 @@ CONFIG_USB_STORAGE=y | |||
884 | # CONFIG_USB_ISIGHTFW is not set | 913 | # CONFIG_USB_ISIGHTFW is not set |
885 | # CONFIG_USB_VST is not set | 914 | # CONFIG_USB_VST is not set |
886 | # CONFIG_USB_GADGET is not set | 915 | # CONFIG_USB_GADGET is not set |
916 | |||
917 | # | ||
918 | # OTG and related infrastructure | ||
919 | # | ||
887 | # CONFIG_MMC is not set | 920 | # CONFIG_MMC is not set |
888 | # CONFIG_MEMSTICK is not set | 921 | # CONFIG_MEMSTICK is not set |
889 | # CONFIG_NEW_LEDS is not set | 922 | # CONFIG_NEW_LEDS is not set |
@@ -947,7 +980,6 @@ CONFIG_RTC_DRV_DS1307=y | |||
947 | # CONFIG_DMADEVICES is not set | 980 | # CONFIG_DMADEVICES is not set |
948 | # CONFIG_UIO is not set | 981 | # CONFIG_UIO is not set |
949 | # CONFIG_STAGING is not set | 982 | # CONFIG_STAGING is not set |
950 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
951 | 983 | ||
952 | # | 984 | # |
953 | # File systems | 985 | # File systems |
@@ -968,6 +1000,7 @@ CONFIG_FS_MBCACHE=y | |||
968 | CONFIG_FILE_LOCKING=y | 1000 | CONFIG_FILE_LOCKING=y |
969 | # CONFIG_XFS_FS is not set | 1001 | # CONFIG_XFS_FS is not set |
970 | # CONFIG_OCFS2_FS is not set | 1002 | # CONFIG_OCFS2_FS is not set |
1003 | # CONFIG_BTRFS_FS is not set | ||
971 | CONFIG_DNOTIFY=y | 1004 | CONFIG_DNOTIFY=y |
972 | CONFIG_INOTIFY=y | 1005 | CONFIG_INOTIFY=y |
973 | CONFIG_INOTIFY_USER=y | 1006 | CONFIG_INOTIFY_USER=y |
@@ -1004,10 +1037,7 @@ CONFIG_TMPFS=y | |||
1004 | # CONFIG_TMPFS_POSIX_ACL is not set | 1037 | # CONFIG_TMPFS_POSIX_ACL is not set |
1005 | # CONFIG_HUGETLB_PAGE is not set | 1038 | # CONFIG_HUGETLB_PAGE is not set |
1006 | # CONFIG_CONFIGFS_FS is not set | 1039 | # CONFIG_CONFIGFS_FS is not set |
1007 | 1040 | CONFIG_MISC_FILESYSTEMS=y | |
1008 | # | ||
1009 | # Miscellaneous filesystems | ||
1010 | # | ||
1011 | # CONFIG_ADFS_FS is not set | 1041 | # CONFIG_ADFS_FS is not set |
1012 | # CONFIG_AFFS_FS is not set | 1042 | # CONFIG_AFFS_FS is not set |
1013 | # CONFIG_HFS_FS is not set | 1043 | # CONFIG_HFS_FS is not set |
@@ -1027,6 +1057,7 @@ CONFIG_JFFS2_ZLIB=y | |||
1027 | CONFIG_JFFS2_RTIME=y | 1057 | CONFIG_JFFS2_RTIME=y |
1028 | # CONFIG_JFFS2_RUBIN is not set | 1058 | # CONFIG_JFFS2_RUBIN is not set |
1029 | CONFIG_CRAMFS=y | 1059 | CONFIG_CRAMFS=y |
1060 | # CONFIG_SQUASHFS is not set | ||
1030 | # CONFIG_VXFS_FS is not set | 1061 | # CONFIG_VXFS_FS is not set |
1031 | # CONFIG_MINIX_FS is not set | 1062 | # CONFIG_MINIX_FS is not set |
1032 | # CONFIG_OMFS_FS is not set | 1063 | # CONFIG_OMFS_FS is not set |
@@ -1123,6 +1154,7 @@ CONFIG_NLS_ISO8859_1=y | |||
1123 | # Library routines | 1154 | # Library routines |
1124 | # | 1155 | # |
1125 | CONFIG_BITREVERSE=y | 1156 | CONFIG_BITREVERSE=y |
1157 | CONFIG_GENERIC_FIND_LAST_BIT=y | ||
1126 | # CONFIG_CRC_CCITT is not set | 1158 | # CONFIG_CRC_CCITT is not set |
1127 | # CONFIG_CRC16 is not set | 1159 | # CONFIG_CRC16 is not set |
1128 | # CONFIG_CRC_T10DIF is not set | 1160 | # CONFIG_CRC_T10DIF is not set |
@@ -1174,6 +1206,7 @@ CONFIG_DEBUG_INFO=y | |||
1174 | # CONFIG_DEBUG_MEMORY_INIT is not set | 1206 | # CONFIG_DEBUG_MEMORY_INIT is not set |
1175 | # CONFIG_DEBUG_LIST is not set | 1207 | # CONFIG_DEBUG_LIST is not set |
1176 | # CONFIG_DEBUG_SG is not set | 1208 | # CONFIG_DEBUG_SG is not set |
1209 | # CONFIG_DEBUG_NOTIFIERS is not set | ||
1177 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1210 | # CONFIG_BOOT_PRINTK_DELAY is not set |
1178 | # CONFIG_RCU_TORTURE_TEST is not set | 1211 | # CONFIG_RCU_TORTURE_TEST is not set |
1179 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1212 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
@@ -1182,6 +1215,8 @@ CONFIG_DEBUG_INFO=y | |||
1182 | # CONFIG_FAULT_INJECTION is not set | 1215 | # CONFIG_FAULT_INJECTION is not set |
1183 | # CONFIG_LATENCYTOP is not set | 1216 | # CONFIG_LATENCYTOP is not set |
1184 | CONFIG_HAVE_FUNCTION_TRACER=y | 1217 | CONFIG_HAVE_FUNCTION_TRACER=y |
1218 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1219 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | ||
1185 | 1220 | ||
1186 | # | 1221 | # |
1187 | # Tracers | 1222 | # Tracers |
@@ -1190,11 +1225,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y | |||
1190 | # CONFIG_SCHED_TRACER is not set | 1225 | # CONFIG_SCHED_TRACER is not set |
1191 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1226 | # CONFIG_CONTEXT_SWITCH_TRACER is not set |
1192 | # CONFIG_BOOT_TRACER is not set | 1227 | # CONFIG_BOOT_TRACER is not set |
1228 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
1193 | # CONFIG_STACK_TRACER is not set | 1229 | # CONFIG_STACK_TRACER is not set |
1194 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | 1230 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set |
1195 | # CONFIG_SAMPLES is not set | 1231 | # CONFIG_SAMPLES is not set |
1196 | CONFIG_HAVE_ARCH_KGDB=y | 1232 | CONFIG_HAVE_ARCH_KGDB=y |
1197 | # CONFIG_KGDB is not set | 1233 | # CONFIG_KGDB is not set |
1234 | CONFIG_PRINT_STACK_DEPTH=64 | ||
1198 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1235 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1199 | # CONFIG_DEBUG_STACK_USAGE is not set | 1236 | # CONFIG_DEBUG_STACK_USAGE is not set |
1200 | # CONFIG_DEBUG_PAGEALLOC is not set | 1237 | # CONFIG_DEBUG_PAGEALLOC is not set |
@@ -1221,11 +1258,15 @@ CONFIG_CRYPTO=y | |||
1221 | # | 1258 | # |
1222 | # CONFIG_CRYPTO_FIPS is not set | 1259 | # CONFIG_CRYPTO_FIPS is not set |
1223 | CONFIG_CRYPTO_ALGAPI=y | 1260 | CONFIG_CRYPTO_ALGAPI=y |
1224 | CONFIG_CRYPTO_AEAD=y | 1261 | CONFIG_CRYPTO_ALGAPI2=y |
1262 | CONFIG_CRYPTO_AEAD2=y | ||
1225 | CONFIG_CRYPTO_BLKCIPHER=y | 1263 | CONFIG_CRYPTO_BLKCIPHER=y |
1264 | CONFIG_CRYPTO_BLKCIPHER2=y | ||
1226 | CONFIG_CRYPTO_HASH=y | 1265 | CONFIG_CRYPTO_HASH=y |
1227 | CONFIG_CRYPTO_RNG=y | 1266 | CONFIG_CRYPTO_HASH2=y |
1267 | CONFIG_CRYPTO_RNG2=y | ||
1228 | CONFIG_CRYPTO_MANAGER=y | 1268 | CONFIG_CRYPTO_MANAGER=y |
1269 | CONFIG_CRYPTO_MANAGER2=y | ||
1229 | # CONFIG_CRYPTO_GF128MUL is not set | 1270 | # CONFIG_CRYPTO_GF128MUL is not set |
1230 | # CONFIG_CRYPTO_NULL is not set | 1271 | # CONFIG_CRYPTO_NULL is not set |
1231 | # CONFIG_CRYPTO_CRYPTD is not set | 1272 | # CONFIG_CRYPTO_CRYPTD is not set |
diff --git a/arch/powerpc/configs/mpc5200_defconfig b/arch/powerpc/configs/mpc5200_defconfig index 5ff3de205d6..81afc8b373d 100644 --- a/arch/powerpc/configs/mpc5200_defconfig +++ b/arch/powerpc/configs/mpc5200_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.28-rc4 | 3 | # Linux kernel version: 2.6.29-rc2 |
4 | # Thu Nov 13 02:09:07 2008 | 4 | # Mon Jan 26 21:40:44 2009 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -43,7 +43,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y | |||
43 | CONFIG_PPC=y | 43 | CONFIG_PPC=y |
44 | CONFIG_EARLY_PRINTK=y | 44 | CONFIG_EARLY_PRINTK=y |
45 | CONFIG_GENERIC_NVRAM=y | 45 | CONFIG_GENERIC_NVRAM=y |
46 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 46 | CONFIG_SCHED_OMIT_FRAME_POINTER=y |
47 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 47 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
48 | CONFIG_PPC_OF=y | 48 | CONFIG_PPC_OF=y |
49 | CONFIG_OF=y | 49 | CONFIG_OF=y |
@@ -72,10 +72,19 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
72 | # CONFIG_BSD_PROCESS_ACCT is not set | 72 | # CONFIG_BSD_PROCESS_ACCT is not set |
73 | # CONFIG_TASKSTATS is not set | 73 | # CONFIG_TASKSTATS is not set |
74 | # CONFIG_AUDIT is not set | 74 | # CONFIG_AUDIT is not set |
75 | |||
76 | # | ||
77 | # RCU Subsystem | ||
78 | # | ||
79 | CONFIG_CLASSIC_RCU=y | ||
80 | # CONFIG_TREE_RCU is not set | ||
81 | # CONFIG_PREEMPT_RCU is not set | ||
82 | # CONFIG_TREE_RCU_TRACE is not set | ||
83 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
75 | # CONFIG_IKCONFIG is not set | 84 | # CONFIG_IKCONFIG is not set |
76 | CONFIG_LOG_BUF_SHIFT=14 | 85 | CONFIG_LOG_BUF_SHIFT=14 |
77 | # CONFIG_CGROUPS is not set | ||
78 | # CONFIG_GROUP_SCHED is not set | 86 | # CONFIG_GROUP_SCHED is not set |
87 | # CONFIG_CGROUPS is not set | ||
79 | CONFIG_SYSFS_DEPRECATED=y | 88 | CONFIG_SYSFS_DEPRECATED=y |
80 | CONFIG_SYSFS_DEPRECATED_V2=y | 89 | CONFIG_SYSFS_DEPRECATED_V2=y |
81 | # CONFIG_RELAY is not set | 90 | # CONFIG_RELAY is not set |
@@ -108,7 +117,6 @@ CONFIG_SLUB_DEBUG=y | |||
108 | CONFIG_SLUB=y | 117 | CONFIG_SLUB=y |
109 | # CONFIG_SLOB is not set | 118 | # CONFIG_SLOB is not set |
110 | # CONFIG_PROFILING is not set | 119 | # CONFIG_PROFILING is not set |
111 | # CONFIG_MARKERS is not set | ||
112 | CONFIG_HAVE_OPROFILE=y | 120 | CONFIG_HAVE_OPROFILE=y |
113 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | 121 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y |
114 | CONFIG_HAVE_IOREMAP_PROT=y | 122 | CONFIG_HAVE_IOREMAP_PROT=y |
@@ -119,7 +127,6 @@ CONFIG_HAVE_CLK=y | |||
119 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 127 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
120 | CONFIG_SLABINFO=y | 128 | CONFIG_SLABINFO=y |
121 | CONFIG_RT_MUTEXES=y | 129 | CONFIG_RT_MUTEXES=y |
122 | # CONFIG_TINY_SHMEM is not set | ||
123 | CONFIG_BASE_SMALL=0 | 130 | CONFIG_BASE_SMALL=0 |
124 | CONFIG_MODULES=y | 131 | CONFIG_MODULES=y |
125 | # CONFIG_MODULE_FORCE_LOAD is not set | 132 | # CONFIG_MODULE_FORCE_LOAD is not set |
@@ -127,11 +134,9 @@ CONFIG_MODULE_UNLOAD=y | |||
127 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 134 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
128 | # CONFIG_MODVERSIONS is not set | 135 | # CONFIG_MODVERSIONS is not set |
129 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 136 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
130 | CONFIG_KMOD=y | ||
131 | CONFIG_BLOCK=y | 137 | CONFIG_BLOCK=y |
132 | # CONFIG_LBD is not set | 138 | # CONFIG_LBD is not set |
133 | # CONFIG_BLK_DEV_IO_TRACE is not set | 139 | # CONFIG_BLK_DEV_IO_TRACE is not set |
134 | # CONFIG_LSF is not set | ||
135 | # CONFIG_BLK_DEV_BSG is not set | 140 | # CONFIG_BLK_DEV_BSG is not set |
136 | # CONFIG_BLK_DEV_INTEGRITY is not set | 141 | # CONFIG_BLK_DEV_INTEGRITY is not set |
137 | 142 | ||
@@ -147,7 +152,6 @@ CONFIG_DEFAULT_AS=y | |||
147 | # CONFIG_DEFAULT_CFQ is not set | 152 | # CONFIG_DEFAULT_CFQ is not set |
148 | # CONFIG_DEFAULT_NOOP is not set | 153 | # CONFIG_DEFAULT_NOOP is not set |
149 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 154 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
150 | CONFIG_CLASSIC_RCU=y | ||
151 | CONFIG_FREEZER=y | 155 | CONFIG_FREEZER=y |
152 | 156 | ||
153 | # | 157 | # |
@@ -192,7 +196,7 @@ CONFIG_RTAS_PROC=y | |||
192 | CONFIG_PPC_BESTCOMM=y | 196 | CONFIG_PPC_BESTCOMM=y |
193 | CONFIG_PPC_BESTCOMM_ATA=y | 197 | CONFIG_PPC_BESTCOMM_ATA=y |
194 | CONFIG_PPC_BESTCOMM_FEC=y | 198 | CONFIG_PPC_BESTCOMM_FEC=y |
195 | CONFIG_PPC_BESTCOMM_GEN_BD=y | 199 | # CONFIG_SIMPLE_GPIO is not set |
196 | 200 | ||
197 | # | 201 | # |
198 | # Kernel options | 202 | # Kernel options |
@@ -220,6 +224,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | |||
220 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 224 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
221 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 225 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
222 | # CONFIG_KEXEC is not set | 226 | # CONFIG_KEXEC is not set |
227 | # CONFIG_CRASH_DUMP is not set | ||
223 | CONFIG_ARCH_FLATMEM_ENABLE=y | 228 | CONFIG_ARCH_FLATMEM_ENABLE=y |
224 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 229 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
225 | CONFIG_SELECT_MEMORY_MODEL=y | 230 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -231,12 +236,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
231 | CONFIG_PAGEFLAGS_EXTENDED=y | 236 | CONFIG_PAGEFLAGS_EXTENDED=y |
232 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 237 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
233 | CONFIG_MIGRATION=y | 238 | CONFIG_MIGRATION=y |
234 | # CONFIG_RESOURCES_64BIT is not set | ||
235 | # CONFIG_PHYS_ADDR_T_64BIT is not set | 239 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
236 | CONFIG_ZONE_DMA_FLAG=1 | 240 | CONFIG_ZONE_DMA_FLAG=1 |
237 | CONFIG_BOUNCE=y | 241 | CONFIG_BOUNCE=y |
238 | CONFIG_VIRT_TO_BUS=y | 242 | CONFIG_VIRT_TO_BUS=y |
239 | CONFIG_UNEVICTABLE_LRU=y | 243 | CONFIG_UNEVICTABLE_LRU=y |
244 | CONFIG_PPC_4K_PAGES=y | ||
245 | # CONFIG_PPC_16K_PAGES is not set | ||
246 | # CONFIG_PPC_64K_PAGES is not set | ||
240 | CONFIG_FORCE_MAX_ZONEORDER=11 | 247 | CONFIG_FORCE_MAX_ZONEORDER=11 |
241 | CONFIG_PROC_DEVICETREE=y | 248 | CONFIG_PROC_DEVICETREE=y |
242 | # CONFIG_CMDLINE_BOOL is not set | 249 | # CONFIG_CMDLINE_BOOL is not set |
@@ -264,6 +271,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
264 | # CONFIG_PCI_MSI is not set | 271 | # CONFIG_PCI_MSI is not set |
265 | CONFIG_PCI_LEGACY=y | 272 | CONFIG_PCI_LEGACY=y |
266 | # CONFIG_PCI_DEBUG is not set | 273 | # CONFIG_PCI_DEBUG is not set |
274 | # CONFIG_PCI_STUB is not set | ||
267 | # CONFIG_PCCARD is not set | 275 | # CONFIG_PCCARD is not set |
268 | # CONFIG_HOTPLUG_PCI is not set | 276 | # CONFIG_HOTPLUG_PCI is not set |
269 | # CONFIG_HAS_RAPIDIO is not set | 277 | # CONFIG_HAS_RAPIDIO is not set |
@@ -286,6 +294,7 @@ CONFIG_NET=y | |||
286 | # | 294 | # |
287 | # Networking options | 295 | # Networking options |
288 | # | 296 | # |
297 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
289 | CONFIG_PACKET=y | 298 | CONFIG_PACKET=y |
290 | # CONFIG_PACKET_MMAP is not set | 299 | # CONFIG_PACKET_MMAP is not set |
291 | CONFIG_UNIX=y | 300 | CONFIG_UNIX=y |
@@ -342,6 +351,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
342 | # CONFIG_ECONET is not set | 351 | # CONFIG_ECONET is not set |
343 | # CONFIG_WAN_ROUTER is not set | 352 | # CONFIG_WAN_ROUTER is not set |
344 | # CONFIG_NET_SCHED is not set | 353 | # CONFIG_NET_SCHED is not set |
354 | # CONFIG_DCB is not set | ||
345 | 355 | ||
346 | # | 356 | # |
347 | # Network testing | 357 | # Network testing |
@@ -354,6 +364,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
354 | # CONFIG_AF_RXRPC is not set | 364 | # CONFIG_AF_RXRPC is not set |
355 | # CONFIG_PHONET is not set | 365 | # CONFIG_PHONET is not set |
356 | # CONFIG_WIRELESS is not set | 366 | # CONFIG_WIRELESS is not set |
367 | # CONFIG_WIMAX is not set | ||
357 | # CONFIG_RFKILL is not set | 368 | # CONFIG_RFKILL is not set |
358 | # CONFIG_NET_9P is not set | 369 | # CONFIG_NET_9P is not set |
359 | 370 | ||
@@ -376,6 +387,7 @@ CONFIG_MTD=y | |||
376 | # CONFIG_MTD_DEBUG is not set | 387 | # CONFIG_MTD_DEBUG is not set |
377 | CONFIG_MTD_CONCAT=y | 388 | CONFIG_MTD_CONCAT=y |
378 | CONFIG_MTD_PARTITIONS=y | 389 | CONFIG_MTD_PARTITIONS=y |
390 | # CONFIG_MTD_TESTS is not set | ||
379 | # CONFIG_MTD_REDBOOT_PARTS is not set | 391 | # CONFIG_MTD_REDBOOT_PARTS is not set |
380 | CONFIG_MTD_CMDLINE_PARTS=y | 392 | CONFIG_MTD_CMDLINE_PARTS=y |
381 | # CONFIG_MTD_OF_PARTS is not set | 393 | # CONFIG_MTD_OF_PARTS is not set |
@@ -447,6 +459,12 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
447 | # CONFIG_MTD_ONENAND is not set | 459 | # CONFIG_MTD_ONENAND is not set |
448 | 460 | ||
449 | # | 461 | # |
462 | # LPDDR flash memory drivers | ||
463 | # | ||
464 | # CONFIG_MTD_LPDDR is not set | ||
465 | # CONFIG_MTD_QINFO_PROBE is not set | ||
466 | |||
467 | # | ||
450 | # UBI - Unsorted block images | 468 | # UBI - Unsorted block images |
451 | # | 469 | # |
452 | # CONFIG_MTD_UBI is not set | 470 | # CONFIG_MTD_UBI is not set |
@@ -474,13 +492,19 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
474 | # CONFIG_BLK_DEV_HD is not set | 492 | # CONFIG_BLK_DEV_HD is not set |
475 | CONFIG_MISC_DEVICES=y | 493 | CONFIG_MISC_DEVICES=y |
476 | # CONFIG_PHANTOM is not set | 494 | # CONFIG_PHANTOM is not set |
477 | # CONFIG_EEPROM_93CX6 is not set | ||
478 | # CONFIG_SGI_IOC4 is not set | 495 | # CONFIG_SGI_IOC4 is not set |
479 | # CONFIG_TIFM_CORE is not set | 496 | # CONFIG_TIFM_CORE is not set |
480 | # CONFIG_ICS932S401 is not set | 497 | # CONFIG_ICS932S401 is not set |
481 | # CONFIG_ENCLOSURE_SERVICES is not set | 498 | # CONFIG_ENCLOSURE_SERVICES is not set |
482 | # CONFIG_HP_ILO is not set | 499 | # CONFIG_HP_ILO is not set |
483 | # CONFIG_C2PORT is not set | 500 | # CONFIG_C2PORT is not set |
501 | |||
502 | # | ||
503 | # EEPROM support | ||
504 | # | ||
505 | # CONFIG_EEPROM_AT24 is not set | ||
506 | # CONFIG_EEPROM_LEGACY is not set | ||
507 | # CONFIG_EEPROM_93CX6 is not set | ||
484 | CONFIG_HAVE_IDE=y | 508 | CONFIG_HAVE_IDE=y |
485 | # CONFIG_IDE is not set | 509 | # CONFIG_IDE is not set |
486 | 510 | ||
@@ -539,6 +563,8 @@ CONFIG_SCSI_LOWLEVEL=y | |||
539 | # CONFIG_MEGARAID_SAS is not set | 563 | # CONFIG_MEGARAID_SAS is not set |
540 | # CONFIG_SCSI_HPTIOP is not set | 564 | # CONFIG_SCSI_HPTIOP is not set |
541 | # CONFIG_SCSI_BUSLOGIC is not set | 565 | # CONFIG_SCSI_BUSLOGIC is not set |
566 | # CONFIG_LIBFC is not set | ||
567 | # CONFIG_FCOE is not set | ||
542 | # CONFIG_SCSI_DMX3191D is not set | 568 | # CONFIG_SCSI_DMX3191D is not set |
543 | # CONFIG_SCSI_EATA is not set | 569 | # CONFIG_SCSI_EATA is not set |
544 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | 570 | # CONFIG_SCSI_FUTURE_DOMAIN is not set |
@@ -659,6 +685,9 @@ CONFIG_PHYLIB=y | |||
659 | # CONFIG_BROADCOM_PHY is not set | 685 | # CONFIG_BROADCOM_PHY is not set |
660 | # CONFIG_ICPLUS_PHY is not set | 686 | # CONFIG_ICPLUS_PHY is not set |
661 | # CONFIG_REALTEK_PHY is not set | 687 | # CONFIG_REALTEK_PHY is not set |
688 | # CONFIG_NATIONAL_PHY is not set | ||
689 | # CONFIG_STE10XP is not set | ||
690 | # CONFIG_LSI_ET1011C_PHY is not set | ||
662 | # CONFIG_FIXED_PHY is not set | 691 | # CONFIG_FIXED_PHY is not set |
663 | # CONFIG_MDIO_BITBANG is not set | 692 | # CONFIG_MDIO_BITBANG is not set |
664 | CONFIG_NET_ETHERNET=y | 693 | CONFIG_NET_ETHERNET=y |
@@ -693,6 +722,10 @@ CONFIG_FEC_MPC52xx_MDIO=y | |||
693 | # CONFIG_IWLWIFI_LEDS is not set | 722 | # CONFIG_IWLWIFI_LEDS is not set |
694 | 723 | ||
695 | # | 724 | # |
725 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
726 | # | ||
727 | |||
728 | # | ||
696 | # USB Network Adapters | 729 | # USB Network Adapters |
697 | # | 730 | # |
698 | # CONFIG_USB_CATC is not set | 731 | # CONFIG_USB_CATC is not set |
@@ -774,9 +807,11 @@ CONFIG_SERIAL_MPC52xx_CONSOLE=y | |||
774 | CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200 | 807 | CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200 |
775 | # CONFIG_SERIAL_JSM is not set | 808 | # CONFIG_SERIAL_JSM is not set |
776 | CONFIG_UNIX98_PTYS=y | 809 | CONFIG_UNIX98_PTYS=y |
810 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | ||
777 | CONFIG_LEGACY_PTYS=y | 811 | CONFIG_LEGACY_PTYS=y |
778 | CONFIG_LEGACY_PTY_COUNT=256 | 812 | CONFIG_LEGACY_PTY_COUNT=256 |
779 | # CONFIG_HVC_RTAS is not set | 813 | # CONFIG_HVC_RTAS is not set |
814 | # CONFIG_HVC_UDBG is not set | ||
780 | # CONFIG_IPMI_HANDLER is not set | 815 | # CONFIG_IPMI_HANDLER is not set |
781 | # CONFIG_HW_RANDOM is not set | 816 | # CONFIG_HW_RANDOM is not set |
782 | # CONFIG_NVRAM is not set | 817 | # CONFIG_NVRAM is not set |
@@ -844,8 +879,6 @@ CONFIG_I2C_MPC=y | |||
844 | # Miscellaneous I2C Chip support | 879 | # Miscellaneous I2C Chip support |
845 | # | 880 | # |
846 | # CONFIG_DS1682 is not set | 881 | # CONFIG_DS1682 is not set |
847 | # CONFIG_EEPROM_AT24 is not set | ||
848 | # CONFIG_EEPROM_LEGACY is not set | ||
849 | # CONFIG_SENSORS_PCF8574 is not set | 882 | # CONFIG_SENSORS_PCF8574 is not set |
850 | # CONFIG_PCF8575 is not set | 883 | # CONFIG_PCF8575 is not set |
851 | # CONFIG_SENSORS_PCA9539 is not set | 884 | # CONFIG_SENSORS_PCA9539 is not set |
@@ -874,6 +907,7 @@ CONFIG_HWMON=y | |||
874 | # CONFIG_SENSORS_ADT7462 is not set | 907 | # CONFIG_SENSORS_ADT7462 is not set |
875 | # CONFIG_SENSORS_ADT7470 is not set | 908 | # CONFIG_SENSORS_ADT7470 is not set |
876 | # CONFIG_SENSORS_ADT7473 is not set | 909 | # CONFIG_SENSORS_ADT7473 is not set |
910 | # CONFIG_SENSORS_ADT7475 is not set | ||
877 | # CONFIG_SENSORS_ATXP1 is not set | 911 | # CONFIG_SENSORS_ATXP1 is not set |
878 | # CONFIG_SENSORS_DS1621 is not set | 912 | # CONFIG_SENSORS_DS1621 is not set |
879 | # CONFIG_SENSORS_I5K_AMB is not set | 913 | # CONFIG_SENSORS_I5K_AMB is not set |
@@ -894,6 +928,7 @@ CONFIG_HWMON=y | |||
894 | # CONFIG_SENSORS_LM90 is not set | 928 | # CONFIG_SENSORS_LM90 is not set |
895 | # CONFIG_SENSORS_LM92 is not set | 929 | # CONFIG_SENSORS_LM92 is not set |
896 | # CONFIG_SENSORS_LM93 is not set | 930 | # CONFIG_SENSORS_LM93 is not set |
931 | # CONFIG_SENSORS_LTC4245 is not set | ||
897 | # CONFIG_SENSORS_MAX1619 is not set | 932 | # CONFIG_SENSORS_MAX1619 is not set |
898 | # CONFIG_SENSORS_MAX6650 is not set | 933 | # CONFIG_SENSORS_MAX6650 is not set |
899 | # CONFIG_SENSORS_PC87360 is not set | 934 | # CONFIG_SENSORS_PC87360 is not set |
@@ -953,10 +988,12 @@ CONFIG_SSB_POSSIBLE=y | |||
953 | # CONFIG_MFD_CORE is not set | 988 | # CONFIG_MFD_CORE is not set |
954 | # CONFIG_MFD_SM501 is not set | 989 | # CONFIG_MFD_SM501 is not set |
955 | # CONFIG_HTC_PASIC3 is not set | 990 | # CONFIG_HTC_PASIC3 is not set |
991 | # CONFIG_TWL4030_CORE is not set | ||
956 | # CONFIG_MFD_TMIO is not set | 992 | # CONFIG_MFD_TMIO is not set |
957 | # CONFIG_PMIC_DA903X is not set | 993 | # CONFIG_PMIC_DA903X is not set |
958 | # CONFIG_MFD_WM8400 is not set | 994 | # CONFIG_MFD_WM8400 is not set |
959 | # CONFIG_MFD_WM8350_I2C is not set | 995 | # CONFIG_MFD_WM8350_I2C is not set |
996 | # CONFIG_MFD_PCF50633 is not set | ||
960 | # CONFIG_REGULATOR is not set | 997 | # CONFIG_REGULATOR is not set |
961 | 998 | ||
962 | # | 999 | # |
@@ -1051,7 +1088,7 @@ CONFIG_LCD_CLASS_DEVICE=m | |||
1051 | # CONFIG_LCD_ILI9320 is not set | 1088 | # CONFIG_LCD_ILI9320 is not set |
1052 | # CONFIG_LCD_PLATFORM is not set | 1089 | # CONFIG_LCD_PLATFORM is not set |
1053 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | 1090 | CONFIG_BACKLIGHT_CLASS_DEVICE=y |
1054 | # CONFIG_BACKLIGHT_CORGI is not set | 1091 | CONFIG_BACKLIGHT_GENERIC=y |
1055 | 1092 | ||
1056 | # | 1093 | # |
1057 | # Display device support | 1094 | # Display device support |
@@ -1093,21 +1130,22 @@ CONFIG_HID_COMPAT=y | |||
1093 | CONFIG_HID_A4TECH=y | 1130 | CONFIG_HID_A4TECH=y |
1094 | # CONFIG_HID_APPLE is not set | 1131 | # CONFIG_HID_APPLE is not set |
1095 | CONFIG_HID_BELKIN=y | 1132 | CONFIG_HID_BELKIN=y |
1096 | CONFIG_HID_BRIGHT=y | ||
1097 | CONFIG_HID_CHERRY=y | 1133 | CONFIG_HID_CHERRY=y |
1098 | # CONFIG_HID_CHICONY is not set | 1134 | # CONFIG_HID_CHICONY is not set |
1099 | CONFIG_HID_CYPRESS=y | 1135 | CONFIG_HID_CYPRESS=y |
1100 | CONFIG_HID_DELL=y | ||
1101 | CONFIG_HID_EZKEY=y | 1136 | CONFIG_HID_EZKEY=y |
1102 | # CONFIG_HID_GYRATION is not set | 1137 | # CONFIG_HID_GYRATION is not set |
1103 | # CONFIG_HID_LOGITECH is not set | 1138 | # CONFIG_HID_LOGITECH is not set |
1104 | # CONFIG_HID_MICROSOFT is not set | 1139 | # CONFIG_HID_MICROSOFT is not set |
1105 | # CONFIG_HID_MONTEREY is not set | 1140 | # CONFIG_HID_MONTEREY is not set |
1141 | # CONFIG_HID_NTRIG is not set | ||
1106 | # CONFIG_HID_PANTHERLORD is not set | 1142 | # CONFIG_HID_PANTHERLORD is not set |
1107 | # CONFIG_HID_PETALYNX is not set | 1143 | # CONFIG_HID_PETALYNX is not set |
1108 | # CONFIG_HID_SAMSUNG is not set | 1144 | # CONFIG_HID_SAMSUNG is not set |
1109 | # CONFIG_HID_SONY is not set | 1145 | # CONFIG_HID_SONY is not set |
1110 | # CONFIG_HID_SUNPLUS is not set | 1146 | # CONFIG_HID_SUNPLUS is not set |
1147 | # CONFIG_GREENASIA_FF is not set | ||
1148 | # CONFIG_HID_TOPSEED is not set | ||
1111 | # CONFIG_THRUSTMASTER_FF is not set | 1149 | # CONFIG_THRUSTMASTER_FF is not set |
1112 | # CONFIG_ZEROPLUS_FF is not set | 1150 | # CONFIG_ZEROPLUS_FF is not set |
1113 | CONFIG_USB_SUPPORT=y | 1151 | CONFIG_USB_SUPPORT=y |
@@ -1137,6 +1175,7 @@ CONFIG_USB_MON=y | |||
1137 | # | 1175 | # |
1138 | # CONFIG_USB_C67X00_HCD is not set | 1176 | # CONFIG_USB_C67X00_HCD is not set |
1139 | # CONFIG_USB_EHCI_HCD is not set | 1177 | # CONFIG_USB_EHCI_HCD is not set |
1178 | # CONFIG_USB_OXU210HP_HCD is not set | ||
1140 | # CONFIG_USB_ISP116X_HCD is not set | 1179 | # CONFIG_USB_ISP116X_HCD is not set |
1141 | # CONFIG_USB_ISP1760_HCD is not set | 1180 | # CONFIG_USB_ISP1760_HCD is not set |
1142 | CONFIG_USB_OHCI_HCD=y | 1181 | CONFIG_USB_OHCI_HCD=y |
@@ -1164,18 +1203,17 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
1164 | # CONFIG_USB_TMC is not set | 1203 | # CONFIG_USB_TMC is not set |
1165 | 1204 | ||
1166 | # | 1205 | # |
1167 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1206 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; |
1168 | # | 1207 | # |
1169 | 1208 | ||
1170 | # | 1209 | # |
1171 | # may also be needed; see USB_STORAGE Help for more information | 1210 | # see USB_STORAGE Help for more information |
1172 | # | 1211 | # |
1173 | CONFIG_USB_STORAGE=y | 1212 | CONFIG_USB_STORAGE=y |
1174 | # CONFIG_USB_STORAGE_DEBUG is not set | 1213 | # CONFIG_USB_STORAGE_DEBUG is not set |
1175 | # CONFIG_USB_STORAGE_DATAFAB is not set | 1214 | # CONFIG_USB_STORAGE_DATAFAB is not set |
1176 | # CONFIG_USB_STORAGE_FREECOM is not set | 1215 | # CONFIG_USB_STORAGE_FREECOM is not set |
1177 | # CONFIG_USB_STORAGE_ISD200 is not set | 1216 | # CONFIG_USB_STORAGE_ISD200 is not set |
1178 | # CONFIG_USB_STORAGE_DPCM is not set | ||
1179 | # CONFIG_USB_STORAGE_USBAT is not set | 1217 | # CONFIG_USB_STORAGE_USBAT is not set |
1180 | # CONFIG_USB_STORAGE_SDDR09 is not set | 1218 | # CONFIG_USB_STORAGE_SDDR09 is not set |
1181 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1219 | # CONFIG_USB_STORAGE_SDDR55 is not set |
@@ -1222,6 +1260,10 @@ CONFIG_USB_STORAGE=y | |||
1222 | # CONFIG_USB_ISIGHTFW is not set | 1260 | # CONFIG_USB_ISIGHTFW is not set |
1223 | # CONFIG_USB_VST is not set | 1261 | # CONFIG_USB_VST is not set |
1224 | # CONFIG_USB_GADGET is not set | 1262 | # CONFIG_USB_GADGET is not set |
1263 | |||
1264 | # | ||
1265 | # OTG and related infrastructure | ||
1266 | # | ||
1225 | # CONFIG_UWB is not set | 1267 | # CONFIG_UWB is not set |
1226 | # CONFIG_MMC is not set | 1268 | # CONFIG_MMC is not set |
1227 | # CONFIG_MEMSTICK is not set | 1269 | # CONFIG_MEMSTICK is not set |
@@ -1243,7 +1285,6 @@ CONFIG_NEW_LEDS=y | |||
1243 | # CONFIG_DMADEVICES is not set | 1285 | # CONFIG_DMADEVICES is not set |
1244 | # CONFIG_UIO is not set | 1286 | # CONFIG_UIO is not set |
1245 | # CONFIG_STAGING is not set | 1287 | # CONFIG_STAGING is not set |
1246 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
1247 | 1288 | ||
1248 | # | 1289 | # |
1249 | # File systems | 1290 | # File systems |
@@ -1264,6 +1305,7 @@ CONFIG_FS_MBCACHE=y | |||
1264 | CONFIG_FILE_LOCKING=y | 1305 | CONFIG_FILE_LOCKING=y |
1265 | # CONFIG_XFS_FS is not set | 1306 | # CONFIG_XFS_FS is not set |
1266 | # CONFIG_OCFS2_FS is not set | 1307 | # CONFIG_OCFS2_FS is not set |
1308 | # CONFIG_BTRFS_FS is not set | ||
1267 | CONFIG_DNOTIFY=y | 1309 | CONFIG_DNOTIFY=y |
1268 | CONFIG_INOTIFY=y | 1310 | CONFIG_INOTIFY=y |
1269 | CONFIG_INOTIFY_USER=y | 1311 | CONFIG_INOTIFY_USER=y |
@@ -1300,10 +1342,7 @@ CONFIG_TMPFS=y | |||
1300 | # CONFIG_TMPFS_POSIX_ACL is not set | 1342 | # CONFIG_TMPFS_POSIX_ACL is not set |
1301 | # CONFIG_HUGETLB_PAGE is not set | 1343 | # CONFIG_HUGETLB_PAGE is not set |
1302 | # CONFIG_CONFIGFS_FS is not set | 1344 | # CONFIG_CONFIGFS_FS is not set |
1303 | 1345 | CONFIG_MISC_FILESYSTEMS=y | |
1304 | # | ||
1305 | # Miscellaneous filesystems | ||
1306 | # | ||
1307 | # CONFIG_ADFS_FS is not set | 1346 | # CONFIG_ADFS_FS is not set |
1308 | # CONFIG_AFFS_FS is not set | 1347 | # CONFIG_AFFS_FS is not set |
1309 | # CONFIG_HFS_FS is not set | 1348 | # CONFIG_HFS_FS is not set |
@@ -1323,6 +1362,7 @@ CONFIG_JFFS2_ZLIB=y | |||
1323 | CONFIG_JFFS2_RTIME=y | 1362 | CONFIG_JFFS2_RTIME=y |
1324 | # CONFIG_JFFS2_RUBIN is not set | 1363 | # CONFIG_JFFS2_RUBIN is not set |
1325 | CONFIG_CRAMFS=y | 1364 | CONFIG_CRAMFS=y |
1365 | # CONFIG_SQUASHFS is not set | ||
1326 | # CONFIG_VXFS_FS is not set | 1366 | # CONFIG_VXFS_FS is not set |
1327 | # CONFIG_MINIX_FS is not set | 1367 | # CONFIG_MINIX_FS is not set |
1328 | # CONFIG_OMFS_FS is not set | 1368 | # CONFIG_OMFS_FS is not set |
@@ -1403,6 +1443,7 @@ CONFIG_NLS_ISO8859_1=y | |||
1403 | # Library routines | 1443 | # Library routines |
1404 | # | 1444 | # |
1405 | CONFIG_BITREVERSE=y | 1445 | CONFIG_BITREVERSE=y |
1446 | CONFIG_GENERIC_FIND_LAST_BIT=y | ||
1406 | # CONFIG_CRC_CCITT is not set | 1447 | # CONFIG_CRC_CCITT is not set |
1407 | # CONFIG_CRC16 is not set | 1448 | # CONFIG_CRC16 is not set |
1408 | # CONFIG_CRC_T10DIF is not set | 1449 | # CONFIG_CRC_T10DIF is not set |
@@ -1454,6 +1495,7 @@ CONFIG_DEBUG_INFO=y | |||
1454 | # CONFIG_DEBUG_MEMORY_INIT is not set | 1495 | # CONFIG_DEBUG_MEMORY_INIT is not set |
1455 | # CONFIG_DEBUG_LIST is not set | 1496 | # CONFIG_DEBUG_LIST is not set |
1456 | # CONFIG_DEBUG_SG is not set | 1497 | # CONFIG_DEBUG_SG is not set |
1498 | # CONFIG_DEBUG_NOTIFIERS is not set | ||
1457 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1499 | # CONFIG_BOOT_PRINTK_DELAY is not set |
1458 | # CONFIG_RCU_TORTURE_TEST is not set | 1500 | # CONFIG_RCU_TORTURE_TEST is not set |
1459 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1501 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
@@ -1462,6 +1504,8 @@ CONFIG_DEBUG_INFO=y | |||
1462 | # CONFIG_FAULT_INJECTION is not set | 1504 | # CONFIG_FAULT_INJECTION is not set |
1463 | # CONFIG_LATENCYTOP is not set | 1505 | # CONFIG_LATENCYTOP is not set |
1464 | CONFIG_HAVE_FUNCTION_TRACER=y | 1506 | CONFIG_HAVE_FUNCTION_TRACER=y |
1507 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1508 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | ||
1465 | 1509 | ||
1466 | # | 1510 | # |
1467 | # Tracers | 1511 | # Tracers |
@@ -1470,11 +1514,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y | |||
1470 | # CONFIG_SCHED_TRACER is not set | 1514 | # CONFIG_SCHED_TRACER is not set |
1471 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1515 | # CONFIG_CONTEXT_SWITCH_TRACER is not set |
1472 | # CONFIG_BOOT_TRACER is not set | 1516 | # CONFIG_BOOT_TRACER is not set |
1517 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
1473 | # CONFIG_STACK_TRACER is not set | 1518 | # CONFIG_STACK_TRACER is not set |
1474 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | 1519 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set |
1475 | # CONFIG_SAMPLES is not set | 1520 | # CONFIG_SAMPLES is not set |
1476 | CONFIG_HAVE_ARCH_KGDB=y | 1521 | CONFIG_HAVE_ARCH_KGDB=y |
1477 | # CONFIG_KGDB is not set | 1522 | # CONFIG_KGDB is not set |
1523 | CONFIG_PRINT_STACK_DEPTH=64 | ||
1478 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1524 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1479 | # CONFIG_DEBUG_STACK_USAGE is not set | 1525 | # CONFIG_DEBUG_STACK_USAGE is not set |
1480 | # CONFIG_DEBUG_PAGEALLOC is not set | 1526 | # CONFIG_DEBUG_PAGEALLOC is not set |
@@ -1501,11 +1547,15 @@ CONFIG_CRYPTO=y | |||
1501 | # | 1547 | # |
1502 | # CONFIG_CRYPTO_FIPS is not set | 1548 | # CONFIG_CRYPTO_FIPS is not set |
1503 | CONFIG_CRYPTO_ALGAPI=y | 1549 | CONFIG_CRYPTO_ALGAPI=y |
1504 | CONFIG_CRYPTO_AEAD=y | 1550 | CONFIG_CRYPTO_ALGAPI2=y |
1551 | CONFIG_CRYPTO_AEAD2=y | ||
1505 | CONFIG_CRYPTO_BLKCIPHER=y | 1552 | CONFIG_CRYPTO_BLKCIPHER=y |
1553 | CONFIG_CRYPTO_BLKCIPHER2=y | ||
1506 | CONFIG_CRYPTO_HASH=y | 1554 | CONFIG_CRYPTO_HASH=y |
1507 | CONFIG_CRYPTO_RNG=y | 1555 | CONFIG_CRYPTO_HASH2=y |
1556 | CONFIG_CRYPTO_RNG2=y | ||
1508 | CONFIG_CRYPTO_MANAGER=y | 1557 | CONFIG_CRYPTO_MANAGER=y |
1558 | CONFIG_CRYPTO_MANAGER2=y | ||
1509 | # CONFIG_CRYPTO_GF128MUL is not set | 1559 | # CONFIG_CRYPTO_GF128MUL is not set |
1510 | # CONFIG_CRYPTO_NULL is not set | 1560 | # CONFIG_CRYPTO_NULL is not set |
1511 | # CONFIG_CRYPTO_CRYPTD is not set | 1561 | # CONFIG_CRYPTO_CRYPTD is not set |
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index da5a3855a0c..19b12d2cbb4 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c | |||
@@ -16,8 +16,6 @@ | |||
16 | * 2 of the License, or (at your option) any later version. | 16 | * 2 of the License, or (at your option) any later version. |
17 | */ | 17 | */ |
18 | 18 | ||
19 | #define DEBUG | ||
20 | |||
21 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
22 | #include <linux/pci.h> | 20 | #include <linux/pci.h> |
23 | #include <linux/string.h> | 21 | #include <linux/string.h> |
@@ -258,7 +256,8 @@ int pci_read_irq_line(struct pci_dev *pci_dev) | |||
258 | } else { | 256 | } else { |
259 | pr_debug(" Got one, spec %d cells (0x%08x 0x%08x...) on %s\n", | 257 | pr_debug(" Got one, spec %d cells (0x%08x 0x%08x...) on %s\n", |
260 | oirq.size, oirq.specifier[0], oirq.specifier[1], | 258 | oirq.size, oirq.specifier[0], oirq.specifier[1], |
261 | oirq.controller->full_name); | 259 | oirq.controller ? oirq.controller->full_name : |
260 | "<default>"); | ||
262 | 261 | ||
263 | virq = irq_create_of_mapping(oirq.controller, oirq.specifier, | 262 | virq = irq_create_of_mapping(oirq.controller, oirq.specifier, |
264 | oirq.size); | 263 | oirq.size); |
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pci.c b/arch/powerpc/platforms/52xx/mpc52xx_pci.c index c3f2c21024e..87ff522f28b 100644 --- a/arch/powerpc/platforms/52xx/mpc52xx_pci.c +++ b/arch/powerpc/platforms/52xx/mpc52xx_pci.c | |||
@@ -20,14 +20,6 @@ | |||
20 | 20 | ||
21 | 21 | ||
22 | /* ======================================================================== */ | 22 | /* ======================================================================== */ |
23 | /* PCI windows config */ | ||
24 | /* ======================================================================== */ | ||
25 | |||
26 | #define MPC52xx_PCI_TARGET_IO 0xf0000000 | ||
27 | #define MPC52xx_PCI_TARGET_MEM 0x00000000 | ||
28 | |||
29 | |||
30 | /* ======================================================================== */ | ||
31 | /* Structures mapping & Defines for PCI Unit */ | 23 | /* Structures mapping & Defines for PCI Unit */ |
32 | /* ======================================================================== */ | 24 | /* ======================================================================== */ |
33 | 25 | ||
@@ -244,7 +236,7 @@ static struct pci_ops mpc52xx_pci_ops = { | |||
244 | 236 | ||
245 | static void __init | 237 | static void __init |
246 | mpc52xx_pci_setup(struct pci_controller *hose, | 238 | mpc52xx_pci_setup(struct pci_controller *hose, |
247 | struct mpc52xx_pci __iomem *pci_regs) | 239 | struct mpc52xx_pci __iomem *pci_regs, phys_addr_t pci_phys) |
248 | { | 240 | { |
249 | struct resource *res; | 241 | struct resource *res; |
250 | u32 tmp; | 242 | u32 tmp; |
@@ -314,10 +306,14 @@ mpc52xx_pci_setup(struct pci_controller *hose, | |||
314 | /* Set all the IWCR fields at once; they're in the same reg */ | 306 | /* Set all the IWCR fields at once; they're in the same reg */ |
315 | out_be32(&pci_regs->iwcr, MPC52xx_PCI_IWCR_PACK(iwcr0, iwcr1, iwcr2)); | 307 | out_be32(&pci_regs->iwcr, MPC52xx_PCI_IWCR_PACK(iwcr0, iwcr1, iwcr2)); |
316 | 308 | ||
317 | out_be32(&pci_regs->tbatr0, | 309 | /* Map IMMR onto PCI bus */ |
318 | MPC52xx_PCI_TBATR_ENABLE | MPC52xx_PCI_TARGET_IO ); | 310 | pci_phys &= 0xfffc0000; /* bar0 has only 14 significant bits */ |
319 | out_be32(&pci_regs->tbatr1, | 311 | out_be32(&pci_regs->tbatr0, MPC52xx_PCI_TBATR_ENABLE | pci_phys); |
320 | MPC52xx_PCI_TBATR_ENABLE | MPC52xx_PCI_TARGET_MEM ); | 312 | out_be32(&pci_regs->bar0, PCI_BASE_ADDRESS_MEM_PREFETCH | pci_phys); |
313 | |||
314 | /* Map memory onto PCI bus */ | ||
315 | out_be32(&pci_regs->tbatr1, MPC52xx_PCI_TBATR_ENABLE); | ||
316 | out_be32(&pci_regs->bar1, PCI_BASE_ADDRESS_MEM_PREFETCH); | ||
321 | 317 | ||
322 | out_be32(&pci_regs->tcr, MPC52xx_PCI_TCR_LD | MPC52xx_PCI_TCR_WCT8); | 318 | out_be32(&pci_regs->tcr, MPC52xx_PCI_TCR_LD | MPC52xx_PCI_TCR_WCT8); |
323 | 319 | ||
@@ -414,7 +410,7 @@ mpc52xx_add_bridge(struct device_node *node) | |||
414 | 410 | ||
415 | /* Finish setting up PCI using values obtained by | 411 | /* Finish setting up PCI using values obtained by |
416 | * pci_proces_bridge_OF_ranges */ | 412 | * pci_proces_bridge_OF_ranges */ |
417 | mpc52xx_pci_setup(hose, pci_regs); | 413 | mpc52xx_pci_setup(hose, pci_regs, rsrc.start); |
418 | 414 | ||
419 | return 0; | 415 | return 0; |
420 | } | 416 | } |
diff --git a/arch/sh/boards/board-ap325rxa.c b/arch/sh/boards/board-ap325rxa.c index caf4c33f4e8..7c35787d29b 100644 --- a/arch/sh/boards/board-ap325rxa.c +++ b/arch/sh/boards/board-ap325rxa.c | |||
@@ -22,6 +22,7 @@ | |||
22 | #include <linux/gpio.h> | 22 | #include <linux/gpio.h> |
23 | #include <linux/spi/spi.h> | 23 | #include <linux/spi/spi.h> |
24 | #include <linux/spi/spi_gpio.h> | 24 | #include <linux/spi/spi_gpio.h> |
25 | #include <media/ov772x.h> | ||
25 | #include <media/soc_camera_platform.h> | 26 | #include <media/soc_camera_platform.h> |
26 | #include <media/sh_mobile_ceu.h> | 27 | #include <media/sh_mobile_ceu.h> |
27 | #include <video/sh_mobile_lcdc.h> | 28 | #include <video/sh_mobile_lcdc.h> |
@@ -216,7 +217,14 @@ static struct platform_device lcdc_device = { | |||
216 | }, | 217 | }, |
217 | }; | 218 | }; |
218 | 219 | ||
220 | static void camera_power(int val) | ||
221 | { | ||
222 | gpio_set_value(GPIO_PTZ5, val); /* RST_CAM/RSTB */ | ||
223 | mdelay(10); | ||
224 | } | ||
225 | |||
219 | #ifdef CONFIG_I2C | 226 | #ifdef CONFIG_I2C |
227 | /* support for the old ncm03j camera */ | ||
220 | static unsigned char camera_ncm03j_magic[] = | 228 | static unsigned char camera_ncm03j_magic[] = |
221 | { | 229 | { |
222 | 0x87, 0x00, 0x88, 0x08, 0x89, 0x01, 0x8A, 0xE8, | 230 | 0x87, 0x00, 0x88, 0x08, 0x89, 0x01, 0x8A, 0xE8, |
@@ -237,6 +245,23 @@ static unsigned char camera_ncm03j_magic[] = | |||
237 | 0x63, 0xD4, 0x64, 0xEA, 0xD6, 0x0F, | 245 | 0x63, 0xD4, 0x64, 0xEA, 0xD6, 0x0F, |
238 | }; | 246 | }; |
239 | 247 | ||
248 | static int camera_probe(void) | ||
249 | { | ||
250 | struct i2c_adapter *a = i2c_get_adapter(0); | ||
251 | struct i2c_msg msg; | ||
252 | int ret; | ||
253 | |||
254 | camera_power(1); | ||
255 | msg.addr = 0x6e; | ||
256 | msg.buf = camera_ncm03j_magic; | ||
257 | msg.len = 2; | ||
258 | msg.flags = 0; | ||
259 | ret = i2c_transfer(a, &msg, 1); | ||
260 | camera_power(0); | ||
261 | |||
262 | return ret; | ||
263 | } | ||
264 | |||
240 | static int camera_set_capture(struct soc_camera_platform_info *info, | 265 | static int camera_set_capture(struct soc_camera_platform_info *info, |
241 | int enable) | 266 | int enable) |
242 | { | 267 | { |
@@ -245,9 +270,11 @@ static int camera_set_capture(struct soc_camera_platform_info *info, | |||
245 | int ret = 0; | 270 | int ret = 0; |
246 | int i; | 271 | int i; |
247 | 272 | ||
273 | camera_power(0); | ||
248 | if (!enable) | 274 | if (!enable) |
249 | return 0; /* no disable for now */ | 275 | return 0; /* no disable for now */ |
250 | 276 | ||
277 | camera_power(1); | ||
251 | for (i = 0; i < ARRAY_SIZE(camera_ncm03j_magic); i += 2) { | 278 | for (i = 0; i < ARRAY_SIZE(camera_ncm03j_magic); i += 2) { |
252 | u_int8_t buf[8]; | 279 | u_int8_t buf[8]; |
253 | 280 | ||
@@ -286,8 +313,35 @@ static struct platform_device camera_device = { | |||
286 | .platform_data = &camera_info, | 313 | .platform_data = &camera_info, |
287 | }, | 314 | }, |
288 | }; | 315 | }; |
316 | |||
317 | static int __init camera_setup(void) | ||
318 | { | ||
319 | if (camera_probe() > 0) | ||
320 | platform_device_register(&camera_device); | ||
321 | |||
322 | return 0; | ||
323 | } | ||
324 | late_initcall(camera_setup); | ||
325 | |||
289 | #endif /* CONFIG_I2C */ | 326 | #endif /* CONFIG_I2C */ |
290 | 327 | ||
328 | static int ov7725_power(struct device *dev, int mode) | ||
329 | { | ||
330 | camera_power(0); | ||
331 | if (mode) | ||
332 | camera_power(1); | ||
333 | |||
334 | return 0; | ||
335 | } | ||
336 | |||
337 | static struct ov772x_camera_info ov7725_info = { | ||
338 | .buswidth = SOCAM_DATAWIDTH_8, | ||
339 | .flags = OV772X_FLAG_VFLIP | OV772X_FLAG_HFLIP, | ||
340 | .link = { | ||
341 | .power = ov7725_power, | ||
342 | }, | ||
343 | }; | ||
344 | |||
291 | static struct sh_mobile_ceu_info sh_mobile_ceu_info = { | 345 | static struct sh_mobile_ceu_info sh_mobile_ceu_info = { |
292 | .flags = SOCAM_PCLK_SAMPLE_RISING | SOCAM_HSYNC_ACTIVE_HIGH | | 346 | .flags = SOCAM_PCLK_SAMPLE_RISING | SOCAM_HSYNC_ACTIVE_HIGH | |
293 | SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_MASTER | SOCAM_DATAWIDTH_8, | 347 | SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_MASTER | SOCAM_DATAWIDTH_8, |
@@ -338,9 +392,6 @@ static struct platform_device *ap325rxa_devices[] __initdata = { | |||
338 | &ap325rxa_nor_flash_device, | 392 | &ap325rxa_nor_flash_device, |
339 | &lcdc_device, | 393 | &lcdc_device, |
340 | &ceu_device, | 394 | &ceu_device, |
341 | #ifdef CONFIG_I2C | ||
342 | &camera_device, | ||
343 | #endif | ||
344 | &nand_flash_device, | 395 | &nand_flash_device, |
345 | &sdcard_cn3_device, | 396 | &sdcard_cn3_device, |
346 | }; | 397 | }; |
@@ -349,6 +400,10 @@ static struct i2c_board_info __initdata ap325rxa_i2c_devices[] = { | |||
349 | { | 400 | { |
350 | I2C_BOARD_INFO("pcf8563", 0x51), | 401 | I2C_BOARD_INFO("pcf8563", 0x51), |
351 | }, | 402 | }, |
403 | { | ||
404 | I2C_BOARD_INFO("ov772x", 0x21), | ||
405 | .platform_data = &ov7725_info, | ||
406 | }, | ||
352 | }; | 407 | }; |
353 | 408 | ||
354 | static struct spi_board_info ap325rxa_spi_devices[] = { | 409 | static struct spi_board_info ap325rxa_spi_devices[] = { |
@@ -426,7 +481,7 @@ static int __init ap325rxa_devices_setup(void) | |||
426 | gpio_request(GPIO_PTZ6, NULL); | 481 | gpio_request(GPIO_PTZ6, NULL); |
427 | gpio_direction_output(GPIO_PTZ6, 0); /* STBY_CAM */ | 482 | gpio_direction_output(GPIO_PTZ6, 0); /* STBY_CAM */ |
428 | gpio_request(GPIO_PTZ5, NULL); | 483 | gpio_request(GPIO_PTZ5, NULL); |
429 | gpio_direction_output(GPIO_PTZ5, 1); /* RST_CAM */ | 484 | gpio_direction_output(GPIO_PTZ5, 0); /* RST_CAM */ |
430 | gpio_request(GPIO_PTZ4, NULL); | 485 | gpio_request(GPIO_PTZ4, NULL); |
431 | gpio_direction_output(GPIO_PTZ4, 0); /* SADDR */ | 486 | gpio_direction_output(GPIO_PTZ4, 0); /* SADDR */ |
432 | 487 | ||
diff --git a/arch/sh/configs/ap325rxa_defconfig b/arch/sh/configs/ap325rxa_defconfig index 5c423fa8e6b..352f87d50fd 100644 --- a/arch/sh/configs/ap325rxa_defconfig +++ b/arch/sh/configs/ap325rxa_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.28 | 3 | # Linux kernel version: 2.6.29-rc2 |
4 | # Fri Jan 9 16:54:19 2009 | 4 | # Tue Jan 27 11:45:08 2009 |
5 | # | 5 | # |
6 | CONFIG_SUPERH=y | 6 | CONFIG_SUPERH=y |
7 | CONFIG_SUPERH32=y | 7 | CONFIG_SUPERH32=y |
@@ -45,12 +45,12 @@ CONFIG_BSD_PROCESS_ACCT=y | |||
45 | # CONFIG_AUDIT is not set | 45 | # CONFIG_AUDIT is not set |
46 | # CONFIG_IKCONFIG is not set | 46 | # CONFIG_IKCONFIG is not set |
47 | CONFIG_LOG_BUF_SHIFT=14 | 47 | CONFIG_LOG_BUF_SHIFT=14 |
48 | # CONFIG_CGROUPS is not set | ||
49 | CONFIG_GROUP_SCHED=y | 48 | CONFIG_GROUP_SCHED=y |
50 | CONFIG_FAIR_GROUP_SCHED=y | 49 | CONFIG_FAIR_GROUP_SCHED=y |
51 | # CONFIG_RT_GROUP_SCHED is not set | 50 | # CONFIG_RT_GROUP_SCHED is not set |
52 | CONFIG_USER_SCHED=y | 51 | CONFIG_USER_SCHED=y |
53 | # CONFIG_CGROUP_SCHED is not set | 52 | # CONFIG_CGROUP_SCHED is not set |
53 | # CONFIG_CGROUPS is not set | ||
54 | CONFIG_SYSFS_DEPRECATED=y | 54 | CONFIG_SYSFS_DEPRECATED=y |
55 | CONFIG_SYSFS_DEPRECATED_V2=y | 55 | CONFIG_SYSFS_DEPRECATED_V2=y |
56 | # CONFIG_RELAY is not set | 56 | # CONFIG_RELAY is not set |
@@ -378,6 +378,7 @@ CONFIG_WIRELESS=y | |||
378 | # CONFIG_WIRELESS_EXT is not set | 378 | # CONFIG_WIRELESS_EXT is not set |
379 | # CONFIG_LIB80211 is not set | 379 | # CONFIG_LIB80211 is not set |
380 | # CONFIG_MAC80211 is not set | 380 | # CONFIG_MAC80211 is not set |
381 | # CONFIG_WIMAX is not set | ||
381 | # CONFIG_RFKILL is not set | 382 | # CONFIG_RFKILL is not set |
382 | # CONFIG_NET_9P is not set | 383 | # CONFIG_NET_9P is not set |
383 | 384 | ||
@@ -400,6 +401,7 @@ CONFIG_MTD=y | |||
400 | # CONFIG_MTD_DEBUG is not set | 401 | # CONFIG_MTD_DEBUG is not set |
401 | CONFIG_MTD_CONCAT=y | 402 | CONFIG_MTD_CONCAT=y |
402 | CONFIG_MTD_PARTITIONS=y | 403 | CONFIG_MTD_PARTITIONS=y |
404 | # CONFIG_MTD_TESTS is not set | ||
403 | # CONFIG_MTD_REDBOOT_PARTS is not set | 405 | # CONFIG_MTD_REDBOOT_PARTS is not set |
404 | CONFIG_MTD_CMDLINE_PARTS=y | 406 | CONFIG_MTD_CMDLINE_PARTS=y |
405 | # CONFIG_MTD_AR7_PARTS is not set | 407 | # CONFIG_MTD_AR7_PARTS is not set |
@@ -447,9 +449,7 @@ CONFIG_MTD_CFI_UTIL=y | |||
447 | # | 449 | # |
448 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | 450 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set |
449 | CONFIG_MTD_PHYSMAP=y | 451 | CONFIG_MTD_PHYSMAP=y |
450 | CONFIG_MTD_PHYSMAP_START=0xffffffff | 452 | # CONFIG_MTD_PHYSMAP_COMPAT is not set |
451 | CONFIG_MTD_PHYSMAP_LEN=0 | ||
452 | CONFIG_MTD_PHYSMAP_BANKWIDTH=0 | ||
453 | # CONFIG_MTD_PLATRAM is not set | 453 | # CONFIG_MTD_PLATRAM is not set |
454 | 454 | ||
455 | # | 455 | # |
@@ -480,6 +480,12 @@ CONFIG_MTD_NAND_SH_FLCTL=y | |||
480 | # CONFIG_MTD_ONENAND is not set | 480 | # CONFIG_MTD_ONENAND is not set |
481 | 481 | ||
482 | # | 482 | # |
483 | # LPDDR flash memory drivers | ||
484 | # | ||
485 | # CONFIG_MTD_LPDDR is not set | ||
486 | # CONFIG_MTD_QINFO_PROBE is not set | ||
487 | |||
488 | # | ||
483 | # UBI - Unsorted block images | 489 | # UBI - Unsorted block images |
484 | # | 490 | # |
485 | CONFIG_MTD_UBI=y | 491 | CONFIG_MTD_UBI=y |
@@ -607,6 +613,10 @@ CONFIG_SMSC911X=y | |||
607 | # CONFIG_WLAN_PRE80211 is not set | 613 | # CONFIG_WLAN_PRE80211 is not set |
608 | # CONFIG_WLAN_80211 is not set | 614 | # CONFIG_WLAN_80211 is not set |
609 | # CONFIG_IWLWIFI_LEDS is not set | 615 | # CONFIG_IWLWIFI_LEDS is not set |
616 | |||
617 | # | ||
618 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
619 | # | ||
610 | # CONFIG_WAN is not set | 620 | # CONFIG_WAN is not set |
611 | # CONFIG_PPP is not set | 621 | # CONFIG_PPP is not set |
612 | # CONFIG_SLIP is not set | 622 | # CONFIG_SLIP is not set |
@@ -790,6 +800,7 @@ CONFIG_SSB_POSSIBLE=y | |||
790 | # CONFIG_PMIC_DA903X is not set | 800 | # CONFIG_PMIC_DA903X is not set |
791 | # CONFIG_MFD_WM8400 is not set | 801 | # CONFIG_MFD_WM8400 is not set |
792 | # CONFIG_MFD_WM8350_I2C is not set | 802 | # CONFIG_MFD_WM8350_I2C is not set |
803 | # CONFIG_MFD_PCF50633 is not set | ||
793 | # CONFIG_REGULATOR is not set | 804 | # CONFIG_REGULATOR is not set |
794 | 805 | ||
795 | # | 806 | # |
@@ -837,7 +848,7 @@ CONFIG_SOC_CAMERA=y | |||
837 | # CONFIG_SOC_CAMERA_MT9V022 is not set | 848 | # CONFIG_SOC_CAMERA_MT9V022 is not set |
838 | # CONFIG_SOC_CAMERA_TW9910 is not set | 849 | # CONFIG_SOC_CAMERA_TW9910 is not set |
839 | CONFIG_SOC_CAMERA_PLATFORM=y | 850 | CONFIG_SOC_CAMERA_PLATFORM=y |
840 | # CONFIG_SOC_CAMERA_OV772X is not set | 851 | CONFIG_SOC_CAMERA_OV772X=y |
841 | CONFIG_VIDEO_SH_MOBILE_CEU=y | 852 | CONFIG_VIDEO_SH_MOBILE_CEU=y |
842 | # CONFIG_RADIO_ADAPTERS is not set | 853 | # CONFIG_RADIO_ADAPTERS is not set |
843 | # CONFIG_DAB is not set | 854 | # CONFIG_DAB is not set |
@@ -1012,6 +1023,7 @@ CONFIG_FS_POSIX_ACL=y | |||
1012 | CONFIG_FILE_LOCKING=y | 1023 | CONFIG_FILE_LOCKING=y |
1013 | # CONFIG_XFS_FS is not set | 1024 | # CONFIG_XFS_FS is not set |
1014 | # CONFIG_OCFS2_FS is not set | 1025 | # CONFIG_OCFS2_FS is not set |
1026 | # CONFIG_BTRFS_FS is not set | ||
1015 | CONFIG_DNOTIFY=y | 1027 | CONFIG_DNOTIFY=y |
1016 | CONFIG_INOTIFY=y | 1028 | CONFIG_INOTIFY=y |
1017 | CONFIG_INOTIFY_USER=y | 1029 | CONFIG_INOTIFY_USER=y |
@@ -1060,6 +1072,7 @@ CONFIG_MISC_FILESYSTEMS=y | |||
1060 | # CONFIG_JFFS2_FS is not set | 1072 | # CONFIG_JFFS2_FS is not set |
1061 | # CONFIG_UBIFS_FS is not set | 1073 | # CONFIG_UBIFS_FS is not set |
1062 | # CONFIG_CRAMFS is not set | 1074 | # CONFIG_CRAMFS is not set |
1075 | # CONFIG_SQUASHFS is not set | ||
1063 | # CONFIG_VXFS_FS is not set | 1076 | # CONFIG_VXFS_FS is not set |
1064 | # CONFIG_MINIX_FS is not set | 1077 | # CONFIG_MINIX_FS is not set |
1065 | # CONFIG_OMFS_FS is not set | 1078 | # CONFIG_OMFS_FS is not set |
diff --git a/arch/sh/configs/migor_defconfig b/arch/sh/configs/migor_defconfig index 7758263514b..678576796bd 100644 --- a/arch/sh/configs/migor_defconfig +++ b/arch/sh/configs/migor_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.28 | 3 | # Linux kernel version: 2.6.29-rc1 |
4 | # Fri Jan 9 17:09:35 2009 | 4 | # Thu Jan 22 09:16:16 2009 |
5 | # | 5 | # |
6 | CONFIG_SUPERH=y | 6 | CONFIG_SUPERH=y |
7 | CONFIG_SUPERH32=y | 7 | CONFIG_SUPERH32=y |
@@ -45,8 +45,12 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
45 | CONFIG_IKCONFIG=y | 45 | CONFIG_IKCONFIG=y |
46 | CONFIG_IKCONFIG_PROC=y | 46 | CONFIG_IKCONFIG_PROC=y |
47 | CONFIG_LOG_BUF_SHIFT=14 | 47 | CONFIG_LOG_BUF_SHIFT=14 |
48 | # CONFIG_CGROUPS is not set | ||
49 | # CONFIG_GROUP_SCHED is not set | 48 | # CONFIG_GROUP_SCHED is not set |
49 | |||
50 | # | ||
51 | # Control Group support | ||
52 | # | ||
53 | # CONFIG_CGROUPS is not set | ||
50 | CONFIG_SYSFS_DEPRECATED=y | 54 | CONFIG_SYSFS_DEPRECATED=y |
51 | CONFIG_SYSFS_DEPRECATED_V2=y | 55 | CONFIG_SYSFS_DEPRECATED_V2=y |
52 | # CONFIG_RELAY is not set | 56 | # CONFIG_RELAY is not set |
@@ -389,6 +393,7 @@ CONFIG_WIRELESS_EXT=y | |||
389 | CONFIG_WIRELESS_EXT_SYSFS=y | 393 | CONFIG_WIRELESS_EXT_SYSFS=y |
390 | # CONFIG_LIB80211 is not set | 394 | # CONFIG_LIB80211 is not set |
391 | # CONFIG_MAC80211 is not set | 395 | # CONFIG_MAC80211 is not set |
396 | # CONFIG_WIMAX is not set | ||
392 | # CONFIG_RFKILL is not set | 397 | # CONFIG_RFKILL is not set |
393 | # CONFIG_NET_9P is not set | 398 | # CONFIG_NET_9P is not set |
394 | 399 | ||
@@ -411,6 +416,7 @@ CONFIG_MTD=y | |||
411 | # CONFIG_MTD_DEBUG is not set | 416 | # CONFIG_MTD_DEBUG is not set |
412 | CONFIG_MTD_CONCAT=y | 417 | CONFIG_MTD_CONCAT=y |
413 | CONFIG_MTD_PARTITIONS=y | 418 | CONFIG_MTD_PARTITIONS=y |
419 | # CONFIG_MTD_TESTS is not set | ||
414 | # CONFIG_MTD_REDBOOT_PARTS is not set | 420 | # CONFIG_MTD_REDBOOT_PARTS is not set |
415 | CONFIG_MTD_CMDLINE_PARTS=y | 421 | CONFIG_MTD_CMDLINE_PARTS=y |
416 | # CONFIG_MTD_AR7_PARTS is not set | 422 | # CONFIG_MTD_AR7_PARTS is not set |
@@ -458,9 +464,7 @@ CONFIG_MTD_CFI_UTIL=y | |||
458 | # | 464 | # |
459 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | 465 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set |
460 | CONFIG_MTD_PHYSMAP=y | 466 | CONFIG_MTD_PHYSMAP=y |
461 | CONFIG_MTD_PHYSMAP_START=0xffffffff | 467 | # CONFIG_MTD_PHYSMAP_COMPAT is not set |
462 | CONFIG_MTD_PHYSMAP_LEN=0 | ||
463 | CONFIG_MTD_PHYSMAP_BANKWIDTH=0 | ||
464 | # CONFIG_MTD_PLATRAM is not set | 468 | # CONFIG_MTD_PLATRAM is not set |
465 | 469 | ||
466 | # | 470 | # |
@@ -488,6 +492,12 @@ CONFIG_MTD_NAND_PLATFORM=y | |||
488 | # CONFIG_MTD_ONENAND is not set | 492 | # CONFIG_MTD_ONENAND is not set |
489 | 493 | ||
490 | # | 494 | # |
495 | # LPDDR flash memory drivers | ||
496 | # | ||
497 | # CONFIG_MTD_LPDDR is not set | ||
498 | # CONFIG_MTD_QINFO_PROBE is not set | ||
499 | |||
500 | # | ||
491 | # UBI - Unsorted block images | 501 | # UBI - Unsorted block images |
492 | # | 502 | # |
493 | # CONFIG_MTD_UBI is not set | 503 | # CONFIG_MTD_UBI is not set |
@@ -587,6 +597,10 @@ CONFIG_SMC91X=y | |||
587 | # CONFIG_WLAN_PRE80211 is not set | 597 | # CONFIG_WLAN_PRE80211 is not set |
588 | # CONFIG_WLAN_80211 is not set | 598 | # CONFIG_WLAN_80211 is not set |
589 | # CONFIG_IWLWIFI_LEDS is not set | 599 | # CONFIG_IWLWIFI_LEDS is not set |
600 | |||
601 | # | ||
602 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
603 | # | ||
590 | # CONFIG_WAN is not set | 604 | # CONFIG_WAN is not set |
591 | # CONFIG_PPP is not set | 605 | # CONFIG_PPP is not set |
592 | # CONFIG_SLIP is not set | 606 | # CONFIG_SLIP is not set |
@@ -761,6 +775,7 @@ CONFIG_SSB_POSSIBLE=y | |||
761 | # CONFIG_PMIC_DA903X is not set | 775 | # CONFIG_PMIC_DA903X is not set |
762 | # CONFIG_MFD_WM8400 is not set | 776 | # CONFIG_MFD_WM8400 is not set |
763 | # CONFIG_MFD_WM8350_I2C is not set | 777 | # CONFIG_MFD_WM8350_I2C is not set |
778 | # CONFIG_MFD_PCF50633 is not set | ||
764 | # CONFIG_REGULATOR is not set | 779 | # CONFIG_REGULATOR is not set |
765 | 780 | ||
766 | # | 781 | # |
@@ -806,9 +821,9 @@ CONFIG_SOC_CAMERA=y | |||
806 | # CONFIG_SOC_CAMERA_MT9M111 is not set | 821 | # CONFIG_SOC_CAMERA_MT9M111 is not set |
807 | # CONFIG_SOC_CAMERA_MT9T031 is not set | 822 | # CONFIG_SOC_CAMERA_MT9T031 is not set |
808 | # CONFIG_SOC_CAMERA_MT9V022 is not set | 823 | # CONFIG_SOC_CAMERA_MT9V022 is not set |
809 | # CONFIG_SOC_CAMERA_TW9910 is not set | 824 | CONFIG_SOC_CAMERA_TW9910=y |
810 | CONFIG_SOC_CAMERA_PLATFORM=y | 825 | # CONFIG_SOC_CAMERA_PLATFORM is not set |
811 | # CONFIG_SOC_CAMERA_OV772X is not set | 826 | CONFIG_SOC_CAMERA_OV772X=y |
812 | CONFIG_VIDEO_SH_MOBILE_CEU=y | 827 | CONFIG_VIDEO_SH_MOBILE_CEU=y |
813 | # CONFIG_RADIO_ADAPTERS is not set | 828 | # CONFIG_RADIO_ADAPTERS is not set |
814 | # CONFIG_DAB is not set | 829 | # CONFIG_DAB is not set |
@@ -866,11 +881,13 @@ CONFIG_USB_GADGET_SELECTED=y | |||
866 | # CONFIG_USB_GADGET_PXA25X is not set | 881 | # CONFIG_USB_GADGET_PXA25X is not set |
867 | # CONFIG_USB_GADGET_PXA27X is not set | 882 | # CONFIG_USB_GADGET_PXA27X is not set |
868 | # CONFIG_USB_GADGET_S3C2410 is not set | 883 | # CONFIG_USB_GADGET_S3C2410 is not set |
884 | # CONFIG_USB_GADGET_IMX is not set | ||
869 | CONFIG_USB_GADGET_M66592=y | 885 | CONFIG_USB_GADGET_M66592=y |
870 | CONFIG_USB_M66592=y | 886 | CONFIG_USB_M66592=y |
871 | CONFIG_SUPERH_BUILT_IN_M66592=y | 887 | CONFIG_SUPERH_BUILT_IN_M66592=y |
872 | # CONFIG_USB_GADGET_AMD5536UDC is not set | 888 | # CONFIG_USB_GADGET_AMD5536UDC is not set |
873 | # CONFIG_USB_GADGET_FSL_QE is not set | 889 | # CONFIG_USB_GADGET_FSL_QE is not set |
890 | # CONFIG_USB_GADGET_CI13XXX is not set | ||
874 | # CONFIG_USB_GADGET_NET2280 is not set | 891 | # CONFIG_USB_GADGET_NET2280 is not set |
875 | # CONFIG_USB_GADGET_GOKU is not set | 892 | # CONFIG_USB_GADGET_GOKU is not set |
876 | # CONFIG_USB_GADGET_DUMMY_HCD is not set | 893 | # CONFIG_USB_GADGET_DUMMY_HCD is not set |
@@ -883,6 +900,11 @@ CONFIG_USB_G_SERIAL=y | |||
883 | # CONFIG_USB_MIDI_GADGET is not set | 900 | # CONFIG_USB_MIDI_GADGET is not set |
884 | # CONFIG_USB_G_PRINTER is not set | 901 | # CONFIG_USB_G_PRINTER is not set |
885 | # CONFIG_USB_CDC_COMPOSITE is not set | 902 | # CONFIG_USB_CDC_COMPOSITE is not set |
903 | |||
904 | # | ||
905 | # OTG and related infrastructure | ||
906 | # | ||
907 | # CONFIG_USB_GPIO_VBUS is not set | ||
886 | # CONFIG_MMC is not set | 908 | # CONFIG_MMC is not set |
887 | # CONFIG_MEMSTICK is not set | 909 | # CONFIG_MEMSTICK is not set |
888 | # CONFIG_NEW_LEDS is not set | 910 | # CONFIG_NEW_LEDS is not set |
@@ -961,6 +983,7 @@ CONFIG_UIO_PDRV_GENIRQ=y | |||
961 | CONFIG_FILE_LOCKING=y | 983 | CONFIG_FILE_LOCKING=y |
962 | # CONFIG_XFS_FS is not set | 984 | # CONFIG_XFS_FS is not set |
963 | # CONFIG_OCFS2_FS is not set | 985 | # CONFIG_OCFS2_FS is not set |
986 | # CONFIG_BTRFS_FS is not set | ||
964 | # CONFIG_DNOTIFY is not set | 987 | # CONFIG_DNOTIFY is not set |
965 | # CONFIG_INOTIFY is not set | 988 | # CONFIG_INOTIFY is not set |
966 | # CONFIG_QUOTA is not set | 989 | # CONFIG_QUOTA is not set |
@@ -1004,6 +1027,7 @@ CONFIG_MISC_FILESYSTEMS=y | |||
1004 | # CONFIG_EFS_FS is not set | 1027 | # CONFIG_EFS_FS is not set |
1005 | # CONFIG_JFFS2_FS is not set | 1028 | # CONFIG_JFFS2_FS is not set |
1006 | # CONFIG_CRAMFS is not set | 1029 | # CONFIG_CRAMFS is not set |
1030 | # CONFIG_SQUASHFS is not set | ||
1007 | # CONFIG_VXFS_FS is not set | 1031 | # CONFIG_VXFS_FS is not set |
1008 | # CONFIG_MINIX_FS is not set | 1032 | # CONFIG_MINIX_FS is not set |
1009 | # CONFIG_OMFS_FS is not set | 1033 | # CONFIG_OMFS_FS is not set |
diff --git a/arch/sh/include/asm/mutex-llsc.h b/arch/sh/include/asm/mutex-llsc.h index ee839ee58ac..090358a7e1b 100644 --- a/arch/sh/include/asm/mutex-llsc.h +++ b/arch/sh/include/asm/mutex-llsc.h | |||
@@ -21,38 +21,36 @@ | |||
21 | static inline void | 21 | static inline void |
22 | __mutex_fastpath_lock(atomic_t *count, void (*fail_fn)(atomic_t *)) | 22 | __mutex_fastpath_lock(atomic_t *count, void (*fail_fn)(atomic_t *)) |
23 | { | 23 | { |
24 | int __ex_flag, __res; | 24 | int __done, __res; |
25 | 25 | ||
26 | __asm__ __volatile__ ( | 26 | __asm__ __volatile__ ( |
27 | "movli.l @%2, %0 \n" | 27 | "movli.l @%2, %0 \n" |
28 | "add #-1, %0 \n" | 28 | "add #-1, %0 \n" |
29 | "movco.l %0, @%2 \n" | 29 | "movco.l %0, @%2 \n" |
30 | "movt %1 \n" | 30 | "movt %1 \n" |
31 | : "=&z" (__res), "=&r" (__ex_flag) | 31 | : "=&z" (__res), "=&r" (__done) |
32 | : "r" (&(count)->counter) | 32 | : "r" (&(count)->counter) |
33 | : "t"); | 33 | : "t"); |
34 | 34 | ||
35 | __res |= !__ex_flag; | 35 | if (unlikely(!__done || __res != 0)) |
36 | if (unlikely(__res != 0)) | ||
37 | fail_fn(count); | 36 | fail_fn(count); |
38 | } | 37 | } |
39 | 38 | ||
40 | static inline int | 39 | static inline int |
41 | __mutex_fastpath_lock_retval(atomic_t *count, int (*fail_fn)(atomic_t *)) | 40 | __mutex_fastpath_lock_retval(atomic_t *count, int (*fail_fn)(atomic_t *)) |
42 | { | 41 | { |
43 | int __ex_flag, __res; | 42 | int __done, __res; |
44 | 43 | ||
45 | __asm__ __volatile__ ( | 44 | __asm__ __volatile__ ( |
46 | "movli.l @%2, %0 \n" | 45 | "movli.l @%2, %0 \n" |
47 | "add #-1, %0 \n" | 46 | "add #-1, %0 \n" |
48 | "movco.l %0, @%2 \n" | 47 | "movco.l %0, @%2 \n" |
49 | "movt %1 \n" | 48 | "movt %1 \n" |
50 | : "=&z" (__res), "=&r" (__ex_flag) | 49 | : "=&z" (__res), "=&r" (__done) |
51 | : "r" (&(count)->counter) | 50 | : "r" (&(count)->counter) |
52 | : "t"); | 51 | : "t"); |
53 | 52 | ||
54 | __res |= !__ex_flag; | 53 | if (unlikely(!__done || __res != 0)) |
55 | if (unlikely(__res != 0)) | ||
56 | __res = fail_fn(count); | 54 | __res = fail_fn(count); |
57 | 55 | ||
58 | return __res; | 56 | return __res; |
@@ -61,19 +59,18 @@ __mutex_fastpath_lock_retval(atomic_t *count, int (*fail_fn)(atomic_t *)) | |||
61 | static inline void | 59 | static inline void |
62 | __mutex_fastpath_unlock(atomic_t *count, void (*fail_fn)(atomic_t *)) | 60 | __mutex_fastpath_unlock(atomic_t *count, void (*fail_fn)(atomic_t *)) |
63 | { | 61 | { |
64 | int __ex_flag, __res; | 62 | int __done, __res; |
65 | 63 | ||
66 | __asm__ __volatile__ ( | 64 | __asm__ __volatile__ ( |
67 | "movli.l @%2, %0 \n\t" | 65 | "movli.l @%2, %0 \n\t" |
68 | "add #1, %0 \n\t" | 66 | "add #1, %0 \n\t" |
69 | "movco.l %0, @%2 \n\t" | 67 | "movco.l %0, @%2 \n\t" |
70 | "movt %1 \n\t" | 68 | "movt %1 \n\t" |
71 | : "=&z" (__res), "=&r" (__ex_flag) | 69 | : "=&z" (__res), "=&r" (__done) |
72 | : "r" (&(count)->counter) | 70 | : "r" (&(count)->counter) |
73 | : "t"); | 71 | : "t"); |
74 | 72 | ||
75 | __res |= !__ex_flag; | 73 | if (unlikely(!__done || __res <= 0)) |
76 | if (unlikely(__res <= 0)) | ||
77 | fail_fn(count); | 74 | fail_fn(count); |
78 | } | 75 | } |
79 | 76 | ||
diff --git a/arch/sh/include/asm/syscall_32.h b/arch/sh/include/asm/syscall_32.h index 05a868a71ef..5bc34681d99 100644 --- a/arch/sh/include/asm/syscall_32.h +++ b/arch/sh/include/asm/syscall_32.h | |||
@@ -21,23 +21,10 @@ static inline void syscall_rollback(struct task_struct *task, | |||
21 | */ | 21 | */ |
22 | } | 22 | } |
23 | 23 | ||
24 | static inline bool syscall_has_error(struct pt_regs *regs) | ||
25 | { | ||
26 | return (regs->sr & 0x1) ? true : false; | ||
27 | } | ||
28 | static inline void syscall_set_error(struct pt_regs *regs) | ||
29 | { | ||
30 | regs->sr |= 0x1; | ||
31 | } | ||
32 | static inline void syscall_clear_error(struct pt_regs *regs) | ||
33 | { | ||
34 | regs->sr &= ~0x1; | ||
35 | } | ||
36 | |||
37 | static inline long syscall_get_error(struct task_struct *task, | 24 | static inline long syscall_get_error(struct task_struct *task, |
38 | struct pt_regs *regs) | 25 | struct pt_regs *regs) |
39 | { | 26 | { |
40 | return syscall_has_error(regs) ? regs->regs[0] : 0; | 27 | return IS_ERR_VALUE(regs->regs[0]) ? regs->regs[0] : 0; |
41 | } | 28 | } |
42 | 29 | ||
43 | static inline long syscall_get_return_value(struct task_struct *task, | 30 | static inline long syscall_get_return_value(struct task_struct *task, |
@@ -50,13 +37,10 @@ static inline void syscall_set_return_value(struct task_struct *task, | |||
50 | struct pt_regs *regs, | 37 | struct pt_regs *regs, |
51 | int error, long val) | 38 | int error, long val) |
52 | { | 39 | { |
53 | if (error) { | 40 | if (error) |
54 | syscall_set_error(regs); | ||
55 | regs->regs[0] = -error; | 41 | regs->regs[0] = -error; |
56 | } else { | 42 | else |
57 | syscall_clear_error(regs); | ||
58 | regs->regs[0] = val; | 43 | regs->regs[0] = val; |
59 | } | ||
60 | } | 44 | } |
61 | 45 | ||
62 | static inline void syscall_get_arguments(struct task_struct *task, | 46 | static inline void syscall_get_arguments(struct task_struct *task, |
diff --git a/arch/sh/include/asm/syscall_64.h b/arch/sh/include/asm/syscall_64.h index e1143b9784d..c3561ca72be 100644 --- a/arch/sh/include/asm/syscall_64.h +++ b/arch/sh/include/asm/syscall_64.h | |||
@@ -21,23 +21,10 @@ static inline void syscall_rollback(struct task_struct *task, | |||
21 | */ | 21 | */ |
22 | } | 22 | } |
23 | 23 | ||
24 | static inline bool syscall_has_error(struct pt_regs *regs) | ||
25 | { | ||
26 | return (regs->sr & 0x1) ? true : false; | ||
27 | } | ||
28 | static inline void syscall_set_error(struct pt_regs *regs) | ||
29 | { | ||
30 | regs->sr |= 0x1; | ||
31 | } | ||
32 | static inline void syscall_clear_error(struct pt_regs *regs) | ||
33 | { | ||
34 | regs->sr &= ~0x1; | ||
35 | } | ||
36 | |||
37 | static inline long syscall_get_error(struct task_struct *task, | 24 | static inline long syscall_get_error(struct task_struct *task, |
38 | struct pt_regs *regs) | 25 | struct pt_regs *regs) |
39 | { | 26 | { |
40 | return syscall_has_error(regs) ? regs->regs[9] : 0; | 27 | return IS_ERR_VALUE(regs->regs[9]) ? regs->regs[9] : 0; |
41 | } | 28 | } |
42 | 29 | ||
43 | static inline long syscall_get_return_value(struct task_struct *task, | 30 | static inline long syscall_get_return_value(struct task_struct *task, |
@@ -50,13 +37,10 @@ static inline void syscall_set_return_value(struct task_struct *task, | |||
50 | struct pt_regs *regs, | 37 | struct pt_regs *regs, |
51 | int error, long val) | 38 | int error, long val) |
52 | { | 39 | { |
53 | if (error) { | 40 | if (error) |
54 | syscall_set_error(regs); | ||
55 | regs->regs[9] = -error; | 41 | regs->regs[9] = -error; |
56 | } else { | 42 | else |
57 | syscall_clear_error(regs); | ||
58 | regs->regs[9] = val; | 43 | regs->regs[9] = val; |
59 | } | ||
60 | } | 44 | } |
61 | 45 | ||
62 | static inline void syscall_get_arguments(struct task_struct *task, | 46 | static inline void syscall_get_arguments(struct task_struct *task, |
diff --git a/arch/sh/kernel/cpu/sh4/fpu.c b/arch/sh/kernel/cpu/sh4/fpu.c index 2780917c008..e3ea5411da6 100644 --- a/arch/sh/kernel/cpu/sh4/fpu.c +++ b/arch/sh/kernel/cpu/sh4/fpu.c | |||
@@ -423,7 +423,7 @@ static int ieee_fpe_handler(struct pt_regs *regs) | |||
423 | int m; | 423 | int m; |
424 | unsigned int hx; | 424 | unsigned int hx; |
425 | 425 | ||
426 | m = (finsn >> 9) & 0x7; | 426 | m = (finsn >> 8) & 0x7; |
427 | hx = tsk->thread.fpu.hard.fp_regs[m]; | 427 | hx = tsk->thread.fpu.hard.fp_regs[m]; |
428 | 428 | ||
429 | if ((tsk->thread.fpu.hard.fpscr & FPSCR_CAUSE_ERROR) | 429 | if ((tsk->thread.fpu.hard.fpscr & FPSCR_CAUSE_ERROR) |
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index 53424750857..370d2cfa34e 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c | |||
@@ -262,11 +262,11 @@ void __init setup_bootmem_allocator(unsigned long free_pfn) | |||
262 | BOOTMEM_DEFAULT); | 262 | BOOTMEM_DEFAULT); |
263 | 263 | ||
264 | /* | 264 | /* |
265 | * reserve physical page 0 - it's a special BIOS page on many boxes, | 265 | * Reserve physical pages below CONFIG_ZERO_PAGE_OFFSET. |
266 | * enabling clean reboots, SMP operation, laptop functions. | ||
267 | */ | 266 | */ |
268 | reserve_bootmem(__MEMORY_START, CONFIG_ZERO_PAGE_OFFSET, | 267 | if (CONFIG_ZERO_PAGE_OFFSET != 0) |
269 | BOOTMEM_DEFAULT); | 268 | reserve_bootmem(__MEMORY_START, CONFIG_ZERO_PAGE_OFFSET, |
269 | BOOTMEM_DEFAULT); | ||
270 | 270 | ||
271 | sparse_memory_present_with_active_regions(0); | 271 | sparse_memory_present_with_active_regions(0); |
272 | 272 | ||
diff --git a/arch/sh/kernel/signal_32.c b/arch/sh/kernel/signal_32.c index 77c21bde376..17784e19ae3 100644 --- a/arch/sh/kernel/signal_32.c +++ b/arch/sh/kernel/signal_32.c | |||
@@ -510,7 +510,6 @@ handle_syscall_restart(unsigned long save_r0, struct pt_regs *regs, | |||
510 | case -ERESTARTNOHAND: | 510 | case -ERESTARTNOHAND: |
511 | no_system_call_restart: | 511 | no_system_call_restart: |
512 | regs->regs[0] = -EINTR; | 512 | regs->regs[0] = -EINTR; |
513 | regs->sr |= 1; | ||
514 | break; | 513 | break; |
515 | 514 | ||
516 | case -ERESTARTSYS: | 515 | case -ERESTARTSYS: |
@@ -589,8 +588,7 @@ static void do_signal(struct pt_regs *regs, unsigned int save_r0) | |||
589 | 588 | ||
590 | signr = get_signal_to_deliver(&info, &ka, regs, NULL); | 589 | signr = get_signal_to_deliver(&info, &ka, regs, NULL); |
591 | if (signr > 0) { | 590 | if (signr > 0) { |
592 | if (regs->sr & 1) | 591 | handle_syscall_restart(save_r0, regs, &ka.sa); |
593 | handle_syscall_restart(save_r0, regs, &ka.sa); | ||
594 | 592 | ||
595 | /* Whee! Actually deliver the signal. */ | 593 | /* Whee! Actually deliver the signal. */ |
596 | if (handle_signal(signr, &ka, &info, oldset, | 594 | if (handle_signal(signr, &ka, &info, oldset, |
diff --git a/arch/sh/kernel/signal_64.c b/arch/sh/kernel/signal_64.c index b22fdfaaa19..0663a0ee602 100644 --- a/arch/sh/kernel/signal_64.c +++ b/arch/sh/kernel/signal_64.c | |||
@@ -60,7 +60,6 @@ handle_syscall_restart(struct pt_regs *regs, struct sigaction *sa) | |||
60 | case -ERESTARTNOHAND: | 60 | case -ERESTARTNOHAND: |
61 | no_system_call_restart: | 61 | no_system_call_restart: |
62 | regs->regs[REG_RET] = -EINTR; | 62 | regs->regs[REG_RET] = -EINTR; |
63 | regs->sr |= 1; | ||
64 | break; | 63 | break; |
65 | 64 | ||
66 | case -ERESTARTSYS: | 65 | case -ERESTARTSYS: |
@@ -109,8 +108,7 @@ static int do_signal(struct pt_regs *regs, sigset_t *oldset) | |||
109 | 108 | ||
110 | signr = get_signal_to_deliver(&info, &ka, regs, 0); | 109 | signr = get_signal_to_deliver(&info, &ka, regs, 0); |
111 | if (signr > 0) { | 110 | if (signr > 0) { |
112 | if (regs->sr & 1) | 111 | handle_syscall_restart(regs, &ka.sa); |
113 | handle_syscall_restart(regs, &ka.sa); | ||
114 | 112 | ||
115 | /* Whee! Actually deliver the signal. */ | 113 | /* Whee! Actually deliver the signal. */ |
116 | if (handle_signal(signr, &info, &ka, oldset, regs) == 0) { | 114 | if (handle_signal(signr, &info, &ka, oldset, regs) == 0) { |
diff --git a/arch/sh/lib/checksum.S b/arch/sh/lib/checksum.S index cbdd0d40e54..356c8ec9289 100644 --- a/arch/sh/lib/checksum.S +++ b/arch/sh/lib/checksum.S | |||
@@ -36,8 +36,7 @@ | |||
36 | */ | 36 | */ |
37 | 37 | ||
38 | /* | 38 | /* |
39 | * unsigned int csum_partial(const unsigned char *buf, int len, | 39 | * asmlinkage __wsum csum_partial(const void *buf, int len, __wsum sum); |
40 | * unsigned int sum); | ||
41 | */ | 40 | */ |
42 | 41 | ||
43 | .text | 42 | .text |
@@ -49,11 +48,31 @@ ENTRY(csum_partial) | |||
49 | * Fortunately, it is easy to convert 2-byte alignment to 4-byte | 48 | * Fortunately, it is easy to convert 2-byte alignment to 4-byte |
50 | * alignment for the unrolled loop. | 49 | * alignment for the unrolled loop. |
51 | */ | 50 | */ |
52 | mov r5, r1 | ||
53 | mov r4, r0 | 51 | mov r4, r0 |
54 | tst #2, r0 ! Check alignment. | 52 | tst #3, r0 ! Check alignment. |
55 | bt 2f ! Jump if alignment is ok. | 53 | bt/s 2f ! Jump if alignment is ok. |
54 | mov r4, r7 ! Keep a copy to check for alignment | ||
56 | ! | 55 | ! |
56 | tst #1, r0 ! Check alignment. | ||
57 | bt 21f ! Jump if alignment is boundary of 2bytes. | ||
58 | |||
59 | ! buf is odd | ||
60 | tst r5, r5 | ||
61 | add #-1, r5 | ||
62 | bt 9f | ||
63 | mov.b @r4+, r0 | ||
64 | extu.b r0, r0 | ||
65 | addc r0, r6 ! t=0 from previous tst | ||
66 | mov r6, r0 | ||
67 | shll8 r6 | ||
68 | shlr16 r0 | ||
69 | shlr8 r0 | ||
70 | or r0, r6 | ||
71 | mov r4, r0 | ||
72 | tst #2, r0 | ||
73 | bt 2f | ||
74 | 21: | ||
75 | ! buf is 2 byte aligned (len could be 0) | ||
57 | add #-2, r5 ! Alignment uses up two bytes. | 76 | add #-2, r5 ! Alignment uses up two bytes. |
58 | cmp/pz r5 ! | 77 | cmp/pz r5 ! |
59 | bt/s 1f ! Jump if we had at least two bytes. | 78 | bt/s 1f ! Jump if we had at least two bytes. |
@@ -61,16 +80,17 @@ ENTRY(csum_partial) | |||
61 | bra 6f | 80 | bra 6f |
62 | add #2, r5 ! r5 was < 2. Deal with it. | 81 | add #2, r5 ! r5 was < 2. Deal with it. |
63 | 1: | 82 | 1: |
64 | mov r5, r1 ! Save new len for later use. | ||
65 | mov.w @r4+, r0 | 83 | mov.w @r4+, r0 |
66 | extu.w r0, r0 | 84 | extu.w r0, r0 |
67 | addc r0, r6 | 85 | addc r0, r6 |
68 | bf 2f | 86 | bf 2f |
69 | add #1, r6 | 87 | add #1, r6 |
70 | 2: | 88 | 2: |
89 | ! buf is 4 byte aligned (len could be 0) | ||
90 | mov r5, r1 | ||
71 | mov #-5, r0 | 91 | mov #-5, r0 |
72 | shld r0, r5 | 92 | shld r0, r1 |
73 | tst r5, r5 | 93 | tst r1, r1 |
74 | bt/s 4f ! if it's =0, go to 4f | 94 | bt/s 4f ! if it's =0, go to 4f |
75 | clrt | 95 | clrt |
76 | .align 2 | 96 | .align 2 |
@@ -92,30 +112,31 @@ ENTRY(csum_partial) | |||
92 | addc r0, r6 | 112 | addc r0, r6 |
93 | addc r2, r6 | 113 | addc r2, r6 |
94 | movt r0 | 114 | movt r0 |
95 | dt r5 | 115 | dt r1 |
96 | bf/s 3b | 116 | bf/s 3b |
97 | cmp/eq #1, r0 | 117 | cmp/eq #1, r0 |
98 | ! here, we know r5==0 | 118 | ! here, we know r1==0 |
99 | addc r5, r6 ! add carry to r6 | 119 | addc r1, r6 ! add carry to r6 |
100 | 4: | 120 | 4: |
101 | mov r1, r0 | 121 | mov r5, r0 |
102 | and #0x1c, r0 | 122 | and #0x1c, r0 |
103 | tst r0, r0 | 123 | tst r0, r0 |
104 | bt/s 6f | 124 | bt 6f |
105 | mov r0, r5 | 125 | ! 4 bytes or more remaining |
106 | shlr2 r5 | 126 | mov r0, r1 |
127 | shlr2 r1 | ||
107 | mov #0, r2 | 128 | mov #0, r2 |
108 | 5: | 129 | 5: |
109 | addc r2, r6 | 130 | addc r2, r6 |
110 | mov.l @r4+, r2 | 131 | mov.l @r4+, r2 |
111 | movt r0 | 132 | movt r0 |
112 | dt r5 | 133 | dt r1 |
113 | bf/s 5b | 134 | bf/s 5b |
114 | cmp/eq #1, r0 | 135 | cmp/eq #1, r0 |
115 | addc r2, r6 | 136 | addc r2, r6 |
116 | addc r5, r6 ! r5==0 here, so it means add carry-bit | 137 | addc r1, r6 ! r1==0 here, so it means add carry-bit |
117 | 6: | 138 | 6: |
118 | mov r1, r5 | 139 | ! 3 bytes or less remaining |
119 | mov #3, r0 | 140 | mov #3, r0 |
120 | and r0, r5 | 141 | and r0, r5 |
121 | tst r5, r5 | 142 | tst r5, r5 |
@@ -139,8 +160,18 @@ ENTRY(csum_partial) | |||
139 | 8: | 160 | 8: |
140 | addc r0, r6 | 161 | addc r0, r6 |
141 | mov #0, r0 | 162 | mov #0, r0 |
142 | addc r0, r6 | 163 | addc r0, r6 |
143 | 9: | 164 | 9: |
165 | ! Check if the buffer was misaligned, if so realign sum | ||
166 | mov r7, r0 | ||
167 | tst #1, r0 | ||
168 | bt 10f | ||
169 | mov r6, r0 | ||
170 | shll8 r6 | ||
171 | shlr16 r0 | ||
172 | shlr8 r0 | ||
173 | or r0, r6 | ||
174 | 10: | ||
144 | rts | 175 | rts |
145 | mov r6, r0 | 176 | mov r6, r0 |
146 | 177 | ||
diff --git a/arch/sparc/include/asm/cpudata_64.h b/arch/sparc/include/asm/cpudata_64.h index 7da7c13d23c..a11b89ee9ef 100644 --- a/arch/sparc/include/asm/cpudata_64.h +++ b/arch/sparc/include/asm/cpudata_64.h | |||
@@ -17,7 +17,7 @@ | |||
17 | typedef struct { | 17 | typedef struct { |
18 | /* Dcache line 1 */ | 18 | /* Dcache line 1 */ |
19 | unsigned int __softirq_pending; /* must be 1st, see rtrap.S */ | 19 | unsigned int __softirq_pending; /* must be 1st, see rtrap.S */ |
20 | unsigned int __pad0; | 20 | unsigned int __nmi_count; |
21 | unsigned long clock_tick; /* %tick's per second */ | 21 | unsigned long clock_tick; /* %tick's per second */ |
22 | unsigned long __pad; | 22 | unsigned long __pad; |
23 | unsigned int __pad1; | 23 | unsigned int __pad1; |
diff --git a/arch/sparc/include/asm/irq_64.h b/arch/sparc/include/asm/irq_64.h index d47d4a1955a..1934f2cbf51 100644 --- a/arch/sparc/include/asm/irq_64.h +++ b/arch/sparc/include/asm/irq_64.h | |||
@@ -66,9 +66,6 @@ extern void virt_irq_free(unsigned int virt_irq); | |||
66 | extern void __init init_IRQ(void); | 66 | extern void __init init_IRQ(void); |
67 | extern void fixup_irqs(void); | 67 | extern void fixup_irqs(void); |
68 | 68 | ||
69 | extern int register_perfctr_intr(void (*handler)(struct pt_regs *)); | ||
70 | extern void release_perfctr_intr(void (*handler)(struct pt_regs *)); | ||
71 | |||
72 | static inline void set_softint(unsigned long bits) | 69 | static inline void set_softint(unsigned long bits) |
73 | { | 70 | { |
74 | __asm__ __volatile__("wr %0, 0x0, %%set_softint" | 71 | __asm__ __volatile__("wr %0, 0x0, %%set_softint" |
@@ -98,5 +95,6 @@ void __trigger_all_cpu_backtrace(void); | |||
98 | extern void *hardirq_stack[NR_CPUS]; | 95 | extern void *hardirq_stack[NR_CPUS]; |
99 | extern void *softirq_stack[NR_CPUS]; | 96 | extern void *softirq_stack[NR_CPUS]; |
100 | #define __ARCH_HAS_DO_SOFTIRQ | 97 | #define __ARCH_HAS_DO_SOFTIRQ |
98 | #define ARCH_HAS_NMI_WATCHDOG | ||
101 | 99 | ||
102 | #endif | 100 | #endif |
diff --git a/arch/sparc/include/asm/kdebug_64.h b/arch/sparc/include/asm/kdebug_64.h index f905b773235..feb3578e12c 100644 --- a/arch/sparc/include/asm/kdebug_64.h +++ b/arch/sparc/include/asm/kdebug_64.h | |||
@@ -14,6 +14,8 @@ enum die_val { | |||
14 | DIE_TRAP, | 14 | DIE_TRAP, |
15 | DIE_TRAP_TL1, | 15 | DIE_TRAP_TL1, |
16 | DIE_CALL, | 16 | DIE_CALL, |
17 | DIE_NMI, | ||
18 | DIE_NMIWATCHDOG, | ||
17 | }; | 19 | }; |
18 | 20 | ||
19 | #endif | 21 | #endif |
diff --git a/arch/sparc/include/asm/nmi.h b/arch/sparc/include/asm/nmi.h new file mode 100644 index 00000000000..fbd546dd4fe --- /dev/null +++ b/arch/sparc/include/asm/nmi.h | |||
@@ -0,0 +1,10 @@ | |||
1 | #ifndef __NMI_H | ||
2 | #define __NMI_H | ||
3 | |||
4 | extern int __init nmi_init(void); | ||
5 | extern void perfctr_irq(int irq, struct pt_regs *regs); | ||
6 | extern void nmi_adjust_hz(unsigned int new_hz); | ||
7 | |||
8 | extern int nmi_usable; | ||
9 | |||
10 | #endif /* __NMI_H */ | ||
diff --git a/arch/sparc/include/asm/pcr.h b/arch/sparc/include/asm/pcr.h new file mode 100644 index 00000000000..a2f5c61f924 --- /dev/null +++ b/arch/sparc/include/asm/pcr.h | |||
@@ -0,0 +1,46 @@ | |||
1 | #ifndef __PCR_H | ||
2 | #define __PCR_H | ||
3 | |||
4 | struct pcr_ops { | ||
5 | u64 (*read)(void); | ||
6 | void (*write)(u64); | ||
7 | }; | ||
8 | extern const struct pcr_ops *pcr_ops; | ||
9 | |||
10 | extern void deferred_pcr_work_irq(int irq, struct pt_regs *regs); | ||
11 | extern void schedule_deferred_pcr_work(void); | ||
12 | |||
13 | #define PCR_PIC_PRIV 0x00000001 /* PIC access is privileged */ | ||
14 | #define PCR_STRACE 0x00000002 /* Trace supervisor events */ | ||
15 | #define PCR_UTRACE 0x00000004 /* Trace user events */ | ||
16 | #define PCR_N2_HTRACE 0x00000008 /* Trace hypervisor events */ | ||
17 | #define PCR_N2_TOE_OV0 0x00000010 /* Trap if PIC 0 overflows */ | ||
18 | #define PCR_N2_TOE_OV1 0x00000020 /* Trap if PIC 1 overflows */ | ||
19 | #define PCR_N2_MASK0 0x00003fc0 | ||
20 | #define PCR_N2_MASK0_SHIFT 6 | ||
21 | #define PCR_N2_SL0 0x0003c000 | ||
22 | #define PCR_N2_SL0_SHIFT 14 | ||
23 | #define PCR_N2_OV0 0x00040000 | ||
24 | #define PCR_N2_MASK1 0x07f80000 | ||
25 | #define PCR_N2_MASK1_SHIFT 19 | ||
26 | #define PCR_N2_SL1 0x78000000 | ||
27 | #define PCR_N2_SL1_SHIFT 27 | ||
28 | #define PCR_N2_OV1 0x80000000 | ||
29 | |||
30 | extern unsigned int picl_shift; | ||
31 | |||
32 | /* In order to commonize as much of the implementation as | ||
33 | * possible, we use PICH as our counter. Mostly this is | ||
34 | * to accomodate Niagara-1 which can only count insn cycles | ||
35 | * in PICH. | ||
36 | */ | ||
37 | static inline u64 picl_value(unsigned int nmi_hz) | ||
38 | { | ||
39 | u32 delta = local_cpu_data().clock_tick / (nmi_hz << picl_shift); | ||
40 | |||
41 | return ((u64)((0 - delta) & 0xffffffff)) << 32; | ||
42 | } | ||
43 | |||
44 | extern u64 pcr_enable; | ||
45 | |||
46 | #endif /* __PCR_H */ | ||
diff --git a/arch/sparc/include/asm/pil.h b/arch/sparc/include/asm/pil.h index d573820c0ff..32a7efe76d0 100644 --- a/arch/sparc/include/asm/pil.h +++ b/arch/sparc/include/asm/pil.h | |||
@@ -23,6 +23,7 @@ | |||
23 | #define PIL_SMP_CTX_NEW_VERSION 4 | 23 | #define PIL_SMP_CTX_NEW_VERSION 4 |
24 | #define PIL_DEVICE_IRQ 5 | 24 | #define PIL_DEVICE_IRQ 5 |
25 | #define PIL_SMP_CALL_FUNC_SNGL 6 | 25 | #define PIL_SMP_CALL_FUNC_SNGL 6 |
26 | #define PIL_DEFERRED_PCR_WORK 7 | ||
26 | #define PIL_NORMAL_MAX 14 | 27 | #define PIL_NORMAL_MAX 14 |
27 | #define PIL_NMI 15 | 28 | #define PIL_NMI 15 |
28 | 29 | ||
diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile index 53adcaa0348..54742e58831 100644 --- a/arch/sparc/kernel/Makefile +++ b/arch/sparc/kernel/Makefile | |||
@@ -52,6 +52,8 @@ obj-$(CONFIG_SPARC64) += visemul.o | |||
52 | obj-$(CONFIG_SPARC64) += hvapi.o | 52 | obj-$(CONFIG_SPARC64) += hvapi.o |
53 | obj-$(CONFIG_SPARC64) += sstate.o | 53 | obj-$(CONFIG_SPARC64) += sstate.o |
54 | obj-$(CONFIG_SPARC64) += mdesc.o | 54 | obj-$(CONFIG_SPARC64) += mdesc.o |
55 | obj-$(CONFIG_SPARC64) += pcr.o | ||
56 | obj-$(CONFIG_SPARC64) += nmi.o | ||
55 | 57 | ||
56 | # sparc32 do not use GENERIC_HARDIRQS but uses the generic devres implementation | 58 | # sparc32 do not use GENERIC_HARDIRQS but uses the generic devres implementation |
57 | obj-$(CONFIG_SPARC32) += devres.o | 59 | obj-$(CONFIG_SPARC32) += devres.o |
diff --git a/arch/sparc/kernel/cpu.c b/arch/sparc/kernel/cpu.c index 32d32b4824f..d85c3dc4953 100644 --- a/arch/sparc/kernel/cpu.c +++ b/arch/sparc/kernel/cpu.c | |||
@@ -26,6 +26,7 @@ EXPORT_PER_CPU_SYMBOL(__cpu_data); | |||
26 | struct cpu_info { | 26 | struct cpu_info { |
27 | int psr_vers; | 27 | int psr_vers; |
28 | const char *name; | 28 | const char *name; |
29 | const char *pmu_name; | ||
29 | }; | 30 | }; |
30 | 31 | ||
31 | struct fpu_info { | 32 | struct fpu_info { |
@@ -45,6 +46,9 @@ struct manufacturer_info { | |||
45 | #define CPU(ver, _name) \ | 46 | #define CPU(ver, _name) \ |
46 | { .psr_vers = ver, .name = _name } | 47 | { .psr_vers = ver, .name = _name } |
47 | 48 | ||
49 | #define CPU_PMU(ver, _name, _pmu_name) \ | ||
50 | { .psr_vers = ver, .name = _name, .pmu_name = _pmu_name } | ||
51 | |||
48 | #define FPU(ver, _name) \ | 52 | #define FPU(ver, _name) \ |
49 | { .fp_vers = ver, .name = _name } | 53 | { .fp_vers = ver, .name = _name } |
50 | 54 | ||
@@ -183,10 +187,10 @@ static const struct manufacturer_info __initconst manufacturer_info[] = { | |||
183 | },{ | 187 | },{ |
184 | 0x17, | 188 | 0x17, |
185 | .cpu_info = { | 189 | .cpu_info = { |
186 | CPU(0x10, "TI UltraSparc I (SpitFire)"), | 190 | CPU_PMU(0x10, "TI UltraSparc I (SpitFire)", "ultra12"), |
187 | CPU(0x11, "TI UltraSparc II (BlackBird)"), | 191 | CPU_PMU(0x11, "TI UltraSparc II (BlackBird)", "ultra12"), |
188 | CPU(0x12, "TI UltraSparc IIi (Sabre)"), | 192 | CPU_PMU(0x12, "TI UltraSparc IIi (Sabre)", "ultra12"), |
189 | CPU(0x13, "TI UltraSparc IIe (Hummingbird)"), | 193 | CPU_PMU(0x13, "TI UltraSparc IIe (Hummingbird)", "ultra12"), |
190 | CPU(-1, NULL) | 194 | CPU(-1, NULL) |
191 | }, | 195 | }, |
192 | .fpu_info = { | 196 | .fpu_info = { |
@@ -199,7 +203,7 @@ static const struct manufacturer_info __initconst manufacturer_info[] = { | |||
199 | },{ | 203 | },{ |
200 | 0x22, | 204 | 0x22, |
201 | .cpu_info = { | 205 | .cpu_info = { |
202 | CPU(0x10, "TI UltraSparc I (SpitFire)"), | 206 | CPU_PMU(0x10, "TI UltraSparc I (SpitFire)", "ultra12"), |
203 | CPU(-1, NULL) | 207 | CPU(-1, NULL) |
204 | }, | 208 | }, |
205 | .fpu_info = { | 209 | .fpu_info = { |
@@ -209,12 +213,12 @@ static const struct manufacturer_info __initconst manufacturer_info[] = { | |||
209 | },{ | 213 | },{ |
210 | 0x3e, | 214 | 0x3e, |
211 | .cpu_info = { | 215 | .cpu_info = { |
212 | CPU(0x14, "TI UltraSparc III (Cheetah)"), | 216 | CPU_PMU(0x14, "TI UltraSparc III (Cheetah)", "ultra3"), |
213 | CPU(0x15, "TI UltraSparc III+ (Cheetah+)"), | 217 | CPU_PMU(0x15, "TI UltraSparc III+ (Cheetah+)", "ultra3+"), |
214 | CPU(0x16, "TI UltraSparc IIIi (Jalapeno)"), | 218 | CPU_PMU(0x16, "TI UltraSparc IIIi (Jalapeno)", "ultra3i"), |
215 | CPU(0x18, "TI UltraSparc IV (Jaguar)"), | 219 | CPU_PMU(0x18, "TI UltraSparc IV (Jaguar)", "ultra3+"), |
216 | CPU(0x19, "TI UltraSparc IV+ (Panther)"), | 220 | CPU_PMU(0x19, "TI UltraSparc IV+ (Panther)", "ultra4+"), |
217 | CPU(0x22, "TI UltraSparc IIIi+ (Serrano)"), | 221 | CPU_PMU(0x22, "TI UltraSparc IIIi+ (Serrano)", "ultra3i"), |
218 | CPU(-1, NULL) | 222 | CPU(-1, NULL) |
219 | }, | 223 | }, |
220 | .fpu_info = { | 224 | .fpu_info = { |
@@ -234,6 +238,7 @@ static const struct manufacturer_info __initconst manufacturer_info[] = { | |||
234 | 238 | ||
235 | const char *sparc_cpu_type; | 239 | const char *sparc_cpu_type; |
236 | const char *sparc_fpu_type; | 240 | const char *sparc_fpu_type; |
241 | const char *sparc_pmu_type; | ||
237 | 242 | ||
238 | unsigned int fsr_storage; | 243 | unsigned int fsr_storage; |
239 | 244 | ||
@@ -244,6 +249,7 @@ static void set_cpu_and_fpu(int psr_impl, int psr_vers, int fpu_vers) | |||
244 | 249 | ||
245 | sparc_cpu_type = NULL; | 250 | sparc_cpu_type = NULL; |
246 | sparc_fpu_type = NULL; | 251 | sparc_fpu_type = NULL; |
252 | sparc_pmu_type = NULL; | ||
247 | manuf = NULL; | 253 | manuf = NULL; |
248 | 254 | ||
249 | for (i = 0; i < ARRAY_SIZE(manufacturer_info); i++) | 255 | for (i = 0; i < ARRAY_SIZE(manufacturer_info); i++) |
@@ -263,6 +269,7 @@ static void set_cpu_and_fpu(int psr_impl, int psr_vers, int fpu_vers) | |||
263 | { | 269 | { |
264 | if (cpu->psr_vers == psr_vers) { | 270 | if (cpu->psr_vers == psr_vers) { |
265 | sparc_cpu_type = cpu->name; | 271 | sparc_cpu_type = cpu->name; |
272 | sparc_pmu_type = cpu->pmu_name; | ||
266 | sparc_fpu_type = "No FPU"; | 273 | sparc_fpu_type = "No FPU"; |
267 | break; | 274 | break; |
268 | } | 275 | } |
@@ -290,6 +297,8 @@ static void set_cpu_and_fpu(int psr_impl, int psr_vers, int fpu_vers) | |||
290 | psr_impl, fpu_vers); | 297 | psr_impl, fpu_vers); |
291 | sparc_fpu_type = "Unknown FPU"; | 298 | sparc_fpu_type = "Unknown FPU"; |
292 | } | 299 | } |
300 | if (sparc_pmu_type == NULL) | ||
301 | sparc_pmu_type = "Unknown PMU"; | ||
293 | } | 302 | } |
294 | 303 | ||
295 | #ifdef CONFIG_SPARC32 | 304 | #ifdef CONFIG_SPARC32 |
@@ -315,11 +324,13 @@ static void __init sun4v_cpu_probe(void) | |||
315 | case SUN4V_CHIP_NIAGARA1: | 324 | case SUN4V_CHIP_NIAGARA1: |
316 | sparc_cpu_type = "UltraSparc T1 (Niagara)"; | 325 | sparc_cpu_type = "UltraSparc T1 (Niagara)"; |
317 | sparc_fpu_type = "UltraSparc T1 integrated FPU"; | 326 | sparc_fpu_type = "UltraSparc T1 integrated FPU"; |
327 | sparc_pmu_type = "niagara"; | ||
318 | break; | 328 | break; |
319 | 329 | ||
320 | case SUN4V_CHIP_NIAGARA2: | 330 | case SUN4V_CHIP_NIAGARA2: |
321 | sparc_cpu_type = "UltraSparc T2 (Niagara2)"; | 331 | sparc_cpu_type = "UltraSparc T2 (Niagara2)"; |
322 | sparc_fpu_type = "UltraSparc T2 integrated FPU"; | 332 | sparc_fpu_type = "UltraSparc T2 integrated FPU"; |
333 | sparc_pmu_type = "niagara2"; | ||
323 | break; | 334 | break; |
324 | 335 | ||
325 | default: | 336 | default: |
diff --git a/arch/sparc/kernel/irq_64.c b/arch/sparc/kernel/irq_64.c index cab8e028687..e289376198e 100644 --- a/arch/sparc/kernel/irq_64.c +++ b/arch/sparc/kernel/irq_64.c | |||
@@ -196,6 +196,11 @@ int show_interrupts(struct seq_file *p, void *v) | |||
196 | seq_putc(p, '\n'); | 196 | seq_putc(p, '\n'); |
197 | skip: | 197 | skip: |
198 | spin_unlock_irqrestore(&irq_desc[i].lock, flags); | 198 | spin_unlock_irqrestore(&irq_desc[i].lock, flags); |
199 | } else if (i == NR_IRQS) { | ||
200 | seq_printf(p, "NMI: "); | ||
201 | for_each_online_cpu(j) | ||
202 | seq_printf(p, "%10u ", cpu_data(j).__nmi_count); | ||
203 | seq_printf(p, " Non-maskable interrupts\n"); | ||
199 | } | 204 | } |
200 | return 0; | 205 | return 0; |
201 | } | 206 | } |
@@ -778,69 +783,6 @@ void do_softirq(void) | |||
778 | local_irq_restore(flags); | 783 | local_irq_restore(flags); |
779 | } | 784 | } |
780 | 785 | ||
781 | static void unhandled_perf_irq(struct pt_regs *regs) | ||
782 | { | ||
783 | unsigned long pcr, pic; | ||
784 | |||
785 | read_pcr(pcr); | ||
786 | read_pic(pic); | ||
787 | |||
788 | write_pcr(0); | ||
789 | |||
790 | printk(KERN_EMERG "CPU %d: Got unexpected perf counter IRQ.\n", | ||
791 | smp_processor_id()); | ||
792 | printk(KERN_EMERG "CPU %d: PCR[%016lx] PIC[%016lx]\n", | ||
793 | smp_processor_id(), pcr, pic); | ||
794 | } | ||
795 | |||
796 | /* Almost a direct copy of the powerpc PMC code. */ | ||
797 | static DEFINE_SPINLOCK(perf_irq_lock); | ||
798 | static void *perf_irq_owner_caller; /* mostly for debugging */ | ||
799 | static void (*perf_irq)(struct pt_regs *regs) = unhandled_perf_irq; | ||
800 | |||
801 | /* Invoked from level 15 PIL handler in trap table. */ | ||
802 | void perfctr_irq(int irq, struct pt_regs *regs) | ||
803 | { | ||
804 | clear_softint(1 << irq); | ||
805 | perf_irq(regs); | ||
806 | } | ||
807 | |||
808 | int register_perfctr_intr(void (*handler)(struct pt_regs *)) | ||
809 | { | ||
810 | int ret; | ||
811 | |||
812 | if (!handler) | ||
813 | return -EINVAL; | ||
814 | |||
815 | spin_lock(&perf_irq_lock); | ||
816 | if (perf_irq != unhandled_perf_irq) { | ||
817 | printk(KERN_WARNING "register_perfctr_intr: " | ||
818 | "perf IRQ busy (reserved by caller %p)\n", | ||
819 | perf_irq_owner_caller); | ||
820 | ret = -EBUSY; | ||
821 | goto out; | ||
822 | } | ||
823 | |||
824 | perf_irq_owner_caller = __builtin_return_address(0); | ||
825 | perf_irq = handler; | ||
826 | |||
827 | ret = 0; | ||
828 | out: | ||
829 | spin_unlock(&perf_irq_lock); | ||
830 | |||
831 | return ret; | ||
832 | } | ||
833 | EXPORT_SYMBOL_GPL(register_perfctr_intr); | ||
834 | |||
835 | void release_perfctr_intr(void (*handler)(struct pt_regs *)) | ||
836 | { | ||
837 | spin_lock(&perf_irq_lock); | ||
838 | perf_irq_owner_caller = NULL; | ||
839 | perf_irq = unhandled_perf_irq; | ||
840 | spin_unlock(&perf_irq_lock); | ||
841 | } | ||
842 | EXPORT_SYMBOL_GPL(release_perfctr_intr); | ||
843 | |||
844 | #ifdef CONFIG_HOTPLUG_CPU | 786 | #ifdef CONFIG_HOTPLUG_CPU |
845 | void fixup_irqs(void) | 787 | void fixup_irqs(void) |
846 | { | 788 | { |
diff --git a/arch/sparc/kernel/kernel.h b/arch/sparc/kernel/kernel.h index 81a972e8d8e..15d8a3f645c 100644 --- a/arch/sparc/kernel/kernel.h +++ b/arch/sparc/kernel/kernel.h | |||
@@ -5,6 +5,7 @@ | |||
5 | 5 | ||
6 | /* cpu.c */ | 6 | /* cpu.c */ |
7 | extern const char *sparc_cpu_type; | 7 | extern const char *sparc_cpu_type; |
8 | extern const char *sparc_pmu_type; | ||
8 | extern const char *sparc_fpu_type; | 9 | extern const char *sparc_fpu_type; |
9 | 10 | ||
10 | extern unsigned int fsr_storage; | 11 | extern unsigned int fsr_storage; |
diff --git a/arch/sparc/kernel/nmi.c b/arch/sparc/kernel/nmi.c new file mode 100644 index 00000000000..09f088ed4a6 --- /dev/null +++ b/arch/sparc/kernel/nmi.c | |||
@@ -0,0 +1,224 @@ | |||
1 | /* Pseudo NMI support on sparc64 systems. | ||
2 | * | ||
3 | * Copyright (C) 2009 David S. Miller <davem@davemloft.net> | ||
4 | * | ||
5 | * The NMI watchdog support and infrastructure is based almost | ||
6 | * entirely upon the x86 NMI support code. | ||
7 | */ | ||
8 | #include <linux/kernel.h> | ||
9 | #include <linux/param.h> | ||
10 | #include <linux/init.h> | ||
11 | #include <linux/percpu.h> | ||
12 | #include <linux/nmi.h> | ||
13 | #include <linux/module.h> | ||
14 | #include <linux/kprobes.h> | ||
15 | #include <linux/kernel_stat.h> | ||
16 | #include <linux/slab.h> | ||
17 | #include <linux/kdebug.h> | ||
18 | #include <linux/delay.h> | ||
19 | #include <linux/smp.h> | ||
20 | |||
21 | #include <asm/ptrace.h> | ||
22 | #include <asm/local.h> | ||
23 | #include <asm/pcr.h> | ||
24 | |||
25 | /* We don't have a real NMI on sparc64, but we can fake one | ||
26 | * up using profiling counter overflow interrupts and interrupt | ||
27 | * levels. | ||
28 | * | ||
29 | * The profile overflow interrupts at level 15, so we use | ||
30 | * level 14 as our IRQ off level. | ||
31 | */ | ||
32 | |||
33 | static int nmi_watchdog_active; | ||
34 | static int panic_on_timeout; | ||
35 | |||
36 | int nmi_usable; | ||
37 | EXPORT_SYMBOL_GPL(nmi_usable); | ||
38 | |||
39 | static unsigned int nmi_hz = HZ; | ||
40 | |||
41 | static DEFINE_PER_CPU(unsigned int, last_irq_sum); | ||
42 | static DEFINE_PER_CPU(local_t, alert_counter); | ||
43 | static DEFINE_PER_CPU(int, nmi_touch); | ||
44 | |||
45 | void touch_nmi_watchdog(void) | ||
46 | { | ||
47 | if (nmi_watchdog_active) { | ||
48 | int cpu; | ||
49 | |||
50 | for_each_present_cpu(cpu) { | ||
51 | if (per_cpu(nmi_touch, cpu) != 1) | ||
52 | per_cpu(nmi_touch, cpu) = 1; | ||
53 | } | ||
54 | } | ||
55 | |||
56 | touch_softlockup_watchdog(); | ||
57 | } | ||
58 | EXPORT_SYMBOL(touch_nmi_watchdog); | ||
59 | |||
60 | static void die_nmi(const char *str, struct pt_regs *regs, int do_panic) | ||
61 | { | ||
62 | if (notify_die(DIE_NMIWATCHDOG, str, regs, 0, | ||
63 | pt_regs_trap_type(regs), SIGINT) == NOTIFY_STOP) | ||
64 | return; | ||
65 | |||
66 | console_verbose(); | ||
67 | bust_spinlocks(1); | ||
68 | |||
69 | printk(KERN_EMERG "%s", str); | ||
70 | printk(" on CPU%d, ip %08lx, registers:\n", | ||
71 | smp_processor_id(), regs->tpc); | ||
72 | show_regs(regs); | ||
73 | |||
74 | bust_spinlocks(0); | ||
75 | |||
76 | if (do_panic || panic_on_oops) | ||
77 | panic("Non maskable interrupt"); | ||
78 | |||
79 | local_irq_enable(); | ||
80 | do_exit(SIGBUS); | ||
81 | } | ||
82 | |||
83 | notrace __kprobes void perfctr_irq(int irq, struct pt_regs *regs) | ||
84 | { | ||
85 | unsigned int sum, touched = 0; | ||
86 | int cpu = smp_processor_id(); | ||
87 | |||
88 | clear_softint(1 << irq); | ||
89 | pcr_ops->write(PCR_PIC_PRIV); | ||
90 | |||
91 | local_cpu_data().__nmi_count++; | ||
92 | |||
93 | if (notify_die(DIE_NMI, "nmi", regs, 0, | ||
94 | pt_regs_trap_type(regs), SIGINT) == NOTIFY_STOP) | ||
95 | touched = 1; | ||
96 | |||
97 | sum = kstat_irqs_cpu(0, cpu); | ||
98 | if (__get_cpu_var(nmi_touch)) { | ||
99 | __get_cpu_var(nmi_touch) = 0; | ||
100 | touched = 1; | ||
101 | } | ||
102 | if (!touched && __get_cpu_var(last_irq_sum) == sum) { | ||
103 | local_inc(&__get_cpu_var(alert_counter)); | ||
104 | if (local_read(&__get_cpu_var(alert_counter)) == 5 * nmi_hz) | ||
105 | die_nmi("BUG: NMI Watchdog detected LOCKUP", | ||
106 | regs, panic_on_timeout); | ||
107 | } else { | ||
108 | __get_cpu_var(last_irq_sum) = sum; | ||
109 | local_set(&__get_cpu_var(alert_counter), 0); | ||
110 | } | ||
111 | if (nmi_usable) { | ||
112 | write_pic(picl_value(nmi_hz)); | ||
113 | pcr_ops->write(pcr_enable); | ||
114 | } | ||
115 | } | ||
116 | |||
117 | static inline unsigned int get_nmi_count(int cpu) | ||
118 | { | ||
119 | return cpu_data(cpu).__nmi_count; | ||
120 | } | ||
121 | |||
122 | static int endflag __initdata; | ||
123 | |||
124 | static __init void nmi_cpu_busy(void *data) | ||
125 | { | ||
126 | local_irq_enable_in_hardirq(); | ||
127 | while (endflag == 0) | ||
128 | mb(); | ||
129 | } | ||
130 | |||
131 | static void report_broken_nmi(int cpu, int *prev_nmi_count) | ||
132 | { | ||
133 | printk(KERN_CONT "\n"); | ||
134 | |||
135 | printk(KERN_WARNING | ||
136 | "WARNING: CPU#%d: NMI appears to be stuck (%d->%d)!\n", | ||
137 | cpu, prev_nmi_count[cpu], get_nmi_count(cpu)); | ||
138 | |||
139 | printk(KERN_WARNING | ||
140 | "Please report this to bugzilla.kernel.org,\n"); | ||
141 | printk(KERN_WARNING | ||
142 | "and attach the output of the 'dmesg' command.\n"); | ||
143 | |||
144 | nmi_usable = 0; | ||
145 | } | ||
146 | |||
147 | static void stop_watchdog(void *unused) | ||
148 | { | ||
149 | pcr_ops->write(PCR_PIC_PRIV); | ||
150 | } | ||
151 | |||
152 | static int __init check_nmi_watchdog(void) | ||
153 | { | ||
154 | unsigned int *prev_nmi_count; | ||
155 | int cpu, err; | ||
156 | |||
157 | prev_nmi_count = kmalloc(nr_cpu_ids * sizeof(unsigned int), GFP_KERNEL); | ||
158 | if (!prev_nmi_count) { | ||
159 | err = -ENOMEM; | ||
160 | goto error; | ||
161 | } | ||
162 | |||
163 | printk(KERN_INFO "Testing NMI watchdog ... "); | ||
164 | |||
165 | smp_call_function(nmi_cpu_busy, (void *)&endflag, 0); | ||
166 | |||
167 | for_each_possible_cpu(cpu) | ||
168 | prev_nmi_count[cpu] = get_nmi_count(cpu); | ||
169 | local_irq_enable(); | ||
170 | mdelay((20 * 1000) / nmi_hz); /* wait 20 ticks */ | ||
171 | |||
172 | for_each_online_cpu(cpu) { | ||
173 | if (get_nmi_count(cpu) - prev_nmi_count[cpu] <= 5) | ||
174 | report_broken_nmi(cpu, prev_nmi_count); | ||
175 | } | ||
176 | endflag = 1; | ||
177 | if (!nmi_usable) { | ||
178 | kfree(prev_nmi_count); | ||
179 | err = -ENODEV; | ||
180 | goto error; | ||
181 | } | ||
182 | printk("OK.\n"); | ||
183 | |||
184 | nmi_hz = 1; | ||
185 | |||
186 | kfree(prev_nmi_count); | ||
187 | return 0; | ||
188 | error: | ||
189 | on_each_cpu(stop_watchdog, NULL, 1); | ||
190 | return err; | ||
191 | } | ||
192 | |||
193 | static void start_watchdog(void *unused) | ||
194 | { | ||
195 | pcr_ops->write(PCR_PIC_PRIV); | ||
196 | write_pic(picl_value(nmi_hz)); | ||
197 | |||
198 | pcr_ops->write(pcr_enable); | ||
199 | } | ||
200 | |||
201 | void nmi_adjust_hz(unsigned int new_hz) | ||
202 | { | ||
203 | nmi_hz = new_hz; | ||
204 | on_each_cpu(start_watchdog, NULL, 1); | ||
205 | } | ||
206 | EXPORT_SYMBOL_GPL(nmi_adjust_hz); | ||
207 | |||
208 | int __init nmi_init(void) | ||
209 | { | ||
210 | nmi_usable = 1; | ||
211 | |||
212 | on_each_cpu(start_watchdog, NULL, 1); | ||
213 | |||
214 | return check_nmi_watchdog(); | ||
215 | } | ||
216 | |||
217 | static int __init setup_nmi_watchdog(char *str) | ||
218 | { | ||
219 | if (!strncmp(str, "panic", 5)) | ||
220 | panic_on_timeout = 1; | ||
221 | |||
222 | return 0; | ||
223 | } | ||
224 | __setup("nmi_watchdog=", setup_nmi_watchdog); | ||
diff --git a/arch/sparc/kernel/pcr.c b/arch/sparc/kernel/pcr.c new file mode 100644 index 00000000000..92e0dda141a --- /dev/null +++ b/arch/sparc/kernel/pcr.c | |||
@@ -0,0 +1,153 @@ | |||
1 | /* pcr.c: Generic sparc64 performance counter infrastructure. | ||
2 | * | ||
3 | * Copyright (C) 2009 David S. Miller (davem@davemloft.net) | ||
4 | */ | ||
5 | #include <linux/kernel.h> | ||
6 | #include <linux/module.h> | ||
7 | #include <linux/init.h> | ||
8 | #include <linux/irq.h> | ||
9 | |||
10 | #include <asm/pil.h> | ||
11 | #include <asm/pcr.h> | ||
12 | #include <asm/nmi.h> | ||
13 | |||
14 | /* This code is shared between various users of the performance | ||
15 | * counters. Users will be oprofile, pseudo-NMI watchdog, and the | ||
16 | * perf_counter support layer. | ||
17 | */ | ||
18 | |||
19 | #define PCR_SUN4U_ENABLE (PCR_PIC_PRIV | PCR_STRACE | PCR_UTRACE) | ||
20 | #define PCR_N2_ENABLE (PCR_PIC_PRIV | PCR_STRACE | PCR_UTRACE | \ | ||
21 | PCR_N2_TOE_OV1 | \ | ||
22 | (2 << PCR_N2_SL1_SHIFT) | \ | ||
23 | (0xff << PCR_N2_MASK1_SHIFT)) | ||
24 | |||
25 | u64 pcr_enable; | ||
26 | unsigned int picl_shift; | ||
27 | |||
28 | /* Performance counter interrupts run unmasked at PIL level 15. | ||
29 | * Therefore we can't do things like wakeups and other work | ||
30 | * that expects IRQ disabling to be adhered to in locking etc. | ||
31 | * | ||
32 | * Therefore in such situations we defer the work by signalling | ||
33 | * a lower level cpu IRQ. | ||
34 | */ | ||
35 | void deferred_pcr_work_irq(int irq, struct pt_regs *regs) | ||
36 | { | ||
37 | clear_softint(1 << PIL_DEFERRED_PCR_WORK); | ||
38 | } | ||
39 | |||
40 | void schedule_deferred_pcr_work(void) | ||
41 | { | ||
42 | set_softint(1 << PIL_DEFERRED_PCR_WORK); | ||
43 | } | ||
44 | |||
45 | const struct pcr_ops *pcr_ops; | ||
46 | EXPORT_SYMBOL_GPL(pcr_ops); | ||
47 | |||
48 | static u64 direct_pcr_read(void) | ||
49 | { | ||
50 | u64 val; | ||
51 | |||
52 | read_pcr(val); | ||
53 | return val; | ||
54 | } | ||
55 | |||
56 | static void direct_pcr_write(u64 val) | ||
57 | { | ||
58 | write_pcr(val); | ||
59 | } | ||
60 | |||
61 | static const struct pcr_ops direct_pcr_ops = { | ||
62 | .read = direct_pcr_read, | ||
63 | .write = direct_pcr_write, | ||
64 | }; | ||
65 | |||
66 | static void n2_pcr_write(u64 val) | ||
67 | { | ||
68 | unsigned long ret; | ||
69 | |||
70 | ret = sun4v_niagara2_setperf(HV_N2_PERF_SPARC_CTL, val); | ||
71 | if (val != HV_EOK) | ||
72 | write_pcr(val); | ||
73 | } | ||
74 | |||
75 | static const struct pcr_ops n2_pcr_ops = { | ||
76 | .read = direct_pcr_read, | ||
77 | .write = n2_pcr_write, | ||
78 | }; | ||
79 | |||
80 | static unsigned long perf_hsvc_group; | ||
81 | static unsigned long perf_hsvc_major; | ||
82 | static unsigned long perf_hsvc_minor; | ||
83 | |||
84 | static int __init register_perf_hsvc(void) | ||
85 | { | ||
86 | if (tlb_type == hypervisor) { | ||
87 | switch (sun4v_chip_type) { | ||
88 | case SUN4V_CHIP_NIAGARA1: | ||
89 | perf_hsvc_group = HV_GRP_NIAG_PERF; | ||
90 | break; | ||
91 | |||
92 | case SUN4V_CHIP_NIAGARA2: | ||
93 | perf_hsvc_group = HV_GRP_N2_CPU; | ||
94 | break; | ||
95 | |||
96 | default: | ||
97 | return -ENODEV; | ||
98 | } | ||
99 | |||
100 | |||
101 | perf_hsvc_major = 1; | ||
102 | perf_hsvc_minor = 0; | ||
103 | if (sun4v_hvapi_register(perf_hsvc_group, | ||
104 | perf_hsvc_major, | ||
105 | &perf_hsvc_minor)) { | ||
106 | printk("perfmon: Could not register hvapi.\n"); | ||
107 | return -ENODEV; | ||
108 | } | ||
109 | } | ||
110 | return 0; | ||
111 | } | ||
112 | |||
113 | static void __init unregister_perf_hsvc(void) | ||
114 | { | ||
115 | if (tlb_type != hypervisor) | ||
116 | return; | ||
117 | sun4v_hvapi_unregister(perf_hsvc_group); | ||
118 | } | ||
119 | |||
120 | int __init pcr_arch_init(void) | ||
121 | { | ||
122 | int err = register_perf_hsvc(); | ||
123 | |||
124 | if (err) | ||
125 | return err; | ||
126 | |||
127 | switch (tlb_type) { | ||
128 | case hypervisor: | ||
129 | pcr_ops = &n2_pcr_ops; | ||
130 | pcr_enable = PCR_N2_ENABLE; | ||
131 | picl_shift = 2; | ||
132 | break; | ||
133 | |||
134 | case cheetah: | ||
135 | case cheetah_plus: | ||
136 | case spitfire: | ||
137 | pcr_ops = &direct_pcr_ops; | ||
138 | pcr_enable = PCR_SUN4U_ENABLE; | ||
139 | break; | ||
140 | |||
141 | default: | ||
142 | err = -ENODEV; | ||
143 | goto out_unregister; | ||
144 | } | ||
145 | |||
146 | return nmi_init(); | ||
147 | |||
148 | out_unregister: | ||
149 | unregister_perf_hsvc(); | ||
150 | return err; | ||
151 | } | ||
152 | |||
153 | arch_initcall(pcr_arch_init); | ||
diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c index cc8b5604442..a73954b87f0 100644 --- a/arch/sparc/kernel/process_64.c +++ b/arch/sparc/kernel/process_64.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include <linux/cpu.h> | 29 | #include <linux/cpu.h> |
30 | #include <linux/elfcore.h> | 30 | #include <linux/elfcore.h> |
31 | #include <linux/sysrq.h> | 31 | #include <linux/sysrq.h> |
32 | #include <linux/nmi.h> | ||
32 | 33 | ||
33 | #include <asm/uaccess.h> | 34 | #include <asm/uaccess.h> |
34 | #include <asm/system.h> | 35 | #include <asm/system.h> |
@@ -52,8 +53,10 @@ | |||
52 | 53 | ||
53 | static void sparc64_yield(int cpu) | 54 | static void sparc64_yield(int cpu) |
54 | { | 55 | { |
55 | if (tlb_type != hypervisor) | 56 | if (tlb_type != hypervisor) { |
57 | touch_nmi_watchdog(); | ||
56 | return; | 58 | return; |
59 | } | ||
57 | 60 | ||
58 | clear_thread_flag(TIF_POLLING_NRFLAG); | 61 | clear_thread_flag(TIF_POLLING_NRFLAG); |
59 | smp_mb__after_clear_bit(); | 62 | smp_mb__after_clear_bit(); |
diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c index 49d061f4ae9..f2bcfd2967d 100644 --- a/arch/sparc/kernel/setup_64.c +++ b/arch/sparc/kernel/setup_64.c | |||
@@ -354,6 +354,7 @@ static int show_cpuinfo(struct seq_file *m, void *__unused) | |||
354 | seq_printf(m, | 354 | seq_printf(m, |
355 | "cpu\t\t: %s\n" | 355 | "cpu\t\t: %s\n" |
356 | "fpu\t\t: %s\n" | 356 | "fpu\t\t: %s\n" |
357 | "pmu\t\t: %s\n" | ||
357 | "prom\t\t: %s\n" | 358 | "prom\t\t: %s\n" |
358 | "type\t\t: %s\n" | 359 | "type\t\t: %s\n" |
359 | "ncpus probed\t: %d\n" | 360 | "ncpus probed\t: %d\n" |
@@ -366,6 +367,7 @@ static int show_cpuinfo(struct seq_file *m, void *__unused) | |||
366 | , | 367 | , |
367 | sparc_cpu_type, | 368 | sparc_cpu_type, |
368 | sparc_fpu_type, | 369 | sparc_fpu_type, |
370 | sparc_pmu_type, | ||
369 | prom_version, | 371 | prom_version, |
370 | ((tlb_type == hypervisor) ? | 372 | ((tlb_type == hypervisor) ? |
371 | "sun4v" : | 373 | "sun4v" : |
diff --git a/arch/sparc/kernel/ttable.S b/arch/sparc/kernel/ttable.S index ea925503b42..d9bdfb9d5c1 100644 --- a/arch/sparc/kernel/ttable.S +++ b/arch/sparc/kernel/ttable.S | |||
@@ -63,7 +63,8 @@ tl0_irq6: TRAP_IRQ(smp_call_function_single_client, 6) | |||
63 | #else | 63 | #else |
64 | tl0_irq6: BTRAP(0x46) | 64 | tl0_irq6: BTRAP(0x46) |
65 | #endif | 65 | #endif |
66 | tl0_irq7: BTRAP(0x47) BTRAP(0x48) BTRAP(0x49) | 66 | tl0_irq7: TRAP_IRQ(deferred_pcr_work_irq, 7) |
67 | tl0_irq8: BTRAP(0x48) BTRAP(0x49) | ||
67 | tl0_irq10: BTRAP(0x4a) BTRAP(0x4b) BTRAP(0x4c) BTRAP(0x4d) | 68 | tl0_irq10: BTRAP(0x4a) BTRAP(0x4b) BTRAP(0x4c) BTRAP(0x4d) |
68 | tl0_irq14: TRAP_IRQ(timer_interrupt, 14) | 69 | tl0_irq14: TRAP_IRQ(timer_interrupt, 14) |
69 | tl0_irq15: TRAP_NMI_IRQ(perfctr_irq, 15) | 70 | tl0_irq15: TRAP_NMI_IRQ(perfctr_irq, 15) |
diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c index a9e474bf638..4ab8993b086 100644 --- a/arch/sparc/mm/fault_64.c +++ b/arch/sparc/mm/fault_64.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <linux/interrupt.h> | 19 | #include <linux/interrupt.h> |
20 | #include <linux/kprobes.h> | 20 | #include <linux/kprobes.h> |
21 | #include <linux/kdebug.h> | 21 | #include <linux/kdebug.h> |
22 | #include <linux/percpu.h> | ||
22 | 23 | ||
23 | #include <asm/page.h> | 24 | #include <asm/page.h> |
24 | #include <asm/pgtable.h> | 25 | #include <asm/pgtable.h> |
@@ -224,6 +225,30 @@ cannot_handle: | |||
224 | unhandled_fault (address, current, regs); | 225 | unhandled_fault (address, current, regs); |
225 | } | 226 | } |
226 | 227 | ||
228 | static void noinline bogus_32bit_fault_tpc(struct pt_regs *regs) | ||
229 | { | ||
230 | static int times; | ||
231 | |||
232 | if (times++ < 10) | ||
233 | printk(KERN_ERR "FAULT[%s:%d]: 32-bit process reports " | ||
234 | "64-bit TPC [%lx]\n", | ||
235 | current->comm, current->pid, | ||
236 | regs->tpc); | ||
237 | show_regs(regs); | ||
238 | } | ||
239 | |||
240 | static void noinline bogus_32bit_fault_address(struct pt_regs *regs, | ||
241 | unsigned long addr) | ||
242 | { | ||
243 | static int times; | ||
244 | |||
245 | if (times++ < 10) | ||
246 | printk(KERN_ERR "FAULT[%s:%d]: 32-bit process " | ||
247 | "reports 64-bit fault address [%lx]\n", | ||
248 | current->comm, current->pid, addr); | ||
249 | show_regs(regs); | ||
250 | } | ||
251 | |||
227 | asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs) | 252 | asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs) |
228 | { | 253 | { |
229 | struct mm_struct *mm = current->mm; | 254 | struct mm_struct *mm = current->mm; |
@@ -244,6 +269,19 @@ asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs) | |||
244 | (fault_code & FAULT_CODE_DTLB)) | 269 | (fault_code & FAULT_CODE_DTLB)) |
245 | BUG(); | 270 | BUG(); |
246 | 271 | ||
272 | if (test_thread_flag(TIF_32BIT)) { | ||
273 | if (!(regs->tstate & TSTATE_PRIV)) { | ||
274 | if (unlikely((regs->tpc >> 32) != 0)) { | ||
275 | bogus_32bit_fault_tpc(regs); | ||
276 | goto intr_or_no_mm; | ||
277 | } | ||
278 | } | ||
279 | if (unlikely((address >> 32) != 0)) { | ||
280 | bogus_32bit_fault_address(regs, address); | ||
281 | goto intr_or_no_mm; | ||
282 | } | ||
283 | } | ||
284 | |||
247 | if (regs->tstate & TSTATE_PRIV) { | 285 | if (regs->tstate & TSTATE_PRIV) { |
248 | unsigned long tpc = regs->tpc; | 286 | unsigned long tpc = regs->tpc; |
249 | 287 | ||
@@ -264,12 +302,6 @@ asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs) | |||
264 | if (in_atomic() || !mm) | 302 | if (in_atomic() || !mm) |
265 | goto intr_or_no_mm; | 303 | goto intr_or_no_mm; |
266 | 304 | ||
267 | if (test_thread_flag(TIF_32BIT)) { | ||
268 | if (!(regs->tstate & TSTATE_PRIV)) | ||
269 | regs->tpc &= 0xffffffff; | ||
270 | address &= 0xffffffff; | ||
271 | } | ||
272 | |||
273 | if (!down_read_trylock(&mm->mmap_sem)) { | 305 | if (!down_read_trylock(&mm->mmap_sem)) { |
274 | if ((regs->tstate & TSTATE_PRIV) && | 306 | if ((regs->tstate & TSTATE_PRIV) && |
275 | !search_exception_tables(regs->tpc)) { | 307 | !search_exception_tables(regs->tpc)) { |
diff --git a/arch/sparc/oprofile/init.c b/arch/sparc/oprofile/init.c index d6e170c074f..d172f86439b 100644 --- a/arch/sparc/oprofile/init.c +++ b/arch/sparc/oprofile/init.c | |||
@@ -13,217 +13,57 @@ | |||
13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
14 | 14 | ||
15 | #ifdef CONFIG_SPARC64 | 15 | #ifdef CONFIG_SPARC64 |
16 | #include <asm/hypervisor.h> | 16 | #include <linux/notifier.h> |
17 | #include <asm/spitfire.h> | 17 | #include <linux/rcupdate.h> |
18 | #include <asm/cpudata.h> | 18 | #include <linux/kdebug.h> |
19 | #include <asm/irq.h> | 19 | #include <asm/nmi.h> |
20 | 20 | ||
21 | static int nmi_enabled; | 21 | static int profile_timer_exceptions_notify(struct notifier_block *self, |
22 | 22 | unsigned long val, void *data) | |
23 | struct pcr_ops { | ||
24 | u64 (*read)(void); | ||
25 | void (*write)(u64); | ||
26 | }; | ||
27 | static const struct pcr_ops *pcr_ops; | ||
28 | |||
29 | static u64 direct_pcr_read(void) | ||
30 | { | ||
31 | u64 val; | ||
32 | |||
33 | read_pcr(val); | ||
34 | return val; | ||
35 | } | ||
36 | |||
37 | static void direct_pcr_write(u64 val) | ||
38 | { | ||
39 | write_pcr(val); | ||
40 | } | ||
41 | |||
42 | static const struct pcr_ops direct_pcr_ops = { | ||
43 | .read = direct_pcr_read, | ||
44 | .write = direct_pcr_write, | ||
45 | }; | ||
46 | |||
47 | static void n2_pcr_write(u64 val) | ||
48 | { | 23 | { |
49 | unsigned long ret; | 24 | struct die_args *args = (struct die_args *)data; |
50 | 25 | int ret = NOTIFY_DONE; | |
51 | ret = sun4v_niagara2_setperf(HV_N2_PERF_SPARC_CTL, val); | ||
52 | if (val != HV_EOK) | ||
53 | write_pcr(val); | ||
54 | } | ||
55 | |||
56 | static const struct pcr_ops n2_pcr_ops = { | ||
57 | .read = direct_pcr_read, | ||
58 | .write = n2_pcr_write, | ||
59 | }; | ||
60 | |||
61 | /* In order to commonize as much of the implementation as | ||
62 | * possible, we use PICH as our counter. Mostly this is | ||
63 | * to accomodate Niagara-1 which can only count insn cycles | ||
64 | * in PICH. | ||
65 | */ | ||
66 | static u64 picl_value(void) | ||
67 | { | ||
68 | u32 delta = local_cpu_data().clock_tick / HZ; | ||
69 | |||
70 | return ((u64)((0 - delta) & 0xffffffff)) << 32; | ||
71 | } | ||
72 | |||
73 | #define PCR_PIC_PRIV 0x00000001 /* PIC access is privileged */ | ||
74 | #define PCR_STRACE 0x00000002 /* Trace supervisor events */ | ||
75 | #define PCR_UTRACE 0x00000004 /* Trace user events */ | ||
76 | #define PCR_N2_HTRACE 0x00000008 /* Trace hypervisor events */ | ||
77 | #define PCR_N2_TOE_OV0 0x00000010 /* Trap if PIC 0 overflows */ | ||
78 | #define PCR_N2_TOE_OV1 0x00000020 /* Trap if PIC 1 overflows */ | ||
79 | #define PCR_N2_MASK0 0x00003fc0 | ||
80 | #define PCR_N2_MASK0_SHIFT 6 | ||
81 | #define PCR_N2_SL0 0x0003c000 | ||
82 | #define PCR_N2_SL0_SHIFT 14 | ||
83 | #define PCR_N2_OV0 0x00040000 | ||
84 | #define PCR_N2_MASK1 0x07f80000 | ||
85 | #define PCR_N2_MASK1_SHIFT 19 | ||
86 | #define PCR_N2_SL1 0x78000000 | ||
87 | #define PCR_N2_SL1_SHIFT 27 | ||
88 | #define PCR_N2_OV1 0x80000000 | ||
89 | |||
90 | #define PCR_SUN4U_ENABLE (PCR_PIC_PRIV | PCR_STRACE | PCR_UTRACE) | ||
91 | #define PCR_N2_ENABLE (PCR_PIC_PRIV | PCR_STRACE | PCR_UTRACE | \ | ||
92 | PCR_N2_TOE_OV1 | \ | ||
93 | (2 << PCR_N2_SL1_SHIFT) | \ | ||
94 | (0xff << PCR_N2_MASK1_SHIFT)) | ||
95 | |||
96 | static u64 pcr_enable = PCR_SUN4U_ENABLE; | ||
97 | |||
98 | static void nmi_handler(struct pt_regs *regs) | ||
99 | { | ||
100 | pcr_ops->write(PCR_PIC_PRIV); | ||
101 | |||
102 | if (nmi_enabled) { | ||
103 | oprofile_add_sample(regs, 0); | ||
104 | |||
105 | write_pic(picl_value()); | ||
106 | pcr_ops->write(pcr_enable); | ||
107 | } | ||
108 | } | ||
109 | |||
110 | /* We count "clock cycle" events in the lower 32-bit PIC. | ||
111 | * Then configure it such that it overflows every HZ, and thus | ||
112 | * generates a level 15 interrupt at that frequency. | ||
113 | */ | ||
114 | static void cpu_nmi_start(void *_unused) | ||
115 | { | ||
116 | pcr_ops->write(PCR_PIC_PRIV); | ||
117 | write_pic(picl_value()); | ||
118 | |||
119 | pcr_ops->write(pcr_enable); | ||
120 | } | ||
121 | 26 | ||
122 | static void cpu_nmi_stop(void *_unused) | 27 | switch (val) { |
123 | { | 28 | case DIE_NMI: |
124 | pcr_ops->write(PCR_PIC_PRIV); | 29 | oprofile_add_sample(args->regs, 0); |
125 | } | 30 | ret = NOTIFY_STOP; |
126 | 31 | break; | |
127 | static int nmi_start(void) | 32 | default: |
128 | { | 33 | break; |
129 | int err = register_perfctr_intr(nmi_handler); | ||
130 | |||
131 | if (!err) { | ||
132 | nmi_enabled = 1; | ||
133 | wmb(); | ||
134 | err = on_each_cpu(cpu_nmi_start, NULL, 1); | ||
135 | if (err) { | ||
136 | nmi_enabled = 0; | ||
137 | wmb(); | ||
138 | on_each_cpu(cpu_nmi_stop, NULL, 1); | ||
139 | release_perfctr_intr(nmi_handler); | ||
140 | } | ||
141 | } | 34 | } |
142 | 35 | return ret; | |
143 | return err; | ||
144 | } | ||
145 | |||
146 | static void nmi_stop(void) | ||
147 | { | ||
148 | nmi_enabled = 0; | ||
149 | wmb(); | ||
150 | |||
151 | on_each_cpu(cpu_nmi_stop, NULL, 1); | ||
152 | release_perfctr_intr(nmi_handler); | ||
153 | synchronize_sched(); | ||
154 | } | 36 | } |
155 | 37 | ||
156 | static unsigned long perf_hsvc_group; | 38 | static struct notifier_block profile_timer_exceptions_nb = { |
157 | static unsigned long perf_hsvc_major; | 39 | .notifier_call = profile_timer_exceptions_notify, |
158 | static unsigned long perf_hsvc_minor; | 40 | }; |
159 | 41 | ||
160 | static int __init register_perf_hsvc(void) | 42 | static int timer_start(void) |
161 | { | 43 | { |
162 | if (tlb_type == hypervisor) { | 44 | if (register_die_notifier(&profile_timer_exceptions_nb)) |
163 | switch (sun4v_chip_type) { | 45 | return 1; |
164 | case SUN4V_CHIP_NIAGARA1: | 46 | nmi_adjust_hz(HZ); |
165 | perf_hsvc_group = HV_GRP_NIAG_PERF; | ||
166 | break; | ||
167 | |||
168 | case SUN4V_CHIP_NIAGARA2: | ||
169 | perf_hsvc_group = HV_GRP_N2_CPU; | ||
170 | break; | ||
171 | |||
172 | default: | ||
173 | return -ENODEV; | ||
174 | } | ||
175 | |||
176 | |||
177 | perf_hsvc_major = 1; | ||
178 | perf_hsvc_minor = 0; | ||
179 | if (sun4v_hvapi_register(perf_hsvc_group, | ||
180 | perf_hsvc_major, | ||
181 | &perf_hsvc_minor)) { | ||
182 | printk("perfmon: Could not register N2 hvapi.\n"); | ||
183 | return -ENODEV; | ||
184 | } | ||
185 | } | ||
186 | return 0; | 47 | return 0; |
187 | } | 48 | } |
188 | 49 | ||
189 | static void unregister_perf_hsvc(void) | 50 | |
51 | static void timer_stop(void) | ||
190 | { | 52 | { |
191 | if (tlb_type != hypervisor) | 53 | nmi_adjust_hz(1); |
192 | return; | 54 | unregister_die_notifier(&profile_timer_exceptions_nb); |
193 | sun4v_hvapi_unregister(perf_hsvc_group); | 55 | synchronize_sched(); /* Allow already-started NMIs to complete. */ |
194 | } | 56 | } |
195 | 57 | ||
196 | static int oprofile_nmi_init(struct oprofile_operations *ops) | 58 | static int op_nmi_timer_init(struct oprofile_operations *ops) |
197 | { | 59 | { |
198 | int err = register_perf_hsvc(); | 60 | if (!nmi_usable) |
199 | |||
200 | if (err) | ||
201 | return err; | ||
202 | |||
203 | switch (tlb_type) { | ||
204 | case hypervisor: | ||
205 | pcr_ops = &n2_pcr_ops; | ||
206 | pcr_enable = PCR_N2_ENABLE; | ||
207 | break; | ||
208 | |||
209 | case cheetah: | ||
210 | case cheetah_plus: | ||
211 | pcr_ops = &direct_pcr_ops; | ||
212 | break; | ||
213 | |||
214 | default: | ||
215 | return -ENODEV; | 61 | return -ENODEV; |
216 | } | ||
217 | 62 | ||
218 | ops->create_files = NULL; | 63 | ops->start = timer_start; |
219 | ops->setup = NULL; | 64 | ops->stop = timer_stop; |
220 | ops->shutdown = NULL; | ||
221 | ops->start = nmi_start; | ||
222 | ops->stop = nmi_stop; | ||
223 | ops->cpu_type = "timer"; | 65 | ops->cpu_type = "timer"; |
224 | 66 | printk(KERN_INFO "oprofile: Using perfctr NMI timer interrupt.\n"); | |
225 | printk(KERN_INFO "oprofile: Using perfctr based NMI timer interrupt.\n"); | ||
226 | |||
227 | return 0; | 67 | return 0; |
228 | } | 68 | } |
229 | #endif | 69 | #endif |
@@ -233,7 +73,7 @@ int __init oprofile_arch_init(struct oprofile_operations *ops) | |||
233 | int ret = -ENODEV; | 73 | int ret = -ENODEV; |
234 | 74 | ||
235 | #ifdef CONFIG_SPARC64 | 75 | #ifdef CONFIG_SPARC64 |
236 | ret = oprofile_nmi_init(ops); | 76 | ret = op_nmi_timer_init(ops); |
237 | if (!ret) | 77 | if (!ret) |
238 | return ret; | 78 | return ret; |
239 | #endif | 79 | #endif |
@@ -241,10 +81,6 @@ int __init oprofile_arch_init(struct oprofile_operations *ops) | |||
241 | return ret; | 81 | return ret; |
242 | } | 82 | } |
243 | 83 | ||
244 | |||
245 | void oprofile_arch_exit(void) | 84 | void oprofile_arch_exit(void) |
246 | { | 85 | { |
247 | #ifdef CONFIG_SPARC64 | ||
248 | unregister_perf_hsvc(); | ||
249 | #endif | ||
250 | } | 86 | } |
diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c index 75115849af3..4a58c8ce3f6 100644 --- a/arch/x86/boot/video-vesa.c +++ b/arch/x86/boot/video-vesa.c | |||
@@ -269,9 +269,8 @@ void vesa_store_edid(void) | |||
269 | we genuinely have to assume all registers are destroyed here. */ | 269 | we genuinely have to assume all registers are destroyed here. */ |
270 | 270 | ||
271 | asm("pushw %%es; movw %2,%%es; "INT10"; popw %%es" | 271 | asm("pushw %%es; movw %2,%%es; "INT10"; popw %%es" |
272 | : "+a" (ax), "+b" (bx) | 272 | : "+a" (ax), "+b" (bx), "+c" (cx), "+D" (di) |
273 | : "c" (cx), "D" (di) | 273 | : : "esi", "edx"); |
274 | : "esi"); | ||
275 | 274 | ||
276 | if (ax != 0x004f) | 275 | if (ax != 0x004f) |
277 | return; /* No EDID */ | 276 | return; /* No EDID */ |
@@ -285,9 +284,9 @@ void vesa_store_edid(void) | |||
285 | dx = 0; /* EDID block number */ | 284 | dx = 0; /* EDID block number */ |
286 | di =(size_t) &boot_params.edid_info; /* (ES:)Pointer to block */ | 285 | di =(size_t) &boot_params.edid_info; /* (ES:)Pointer to block */ |
287 | asm(INT10 | 286 | asm(INT10 |
288 | : "+a" (ax), "+b" (bx), "+d" (dx), "=m" (boot_params.edid_info) | 287 | : "+a" (ax), "+b" (bx), "+d" (dx), "=m" (boot_params.edid_info), |
289 | : "c" (cx), "D" (di) | 288 | "+c" (cx), "+D" (di) |
290 | : "esi"); | 289 | : : "esi"); |
291 | #endif /* CONFIG_FIRMWARE_EDID */ | 290 | #endif /* CONFIG_FIRMWARE_EDID */ |
292 | } | 291 | } |
293 | 292 | ||
diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S index 256b00b6189..5a0d76dc56a 100644 --- a/arch/x86/ia32/ia32entry.S +++ b/arch/x86/ia32/ia32entry.S | |||
@@ -418,9 +418,9 @@ ENTRY(ia32_syscall) | |||
418 | orl $TS_COMPAT,TI_status(%r10) | 418 | orl $TS_COMPAT,TI_status(%r10) |
419 | testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10) | 419 | testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10) |
420 | jnz ia32_tracesys | 420 | jnz ia32_tracesys |
421 | ia32_do_syscall: | ||
422 | cmpl $(IA32_NR_syscalls-1),%eax | 421 | cmpl $(IA32_NR_syscalls-1),%eax |
423 | ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */ | 422 | ja ia32_badsys |
423 | ia32_do_call: | ||
424 | IA32_ARG_FIXUP | 424 | IA32_ARG_FIXUP |
425 | call *ia32_sys_call_table(,%rax,8) # xxx: rip relative | 425 | call *ia32_sys_call_table(,%rax,8) # xxx: rip relative |
426 | ia32_sysret: | 426 | ia32_sysret: |
@@ -435,7 +435,9 @@ ia32_tracesys: | |||
435 | call syscall_trace_enter | 435 | call syscall_trace_enter |
436 | LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */ | 436 | LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */ |
437 | RESTORE_REST | 437 | RESTORE_REST |
438 | jmp ia32_do_syscall | 438 | cmpl $(IA32_NR_syscalls-1),%eax |
439 | ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */ | ||
440 | jmp ia32_do_call | ||
439 | END(ia32_syscall) | 441 | END(ia32_syscall) |
440 | 442 | ||
441 | ia32_badsys: | 443 | ia32_badsys: |
diff --git a/arch/x86/include/asm/dma-mapping.h b/arch/x86/include/asm/dma-mapping.h index 4035357f5b9..132a134d12f 100644 --- a/arch/x86/include/asm/dma-mapping.h +++ b/arch/x86/include/asm/dma-mapping.h | |||
@@ -2,8 +2,8 @@ | |||
2 | #define _ASM_X86_DMA_MAPPING_H | 2 | #define _ASM_X86_DMA_MAPPING_H |
3 | 3 | ||
4 | /* | 4 | /* |
5 | * IOMMU interface. See Documentation/DMA-mapping.txt and DMA-API.txt for | 5 | * IOMMU interface. See Documentation/PCI/PCI-DMA-mapping.txt and |
6 | * documentation. | 6 | * Documentation/DMA-API.txt for documentation. |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include <linux/scatterlist.h> | 9 | #include <linux/scatterlist.h> |
diff --git a/arch/x86/include/asm/e820.h b/arch/x86/include/asm/e820.h index 3d8ceddbd40..00d41ce4c84 100644 --- a/arch/x86/include/asm/e820.h +++ b/arch/x86/include/asm/e820.h | |||
@@ -49,6 +49,7 @@ | |||
49 | #define E820_RESERVED_KERN 128 | 49 | #define E820_RESERVED_KERN 128 |
50 | 50 | ||
51 | #ifndef __ASSEMBLY__ | 51 | #ifndef __ASSEMBLY__ |
52 | #include <linux/types.h> | ||
52 | struct e820entry { | 53 | struct e820entry { |
53 | __u64 addr; /* start of memory segment */ | 54 | __u64 addr; /* start of memory segment */ |
54 | __u64 size; /* size of memory segment */ | 55 | __u64 size; /* size of memory segment */ |
diff --git a/arch/x86/include/asm/kvm.h b/arch/x86/include/asm/kvm.h index b95162af0bf..d2e3bf3608a 100644 --- a/arch/x86/include/asm/kvm.h +++ b/arch/x86/include/asm/kvm.h | |||
@@ -6,7 +6,7 @@ | |||
6 | * | 6 | * |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include <asm/types.h> | 9 | #include <linux/types.h> |
10 | #include <linux/ioctl.h> | 10 | #include <linux/ioctl.h> |
11 | 11 | ||
12 | /* Architectural interrupt line count. */ | 12 | /* Architectural interrupt line count. */ |
diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h index 1d6e17c2f23..32c6e17b960 100644 --- a/arch/x86/include/asm/mce.h +++ b/arch/x86/include/asm/mce.h | |||
@@ -3,8 +3,8 @@ | |||
3 | 3 | ||
4 | #ifdef __x86_64__ | 4 | #ifdef __x86_64__ |
5 | 5 | ||
6 | #include <linux/types.h> | ||
6 | #include <asm/ioctls.h> | 7 | #include <asm/ioctls.h> |
7 | #include <asm/types.h> | ||
8 | 8 | ||
9 | /* | 9 | /* |
10 | * Machine Check support for x86 | 10 | * Machine Check support for x86 |
@@ -115,8 +115,6 @@ extern int mce_notify_user(void); | |||
115 | 115 | ||
116 | #endif /* !CONFIG_X86_32 */ | 116 | #endif /* !CONFIG_X86_32 */ |
117 | 117 | ||
118 | |||
119 | |||
120 | #ifdef CONFIG_X86_MCE | 118 | #ifdef CONFIG_X86_MCE |
121 | extern void mcheck_init(struct cpuinfo_x86 *c); | 119 | extern void mcheck_init(struct cpuinfo_x86 *c); |
122 | #else | 120 | #else |
@@ -126,5 +124,4 @@ extern void stop_mce(void); | |||
126 | extern void restart_mce(void); | 124 | extern void restart_mce(void); |
127 | 125 | ||
128 | #endif /* __KERNEL__ */ | 126 | #endif /* __KERNEL__ */ |
129 | |||
130 | #endif /* _ASM_X86_MCE_H */ | 127 | #endif /* _ASM_X86_MCE_H */ |
diff --git a/arch/x86/include/asm/mtrr.h b/arch/x86/include/asm/mtrr.h index 14080d22edb..a51ada8467d 100644 --- a/arch/x86/include/asm/mtrr.h +++ b/arch/x86/include/asm/mtrr.h | |||
@@ -23,6 +23,7 @@ | |||
23 | #ifndef _ASM_X86_MTRR_H | 23 | #ifndef _ASM_X86_MTRR_H |
24 | #define _ASM_X86_MTRR_H | 24 | #define _ASM_X86_MTRR_H |
25 | 25 | ||
26 | #include <linux/types.h> | ||
26 | #include <linux/ioctl.h> | 27 | #include <linux/ioctl.h> |
27 | #include <linux/errno.h> | 28 | #include <linux/errno.h> |
28 | 29 | ||
diff --git a/arch/x86/include/asm/ptrace-abi.h b/arch/x86/include/asm/ptrace-abi.h index 25f1bb8fc62..8e0f8d199e0 100644 --- a/arch/x86/include/asm/ptrace-abi.h +++ b/arch/x86/include/asm/ptrace-abi.h | |||
@@ -83,7 +83,7 @@ | |||
83 | #ifdef CONFIG_X86_PTRACE_BTS | 83 | #ifdef CONFIG_X86_PTRACE_BTS |
84 | 84 | ||
85 | #ifndef __ASSEMBLY__ | 85 | #ifndef __ASSEMBLY__ |
86 | #include <asm/types.h> | 86 | #include <linux/types.h> |
87 | 87 | ||
88 | /* configuration/status structure used in PTRACE_BTS_CONFIG and | 88 | /* configuration/status structure used in PTRACE_BTS_CONFIG and |
89 | PTRACE_BTS_STATUS commands. | 89 | PTRACE_BTS_STATUS commands. |
diff --git a/arch/x86/include/asm/sigcontext.h b/arch/x86/include/asm/sigcontext.h index 0afcb5e58ac..ec666491aaa 100644 --- a/arch/x86/include/asm/sigcontext.h +++ b/arch/x86/include/asm/sigcontext.h | |||
@@ -2,7 +2,7 @@ | |||
2 | #define _ASM_X86_SIGCONTEXT_H | 2 | #define _ASM_X86_SIGCONTEXT_H |
3 | 3 | ||
4 | #include <linux/compiler.h> | 4 | #include <linux/compiler.h> |
5 | #include <asm/types.h> | 5 | #include <linux/types.h> |
6 | 6 | ||
7 | #define FP_XSTATE_MAGIC1 0x46505853U | 7 | #define FP_XSTATE_MAGIC1 0x46505853U |
8 | #define FP_XSTATE_MAGIC2 0x46505845U | 8 | #define FP_XSTATE_MAGIC2 0x46505845U |
diff --git a/arch/x86/include/asm/sigcontext32.h b/arch/x86/include/asm/sigcontext32.h index 6126188cf3a..ad1478c4ae1 100644 --- a/arch/x86/include/asm/sigcontext32.h +++ b/arch/x86/include/asm/sigcontext32.h | |||
@@ -1,6 +1,8 @@ | |||
1 | #ifndef _ASM_X86_SIGCONTEXT32_H | 1 | #ifndef _ASM_X86_SIGCONTEXT32_H |
2 | #define _ASM_X86_SIGCONTEXT32_H | 2 | #define _ASM_X86_SIGCONTEXT32_H |
3 | 3 | ||
4 | #include <linux/types.h> | ||
5 | |||
4 | /* signal context for 32bit programs. */ | 6 | /* signal context for 32bit programs. */ |
5 | 7 | ||
6 | #define X86_FXSR_MAGIC 0x0000 | 8 | #define X86_FXSR_MAGIC 0x0000 |
diff --git a/arch/x86/include/asm/swab.h b/arch/x86/include/asm/swab.h index 306d4178ffc..557cd9f0066 100644 --- a/arch/x86/include/asm/swab.h +++ b/arch/x86/include/asm/swab.h | |||
@@ -1,7 +1,7 @@ | |||
1 | #ifndef _ASM_X86_SWAB_H | 1 | #ifndef _ASM_X86_SWAB_H |
2 | #define _ASM_X86_SWAB_H | 2 | #define _ASM_X86_SWAB_H |
3 | 3 | ||
4 | #include <asm/types.h> | 4 | #include <linux/types.h> |
5 | #include <linux/compiler.h> | 5 | #include <linux/compiler.h> |
6 | 6 | ||
7 | static inline __attribute_const__ __u32 __arch_swab32(__u32 val) | 7 | static inline __attribute_const__ __u32 __arch_swab32(__u32 val) |
diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c index 707c1f6f95f..a60c1f3bcb8 100644 --- a/arch/x86/kernel/acpi/sleep.c +++ b/arch/x86/kernel/acpi/sleep.c | |||
@@ -156,11 +156,11 @@ static int __init acpi_sleep_setup(char *str) | |||
156 | #ifdef CONFIG_HIBERNATION | 156 | #ifdef CONFIG_HIBERNATION |
157 | if (strncmp(str, "s4_nohwsig", 10) == 0) | 157 | if (strncmp(str, "s4_nohwsig", 10) == 0) |
158 | acpi_no_s4_hw_signature(); | 158 | acpi_no_s4_hw_signature(); |
159 | if (strncmp(str, "s4_nonvs", 8) == 0) | ||
160 | acpi_s4_no_nvs(); | ||
159 | #endif | 161 | #endif |
160 | if (strncmp(str, "old_ordering", 12) == 0) | 162 | if (strncmp(str, "old_ordering", 12) == 0) |
161 | acpi_old_suspend_ordering(); | 163 | acpi_old_suspend_ordering(); |
162 | if (strncmp(str, "s4_nonvs", 8) == 0) | ||
163 | acpi_s4_no_nvs(); | ||
164 | str = strchr(str, ','); | 164 | str = strchr(str, ','); |
165 | if (str != NULL) | 165 | if (str != NULL) |
166 | str += strspn(str, ", \t"); | 166 | str += strspn(str, ", \t"); |
diff --git a/arch/x86/kernel/apic.c b/arch/x86/kernel/apic.c index 4b6df2469fe..115449f869e 100644 --- a/arch/x86/kernel/apic.c +++ b/arch/x86/kernel/apic.c | |||
@@ -1436,7 +1436,7 @@ static int __init detect_init_APIC(void) | |||
1436 | switch (boot_cpu_data.x86_vendor) { | 1436 | switch (boot_cpu_data.x86_vendor) { |
1437 | case X86_VENDOR_AMD: | 1437 | case X86_VENDOR_AMD: |
1438 | if ((boot_cpu_data.x86 == 6 && boot_cpu_data.x86_model > 1) || | 1438 | if ((boot_cpu_data.x86 == 6 && boot_cpu_data.x86_model > 1) || |
1439 | (boot_cpu_data.x86 == 15)) | 1439 | (boot_cpu_data.x86 >= 15)) |
1440 | break; | 1440 | break; |
1441 | goto no_apic; | 1441 | goto no_apic; |
1442 | case X86_VENDOR_INTEL: | 1442 | case X86_VENDOR_INTEL: |
diff --git a/arch/x86/kernel/cpu/cpufreq/Kconfig b/arch/x86/kernel/cpu/cpufreq/Kconfig index efae3b22a0f..65792c2cc46 100644 --- a/arch/x86/kernel/cpu/cpufreq/Kconfig +++ b/arch/x86/kernel/cpu/cpufreq/Kconfig | |||
@@ -245,17 +245,6 @@ config X86_E_POWERSAVER | |||
245 | 245 | ||
246 | comment "shared options" | 246 | comment "shared options" |
247 | 247 | ||
248 | config X86_ACPI_CPUFREQ_PROC_INTF | ||
249 | bool "/proc/acpi/processor/../performance interface (deprecated)" | ||
250 | depends on PROC_FS | ||
251 | depends on X86_ACPI_CPUFREQ || X86_POWERNOW_K7_ACPI || X86_POWERNOW_K8_ACPI | ||
252 | help | ||
253 | This enables the deprecated /proc/acpi/processor/../performance | ||
254 | interface. While it is helpful for debugging, the generic, | ||
255 | cross-architecture cpufreq interfaces should be used. | ||
256 | |||
257 | If in doubt, say N. | ||
258 | |||
259 | config X86_SPEEDSTEP_LIB | 248 | config X86_SPEEDSTEP_LIB |
260 | tristate | 249 | tristate |
261 | default (X86_SPEEDSTEP_ICH || X86_SPEEDSTEP_SMI || X86_P4_CLOCKMOD) | 250 | default (X86_SPEEDSTEP_ICH || X86_SPEEDSTEP_SMI || X86_P4_CLOCKMOD) |
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index 549f2ada55f..430e5c38a54 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c | |||
@@ -30,7 +30,7 @@ | |||
30 | static void __cpuinit early_init_intel(struct cpuinfo_x86 *c) | 30 | static void __cpuinit early_init_intel(struct cpuinfo_x86 *c) |
31 | { | 31 | { |
32 | /* Unmask CPUID levels if masked: */ | 32 | /* Unmask CPUID levels if masked: */ |
33 | if (c->x86 == 6 && c->x86_model >= 15) { | 33 | if (c->x86 > 6 || (c->x86 == 6 && c->x86_model >= 0xd)) { |
34 | u64 misc_enable; | 34 | u64 misc_enable; |
35 | 35 | ||
36 | rdmsrl(MSR_IA32_MISC_ENABLE, misc_enable); | 36 | rdmsrl(MSR_IA32_MISC_ENABLE, misc_enable); |
diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c index 48533d77be7..da299eb85fc 100644 --- a/arch/x86/kernel/cpu/intel_cacheinfo.c +++ b/arch/x86/kernel/cpu/intel_cacheinfo.c | |||
@@ -36,8 +36,11 @@ static struct _cache_table cache_table[] __cpuinitdata = | |||
36 | { | 36 | { |
37 | { 0x06, LVL_1_INST, 8 }, /* 4-way set assoc, 32 byte line size */ | 37 | { 0x06, LVL_1_INST, 8 }, /* 4-way set assoc, 32 byte line size */ |
38 | { 0x08, LVL_1_INST, 16 }, /* 4-way set assoc, 32 byte line size */ | 38 | { 0x08, LVL_1_INST, 16 }, /* 4-way set assoc, 32 byte line size */ |
39 | { 0x09, LVL_1_INST, 32 }, /* 4-way set assoc, 64 byte line size */ | ||
39 | { 0x0a, LVL_1_DATA, 8 }, /* 2 way set assoc, 32 byte line size */ | 40 | { 0x0a, LVL_1_DATA, 8 }, /* 2 way set assoc, 32 byte line size */ |
40 | { 0x0c, LVL_1_DATA, 16 }, /* 4-way set assoc, 32 byte line size */ | 41 | { 0x0c, LVL_1_DATA, 16 }, /* 4-way set assoc, 32 byte line size */ |
42 | { 0x0d, LVL_1_DATA, 16 }, /* 4-way set assoc, 64 byte line size */ | ||
43 | { 0x21, LVL_2, 256 }, /* 8-way set assoc, 64 byte line size */ | ||
41 | { 0x22, LVL_3, 512 }, /* 4-way set assoc, sectored cache, 64 byte line size */ | 44 | { 0x22, LVL_3, 512 }, /* 4-way set assoc, sectored cache, 64 byte line size */ |
42 | { 0x23, LVL_3, 1024 }, /* 8-way set assoc, sectored cache, 64 byte line size */ | 45 | { 0x23, LVL_3, 1024 }, /* 8-way set assoc, sectored cache, 64 byte line size */ |
43 | { 0x25, LVL_3, 2048 }, /* 8-way set assoc, sectored cache, 64 byte line size */ | 46 | { 0x25, LVL_3, 2048 }, /* 8-way set assoc, sectored cache, 64 byte line size */ |
@@ -85,6 +88,18 @@ static struct _cache_table cache_table[] __cpuinitdata = | |||
85 | { 0x85, LVL_2, 2048 }, /* 8-way set assoc, 32 byte line size */ | 88 | { 0x85, LVL_2, 2048 }, /* 8-way set assoc, 32 byte line size */ |
86 | { 0x86, LVL_2, 512 }, /* 4-way set assoc, 64 byte line size */ | 89 | { 0x86, LVL_2, 512 }, /* 4-way set assoc, 64 byte line size */ |
87 | { 0x87, LVL_2, 1024 }, /* 8-way set assoc, 64 byte line size */ | 90 | { 0x87, LVL_2, 1024 }, /* 8-way set assoc, 64 byte line size */ |
91 | { 0xd0, LVL_3, 512 }, /* 4-way set assoc, 64 byte line size */ | ||
92 | { 0xd1, LVL_3, 1024 }, /* 4-way set assoc, 64 byte line size */ | ||
93 | { 0xd2, LVL_3, 2048 }, /* 4-way set assoc, 64 byte line size */ | ||
94 | { 0xd6, LVL_3, 1024 }, /* 8-way set assoc, 64 byte line size */ | ||
95 | { 0xd7, LVL_3, 2038 }, /* 8-way set assoc, 64 byte line size */ | ||
96 | { 0xd8, LVL_3, 4096 }, /* 12-way set assoc, 64 byte line size */ | ||
97 | { 0xdc, LVL_3, 2048 }, /* 12-way set assoc, 64 byte line size */ | ||
98 | { 0xdd, LVL_3, 4096 }, /* 12-way set assoc, 64 byte line size */ | ||
99 | { 0xde, LVL_3, 8192 }, /* 12-way set assoc, 64 byte line size */ | ||
100 | { 0xe2, LVL_3, 2048 }, /* 16-way set assoc, 64 byte line size */ | ||
101 | { 0xe3, LVL_3, 4096 }, /* 16-way set assoc, 64 byte line size */ | ||
102 | { 0xe4, LVL_3, 8192 }, /* 16-way set assoc, 64 byte line size */ | ||
88 | { 0x00, 0, 0} | 103 | { 0x00, 0, 0} |
89 | }; | 104 | }; |
90 | 105 | ||
diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c index d259e5d2e05..236a401b825 100644 --- a/arch/x86/kernel/cpu/mtrr/main.c +++ b/arch/x86/kernel/cpu/mtrr/main.c | |||
@@ -1594,8 +1594,7 @@ int __init mtrr_trim_uncached_memory(unsigned long end_pfn) | |||
1594 | 1594 | ||
1595 | /* kvm/qemu doesn't have mtrr set right, don't trim them all */ | 1595 | /* kvm/qemu doesn't have mtrr set right, don't trim them all */ |
1596 | if (!highest_pfn) { | 1596 | if (!highest_pfn) { |
1597 | WARN(!kvm_para_available(), KERN_WARNING | 1597 | printk(KERN_INFO "CPU MTRRs all blank - virtualized system.\n"); |
1598 | "WARNING: strange, CPU MTRRs all blank?\n"); | ||
1599 | return 0; | 1598 | return 0; |
1600 | } | 1599 | } |
1601 | 1600 | ||
diff --git a/arch/x86/kernel/ds.c b/arch/x86/kernel/ds.c index da91701a234..169a120587b 100644 --- a/arch/x86/kernel/ds.c +++ b/arch/x86/kernel/ds.c | |||
@@ -15,8 +15,8 @@ | |||
15 | * - buffer allocation (memory accounting) | 15 | * - buffer allocation (memory accounting) |
16 | * | 16 | * |
17 | * | 17 | * |
18 | * Copyright (C) 2007-2008 Intel Corporation. | 18 | * Copyright (C) 2007-2009 Intel Corporation. |
19 | * Markus Metzger <markus.t.metzger@intel.com>, 2007-2008 | 19 | * Markus Metzger <markus.t.metzger@intel.com>, 2007-2009 |
20 | */ | 20 | */ |
21 | 21 | ||
22 | 22 | ||
@@ -890,7 +890,7 @@ int ds_set_pebs_reset(struct pebs_tracer *tracer, u64 value) | |||
890 | } | 890 | } |
891 | 891 | ||
892 | static const struct ds_configuration ds_cfg_netburst = { | 892 | static const struct ds_configuration ds_cfg_netburst = { |
893 | .name = "netburst", | 893 | .name = "Netburst", |
894 | .ctl[dsf_bts] = (1 << 2) | (1 << 3), | 894 | .ctl[dsf_bts] = (1 << 2) | (1 << 3), |
895 | .ctl[dsf_bts_kernel] = (1 << 5), | 895 | .ctl[dsf_bts_kernel] = (1 << 5), |
896 | .ctl[dsf_bts_user] = (1 << 6), | 896 | .ctl[dsf_bts_user] = (1 << 6), |
@@ -904,7 +904,7 @@ static const struct ds_configuration ds_cfg_netburst = { | |||
904 | #endif | 904 | #endif |
905 | }; | 905 | }; |
906 | static const struct ds_configuration ds_cfg_pentium_m = { | 906 | static const struct ds_configuration ds_cfg_pentium_m = { |
907 | .name = "pentium m", | 907 | .name = "Pentium M", |
908 | .ctl[dsf_bts] = (1 << 6) | (1 << 7), | 908 | .ctl[dsf_bts] = (1 << 6) | (1 << 7), |
909 | 909 | ||
910 | .sizeof_field = sizeof(long), | 910 | .sizeof_field = sizeof(long), |
@@ -915,8 +915,8 @@ static const struct ds_configuration ds_cfg_pentium_m = { | |||
915 | .sizeof_rec[ds_pebs] = sizeof(long) * 18, | 915 | .sizeof_rec[ds_pebs] = sizeof(long) * 18, |
916 | #endif | 916 | #endif |
917 | }; | 917 | }; |
918 | static const struct ds_configuration ds_cfg_core2 = { | 918 | static const struct ds_configuration ds_cfg_core2_atom = { |
919 | .name = "core 2", | 919 | .name = "Core 2/Atom", |
920 | .ctl[dsf_bts] = (1 << 6) | (1 << 7), | 920 | .ctl[dsf_bts] = (1 << 6) | (1 << 7), |
921 | .ctl[dsf_bts_kernel] = (1 << 9), | 921 | .ctl[dsf_bts_kernel] = (1 << 9), |
922 | .ctl[dsf_bts_user] = (1 << 10), | 922 | .ctl[dsf_bts_user] = (1 << 10), |
@@ -949,19 +949,22 @@ void __cpuinit ds_init_intel(struct cpuinfo_x86 *c) | |||
949 | switch (c->x86) { | 949 | switch (c->x86) { |
950 | case 0x6: | 950 | case 0x6: |
951 | switch (c->x86_model) { | 951 | switch (c->x86_model) { |
952 | case 0 ... 0xC: | 952 | case 0x9: |
953 | /* sorry, don't know about them */ | 953 | case 0xd: /* Pentium M */ |
954 | break; | ||
955 | case 0xD: | ||
956 | case 0xE: /* Pentium M */ | ||
957 | ds_configure(&ds_cfg_pentium_m); | 954 | ds_configure(&ds_cfg_pentium_m); |
958 | break; | 955 | break; |
959 | default: /* Core2, Atom, ... */ | 956 | case 0xf: |
960 | ds_configure(&ds_cfg_core2); | 957 | case 0x17: /* Core2 */ |
958 | case 0x1c: /* Atom */ | ||
959 | ds_configure(&ds_cfg_core2_atom); | ||
960 | break; | ||
961 | case 0x1a: /* i7 */ | ||
962 | default: | ||
963 | /* sorry, don't know about them */ | ||
961 | break; | 964 | break; |
962 | } | 965 | } |
963 | break; | 966 | break; |
964 | case 0xF: | 967 | case 0xf: |
965 | switch (c->x86_model) { | 968 | switch (c->x86_model) { |
966 | case 0x0: | 969 | case 0x0: |
967 | case 0x1: | 970 | case 0x1: |
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index e28c7a98779..a1346217e43 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S | |||
@@ -346,6 +346,7 @@ ENTRY(save_args) | |||
346 | popq_cfi %rax /* move return address... */ | 346 | popq_cfi %rax /* move return address... */ |
347 | mov %gs:pda_irqstackptr,%rsp | 347 | mov %gs:pda_irqstackptr,%rsp |
348 | EMPTY_FRAME 0 | 348 | EMPTY_FRAME 0 |
349 | pushq_cfi %rbp /* backlink for unwinder */ | ||
349 | pushq_cfi %rax /* ... to the new stack */ | 350 | pushq_cfi %rax /* ... to the new stack */ |
350 | /* | 351 | /* |
351 | * We entered an interrupt context - irqs are off: | 352 | * We entered an interrupt context - irqs are off: |
diff --git a/arch/x86/kernel/io_apic.c b/arch/x86/kernel/io_apic.c index 1c4a1302536..9b0c480c383 100644 --- a/arch/x86/kernel/io_apic.c +++ b/arch/x86/kernel/io_apic.c | |||
@@ -2528,14 +2528,15 @@ static void irq_complete_move(struct irq_desc **descp) | |||
2528 | 2528 | ||
2529 | vector = ~get_irq_regs()->orig_ax; | 2529 | vector = ~get_irq_regs()->orig_ax; |
2530 | me = smp_processor_id(); | 2530 | me = smp_processor_id(); |
2531 | |||
2532 | if (vector == cfg->vector && cpumask_test_cpu(me, cfg->domain)) { | ||
2531 | #ifdef CONFIG_NUMA_MIGRATE_IRQ_DESC | 2533 | #ifdef CONFIG_NUMA_MIGRATE_IRQ_DESC |
2532 | *descp = desc = move_irq_desc(desc, me); | 2534 | *descp = desc = move_irq_desc(desc, me); |
2533 | /* get the new one */ | 2535 | /* get the new one */ |
2534 | cfg = desc->chip_data; | 2536 | cfg = desc->chip_data; |
2535 | #endif | 2537 | #endif |
2536 | |||
2537 | if (vector == cfg->vector && cpumask_test_cpu(me, cfg->domain)) | ||
2538 | send_cleanup_vector(cfg); | 2538 | send_cleanup_vector(cfg); |
2539 | } | ||
2539 | } | 2540 | } |
2540 | #else | 2541 | #else |
2541 | static inline void irq_complete_move(struct irq_desc **descp) {} | 2542 | static inline void irq_complete_move(struct irq_desc **descp) {} |
diff --git a/arch/x86/kernel/irqinit_32.c b/arch/x86/kernel/irqinit_32.c index 1507ad4e674..10a09c2f182 100644 --- a/arch/x86/kernel/irqinit_32.c +++ b/arch/x86/kernel/irqinit_32.c | |||
@@ -78,15 +78,6 @@ void __init init_ISA_irqs(void) | |||
78 | } | 78 | } |
79 | } | 79 | } |
80 | 80 | ||
81 | /* | ||
82 | * IRQ2 is cascade interrupt to second interrupt controller | ||
83 | */ | ||
84 | static struct irqaction irq2 = { | ||
85 | .handler = no_action, | ||
86 | .mask = CPU_MASK_NONE, | ||
87 | .name = "cascade", | ||
88 | }; | ||
89 | |||
90 | DEFINE_PER_CPU(vector_irq_t, vector_irq) = { | 81 | DEFINE_PER_CPU(vector_irq_t, vector_irq) = { |
91 | [0 ... IRQ0_VECTOR - 1] = -1, | 82 | [0 ... IRQ0_VECTOR - 1] = -1, |
92 | [IRQ0_VECTOR] = 0, | 83 | [IRQ0_VECTOR] = 0, |
@@ -178,9 +169,6 @@ void __init native_init_IRQ(void) | |||
178 | alloc_intr_gate(THERMAL_APIC_VECTOR, thermal_interrupt); | 169 | alloc_intr_gate(THERMAL_APIC_VECTOR, thermal_interrupt); |
179 | #endif | 170 | #endif |
180 | 171 | ||
181 | if (!acpi_ioapic) | ||
182 | setup_irq(2, &irq2); | ||
183 | |||
184 | /* setup after call gates are initialised (usually add in | 172 | /* setup after call gates are initialised (usually add in |
185 | * the architecture specific gates) | 173 | * the architecture specific gates) |
186 | */ | 174 | */ |
diff --git a/arch/x86/kernel/pci-gart_64.c b/arch/x86/kernel/pci-gart_64.c index 00c2bcd4146..d5768b1af08 100644 --- a/arch/x86/kernel/pci-gart_64.c +++ b/arch/x86/kernel/pci-gart_64.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * This allows to use PCI devices that only support 32bit addresses on systems | 5 | * This allows to use PCI devices that only support 32bit addresses on systems |
6 | * with more than 4GB. | 6 | * with more than 4GB. |
7 | * | 7 | * |
8 | * See Documentation/DMA-mapping.txt for the interface specification. | 8 | * See Documentation/PCI/PCI-DMA-mapping.txt for the interface specification. |
9 | * | 9 | * |
10 | * Copyright 2002 Andi Kleen, SuSE Labs. | 10 | * Copyright 2002 Andi Kleen, SuSE Labs. |
11 | * Subject to the GNU General Public License v2 only. | 11 | * Subject to the GNU General Public License v2 only. |
diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c index a7ed208f81e..92f1c6f3e19 100644 --- a/arch/x86/lguest/boot.c +++ b/arch/x86/lguest/boot.c | |||
@@ -931,7 +931,7 @@ static void lguest_restart(char *reason) | |||
931 | * that we can fit comfortably. | 931 | * that we can fit comfortably. |
932 | * | 932 | * |
933 | * First we need assembly templates of each of the patchable Guest operations, | 933 | * First we need assembly templates of each of the patchable Guest operations, |
934 | * and these are in lguest_asm.S. */ | 934 | * and these are in i386_head.S. */ |
935 | 935 | ||
936 | /*G:060 We construct a table from the assembler templates: */ | 936 | /*G:060 We construct a table from the assembler templates: */ |
937 | static const struct lguest_insns | 937 | static const struct lguest_insns |
@@ -1093,7 +1093,7 @@ __init void lguest_init(void) | |||
1093 | acpi_ht = 0; | 1093 | acpi_ht = 0; |
1094 | #endif | 1094 | #endif |
1095 | 1095 | ||
1096 | /* We set the perferred console to "hvc". This is the "hypervisor | 1096 | /* We set the preferred console to "hvc". This is the "hypervisor |
1097 | * virtual console" driver written by the PowerPC people, which we also | 1097 | * virtual console" driver written by the PowerPC people, which we also |
1098 | * adapted for lguest's use. */ | 1098 | * adapted for lguest's use. */ |
1099 | add_preferred_console("hvc", 0, NULL); | 1099 | add_preferred_console("hvc", 0, NULL); |
diff --git a/arch/x86/mach-default/setup.c b/arch/x86/mach-default/setup.c index df167f26562..a265a7c6319 100644 --- a/arch/x86/mach-default/setup.c +++ b/arch/x86/mach-default/setup.c | |||
@@ -38,6 +38,15 @@ void __init pre_intr_init_hook(void) | |||
38 | init_ISA_irqs(); | 38 | init_ISA_irqs(); |
39 | } | 39 | } |
40 | 40 | ||
41 | /* | ||
42 | * IRQ2 is cascade interrupt to second interrupt controller | ||
43 | */ | ||
44 | static struct irqaction irq2 = { | ||
45 | .handler = no_action, | ||
46 | .mask = CPU_MASK_NONE, | ||
47 | .name = "cascade", | ||
48 | }; | ||
49 | |||
41 | /** | 50 | /** |
42 | * intr_init_hook - post gate setup interrupt initialisation | 51 | * intr_init_hook - post gate setup interrupt initialisation |
43 | * | 52 | * |
@@ -53,6 +62,9 @@ void __init intr_init_hook(void) | |||
53 | if (x86_quirks->arch_intr_init()) | 62 | if (x86_quirks->arch_intr_init()) |
54 | return; | 63 | return; |
55 | } | 64 | } |
65 | if (!acpi_ioapic) | ||
66 | setup_irq(2, &irq2); | ||
67 | |||
56 | } | 68 | } |
57 | 69 | ||
58 | /** | 70 | /** |
diff --git a/arch/x86/mach-voyager/setup.c b/arch/x86/mach-voyager/setup.c index a580b9562e7..d914a7996a6 100644 --- a/arch/x86/mach-voyager/setup.c +++ b/arch/x86/mach-voyager/setup.c | |||
@@ -33,13 +33,23 @@ void __init intr_init_hook(void) | |||
33 | setup_irq(2, &irq2); | 33 | setup_irq(2, &irq2); |
34 | } | 34 | } |
35 | 35 | ||
36 | void __init pre_setup_arch_hook(void) | 36 | static void voyager_disable_tsc(void) |
37 | { | 37 | { |
38 | /* Voyagers run their CPUs from independent clocks, so disable | 38 | /* Voyagers run their CPUs from independent clocks, so disable |
39 | * the TSC code because we can't sync them */ | 39 | * the TSC code because we can't sync them */ |
40 | setup_clear_cpu_cap(X86_FEATURE_TSC); | 40 | setup_clear_cpu_cap(X86_FEATURE_TSC); |
41 | } | 41 | } |
42 | 42 | ||
43 | void __init pre_setup_arch_hook(void) | ||
44 | { | ||
45 | voyager_disable_tsc(); | ||
46 | } | ||
47 | |||
48 | void __init pre_time_init_hook(void) | ||
49 | { | ||
50 | voyager_disable_tsc(); | ||
51 | } | ||
52 | |||
43 | void __init trap_init_hook(void) | 53 | void __init trap_init_hook(void) |
44 | { | 54 | { |
45 | } | 55 | } |
diff --git a/arch/x86/mach-voyager/voyager_smp.c b/arch/x86/mach-voyager/voyager_smp.c index 9840b7ec749..7ffcdeec463 100644 --- a/arch/x86/mach-voyager/voyager_smp.c +++ b/arch/x86/mach-voyager/voyager_smp.c | |||
@@ -81,7 +81,7 @@ static void enable_local_vic_irq(unsigned int irq); | |||
81 | static void disable_local_vic_irq(unsigned int irq); | 81 | static void disable_local_vic_irq(unsigned int irq); |
82 | static void before_handle_vic_irq(unsigned int irq); | 82 | static void before_handle_vic_irq(unsigned int irq); |
83 | static void after_handle_vic_irq(unsigned int irq); | 83 | static void after_handle_vic_irq(unsigned int irq); |
84 | static void set_vic_irq_affinity(unsigned int irq, cpumask_t mask); | 84 | static void set_vic_irq_affinity(unsigned int irq, const struct cpumask *mask); |
85 | static void ack_vic_irq(unsigned int irq); | 85 | static void ack_vic_irq(unsigned int irq); |
86 | static void vic_enable_cpi(void); | 86 | static void vic_enable_cpi(void); |
87 | static void do_boot_cpu(__u8 cpuid); | 87 | static void do_boot_cpu(__u8 cpuid); |
@@ -211,8 +211,6 @@ static __u32 cpu_booted_map; | |||
211 | static cpumask_t smp_commenced_mask = CPU_MASK_NONE; | 211 | static cpumask_t smp_commenced_mask = CPU_MASK_NONE; |
212 | 212 | ||
213 | /* This is for the new dynamic CPU boot code */ | 213 | /* This is for the new dynamic CPU boot code */ |
214 | cpumask_t cpu_callin_map = CPU_MASK_NONE; | ||
215 | cpumask_t cpu_callout_map = CPU_MASK_NONE; | ||
216 | 214 | ||
217 | /* The per processor IRQ masks (these are usually kept in sync) */ | 215 | /* The per processor IRQ masks (these are usually kept in sync) */ |
218 | static __u16 vic_irq_mask[NR_CPUS] __cacheline_aligned; | 216 | static __u16 vic_irq_mask[NR_CPUS] __cacheline_aligned; |
@@ -378,7 +376,7 @@ void __init find_smp_config(void) | |||
378 | cpus_addr(phys_cpu_present_map)[0] |= | 376 | cpus_addr(phys_cpu_present_map)[0] |= |
379 | voyager_extended_cmos_read(VOYAGER_PROCESSOR_PRESENT_MASK + | 377 | voyager_extended_cmos_read(VOYAGER_PROCESSOR_PRESENT_MASK + |
380 | 3) << 24; | 378 | 3) << 24; |
381 | cpu_possible_map = phys_cpu_present_map; | 379 | init_cpu_possible(&phys_cpu_present_map); |
382 | printk("VOYAGER SMP: phys_cpu_present_map = 0x%lx\n", | 380 | printk("VOYAGER SMP: phys_cpu_present_map = 0x%lx\n", |
383 | cpus_addr(phys_cpu_present_map)[0]); | 381 | cpus_addr(phys_cpu_present_map)[0]); |
384 | /* Here we set up the VIC to enable SMP */ | 382 | /* Here we set up the VIC to enable SMP */ |
@@ -1599,16 +1597,16 @@ static void after_handle_vic_irq(unsigned int irq) | |||
1599 | * change the mask and then do an interrupt enable CPI to re-enable on | 1597 | * change the mask and then do an interrupt enable CPI to re-enable on |
1600 | * the selected processors */ | 1598 | * the selected processors */ |
1601 | 1599 | ||
1602 | void set_vic_irq_affinity(unsigned int irq, cpumask_t mask) | 1600 | void set_vic_irq_affinity(unsigned int irq, const struct cpumask *mask) |
1603 | { | 1601 | { |
1604 | /* Only extended processors handle interrupts */ | 1602 | /* Only extended processors handle interrupts */ |
1605 | unsigned long real_mask; | 1603 | unsigned long real_mask; |
1606 | unsigned long irq_mask = 1 << irq; | 1604 | unsigned long irq_mask = 1 << irq; |
1607 | int cpu; | 1605 | int cpu; |
1608 | 1606 | ||
1609 | real_mask = cpus_addr(mask)[0] & voyager_extended_vic_processors; | 1607 | real_mask = cpus_addr(*mask)[0] & voyager_extended_vic_processors; |
1610 | 1608 | ||
1611 | if (cpus_addr(mask)[0] == 0) | 1609 | if (cpus_addr(*mask)[0] == 0) |
1612 | /* can't have no CPUs to accept the interrupt -- extremely | 1610 | /* can't have no CPUs to accept the interrupt -- extremely |
1613 | * bad things will happen */ | 1611 | * bad things will happen */ |
1614 | return; | 1612 | return; |
@@ -1750,10 +1748,11 @@ static void __cpuinit voyager_smp_prepare_boot_cpu(void) | |||
1750 | init_gdt(smp_processor_id()); | 1748 | init_gdt(smp_processor_id()); |
1751 | switch_to_new_gdt(); | 1749 | switch_to_new_gdt(); |
1752 | 1750 | ||
1753 | cpu_set(smp_processor_id(), cpu_online_map); | 1751 | cpu_online_map = cpumask_of_cpu(smp_processor_id()); |
1754 | cpu_set(smp_processor_id(), cpu_callout_map); | 1752 | cpu_callout_map = cpumask_of_cpu(smp_processor_id()); |
1755 | cpu_set(smp_processor_id(), cpu_possible_map); | 1753 | cpu_callin_map = CPU_MASK_NONE; |
1756 | cpu_set(smp_processor_id(), cpu_present_map); | 1754 | cpu_present_map = cpumask_of_cpu(smp_processor_id()); |
1755 | |||
1757 | } | 1756 | } |
1758 | 1757 | ||
1759 | static int __cpuinit voyager_cpu_up(unsigned int cpu) | 1758 | static int __cpuinit voyager_cpu_up(unsigned int cpu) |
@@ -1783,9 +1782,9 @@ void __init smp_setup_processor_id(void) | |||
1783 | x86_write_percpu(cpu_number, hard_smp_processor_id()); | 1782 | x86_write_percpu(cpu_number, hard_smp_processor_id()); |
1784 | } | 1783 | } |
1785 | 1784 | ||
1786 | static void voyager_send_call_func(cpumask_t callmask) | 1785 | static void voyager_send_call_func(const struct cpumask *callmask) |
1787 | { | 1786 | { |
1788 | __u32 mask = cpus_addr(callmask)[0] & ~(1 << smp_processor_id()); | 1787 | __u32 mask = cpus_addr(*callmask)[0] & ~(1 << smp_processor_id()); |
1789 | send_CPI(mask, VIC_CALL_FUNCTION_CPI); | 1788 | send_CPI(mask, VIC_CALL_FUNCTION_CPI); |
1790 | } | 1789 | } |
1791 | 1790 | ||
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index 90dfae511a4..c76ef1d701c 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c | |||
@@ -603,8 +603,6 @@ void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code) | |||
603 | 603 | ||
604 | si_code = SEGV_MAPERR; | 604 | si_code = SEGV_MAPERR; |
605 | 605 | ||
606 | if (notify_page_fault(regs)) | ||
607 | return; | ||
608 | if (unlikely(kmmio_fault(regs, address))) | 606 | if (unlikely(kmmio_fault(regs, address))) |
609 | return; | 607 | return; |
610 | 608 | ||
@@ -634,6 +632,9 @@ void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code) | |||
634 | if (spurious_fault(address, error_code)) | 632 | if (spurious_fault(address, error_code)) |
635 | return; | 633 | return; |
636 | 634 | ||
635 | /* kprobes don't want to hook the spurious faults. */ | ||
636 | if (notify_page_fault(regs)) | ||
637 | return; | ||
637 | /* | 638 | /* |
638 | * Don't take the mm semaphore here. If we fixup a prefetch | 639 | * Don't take the mm semaphore here. If we fixup a prefetch |
639 | * fault we could otherwise deadlock. | 640 | * fault we could otherwise deadlock. |
@@ -641,6 +642,9 @@ void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code) | |||
641 | goto bad_area_nosemaphore; | 642 | goto bad_area_nosemaphore; |
642 | } | 643 | } |
643 | 644 | ||
645 | /* kprobes don't want to hook the spurious faults. */ | ||
646 | if (notify_page_fault(regs)) | ||
647 | return; | ||
644 | 648 | ||
645 | /* | 649 | /* |
646 | * It's safe to allow irq's after cr2 has been saved and the | 650 | * It's safe to allow irq's after cr2 has been saved and the |
diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c index 4064345cf14..fecbce6e7d7 100644 --- a/arch/x86/pci/irq.c +++ b/arch/x86/pci/irq.c | |||
@@ -572,6 +572,7 @@ static __init int intel_router_probe(struct irq_router *r, struct pci_dev *route | |||
572 | case PCI_DEVICE_ID_INTEL_ICH7_1: | 572 | case PCI_DEVICE_ID_INTEL_ICH7_1: |
573 | case PCI_DEVICE_ID_INTEL_ICH7_30: | 573 | case PCI_DEVICE_ID_INTEL_ICH7_30: |
574 | case PCI_DEVICE_ID_INTEL_ICH7_31: | 574 | case PCI_DEVICE_ID_INTEL_ICH7_31: |
575 | case PCI_DEVICE_ID_INTEL_TGP_LPC: | ||
575 | case PCI_DEVICE_ID_INTEL_ESB2_0: | 576 | case PCI_DEVICE_ID_INTEL_ESB2_0: |
576 | case PCI_DEVICE_ID_INTEL_ICH8_0: | 577 | case PCI_DEVICE_ID_INTEL_ICH8_0: |
577 | case PCI_DEVICE_ID_INTEL_ICH8_1: | 578 | case PCI_DEVICE_ID_INTEL_ICH8_1: |
diff --git a/arch/x86/xen/multicalls.h b/arch/x86/xen/multicalls.h index 85893824161..fa3e10725d9 100644 --- a/arch/x86/xen/multicalls.h +++ b/arch/x86/xen/multicalls.h | |||
@@ -19,8 +19,10 @@ DECLARE_PER_CPU(unsigned long, xen_mc_irq_flags); | |||
19 | paired with xen_mc_issue() */ | 19 | paired with xen_mc_issue() */ |
20 | static inline void xen_mc_batch(void) | 20 | static inline void xen_mc_batch(void) |
21 | { | 21 | { |
22 | unsigned long flags; | ||
22 | /* need to disable interrupts until this entry is complete */ | 23 | /* need to disable interrupts until this entry is complete */ |
23 | local_irq_save(__get_cpu_var(xen_mc_irq_flags)); | 24 | local_irq_save(flags); |
25 | __get_cpu_var(xen_mc_irq_flags) = flags; | ||
24 | } | 26 | } |
25 | 27 | ||
26 | static inline struct multicall_space xen_mc_entry(size_t args) | 28 | static inline struct multicall_space xen_mc_entry(size_t args) |