Skip to content

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

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

parents adac1665 14e54cc3
Show whitespace changes
Inline Side-by-side
Showing with 465 additions and 424 deletions
arch/arm/configs/bast_defconfig
View file @ bb4bc81a
...@@ -14,8 +14,7 @@ CONFIG_GENERIC_IOMAP=y ...@@ -14,8 +14,7 @@ CONFIG_GENERIC_IOMAP=y
# Code maturity level options # Code maturity level options
# #
CONFIG_EXPERIMENTAL=y CONFIG_EXPERIMENTAL=y
# CONFIG_CLEAN_COMPILE is not set CONFIG_CLEAN_COMPILE=y
CONFIG_BROKEN=y
CONFIG_BROKEN_ON_SMP=y CONFIG_BROKEN_ON_SMP=y
# #
...@@ -360,7 +359,6 @@ CONFIG_BLK_DEV_IDE_BAST=y ...@@ -360,7 +359,6 @@ CONFIG_BLK_DEV_IDE_BAST=y
# #
# IEEE 1394 (FireWire) support # IEEE 1394 (FireWire) support
# #
# CONFIG_IEEE1394 is not set
# #
# I2O device support # I2O device support
...@@ -781,7 +779,6 @@ CONFIG_SYSFS=y ...@@ -781,7 +779,6 @@ CONFIG_SYSFS=y
# CONFIG_DEVFS_FS is not set # CONFIG_DEVFS_FS is not set
# CONFIG_DEVPTS_FS_XATTR is not set # CONFIG_DEVPTS_FS_XATTR is not set
# CONFIG_TMPFS is not set # CONFIG_TMPFS is not set
# CONFIG_HUGETLBFS is not set
# CONFIG_HUGETLB_PAGE is not set # CONFIG_HUGETLB_PAGE is not set
CONFIG_RAMFS=y CONFIG_RAMFS=y
......
arch/arm/configs/collie_defconfig
View file @ bb4bc81a
...@@ -13,8 +13,7 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y ...@@ -13,8 +13,7 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y
# Code maturity level options # Code maturity level options
# #
CONFIG_EXPERIMENTAL=y CONFIG_EXPERIMENTAL=y
# CONFIG_CLEAN_COMPILE is not set CONFIG_CLEAN_COMPILE=y
CONFIG_BROKEN=y
CONFIG_BROKEN_ON_SMP=y CONFIG_BROKEN_ON_SMP=y
CONFIG_LOCK_KERNEL=y CONFIG_LOCK_KERNEL=y
CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_INIT_ENV_ARG_LIMIT=32
...@@ -308,9 +307,7 @@ CONFIG_MTD_CFI_I2=y ...@@ -308,9 +307,7 @@ CONFIG_MTD_CFI_I2=y
# CONFIG_MTD_ROM is not set # CONFIG_MTD_ROM is not set
# CONFIG_MTD_ABSENT is not set # CONFIG_MTD_ABSENT is not set
CONFIG_MTD_OBSOLETE_CHIPS=y CONFIG_MTD_OBSOLETE_CHIPS=y
# CONFIG_MTD_AMDSTD is not set
CONFIG_MTD_SHARP=y CONFIG_MTD_SHARP=y
# CONFIG_MTD_JEDEC is not set
# #
# Mapping drivers for chip access # Mapping drivers for chip access
...@@ -396,7 +393,6 @@ CONFIG_ATA_OVER_ETH=m ...@@ -396,7 +393,6 @@ CONFIG_ATA_OVER_ETH=m
# #
# IEEE 1394 (FireWire) support # IEEE 1394 (FireWire) support
# #
# CONFIG_IEEE1394 is not set
# #
# I2O device support # I2O device support
...@@ -741,7 +737,6 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" ...@@ -741,7 +737,6 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
CONFIG_PROC_FS=y CONFIG_PROC_FS=y
CONFIG_SYSFS=y CONFIG_SYSFS=y
CONFIG_TMPFS=y CONFIG_TMPFS=y
# CONFIG_HUGETLBFS is not set
# CONFIG_HUGETLB_PAGE is not set # CONFIG_HUGETLB_PAGE is not set
CONFIG_RAMFS=y CONFIG_RAMFS=y
# CONFIG_RELAYFS_FS is not set # CONFIG_RELAYFS_FS is not set
......
arch/arm/configs/s3c2410_defconfig
View file @ bb4bc81a
...@@ -13,8 +13,7 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y ...@@ -13,8 +13,7 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y
# Code maturity level options # Code maturity level options
# #
CONFIG_EXPERIMENTAL=y CONFIG_EXPERIMENTAL=y
# CONFIG_CLEAN_COMPILE is not set CONFIG_CLEAN_COMPILE=y
CONFIG_BROKEN=y
CONFIG_BROKEN_ON_SMP=y CONFIG_BROKEN_ON_SMP=y
CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_INIT_ENV_ARG_LIMIT=32
...@@ -473,7 +472,6 @@ CONFIG_BLK_DEV_IDE_BAST=y ...@@ -473,7 +472,6 @@ CONFIG_BLK_DEV_IDE_BAST=y
# #
# IEEE 1394 (FireWire) support # IEEE 1394 (FireWire) support
# #
# CONFIG_IEEE1394 is not set
# #
# I2O device support # I2O device support
...@@ -896,7 +894,6 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" ...@@ -896,7 +894,6 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
CONFIG_PROC_FS=y CONFIG_PROC_FS=y
CONFIG_SYSFS=y CONFIG_SYSFS=y
# CONFIG_TMPFS is not set # CONFIG_TMPFS is not set
# CONFIG_HUGETLBFS is not set
# CONFIG_HUGETLB_PAGE is not set # CONFIG_HUGETLB_PAGE is not set
CONFIG_RAMFS=y CONFIG_RAMFS=y
# CONFIG_RELAYFS_FS is not set # CONFIG_RELAYFS_FS is not set
......
arch/arm/kernel/calls.S
View file @ bb4bc81a
...@@ -7,337 +7,334 @@ ...@@ -7,337 +7,334 @@
* it under the terms of the GNU General Public License version 2 as * it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation. * published by the Free Software Foundation.
* *
* This file is included twice in entry-common.S * This file is included thrice in entry-common.S
*/ */
#ifndef NR_syscalls /* 0 */ CALL(sys_restart_syscall)
#define NR_syscalls 328 CALL(sys_exit)
#else CALL(sys_fork_wrapper)
CALL(sys_read)
100: CALL(sys_write)
/* 0 */ .long sys_restart_syscall /* 5 */ CALL(sys_open)
.long sys_exit CALL(sys_close)
.long sys_fork_wrapper CALL(sys_ni_syscall) /* was sys_waitpid */
.long sys_read CALL(sys_creat)
.long sys_write CALL(sys_link)
/* 5 */ .long sys_open /* 10 */ CALL(sys_unlink)
.long sys_close CALL(sys_execve_wrapper)
.long sys_ni_syscall /* was sys_waitpid */ CALL(sys_chdir)
.long sys_creat CALL(OBSOLETE(sys_time)) /* used by libc4 */
.long sys_link CALL(sys_mknod)
/* 10 */ .long sys_unlink /* 15 */ CALL(sys_chmod)
.long sys_execve_wrapper CALL(sys_lchown16)
.long sys_chdir CALL(sys_ni_syscall) /* was sys_break */
.long OBSOLETE(sys_time) /* used by libc4 */ CALL(sys_ni_syscall) /* was sys_stat */
.long sys_mknod CALL(sys_lseek)
/* 15 */ .long sys_chmod /* 20 */ CALL(sys_getpid)
.long sys_lchown16 CALL(sys_mount)
.long sys_ni_syscall /* was sys_break */ CALL(OBSOLETE(sys_oldumount)) /* used by libc4 */
.long sys_ni_syscall /* was sys_stat */ CALL(sys_setuid16)
.long sys_lseek CALL(sys_getuid16)
/* 20 */ .long sys_getpid /* 25 */ CALL(OBSOLETE(sys_stime))
.long sys_mount CALL(sys_ptrace)
.long OBSOLETE(sys_oldumount) /* used by libc4 */ CALL(OBSOLETE(sys_alarm)) /* used by libc4 */
.long sys_setuid16 CALL(sys_ni_syscall) /* was sys_fstat */
.long sys_getuid16 CALL(sys_pause)
/* 25 */ .long OBSOLETE(sys_stime) /* 30 */ CALL(OBSOLETE(sys_utime)) /* used by libc4 */
.long sys_ptrace CALL(sys_ni_syscall) /* was sys_stty */
.long OBSOLETE(sys_alarm) /* used by libc4 */ CALL(sys_ni_syscall) /* was sys_getty */
.long sys_ni_syscall /* was sys_fstat */ CALL(sys_access)
.long sys_pause CALL(sys_nice)
/* 30 */ .long OBSOLETE(sys_utime) /* used by libc4 */ /* 35 */ CALL(sys_ni_syscall) /* was sys_ftime */
.long sys_ni_syscall /* was sys_stty */ CALL(sys_sync)
.long sys_ni_syscall /* was sys_getty */ CALL(sys_kill)
.long sys_access CALL(sys_rename)
.long sys_nice CALL(sys_mkdir)
/* 35 */ .long sys_ni_syscall /* was sys_ftime */ /* 40 */ CALL(sys_rmdir)
.long sys_sync CALL(sys_dup)
.long sys_kill CALL(sys_pipe)
.long sys_rename CALL(sys_times)
.long sys_mkdir CALL(sys_ni_syscall) /* was sys_prof */
/* 40 */ .long sys_rmdir /* 45 */ CALL(sys_brk)
.long sys_dup CALL(sys_setgid16)
.long sys_pipe CALL(sys_getgid16)
.long sys_times CALL(sys_ni_syscall) /* was sys_signal */
.long sys_ni_syscall /* was sys_prof */ CALL(sys_geteuid16)
/* 45 */ .long sys_brk /* 50 */ CALL(sys_getegid16)
.long sys_setgid16 CALL(sys_acct)
.long sys_getgid16 CALL(sys_umount)
.long sys_ni_syscall /* was sys_signal */ CALL(sys_ni_syscall) /* was sys_lock */
.long sys_geteuid16 CALL(sys_ioctl)
/* 50 */ .long sys_getegid16 /* 55 */ CALL(sys_fcntl)
.long sys_acct CALL(sys_ni_syscall) /* was sys_mpx */
.long sys_umount CALL(sys_setpgid)
.long sys_ni_syscall /* was sys_lock */ CALL(sys_ni_syscall) /* was sys_ulimit */
.long sys_ioctl CALL(sys_ni_syscall) /* was sys_olduname */
/* 55 */ .long sys_fcntl /* 60 */ CALL(sys_umask)
.long sys_ni_syscall /* was sys_mpx */ CALL(sys_chroot)
.long sys_setpgid CALL(sys_ustat)
.long sys_ni_syscall /* was sys_ulimit */ CALL(sys_dup2)
.long sys_ni_syscall /* was sys_olduname */ CALL(sys_getppid)
/* 60 */ .long sys_umask /* 65 */ CALL(sys_getpgrp)
.long sys_chroot CALL(sys_setsid)
.long sys_ustat CALL(sys_sigaction)
.long sys_dup2 CALL(sys_ni_syscall) /* was sys_sgetmask */
.long sys_getppid CALL(sys_ni_syscall) /* was sys_ssetmask */
/* 65 */ .long sys_getpgrp /* 70 */ CALL(sys_setreuid16)
.long sys_setsid CALL(sys_setregid16)
.long sys_sigaction CALL(sys_sigsuspend_wrapper)
.long sys_ni_syscall /* was sys_sgetmask */ CALL(sys_sigpending)
.long sys_ni_syscall /* was sys_ssetmask */ CALL(sys_sethostname)
/* 70 */ .long sys_setreuid16 /* 75 */ CALL(sys_setrlimit)
.long sys_setregid16 CALL(OBSOLETE(sys_old_getrlimit)) /* used by libc4 */
.long sys_sigsuspend_wrapper CALL(sys_getrusage)
.long sys_sigpending CALL(sys_gettimeofday)
.long sys_sethostname CALL(sys_settimeofday)
/* 75 */ .long sys_setrlimit /* 80 */ CALL(sys_getgroups16)
.long OBSOLETE(sys_old_getrlimit) /* used by libc4 */ CALL(sys_setgroups16)
.long sys_getrusage CALL(OBSOLETE(old_select)) /* used by libc4 */
.long sys_gettimeofday CALL(sys_symlink)
.long sys_settimeofday CALL(sys_ni_syscall) /* was sys_lstat */
/* 80 */ .long sys_getgroups16 /* 85 */ CALL(sys_readlink)
.long sys_setgroups16 CALL(sys_uselib)
.long OBSOLETE(old_select) /* used by libc4 */ CALL(sys_swapon)
.long sys_symlink CALL(sys_reboot)
.long sys_ni_syscall /* was sys_lstat */ CALL(OBSOLETE(old_readdir)) /* used by libc4 */
/* 85 */ .long sys_readlink /* 90 */ CALL(OBSOLETE(old_mmap)) /* used by libc4 */
.long sys_uselib CALL(sys_munmap)
.long sys_swapon CALL(sys_truncate)
.long sys_reboot CALL(sys_ftruncate)
.long OBSOLETE(old_readdir) /* used by libc4 */ CALL(sys_fchmod)
/* 90 */ .long OBSOLETE(old_mmap) /* used by libc4 */ /* 95 */ CALL(sys_fchown16)
.long sys_munmap CALL(sys_getpriority)
.long sys_truncate CALL(sys_setpriority)
.long sys_ftruncate CALL(sys_ni_syscall) /* was sys_profil */
.long sys_fchmod CALL(sys_statfs)
/* 95 */ .long sys_fchown16 /* 100 */ CALL(sys_fstatfs)
.long sys_getpriority CALL(sys_ni_syscall)
.long sys_setpriority CALL(OBSOLETE(sys_socketcall))
.long sys_ni_syscall /* was sys_profil */ CALL(sys_syslog)
.long sys_statfs CALL(sys_setitimer)
/* 100 */ .long sys_fstatfs /* 105 */ CALL(sys_getitimer)
.long sys_ni_syscall CALL(sys_newstat)
.long OBSOLETE(sys_socketcall) CALL(sys_newlstat)
.long sys_syslog CALL(sys_newfstat)
.long sys_setitimer CALL(sys_ni_syscall) /* was sys_uname */
/* 105 */ .long sys_getitimer /* 110 */ CALL(sys_ni_syscall) /* was sys_iopl */
.long sys_newstat CALL(sys_vhangup)
.long sys_newlstat CALL(sys_ni_syscall)
.long sys_newfstat CALL(OBSOLETE(sys_syscall)) /* call a syscall */
.long sys_ni_syscall /* was sys_uname */ CALL(sys_wait4)
/* 110 */ .long sys_ni_syscall /* was sys_iopl */ /* 115 */ CALL(sys_swapoff)
.long sys_vhangup CALL(sys_sysinfo)
.long sys_ni_syscall CALL(OBSOLETE(ABI(sys_ipc, sys_oabi_ipc)))
.long OBSOLETE(sys_syscall) /* call a syscall */ CALL(sys_fsync)
.long sys_wait4 CALL(sys_sigreturn_wrapper)
/* 115 */ .long sys_swapoff /* 120 */ CALL(sys_clone_wrapper)
.long sys_sysinfo CALL(sys_setdomainname)
.long OBSOLETE(ABI(sys_ipc, sys_oabi_ipc)) CALL(sys_newuname)
.long sys_fsync CALL(sys_ni_syscall)
.long sys_sigreturn_wrapper CALL(sys_adjtimex)
/* 120 */ .long sys_clone_wrapper /* 125 */ CALL(sys_mprotect)
.long sys_setdomainname CALL(sys_sigprocmask)
.long sys_newuname CALL(sys_ni_syscall) /* was sys_create_module */
.long sys_ni_syscall CALL(sys_init_module)
.long sys_adjtimex CALL(sys_delete_module)
/* 125 */ .long sys_mprotect /* 130 */ CALL(sys_ni_syscall) /* was sys_get_kernel_syms */
.long sys_sigprocmask CALL(sys_quotactl)
.long sys_ni_syscall /* was sys_create_module */ CALL(sys_getpgid)
.long sys_init_module CALL(sys_fchdir)
.long sys_delete_module CALL(sys_bdflush)
/* 130 */ .long sys_ni_syscall /* was sys_get_kernel_syms */ /* 135 */ CALL(sys_sysfs)
.long sys_quotactl CALL(sys_personality)
.long sys_getpgid CALL(sys_ni_syscall) /* CALL(_sys_afs_syscall) */
.long sys_fchdir CALL(sys_setfsuid16)
.long sys_bdflush CALL(sys_setfsgid16)
/* 135 */ .long sys_sysfs /* 140 */ CALL(sys_llseek)
.long sys_personality CALL(sys_getdents)
.long sys_ni_syscall /* .long _sys_afs_syscall */ CALL(sys_select)
.long sys_setfsuid16 CALL(sys_flock)
.long sys_setfsgid16 CALL(sys_msync)
/* 140 */ .long sys_llseek /* 145 */ CALL(sys_readv)
.long sys_getdents CALL(sys_writev)
.long sys_select CALL(sys_getsid)
.long sys_flock CALL(sys_fdatasync)
.long sys_msync CALL(sys_sysctl)
/* 145 */ .long sys_readv /* 150 */ CALL(sys_mlock)
.long sys_writev CALL(sys_munlock)
.long sys_getsid CALL(sys_mlockall)
.long sys_fdatasync CALL(sys_munlockall)
.long sys_sysctl CALL(sys_sched_setparam)
/* 150 */ .long sys_mlock /* 155 */ CALL(sys_sched_getparam)
.long sys_munlock CALL(sys_sched_setscheduler)
.long sys_mlockall CALL(sys_sched_getscheduler)
.long sys_munlockall CALL(sys_sched_yield)
.long sys_sched_setparam CALL(sys_sched_get_priority_max)
/* 155 */ .long sys_sched_getparam /* 160 */ CALL(sys_sched_get_priority_min)
.long sys_sched_setscheduler CALL(sys_sched_rr_get_interval)
.long sys_sched_getscheduler CALL(sys_nanosleep)
.long sys_sched_yield CALL(sys_arm_mremap)
.long sys_sched_get_priority_max CALL(sys_setresuid16)
/* 160 */ .long sys_sched_get_priority_min /* 165 */ CALL(sys_getresuid16)
.long sys_sched_rr_get_interval CALL(sys_ni_syscall)
.long sys_nanosleep CALL(sys_ni_syscall) /* was sys_query_module */
.long sys_arm_mremap CALL(sys_poll)
.long sys_setresuid16 CALL(sys_nfsservctl)
/* 165 */ .long sys_getresuid16 /* 170 */ CALL(sys_setresgid16)
.long sys_ni_syscall CALL(sys_getresgid16)
.long sys_ni_syscall /* was sys_query_module */ CALL(sys_prctl)
.long sys_poll CALL(sys_rt_sigreturn_wrapper)
.long sys_nfsservctl CALL(sys_rt_sigaction)
/* 170 */ .long sys_setresgid16 /* 175 */ CALL(sys_rt_sigprocmask)
.long sys_getresgid16 CALL(sys_rt_sigpending)
.long sys_prctl CALL(sys_rt_sigtimedwait)
.long sys_rt_sigreturn_wrapper CALL(sys_rt_sigqueueinfo)
.long sys_rt_sigaction CALL(sys_rt_sigsuspend_wrapper)
/* 175 */ .long sys_rt_sigprocmask /* 180 */ CALL(ABI(sys_pread64, sys_oabi_pread64))
.long sys_rt_sigpending CALL(ABI(sys_pwrite64, sys_oabi_pwrite64))
.long sys_rt_sigtimedwait CALL(sys_chown16)
.long sys_rt_sigqueueinfo CALL(sys_getcwd)
.long sys_rt_sigsuspend_wrapper CALL(sys_capget)
/* 180 */ .long ABI(sys_pread64, sys_oabi_pread64) /* 185 */ CALL(sys_capset)
.long ABI(sys_pwrite64, sys_oabi_pwrite64) CALL(sys_sigaltstack_wrapper)
.long sys_chown16 CALL(sys_sendfile)
.long sys_getcwd CALL(sys_ni_syscall)
.long sys_capget CALL(sys_ni_syscall)
/* 185 */ .long sys_capset /* 190 */ CALL(sys_vfork_wrapper)
.long sys_sigaltstack_wrapper CALL(sys_getrlimit)
.long sys_sendfile CALL(sys_mmap2)
.long sys_ni_syscall CALL(ABI(sys_truncate64, sys_oabi_truncate64))
.long sys_ni_syscall CALL(ABI(sys_ftruncate64, sys_oabi_ftruncate64))
/* 190 */ .long sys_vfork_wrapper /* 195 */ CALL(ABI(sys_stat64, sys_oabi_stat64))
.long sys_getrlimit CALL(ABI(sys_lstat64, sys_oabi_lstat64))
.long sys_mmap2 CALL(ABI(sys_fstat64, sys_oabi_fstat64))
.long ABI(sys_truncate64, sys_oabi_truncate64) CALL(sys_lchown)
.long ABI(sys_ftruncate64, sys_oabi_ftruncate64) CALL(sys_getuid)
/* 195 */ .long ABI(sys_stat64, sys_oabi_stat64) /* 200 */ CALL(sys_getgid)
.long ABI(sys_lstat64, sys_oabi_lstat64) CALL(sys_geteuid)
.long ABI(sys_fstat64, sys_oabi_fstat64) CALL(sys_getegid)
.long sys_lchown CALL(sys_setreuid)
.long sys_getuid CALL(sys_setregid)
/* 200 */ .long sys_getgid /* 205 */ CALL(sys_getgroups)
.long sys_geteuid CALL(sys_setgroups)
.long sys_getegid CALL(sys_fchown)
.long sys_setreuid CALL(sys_setresuid)
.long sys_setregid CALL(sys_getresuid)
/* 205 */ .long sys_getgroups /* 210 */ CALL(sys_setresgid)
.long sys_setgroups CALL(sys_getresgid)
.long sys_fchown CALL(sys_chown)
.long sys_setresuid CALL(sys_setuid)
.long sys_getresuid CALL(sys_setgid)
/* 210 */ .long sys_setresgid /* 215 */ CALL(sys_setfsuid)
.long sys_getresgid CALL(sys_setfsgid)
.long sys_chown CALL(sys_getdents64)
.long sys_setuid CALL(sys_pivot_root)
.long sys_setgid CALL(sys_mincore)
/* 215 */ .long sys_setfsuid /* 220 */ CALL(sys_madvise)
.long sys_setfsgid CALL(ABI(sys_fcntl64, sys_oabi_fcntl64))
.long sys_getdents64 CALL(sys_ni_syscall) /* TUX */
.long sys_pivot_root CALL(sys_ni_syscall)
.long sys_mincore CALL(sys_gettid)
/* 220 */ .long sys_madvise /* 225 */ CALL(ABI(sys_readahead, sys_oabi_readahead))
.long ABI(sys_fcntl64, sys_oabi_fcntl64) CALL(sys_setxattr)
.long sys_ni_syscall /* TUX */ CALL(sys_lsetxattr)
.long sys_ni_syscall CALL(sys_fsetxattr)
.long sys_gettid CALL(sys_getxattr)
/* 225 */ .long ABI(sys_readahead, sys_oabi_readahead) /* 230 */ CALL(sys_lgetxattr)
.long sys_setxattr CALL(sys_fgetxattr)
.long sys_lsetxattr CALL(sys_listxattr)
.long sys_fsetxattr CALL(sys_llistxattr)
.long sys_getxattr CALL(sys_flistxattr)
/* 230 */ .long sys_lgetxattr /* 235 */ CALL(sys_removexattr)
.long sys_fgetxattr CALL(sys_lremovexattr)
.long sys_listxattr CALL(sys_fremovexattr)
.long sys_llistxattr CALL(sys_tkill)
.long sys_flistxattr CALL(sys_sendfile64)
/* 235 */ .long sys_removexattr /* 240 */ CALL(sys_futex)
.long sys_lremovexattr CALL(sys_sched_setaffinity)
.long sys_fremovexattr CALL(sys_sched_getaffinity)
.long sys_tkill CALL(sys_io_setup)
.long sys_sendfile64 CALL(sys_io_destroy)
/* 240 */ .long sys_futex /* 245 */ CALL(sys_io_getevents)
.long sys_sched_setaffinity CALL(sys_io_submit)
.long sys_sched_getaffinity CALL(sys_io_cancel)
.long sys_io_setup CALL(sys_exit_group)
.long sys_io_destroy CALL(sys_lookup_dcookie)
/* 245 */ .long sys_io_getevents /* 250 */ CALL(sys_epoll_create)
.long sys_io_submit CALL(ABI(sys_epoll_ctl, sys_oabi_epoll_ctl))
.long sys_io_cancel CALL(ABI(sys_epoll_wait, sys_oabi_epoll_wait))
.long sys_exit_group CALL(sys_remap_file_pages)
.long sys_lookup_dcookie CALL(sys_ni_syscall) /* sys_set_thread_area */
/* 250 */ .long sys_epoll_create /* 255 */ CALL(sys_ni_syscall) /* sys_get_thread_area */
.long ABI(sys_epoll_ctl, sys_oabi_epoll_ctl) CALL(sys_set_tid_address)
.long ABI(sys_epoll_wait, sys_oabi_epoll_wait) CALL(sys_timer_create)
.long sys_remap_file_pages CALL(sys_timer_settime)
.long sys_ni_syscall /* sys_set_thread_area */ CALL(sys_timer_gettime)
/* 255 */ .long sys_ni_syscall /* sys_get_thread_area */ /* 260 */ CALL(sys_timer_getoverrun)
.long sys_set_tid_address CALL(sys_timer_delete)
.long sys_timer_create CALL(sys_clock_settime)
.long sys_timer_settime CALL(sys_clock_gettime)
.long sys_timer_gettime CALL(sys_clock_getres)
/* 260 */ .long sys_timer_getoverrun /* 265 */ CALL(sys_clock_nanosleep)
.long sys_timer_delete CALL(sys_statfs64_wrapper)
.long sys_clock_settime CALL(sys_fstatfs64_wrapper)
.long sys_clock_gettime CALL(sys_tgkill)
.long sys_clock_getres CALL(sys_utimes)
/* 265 */ .long sys_clock_nanosleep /* 270 */ CALL(sys_arm_fadvise64_64)
.long sys_statfs64_wrapper CALL(sys_pciconfig_iobase)
.long sys_fstatfs64_wrapper CALL(sys_pciconfig_read)
.long sys_tgkill CALL(sys_pciconfig_write)
.long sys_utimes CALL(sys_mq_open)
/* 270 */ .long sys_arm_fadvise64_64 /* 275 */ CALL(sys_mq_unlink)
.long sys_pciconfig_iobase CALL(sys_mq_timedsend)
.long sys_pciconfig_read CALL(sys_mq_timedreceive)
.long sys_pciconfig_write CALL(sys_mq_notify)
.long sys_mq_open CALL(sys_mq_getsetattr)
/* 275 */ .long sys_mq_unlink /* 280 */ CALL(sys_waitid)
.long sys_mq_timedsend CALL(sys_socket)
.long sys_mq_timedreceive CALL(sys_bind)
.long sys_mq_notify CALL(sys_connect)
.long sys_mq_getsetattr CALL(sys_listen)
/* 280 */ .long sys_waitid /* 285 */ CALL(sys_accept)
.long sys_socket CALL(sys_getsockname)
.long sys_bind CALL(sys_getpeername)
.long sys_connect CALL(sys_socketpair)
.long sys_listen CALL(sys_send)
/* 285 */ .long sys_accept /* 290 */ CALL(sys_sendto)
.long sys_getsockname CALL(sys_recv)
.long sys_getpeername CALL(sys_recvfrom)
.long sys_socketpair CALL(sys_shutdown)
.long sys_send CALL(sys_setsockopt)
/* 290 */ .long sys_sendto /* 295 */ CALL(sys_getsockopt)
.long sys_recv CALL(sys_sendmsg)
.long sys_recvfrom CALL(sys_recvmsg)
.long sys_shutdown CALL(ABI(sys_semop, sys_oabi_semop))
.long sys_setsockopt CALL(sys_semget)
/* 295 */ .long sys_getsockopt /* 300 */ CALL(sys_semctl)
.long sys_sendmsg CALL(sys_msgsnd)
.long sys_recvmsg CALL(sys_msgrcv)
.long ABI(sys_semop, sys_oabi_semop) CALL(sys_msgget)
.long sys_semget CALL(sys_msgctl)
/* 300 */ .long sys_semctl /* 305 */ CALL(sys_shmat)
.long sys_msgsnd CALL(sys_shmdt)
.long sys_msgrcv CALL(sys_shmget)
.long sys_msgget CALL(sys_shmctl)
.long sys_msgctl CALL(sys_add_key)
/* 305 */ .long sys_shmat /* 310 */ CALL(sys_request_key)
.long sys_shmdt CALL(sys_keyctl)
.long sys_shmget CALL(ABI(sys_semtimedop, sys_oabi_semtimedop))
.long sys_shmctl /* vserver */ CALL(sys_ni_syscall)
.long sys_add_key CALL(sys_ioprio_set)
/* 310 */ .long sys_request_key /* 315 */ CALL(sys_ioprio_get)
.long sys_keyctl CALL(sys_inotify_init)
.long ABI(sys_semtimedop, sys_oabi_semtimedop) CALL(sys_inotify_add_watch)
/* vserver */ .long sys_ni_syscall CALL(sys_inotify_rm_watch)
.long sys_ioprio_set CALL(sys_mbind)
/* 315 */ .long sys_ioprio_get /* 320 */ CALL(sys_get_mempolicy)
.long sys_inotify_init CALL(sys_set_mempolicy)
.long sys_inotify_add_watch #ifndef syscalls_counted
.long sys_inotify_rm_watch .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls
.long sys_mbind #define syscalls_counted
/* 320 */ .long sys_get_mempolicy
.long sys_set_mempolicy
.rept NR_syscalls - (. - 100b) / 4
.long sys_ni_syscall
.endr
#endif #endif
.rept syscalls_padding
CALL(sys_ni_syscall)
.endr
arch/arm/kernel/entry-common.S
View file @ bb4bc81a
...@@ -87,7 +87,11 @@ ENTRY(ret_from_fork) ...@@ -87,7 +87,11 @@ ENTRY(ret_from_fork)
b ret_slow_syscall b ret_slow_syscall
.equ NR_syscalls,0
#define CALL(x) .equ NR_syscalls,NR_syscalls+1
#include "calls.S" #include "calls.S"
#undef CALL
#define CALL(x) .long x
/*============================================================================= /*=============================================================================
* SWI handler * SWI handler
......
arch/arm/mach-integrator/integrator_cp.c
View file @ bb4bc81a
...@@ -469,7 +469,9 @@ static void cp_clcd_enable(struct clcd_fb *fb) ...@@ -469,7 +469,9 @@ static void cp_clcd_enable(struct clcd_fb *fb)
if (fb->fb.var.bits_per_pixel <= 8) if (fb->fb.var.bits_per_pixel <= 8)
val = CM_CTRL_LCDMUXSEL_VGA_8421BPP; val = CM_CTRL_LCDMUXSEL_VGA_8421BPP;
else if (fb->fb.var.bits_per_pixel <= 16) else if (fb->fb.var.bits_per_pixel <= 16)
val = CM_CTRL_LCDMUXSEL_VGA_16BPP; val = CM_CTRL_LCDMUXSEL_VGA_16BPP
| CM_CTRL_LCDEN0 | CM_CTRL_LCDEN1
| CM_CTRL_STATIC1 | CM_CTRL_STATIC2;
else else
val = 0; /* no idea for this, don't trust the docs */ val = 0; /* no idea for this, don't trust the docs */
......
arch/arm/mach-s3c2410/cpu.h
View file @ bb4bc81a
...@@ -17,11 +17,12 @@ ...@@ -17,11 +17,12 @@
* 14-Jan-2005 BJD Added s3c24xx_init_clocks() call * 14-Jan-2005 BJD Added s3c24xx_init_clocks() call
* 10-Mar-2005 LCVR Changed S3C2410_{VA,SZ} to S3C24XX_{VA,SZ} & IODESC_ENT * 10-Mar-2005 LCVR Changed S3C2410_{VA,SZ} to S3C24XX_{VA,SZ} & IODESC_ENT
* 14-Mar-2005 BJD Updated for __iomem * 14-Mar-2005 BJD Updated for __iomem
* 15-Jan-2006 LCVR Updated S3C2410_PA_##x to new S3C24XX_PA_##x macro
*/ */
/* todo - fix when rmk changes iodescs to use `void __iomem *` */ /* todo - fix when rmk changes iodescs to use `void __iomem *` */
#define IODESC_ENT(x) { (unsigned long)S3C24XX_VA_##x, __phys_to_pfn(S3C2410_PA_##x), S3C24XX_SZ_##x, MT_DEVICE } #define IODESC_ENT(x) { (unsigned long)S3C24XX_VA_##x, __phys_to_pfn(S3C24XX_PA_##x), S3C24XX_SZ_##x, MT_DEVICE }
#ifndef MHZ #ifndef MHZ
#define MHZ (1000*1000) #define MHZ (1000*1000)
......
arch/arm/mach-s3c2410/devs.c
View file @ bb4bc81a
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
* published by the Free Software Foundation. * published by the Free Software Foundation.
* *
* Modifications: * Modifications:
* 15-Jan-2006 LCVR Using S3C24XX_PA_##x macro for common S3C24XX devices
* 10-Mar-2005 LCVR Changed S3C2410_{VA,SZ} to S3C24XX_{VA,SZ} * 10-Mar-2005 LCVR Changed S3C2410_{VA,SZ} to S3C24XX_{VA,SZ}
* 10-Feb-2005 BJD Added camera from guillaume.gourat@nexvision.tv * 10-Feb-2005 BJD Added camera from guillaume.gourat@nexvision.tv
* 29-Aug-2004 BJD Added timers 0 through 3 * 29-Aug-2004 BJD Added timers 0 through 3
...@@ -46,8 +47,8 @@ struct platform_device *s3c24xx_uart_devs[3]; ...@@ -46,8 +47,8 @@ struct platform_device *s3c24xx_uart_devs[3];
static struct resource s3c_usb_resource[] = { static struct resource s3c_usb_resource[] = {
[0] = { [0] = {
.start = S3C2410_PA_USBHOST, .start = S3C24XX_PA_USBHOST,
.end = S3C2410_PA_USBHOST + S3C24XX_SZ_USBHOST - 1, .end = S3C24XX_PA_USBHOST + S3C24XX_SZ_USBHOST - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
[1] = { [1] = {
...@@ -76,8 +77,8 @@ EXPORT_SYMBOL(s3c_device_usb); ...@@ -76,8 +77,8 @@ EXPORT_SYMBOL(s3c_device_usb);
static struct resource s3c_lcd_resource[] = { static struct resource s3c_lcd_resource[] = {
[0] = { [0] = {
.start = S3C2410_PA_LCD, .start = S3C24XX_PA_LCD,
.end = S3C2410_PA_LCD + S3C24XX_SZ_LCD - 1, .end = S3C24XX_PA_LCD + S3C24XX_SZ_LCD - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
[1] = { [1] = {
...@@ -139,8 +140,8 @@ EXPORT_SYMBOL(s3c_device_nand); ...@@ -139,8 +140,8 @@ EXPORT_SYMBOL(s3c_device_nand);
static struct resource s3c_usbgadget_resource[] = { static struct resource s3c_usbgadget_resource[] = {
[0] = { [0] = {
.start = S3C2410_PA_USBDEV, .start = S3C24XX_PA_USBDEV,
.end = S3C2410_PA_USBDEV + S3C24XX_SZ_USBDEV - 1, .end = S3C24XX_PA_USBDEV + S3C24XX_SZ_USBDEV - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
[1] = { [1] = {
...@@ -164,8 +165,8 @@ EXPORT_SYMBOL(s3c_device_usbgadget); ...@@ -164,8 +165,8 @@ EXPORT_SYMBOL(s3c_device_usbgadget);
static struct resource s3c_wdt_resource[] = { static struct resource s3c_wdt_resource[] = {
[0] = { [0] = {
.start = S3C2410_PA_WATCHDOG, .start = S3C24XX_PA_WATCHDOG,
.end = S3C2410_PA_WATCHDOG + S3C24XX_SZ_WATCHDOG - 1, .end = S3C24XX_PA_WATCHDOG + S3C24XX_SZ_WATCHDOG - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
[1] = { [1] = {
...@@ -189,8 +190,8 @@ EXPORT_SYMBOL(s3c_device_wdt); ...@@ -189,8 +190,8 @@ EXPORT_SYMBOL(s3c_device_wdt);
static struct resource s3c_i2c_resource[] = { static struct resource s3c_i2c_resource[] = {
[0] = { [0] = {
.start = S3C2410_PA_IIC, .start = S3C24XX_PA_IIC,
.end = S3C2410_PA_IIC + S3C24XX_SZ_IIC - 1, .end = S3C24XX_PA_IIC + S3C24XX_SZ_IIC - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
[1] = { [1] = {
...@@ -214,8 +215,8 @@ EXPORT_SYMBOL(s3c_device_i2c); ...@@ -214,8 +215,8 @@ EXPORT_SYMBOL(s3c_device_i2c);
static struct resource s3c_iis_resource[] = { static struct resource s3c_iis_resource[] = {
[0] = { [0] = {
.start = S3C2410_PA_IIS, .start = S3C24XX_PA_IIS,
.end = S3C2410_PA_IIS + S3C24XX_SZ_IIS -1, .end = S3C24XX_PA_IIS + S3C24XX_SZ_IIS -1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
} }
}; };
...@@ -239,8 +240,8 @@ EXPORT_SYMBOL(s3c_device_iis); ...@@ -239,8 +240,8 @@ EXPORT_SYMBOL(s3c_device_iis);
static struct resource s3c_rtc_resource[] = { static struct resource s3c_rtc_resource[] = {
[0] = { [0] = {
.start = S3C2410_PA_RTC, .start = S3C24XX_PA_RTC,
.end = S3C2410_PA_RTC + 0xff, .end = S3C24XX_PA_RTC + 0xff,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
[1] = { [1] = {
...@@ -268,8 +269,8 @@ EXPORT_SYMBOL(s3c_device_rtc); ...@@ -268,8 +269,8 @@ EXPORT_SYMBOL(s3c_device_rtc);
static struct resource s3c_adc_resource[] = { static struct resource s3c_adc_resource[] = {
[0] = { [0] = {
.start = S3C2410_PA_ADC, .start = S3C24XX_PA_ADC,
.end = S3C2410_PA_ADC + S3C24XX_SZ_ADC - 1, .end = S3C24XX_PA_ADC + S3C24XX_SZ_ADC - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
[1] = { [1] = {
...@@ -316,8 +317,8 @@ EXPORT_SYMBOL(s3c_device_sdi); ...@@ -316,8 +317,8 @@ EXPORT_SYMBOL(s3c_device_sdi);
static struct resource s3c_spi0_resource[] = { static struct resource s3c_spi0_resource[] = {
[0] = { [0] = {
.start = S3C2410_PA_SPI, .start = S3C24XX_PA_SPI,
.end = S3C2410_PA_SPI + 0x1f, .end = S3C24XX_PA_SPI + 0x1f,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
[1] = { [1] = {
...@@ -341,8 +342,8 @@ EXPORT_SYMBOL(s3c_device_spi0); ...@@ -341,8 +342,8 @@ EXPORT_SYMBOL(s3c_device_spi0);
static struct resource s3c_spi1_resource[] = { static struct resource s3c_spi1_resource[] = {
[0] = { [0] = {
.start = S3C2410_PA_SPI + 0x20, .start = S3C24XX_PA_SPI + 0x20,
.end = S3C2410_PA_SPI + 0x20 + 0x1f, .end = S3C24XX_PA_SPI + 0x20 + 0x1f,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
[1] = { [1] = {
...@@ -366,8 +367,8 @@ EXPORT_SYMBOL(s3c_device_spi1); ...@@ -366,8 +367,8 @@ EXPORT_SYMBOL(s3c_device_spi1);
static struct resource s3c_timer0_resource[] = { static struct resource s3c_timer0_resource[] = {
[0] = { [0] = {
.start = S3C2410_PA_TIMER + 0x0C, .start = S3C24XX_PA_TIMER + 0x0C,
.end = S3C2410_PA_TIMER + 0x0C + 0xB, .end = S3C24XX_PA_TIMER + 0x0C + 0xB,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
[1] = { [1] = {
...@@ -391,8 +392,8 @@ EXPORT_SYMBOL(s3c_device_timer0); ...@@ -391,8 +392,8 @@ EXPORT_SYMBOL(s3c_device_timer0);
static struct resource s3c_timer1_resource[] = { static struct resource s3c_timer1_resource[] = {
[0] = { [0] = {
.start = S3C2410_PA_TIMER + 0x18, .start = S3C24XX_PA_TIMER + 0x18,
.end = S3C2410_PA_TIMER + 0x23, .end = S3C24XX_PA_TIMER + 0x23,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
[1] = { [1] = {
...@@ -416,8 +417,8 @@ EXPORT_SYMBOL(s3c_device_timer1); ...@@ -416,8 +417,8 @@ EXPORT_SYMBOL(s3c_device_timer1);
static struct resource s3c_timer2_resource[] = { static struct resource s3c_timer2_resource[] = {
[0] = { [0] = {
.start = S3C2410_PA_TIMER + 0x24, .start = S3C24XX_PA_TIMER + 0x24,
.end = S3C2410_PA_TIMER + 0x2F, .end = S3C24XX_PA_TIMER + 0x2F,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
[1] = { [1] = {
...@@ -441,8 +442,8 @@ EXPORT_SYMBOL(s3c_device_timer2); ...@@ -441,8 +442,8 @@ EXPORT_SYMBOL(s3c_device_timer2);
static struct resource s3c_timer3_resource[] = { static struct resource s3c_timer3_resource[] = {
[0] = { [0] = {
.start = S3C2410_PA_TIMER + 0x30, .start = S3C24XX_PA_TIMER + 0x30,
.end = S3C2410_PA_TIMER + 0x3B, .end = S3C24XX_PA_TIMER + 0x3B,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
[1] = { [1] = {
......
arch/arm/mach-s3c2410/dma.c
View file @ bb4bc81a
...@@ -1152,7 +1152,7 @@ static int __init s3c2410_init_dma(void) ...@@ -1152,7 +1152,7 @@ static int __init s3c2410_init_dma(void)
printk("S3C2410 DMA Driver, (c) 2003-2004 Simtec Electronics\n"); printk("S3C2410 DMA Driver, (c) 2003-2004 Simtec Electronics\n");
dma_base = ioremap(S3C2410_PA_DMA, 0x200); dma_base = ioremap(S3C24XX_PA_DMA, 0x200);
if (dma_base == NULL) { if (dma_base == NULL) {
printk(KERN_ERR "dma failed to remap register block\n"); printk(KERN_ERR "dma failed to remap register block\n");
return -ENOMEM; return -ENOMEM;
......
arch/arm/mach-s3c2410/sleep.S
View file @ bb4bc81a
...@@ -133,12 +133,12 @@ ENTRY(s3c2410_cpu_resume) ...@@ -133,12 +133,12 @@ ENTRY(s3c2410_cpu_resume)
@@ load UART to allow us to print the two characters for @@ load UART to allow us to print the two characters for
@@ resume debug @@ resume debug
mov r2, #S3C2410_PA_UART & 0xff000000 mov r2, #S3C24XX_PA_UART & 0xff000000
orr r2, r2, #S3C2410_PA_UART & 0xff000 orr r2, r2, #S3C24XX_PA_UART & 0xff000
#if 0 #if 0
/* SMDK2440 LED set */ /* SMDK2440 LED set */
mov r14, #S3C2410_PA_GPIO mov r14, #S3C24XX_PA_GPIO
ldr r12, [ r14, #0x54 ] ldr r12, [ r14, #0x54 ]
bic r12, r12, #3<<4 bic r12, r12, #3<<4
orr r12, r12, #1<<7 orr r12, r12, #1<<7
......
arch/arm/mm/ioremap.c
View file @ bb4bc81a
...@@ -142,7 +142,7 @@ __ioremap_pfn(unsigned long pfn, unsigned long offset, size_t size, ...@@ -142,7 +142,7 @@ __ioremap_pfn(unsigned long pfn, unsigned long offset, size_t size,
return NULL; return NULL;
addr = (unsigned long)area->addr; addr = (unsigned long)area->addr;
if (remap_area_pages(addr, pfn, size, flags)) { if (remap_area_pages(addr, pfn, size, flags)) {
vfree(addr); vfree((void *)addr);
return NULL; return NULL;
} }
return (void __iomem *) (offset + (char *)addr); return (void __iomem *) (offset + (char *)addr);
......
arch/arm/mm/mm-armv.c
View file @ bb4bc81a
...@@ -343,6 +343,12 @@ static struct mem_types mem_types[] __initdata = { ...@@ -343,6 +343,12 @@ static struct mem_types mem_types[] __initdata = {
PMD_SECT_AP_WRITE | PMD_SECT_BUFFERABLE | PMD_SECT_AP_WRITE | PMD_SECT_BUFFERABLE |
PMD_SECT_TEX(1), PMD_SECT_TEX(1),
.domain = DOMAIN_IO, .domain = DOMAIN_IO,
},
[MT_NONSHARED_DEVICE] = {
.prot_l1 = PMD_TYPE_TABLE,
.prot_sect = PMD_TYPE_SECT | PMD_SECT_NONSHARED_DEV |
PMD_SECT_AP_WRITE,
.domain = DOMAIN_IO,
} }
}; };
......
drivers/input/touchscreen/ads7846.c
View file @ bb4bc81a
...@@ -29,9 +29,6 @@ ...@@ -29,9 +29,6 @@
#ifdef CONFIG_ARCH_OMAP #ifdef CONFIG_ARCH_OMAP
#include <asm/arch/gpio.h> #include <asm/arch/gpio.h>
#endif #endif
#else
#define set_irq_type(irq,type) do{}while(0)
#endif #endif
...@@ -509,14 +506,14 @@ static int __devinit ads7846_probe(struct spi_device *spi) ...@@ -509,14 +506,14 @@ static int __devinit ads7846_probe(struct spi_device *spi)
ts->msg.complete = ads7846_rx; ts->msg.complete = ads7846_rx;
ts->msg.context = ts; ts->msg.context = ts;
if (request_irq(spi->irq, ads7846_irq, SA_SAMPLE_RANDOM, if (request_irq(spi->irq, ads7846_irq,
SA_SAMPLE_RANDOM | SA_TRIGGER_FALLING,
spi->dev.bus_id, ts)) { spi->dev.bus_id, ts)) {
dev_dbg(&spi->dev, "irq %d busy?\n", spi->irq); dev_dbg(&spi->dev, "irq %d busy?\n", spi->irq);
input_unregister_device(&ts->input); input_unregister_device(&ts->input);
kfree(ts); kfree(ts);
return -EBUSY; return -EBUSY;
} }
set_irq_type(spi->irq, IRQT_FALLING);
dev_info(&spi->dev, "touchscreen, irq %d\n", spi->irq); dev_info(&spi->dev, "touchscreen, irq %d\n", spi->irq);
......
drivers/serial/imx.c
View file @ bb4bc81a
...@@ -402,10 +402,10 @@ static int imx_startup(struct uart_port *port) ...@@ -402,10 +402,10 @@ static int imx_startup(struct uart_port *port)
DRIVER_NAME, sport); DRIVER_NAME, sport);
if (retval) goto error_out2; if (retval) goto error_out2;
retval = request_irq(sport->rtsirq, imx_rtsint, 0, retval = request_irq(sport->rtsirq, imx_rtsint,
SA_TRIGGER_FALLING | SA_TRIGGER_RISING,
DRIVER_NAME, sport); DRIVER_NAME, sport);
if (retval) goto error_out3; if (retval) goto error_out3;
set_irq_type(sport->rtsirq, IRQT_BOTHEDGE);
/* /*
* Finally, clear and enable interrupts * Finally, clear and enable interrupts
......
drivers/serial/s3c2410.c
View file @ bb4bc81a
...@@ -1060,7 +1060,7 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport, ...@@ -1060,7 +1060,7 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
dbg("resource %p (%lx..%lx)\n", res, res->start, res->end); dbg("resource %p (%lx..%lx)\n", res, res->start, res->end);
port->mapbase = res->start; port->mapbase = res->start;
port->membase = S3C24XX_VA_UART + (res->start - S3C2410_PA_UART); port->membase = S3C24XX_VA_UART + (res->start - S3C24XX_PA_UART);
port->irq = platform_get_irq(platdev, 0); port->irq = platform_get_irq(platdev, 0);
ourport->clk = clk_get(&platdev->dev, "uart"); ourport->clk = clk_get(&platdev->dev, "uart");
......
drivers/video/amba-clcd.c
View file @ bb4bc81a
...@@ -116,9 +116,10 @@ clcdfb_set_bitfields(struct clcd_fb *fb, struct fb_var_screeninfo *var) ...@@ -116,9 +116,10 @@ clcdfb_set_bitfields(struct clcd_fb *fb, struct fb_var_screeninfo *var)
int ret = 0; int ret = 0;
memset(&var->transp, 0, sizeof(var->transp)); memset(&var->transp, 0, sizeof(var->transp));
memset(&var->red, 0, sizeof(var->red));
memset(&var->green, 0, sizeof(var->green)); var->red.msb_right = 0;
memset(&var->blue, 0, sizeof(var->blue)); var->green.msb_right = 0;
var->blue.msb_right = 0;
switch (var->bits_per_pixel) { switch (var->bits_per_pixel) {
case 1: case 1:
...@@ -134,38 +135,41 @@ clcdfb_set_bitfields(struct clcd_fb *fb, struct fb_var_screeninfo *var) ...@@ -134,38 +135,41 @@ clcdfb_set_bitfields(struct clcd_fb *fb, struct fb_var_screeninfo *var)
break; break;
case 16: case 16:
var->red.length = 5; var->red.length = 5;
var->green.length = 6;
var->blue.length = 5; var->blue.length = 5;
if (fb->panel->cntl & CNTL_BGR) { /*
var->red.offset = 11; * Green length can be 5 or 6 depending whether
var->green.offset = 5; * we're operating in RGB555 or RGB565 mode.
var->blue.offset = 0; */
} else { if (var->green.length != 5 && var->green.length != 6)
var->red.offset = 0; var->green.length = 6;
var->green.offset = 5;
var->blue.offset = 11;
}
break; break;
case 32: case 32:
if (fb->panel->cntl & CNTL_LCDTFT) { if (fb->panel->cntl & CNTL_LCDTFT) {
var->red.length = 8; var->red.length = 8;
var->green.length = 8; var->green.length = 8;
var->blue.length = 8; var->blue.length = 8;
break;
}
default:
ret = -EINVAL;
break;
}
/*
* >= 16bpp displays have separate colour component bitfields
* encoded in the pixel data. Calculate their position from
* the bitfield length defined above.
*/
if (ret == 0 && var->bits_per_pixel >= 16) {
if (fb->panel->cntl & CNTL_BGR) { if (fb->panel->cntl & CNTL_BGR) {
var->red.offset = 16;
var->green.offset = 8;
var->blue.offset = 0; var->blue.offset = 0;
var->green.offset = var->blue.offset + var->blue.length;
var->red.offset = var->green.offset + var->green.length;
} else { } else {
var->red.offset = 0; var->red.offset = 0;
var->green.offset = 8; var->green.offset = var->red.offset + var->red.length;
var->blue.offset = 16; var->blue.offset = var->green.offset + var->green.length;
} }
break;
}
default:
ret = -EINVAL;
break;
} }
return ret; return ret;
......
include/asm-arm/arch-s3c2410/debug-macro.S
View file @ bb4bc81a
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
.macro addruart, rx .macro addruart, rx
mrc p15, 0, \rx, c1, c0 mrc p15, 0, \rx, c1, c0
tst \rx, #1 tst \rx, #1
ldreq \rx, = S3C2410_PA_UART ldreq \rx, = S3C24XX_PA_UART
ldrne \rx, = S3C24XX_VA_UART ldrne \rx, = S3C24XX_VA_UART
#if CONFIG_DEBUG_S3C2410_UART != 0 #if CONFIG_DEBUG_S3C2410_UART != 0
add \rx, \rx, #(S3C2410_UART1_OFF * CONFIG_DEBUG_S3C2410_UART) add \rx, \rx, #(S3C2410_UART1_OFF * CONFIG_DEBUG_S3C2410_UART)
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
1003: 1003:
mrc p15, 0, \rd, c1, c0 mrc p15, 0, \rd, c1, c0
tst \rd, #1 tst \rd, #1
addeq \rd, \rx, #(S3C2410_PA_GPIO - S3C2410_PA_UART) addeq \rd, \rx, #(S3C24XX_PA_GPIO - S3C24XX_PA_UART)
addne \rd, \rx, #(S3C24XX_VA_GPIO - S3C24XX_VA_UART) addne \rd, \rx, #(S3C24XX_VA_GPIO - S3C24XX_VA_UART)
bic \rd, \rd, #0xff000 bic \rd, \rd, #0xff000
ldr \rd, [ \rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0) ] ldr \rd, [ \rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0) ]
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
1003: 1003:
mrc p15, 0, \rd, c1, c0 mrc p15, 0, \rd, c1, c0
tst \rd, #1 tst \rd, #1
addeq \rd, \rx, #(S3C2410_PA_GPIO - S3C2410_PA_UART) addeq \rd, \rx, #(S3C24XX_PA_GPIO - S3C24XX_PA_UART)
addne \rd, \rx, #(S3C24XX_VA_GPIO - S3C24XX_VA_UART) addne \rd, \rx, #(S3C24XX_VA_GPIO - S3C24XX_VA_UART)
bic \rd, \rd, #0xff000 bic \rd, \rd, #0xff000
ldr \rd, [ \rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0) ] ldr \rd, [ \rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0) ]
......
include/asm-arm/arch-s3c2410/map.h
View file @ bb4bc81a
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* 06-Jan-2003 BJD Linux 2.6.0 version, moved bast specifics out * 06-Jan-2003 BJD Linux 2.6.0 version, moved bast specifics out
* 10-Feb-2005 BJD Added CAMIF definition from guillaume.gourat@nexvision.tv * 10-Feb-2005 BJD Added CAMIF definition from guillaume.gourat@nexvision.tv
* 10-Mar-2005 LCVR Added support to S3C2400, changed {VA,SZ} names * 10-Mar-2005 LCVR Added support to S3C2400, changed {VA,SZ} names
* 15-Jan-2006 LCVR Added S3C24XX_PA macros for common S3C24XX resources
*/ */
#ifndef __ASM_ARCH_MAP_H #ifndef __ASM_ARCH_MAP_H
...@@ -188,5 +189,42 @@ ...@@ -188,5 +189,42 @@
#define S3C2400_SDRAM_PA (S3C2400_CS6) #define S3C2400_SDRAM_PA (S3C2400_CS6)
/* Use a single interface for common resources between S3C24XX cpus */
#ifdef CONFIG_CPU_S3C2400
#define S3C24XX_PA_IRQ S3C2400_PA_IRQ
#define S3C24XX_PA_MEMCTRL S3C2400_PA_MEMCTRL
#define S3C24XX_PA_USBHOST S3C2400_PA_USBHOST
#define S3C24XX_PA_DMA S3C2400_PA_DMA
#define S3C24XX_PA_CLKPWR S3C2400_PA_CLKPWR
#define S3C24XX_PA_LCD S3C2400_PA_LCD
#define S3C24XX_PA_UART S3C2400_PA_UART
#define S3C24XX_PA_TIMER S3C2400_PA_TIMER
#define S3C24XX_PA_USBDEV S3C2400_PA_USBDEV
#define S3C24XX_PA_WATCHDOG S3C2400_PA_WATCHDOG
#define S3C24XX_PA_IIC S3C2400_PA_IIC
#define S3C24XX_PA_IIS S3C2400_PA_IIS
#define S3C24XX_PA_GPIO S3C2400_PA_GPIO
#define S3C24XX_PA_RTC S3C2400_PA_RTC
#define S3C24XX_PA_ADC S3C2400_PA_ADC
#define S3C24XX_PA_SPI S3C2400_PA_SPI
#else
#define S3C24XX_PA_IRQ S3C2410_PA_IRQ
#define S3C24XX_PA_MEMCTRL S3C2410_PA_MEMCTRL
#define S3C24XX_PA_USBHOST S3C2410_PA_USBHOST
#define S3C24XX_PA_DMA S3C2410_PA_DMA
#define S3C24XX_PA_CLKPWR S3C2410_PA_CLKPWR
#define S3C24XX_PA_LCD S3C2410_PA_LCD
#define S3C24XX_PA_UART S3C2410_PA_UART
#define S3C24XX_PA_TIMER S3C2410_PA_TIMER
#define S3C24XX_PA_USBDEV S3C2410_PA_USBDEV
#define S3C24XX_PA_WATCHDOG S3C2410_PA_WATCHDOG
#define S3C24XX_PA_IIC S3C2410_PA_IIC
#define S3C24XX_PA_IIS S3C2410_PA_IIS
#define S3C24XX_PA_GPIO S3C2410_PA_GPIO
#define S3C24XX_PA_RTC S3C2410_PA_RTC
#define S3C24XX_PA_ADC S3C2410_PA_ADC
#define S3C24XX_PA_SPI S3C2410_PA_SPI
#endif
#endif /* __ASM_ARCH_MAP_H */ #endif /* __ASM_ARCH_MAP_H */
include/asm-arm/arch-s3c2410/regs-serial.h
View file @ bb4bc81a
...@@ -39,9 +39,9 @@ ...@@ -39,9 +39,9 @@
#define S3C24XX_VA_UART1 (S3C24XX_VA_UART + 0x4000 ) #define S3C24XX_VA_UART1 (S3C24XX_VA_UART + 0x4000 )
#define S3C24XX_VA_UART2 (S3C24XX_VA_UART + 0x8000 ) #define S3C24XX_VA_UART2 (S3C24XX_VA_UART + 0x8000 )
#define S3C2410_PA_UART0 (S3C2410_PA_UART) #define S3C2410_PA_UART0 (S3C24XX_PA_UART)
#define S3C2410_PA_UART1 (S3C2410_PA_UART + 0x4000 ) #define S3C2410_PA_UART1 (S3C24XX_PA_UART + 0x4000 )
#define S3C2410_PA_UART2 (S3C2410_PA_UART + 0x8000 ) #define S3C2410_PA_UART2 (S3C24XX_PA_UART + 0x8000 )
#define S3C2410_URXH (0x24) #define S3C2410_URXH (0x24)
#define S3C2410_UTXH (0x20) #define S3C2410_UTXH (0x20)
......
include/asm-arm/arch-s3c2410/uncompress.h
View file @ bb4bc81a
...@@ -35,13 +35,13 @@ ...@@ -35,13 +35,13 @@
#undef S3C2410_GPIOREG #undef S3C2410_GPIOREG
#undef S3C2410_WDOGREG #undef S3C2410_WDOGREG
#define S3C2410_GPIOREG(x) ((S3C2410_PA_GPIO + (x))) #define S3C2410_GPIOREG(x) ((S3C24XX_PA_GPIO + (x)))
#define S3C2410_WDOGREG(x) ((S3C2410_PA_WATCHDOG + (x))) #define S3C2410_WDOGREG(x) ((S3C24XX_PA_WATCHDOG + (x)))
/* how many bytes we allow into the FIFO at a time in FIFO mode */ /* how many bytes we allow into the FIFO at a time in FIFO mode */
#define FIFO_MAX (14) #define FIFO_MAX (14)
#define uart_base S3C2410_PA_UART + (0x4000*CONFIG_S3C2410_LOWLEVEL_UART_PORT) #define uart_base S3C24XX_PA_UART + (0x4000*CONFIG_S3C2410_LOWLEVEL_UART_PORT)
static __inline__ void static __inline__ void
uart_wr(unsigned int reg, unsigned int val) uart_wr(unsigned int reg, unsigned int val)
......
include/asm-arm/mach/map.h
View file @ bb4bc81a
...@@ -26,6 +26,7 @@ struct meminfo; ...@@ -26,6 +26,7 @@ struct meminfo;
#define MT_MEMORY 5 #define MT_MEMORY 5
#define MT_ROM 6 #define MT_ROM 6
#define MT_IXP2000_DEVICE 7 #define MT_IXP2000_DEVICE 7
#define MT_NONSHARED_DEVICE 8
extern void create_memmap_holes(struct meminfo *); extern void create_memmap_holes(struct meminfo *);
extern void memtable_init(struct meminfo *); extern void memtable_init(struct meminfo *);
......
include/asm-arm/pgtable.h
View file @ bb4bc81a
...@@ -168,6 +168,7 @@ extern void __pgd_error(const char *file, int line, unsigned long val); ...@@ -168,6 +168,7 @@ extern void __pgd_error(const char *file, int line, unsigned long val);
#define PMD_SECT_WB (PMD_SECT_CACHEABLE | PMD_SECT_BUFFERABLE) #define PMD_SECT_WB (PMD_SECT_CACHEABLE | PMD_SECT_BUFFERABLE)
#define PMD_SECT_MINICACHE (PMD_SECT_TEX(1) | PMD_SECT_CACHEABLE) #define PMD_SECT_MINICACHE (PMD_SECT_TEX(1) | PMD_SECT_CACHEABLE)
#define PMD_SECT_WBWA (PMD_SECT_TEX(1) | PMD_SECT_CACHEABLE | PMD_SECT_BUFFERABLE) #define PMD_SECT_WBWA (PMD_SECT_TEX(1) | PMD_SECT_CACHEABLE | PMD_SECT_BUFFERABLE)
#define PMD_SECT_NONSHARED_DEV (PMD_SECT_TEX(2))
/* /*
* - coarse table (not used) * - coarse table (not used)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7