mirror of
https://github.com/torvalds/linux.git
synced 2024-11-07 12:41:55 +00:00
Merge master.kernel.org:/home/rmk/linux-2.6-arm
This commit is contained in:
Linus Torvalds
commit
bb4bc81a23
@ -14,8 +14,7 @@ CONFIG_GENERIC_IOMAP=y
|
||||
# Code maturity level options
|
||||
#
|
||||
CONFIG_EXPERIMENTAL=y
|
||||
# CONFIG_CLEAN_COMPILE is not set
|
||||
CONFIG_BROKEN=y
|
||||
CONFIG_CLEAN_COMPILE=y
|
||||
CONFIG_BROKEN_ON_SMP=y
|
||||
|
||||
#
|
||||
@ -360,7 +359,6 @@ CONFIG_BLK_DEV_IDE_BAST=y
|
||||
#
|
||||
# IEEE 1394 (FireWire) support
|
||||
#
|
||||
# CONFIG_IEEE1394 is not set
|
||||
|
||||
#
|
||||
# I2O device support
|
||||
@ -781,7 +779,6 @@ CONFIG_SYSFS=y
|
||||
# CONFIG_DEVFS_FS is not set
|
||||
# CONFIG_DEVPTS_FS_XATTR is not set
|
||||
# CONFIG_TMPFS is not set
|
||||
# CONFIG_HUGETLBFS is not set
|
||||
# CONFIG_HUGETLB_PAGE is not set
|
||||
CONFIG_RAMFS=y
|
||||
|
||||
|
||||
@ -13,8 +13,7 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y
|
||||
# Code maturity level options
|
||||
#
|
||||
CONFIG_EXPERIMENTAL=y
|
||||
# CONFIG_CLEAN_COMPILE is not set
|
||||
CONFIG_BROKEN=y
|
||||
CONFIG_CLEAN_COMPILE=y
|
||||
CONFIG_BROKEN_ON_SMP=y
|
||||
CONFIG_LOCK_KERNEL=y
|
||||
CONFIG_INIT_ENV_ARG_LIMIT=32
|
||||
@ -308,9 +307,7 @@ CONFIG_MTD_CFI_I2=y
|
||||
# CONFIG_MTD_ROM is not set
|
||||
# CONFIG_MTD_ABSENT is not set
|
||||
CONFIG_MTD_OBSOLETE_CHIPS=y
|
||||
# CONFIG_MTD_AMDSTD is not set
|
||||
CONFIG_MTD_SHARP=y
|
||||
# CONFIG_MTD_JEDEC is not set
|
||||
|
||||
#
|
||||
# Mapping drivers for chip access
|
||||
@ -396,7 +393,6 @@ CONFIG_ATA_OVER_ETH=m
|
||||
#
|
||||
# IEEE 1394 (FireWire) support
|
||||
#
|
||||
# CONFIG_IEEE1394 is not set
|
||||
|
||||
#
|
||||
# I2O device support
|
||||
@ -741,7 +737,6 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
|
||||
CONFIG_PROC_FS=y
|
||||
CONFIG_SYSFS=y
|
||||
CONFIG_TMPFS=y
|
||||
# CONFIG_HUGETLBFS is not set
|
||||
# CONFIG_HUGETLB_PAGE is not set
|
||||
CONFIG_RAMFS=y
|
||||
# CONFIG_RELAYFS_FS is not set
|
||||
|
||||
@ -13,8 +13,7 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y
|
||||
# Code maturity level options
|
||||
#
|
||||
CONFIG_EXPERIMENTAL=y
|
||||
# CONFIG_CLEAN_COMPILE is not set
|
||||
CONFIG_BROKEN=y
|
||||
CONFIG_CLEAN_COMPILE=y
|
||||
CONFIG_BROKEN_ON_SMP=y
|
||||
CONFIG_INIT_ENV_ARG_LIMIT=32
|
||||
|
||||
@ -473,7 +472,6 @@ CONFIG_BLK_DEV_IDE_BAST=y
|
||||
#
|
||||
# IEEE 1394 (FireWire) support
|
||||
#
|
||||
# CONFIG_IEEE1394 is not set
|
||||
|
||||
#
|
||||
# I2O device support
|
||||
@ -896,7 +894,6 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
|
||||
CONFIG_PROC_FS=y
|
||||
CONFIG_SYSFS=y
|
||||
# CONFIG_TMPFS is not set
|
||||
# CONFIG_HUGETLBFS is not set
|
||||
# CONFIG_HUGETLB_PAGE is not set
|
||||
CONFIG_RAMFS=y
|
||||
# CONFIG_RELAYFS_FS is not set
|
||||
|
||||
@ -7,337 +7,334 @@
|
||||
* it under the terms of the GNU General Public License version 2 as
|
||||
* 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
|
||||
#define NR_syscalls 328
|
||||
#else
|
||||
|
||||
100:
|
||||
/* 0 */ .long sys_restart_syscall
|
||||
.long sys_exit
|
||||
.long sys_fork_wrapper
|
||||
.long sys_read
|
||||
.long sys_write
|
||||
/* 5 */ .long sys_open
|
||||
.long sys_close
|
||||
.long sys_ni_syscall /* was sys_waitpid */
|
||||
.long sys_creat
|
||||
.long sys_link
|
||||
/* 10 */ .long sys_unlink
|
||||
.long sys_execve_wrapper
|
||||
.long sys_chdir
|
||||
.long OBSOLETE(sys_time) /* used by libc4 */
|
||||
.long sys_mknod
|
||||
/* 15 */ .long sys_chmod
|
||||
.long sys_lchown16
|
||||
.long sys_ni_syscall /* was sys_break */
|
||||
.long sys_ni_syscall /* was sys_stat */
|
||||
.long sys_lseek
|
||||
/* 20 */ .long sys_getpid
|
||||
.long sys_mount
|
||||
.long OBSOLETE(sys_oldumount) /* used by libc4 */
|
||||
.long sys_setuid16
|
||||
.long sys_getuid16
|
||||
/* 25 */ .long OBSOLETE(sys_stime)
|
||||
.long sys_ptrace
|
||||
.long OBSOLETE(sys_alarm) /* used by libc4 */
|
||||
.long sys_ni_syscall /* was sys_fstat */
|
||||
.long sys_pause
|
||||
/* 30 */ .long OBSOLETE(sys_utime) /* used by libc4 */
|
||||
.long sys_ni_syscall /* was sys_stty */
|
||||
.long sys_ni_syscall /* was sys_getty */
|
||||
.long sys_access
|
||||
.long sys_nice
|
||||
/* 35 */ .long sys_ni_syscall /* was sys_ftime */
|
||||
.long sys_sync
|
||||
.long sys_kill
|
||||
.long sys_rename
|
||||
.long sys_mkdir
|
||||
/* 40 */ .long sys_rmdir
|
||||
.long sys_dup
|
||||
.long sys_pipe
|
||||
.long sys_times
|
||||
.long sys_ni_syscall /* was sys_prof */
|
||||
/* 45 */ .long sys_brk
|
||||
.long sys_setgid16
|
||||
.long sys_getgid16
|
||||
.long sys_ni_syscall /* was sys_signal */
|
||||
.long sys_geteuid16
|
||||
/* 50 */ .long sys_getegid16
|
||||
.long sys_acct
|
||||
.long sys_umount
|
||||
.long sys_ni_syscall /* was sys_lock */
|
||||
.long sys_ioctl
|
||||
/* 55 */ .long sys_fcntl
|
||||
.long sys_ni_syscall /* was sys_mpx */
|
||||
.long sys_setpgid
|
||||
.long sys_ni_syscall /* was sys_ulimit */
|
||||
.long sys_ni_syscall /* was sys_olduname */
|
||||
/* 60 */ .long sys_umask
|
||||
.long sys_chroot
|
||||
.long sys_ustat
|
||||
.long sys_dup2
|
||||
.long sys_getppid
|
||||
/* 65 */ .long sys_getpgrp
|
||||
.long sys_setsid
|
||||
.long sys_sigaction
|
||||
.long sys_ni_syscall /* was sys_sgetmask */
|
||||
.long sys_ni_syscall /* was sys_ssetmask */
|
||||
/* 70 */ .long sys_setreuid16
|
||||
.long sys_setregid16
|
||||
.long sys_sigsuspend_wrapper
|
||||
.long sys_sigpending
|
||||
.long sys_sethostname
|
||||
/* 75 */ .long sys_setrlimit
|
||||
.long OBSOLETE(sys_old_getrlimit) /* used by libc4 */
|
||||
.long sys_getrusage
|
||||
.long sys_gettimeofday
|
||||
.long sys_settimeofday
|
||||
/* 80 */ .long sys_getgroups16
|
||||
.long sys_setgroups16
|
||||
.long OBSOLETE(old_select) /* used by libc4 */
|
||||
.long sys_symlink
|
||||
.long sys_ni_syscall /* was sys_lstat */
|
||||
/* 85 */ .long sys_readlink
|
||||
.long sys_uselib
|
||||
.long sys_swapon
|
||||
.long sys_reboot
|
||||
.long OBSOLETE(old_readdir) /* used by libc4 */
|
||||
/* 90 */ .long OBSOLETE(old_mmap) /* used by libc4 */
|
||||
.long sys_munmap
|
||||
.long sys_truncate
|
||||
.long sys_ftruncate
|
||||
.long sys_fchmod
|
||||
/* 95 */ .long sys_fchown16
|
||||
.long sys_getpriority
|
||||
.long sys_setpriority
|
||||
.long sys_ni_syscall /* was sys_profil */
|
||||
.long sys_statfs
|
||||
/* 100 */ .long sys_fstatfs
|
||||
.long sys_ni_syscall
|
||||
.long OBSOLETE(sys_socketcall)
|
||||
.long sys_syslog
|
||||
.long sys_setitimer
|
||||
/* 105 */ .long sys_getitimer
|
||||
.long sys_newstat
|
||||
.long sys_newlstat
|
||||
.long sys_newfstat
|
||||
.long sys_ni_syscall /* was sys_uname */
|
||||
/* 110 */ .long sys_ni_syscall /* was sys_iopl */
|
||||
.long sys_vhangup
|
||||
.long sys_ni_syscall
|
||||
.long OBSOLETE(sys_syscall) /* call a syscall */
|
||||
.long sys_wait4
|
||||
/* 115 */ .long sys_swapoff
|
||||
.long sys_sysinfo
|
||||
.long OBSOLETE(ABI(sys_ipc, sys_oabi_ipc))
|
||||
.long sys_fsync
|
||||
.long sys_sigreturn_wrapper
|
||||
/* 120 */ .long sys_clone_wrapper
|
||||
.long sys_setdomainname
|
||||
.long sys_newuname
|
||||
.long sys_ni_syscall
|
||||
.long sys_adjtimex
|
||||
/* 125 */ .long sys_mprotect
|
||||
.long sys_sigprocmask
|
||||
.long sys_ni_syscall /* was sys_create_module */
|
||||
.long sys_init_module
|
||||
.long sys_delete_module
|
||||
/* 130 */ .long sys_ni_syscall /* was sys_get_kernel_syms */
|
||||
.long sys_quotactl
|
||||
.long sys_getpgid
|
||||
.long sys_fchdir
|
||||
.long sys_bdflush
|
||||
/* 135 */ .long sys_sysfs
|
||||
.long sys_personality
|
||||
.long sys_ni_syscall /* .long _sys_afs_syscall */
|
||||
.long sys_setfsuid16
|
||||
.long sys_setfsgid16
|
||||
/* 140 */ .long sys_llseek
|
||||
.long sys_getdents
|
||||
.long sys_select
|
||||
.long sys_flock
|
||||
.long sys_msync
|
||||
/* 145 */ .long sys_readv
|
||||
.long sys_writev
|
||||
.long sys_getsid
|
||||
.long sys_fdatasync
|
||||
.long sys_sysctl
|
||||
/* 150 */ .long sys_mlock
|
||||
.long sys_munlock
|
||||
.long sys_mlockall
|
||||
.long sys_munlockall
|
||||
.long sys_sched_setparam
|
||||
/* 155 */ .long sys_sched_getparam
|
||||
.long sys_sched_setscheduler
|
||||
.long sys_sched_getscheduler
|
||||
.long sys_sched_yield
|
||||
.long sys_sched_get_priority_max
|
||||
/* 160 */ .long sys_sched_get_priority_min
|
||||
.long sys_sched_rr_get_interval
|
||||
.long sys_nanosleep
|
||||
.long sys_arm_mremap
|
||||
.long sys_setresuid16
|
||||
/* 165 */ .long sys_getresuid16
|
||||
.long sys_ni_syscall
|
||||
.long sys_ni_syscall /* was sys_query_module */
|
||||
.long sys_poll
|
||||
.long sys_nfsservctl
|
||||
/* 170 */ .long sys_setresgid16
|
||||
.long sys_getresgid16
|
||||
.long sys_prctl
|
||||
.long sys_rt_sigreturn_wrapper
|
||||
.long sys_rt_sigaction
|
||||
/* 175 */ .long sys_rt_sigprocmask
|
||||
.long sys_rt_sigpending
|
||||
.long sys_rt_sigtimedwait
|
||||
.long sys_rt_sigqueueinfo
|
||||
.long sys_rt_sigsuspend_wrapper
|
||||
/* 180 */ .long ABI(sys_pread64, sys_oabi_pread64)
|
||||
.long ABI(sys_pwrite64, sys_oabi_pwrite64)
|
||||
.long sys_chown16
|
||||
.long sys_getcwd
|
||||
.long sys_capget
|
||||
/* 185 */ .long sys_capset
|
||||
.long sys_sigaltstack_wrapper
|
||||
.long sys_sendfile
|
||||
.long sys_ni_syscall
|
||||
.long sys_ni_syscall
|
||||
/* 190 */ .long sys_vfork_wrapper
|
||||
.long sys_getrlimit
|
||||
.long sys_mmap2
|
||||
.long ABI(sys_truncate64, sys_oabi_truncate64)
|
||||
.long ABI(sys_ftruncate64, sys_oabi_ftruncate64)
|
||||
/* 195 */ .long ABI(sys_stat64, sys_oabi_stat64)
|
||||
.long ABI(sys_lstat64, sys_oabi_lstat64)
|
||||
.long ABI(sys_fstat64, sys_oabi_fstat64)
|
||||
.long sys_lchown
|
||||
.long sys_getuid
|
||||
/* 200 */ .long sys_getgid
|
||||
.long sys_geteuid
|
||||
.long sys_getegid
|
||||
.long sys_setreuid
|
||||
.long sys_setregid
|
||||
/* 205 */ .long sys_getgroups
|
||||
.long sys_setgroups
|
||||
.long sys_fchown
|
||||
.long sys_setresuid
|
||||
.long sys_getresuid
|
||||
/* 210 */ .long sys_setresgid
|
||||
.long sys_getresgid
|
||||
.long sys_chown
|
||||
.long sys_setuid
|
||||
.long sys_setgid
|
||||
/* 215 */ .long sys_setfsuid
|
||||
.long sys_setfsgid
|
||||
.long sys_getdents64
|
||||
.long sys_pivot_root
|
||||
.long sys_mincore
|
||||
/* 220 */ .long sys_madvise
|
||||
.long ABI(sys_fcntl64, sys_oabi_fcntl64)
|
||||
.long sys_ni_syscall /* TUX */
|
||||
.long sys_ni_syscall
|
||||
.long sys_gettid
|
||||
/* 225 */ .long ABI(sys_readahead, sys_oabi_readahead)
|
||||
.long sys_setxattr
|
||||
.long sys_lsetxattr
|
||||
.long sys_fsetxattr
|
||||
.long sys_getxattr
|
||||
/* 230 */ .long sys_lgetxattr
|
||||
.long sys_fgetxattr
|
||||
.long sys_listxattr
|
||||
.long sys_llistxattr
|
||||
.long sys_flistxattr
|
||||
/* 235 */ .long sys_removexattr
|
||||
.long sys_lremovexattr
|
||||
.long sys_fremovexattr
|
||||
.long sys_tkill
|
||||
.long sys_sendfile64
|
||||
/* 240 */ .long sys_futex
|
||||
.long sys_sched_setaffinity
|
||||
.long sys_sched_getaffinity
|
||||
.long sys_io_setup
|
||||
.long sys_io_destroy
|
||||
/* 245 */ .long sys_io_getevents
|
||||
.long sys_io_submit
|
||||
.long sys_io_cancel
|
||||
.long sys_exit_group
|
||||
.long sys_lookup_dcookie
|
||||
/* 250 */ .long sys_epoll_create
|
||||
.long ABI(sys_epoll_ctl, sys_oabi_epoll_ctl)
|
||||
.long ABI(sys_epoll_wait, sys_oabi_epoll_wait)
|
||||
.long sys_remap_file_pages
|
||||
.long sys_ni_syscall /* sys_set_thread_area */
|
||||
/* 255 */ .long sys_ni_syscall /* sys_get_thread_area */
|
||||
.long sys_set_tid_address
|
||||
.long sys_timer_create
|
||||
.long sys_timer_settime
|
||||
.long sys_timer_gettime
|
||||
/* 260 */ .long sys_timer_getoverrun
|
||||
.long sys_timer_delete
|
||||
.long sys_clock_settime
|
||||
.long sys_clock_gettime
|
||||
.long sys_clock_getres
|
||||
/* 265 */ .long sys_clock_nanosleep
|
||||
.long sys_statfs64_wrapper
|
||||
.long sys_fstatfs64_wrapper
|
||||
.long sys_tgkill
|
||||
.long sys_utimes
|
||||
/* 270 */ .long sys_arm_fadvise64_64
|
||||
.long sys_pciconfig_iobase
|
||||
.long sys_pciconfig_read
|
||||
.long sys_pciconfig_write
|
||||
.long sys_mq_open
|
||||
/* 275 */ .long sys_mq_unlink
|
||||
.long sys_mq_timedsend
|
||||
.long sys_mq_timedreceive
|
||||
.long sys_mq_notify
|
||||
.long sys_mq_getsetattr
|
||||
/* 280 */ .long sys_waitid
|
||||
.long sys_socket
|
||||
.long sys_bind
|
||||
.long sys_connect
|
||||
.long sys_listen
|
||||
/* 285 */ .long sys_accept
|
||||
.long sys_getsockname
|
||||
.long sys_getpeername
|
||||
.long sys_socketpair
|
||||
.long sys_send
|
||||
/* 290 */ .long sys_sendto
|
||||
.long sys_recv
|
||||
.long sys_recvfrom
|
||||
.long sys_shutdown
|
||||
.long sys_setsockopt
|
||||
/* 295 */ .long sys_getsockopt
|
||||
.long sys_sendmsg
|
||||
.long sys_recvmsg
|
||||
.long ABI(sys_semop, sys_oabi_semop)
|
||||
.long sys_semget
|
||||
/* 300 */ .long sys_semctl
|
||||
.long sys_msgsnd
|
||||
.long sys_msgrcv
|
||||
.long sys_msgget
|
||||
.long sys_msgctl
|
||||
/* 305 */ .long sys_shmat
|
||||
.long sys_shmdt
|
||||
.long sys_shmget
|
||||
.long sys_shmctl
|
||||
.long sys_add_key
|
||||
/* 310 */ .long sys_request_key
|
||||
.long sys_keyctl
|
||||
.long ABI(sys_semtimedop, sys_oabi_semtimedop)
|
||||
/* vserver */ .long sys_ni_syscall
|
||||
.long sys_ioprio_set
|
||||
/* 315 */ .long sys_ioprio_get
|
||||
.long sys_inotify_init
|
||||
.long sys_inotify_add_watch
|
||||
.long sys_inotify_rm_watch
|
||||
.long sys_mbind
|
||||
/* 320 */ .long sys_get_mempolicy
|
||||
.long sys_set_mempolicy
|
||||
|
||||
.rept NR_syscalls - (. - 100b) / 4
|
||||
.long sys_ni_syscall
|
||||
.endr
|
||||
/* 0 */ CALL(sys_restart_syscall)
|
||||
CALL(sys_exit)
|
||||
CALL(sys_fork_wrapper)
|
||||
CALL(sys_read)
|
||||
CALL(sys_write)
|
||||
/* 5 */ CALL(sys_open)
|
||||
CALL(sys_close)
|
||||
CALL(sys_ni_syscall) /* was sys_waitpid */
|
||||
CALL(sys_creat)
|
||||
CALL(sys_link)
|
||||
/* 10 */ CALL(sys_unlink)
|
||||
CALL(sys_execve_wrapper)
|
||||
CALL(sys_chdir)
|
||||
CALL(OBSOLETE(sys_time)) /* used by libc4 */
|
||||
CALL(sys_mknod)
|
||||
/* 15 */ CALL(sys_chmod)
|
||||
CALL(sys_lchown16)
|
||||
CALL(sys_ni_syscall) /* was sys_break */
|
||||
CALL(sys_ni_syscall) /* was sys_stat */
|
||||
CALL(sys_lseek)
|
||||
/* 20 */ CALL(sys_getpid)
|
||||
CALL(sys_mount)
|
||||
CALL(OBSOLETE(sys_oldumount)) /* used by libc4 */
|
||||
CALL(sys_setuid16)
|
||||
CALL(sys_getuid16)
|
||||
/* 25 */ CALL(OBSOLETE(sys_stime))
|
||||
CALL(sys_ptrace)
|
||||
CALL(OBSOLETE(sys_alarm)) /* used by libc4 */
|
||||
CALL(sys_ni_syscall) /* was sys_fstat */
|
||||
CALL(sys_pause)
|
||||
/* 30 */ CALL(OBSOLETE(sys_utime)) /* used by libc4 */
|
||||
CALL(sys_ni_syscall) /* was sys_stty */
|
||||
CALL(sys_ni_syscall) /* was sys_getty */
|
||||
CALL(sys_access)
|
||||
CALL(sys_nice)
|
||||
/* 35 */ CALL(sys_ni_syscall) /* was sys_ftime */
|
||||
CALL(sys_sync)
|
||||
CALL(sys_kill)
|
||||
CALL(sys_rename)
|
||||
CALL(sys_mkdir)
|
||||
/* 40 */ CALL(sys_rmdir)
|
||||
CALL(sys_dup)
|
||||
CALL(sys_pipe)
|
||||
CALL(sys_times)
|
||||
CALL(sys_ni_syscall) /* was sys_prof */
|
||||
/* 45 */ CALL(sys_brk)
|
||||
CALL(sys_setgid16)
|
||||
CALL(sys_getgid16)
|
||||
CALL(sys_ni_syscall) /* was sys_signal */
|
||||
CALL(sys_geteuid16)
|
||||
/* 50 */ CALL(sys_getegid16)
|
||||
CALL(sys_acct)
|
||||
CALL(sys_umount)
|
||||
CALL(sys_ni_syscall) /* was sys_lock */
|
||||
CALL(sys_ioctl)
|
||||
/* 55 */ CALL(sys_fcntl)
|
||||
CALL(sys_ni_syscall) /* was sys_mpx */
|
||||
CALL(sys_setpgid)
|
||||
CALL(sys_ni_syscall) /* was sys_ulimit */
|
||||
CALL(sys_ni_syscall) /* was sys_olduname */
|
||||
/* 60 */ CALL(sys_umask)
|
||||
CALL(sys_chroot)
|
||||
CALL(sys_ustat)
|
||||
CALL(sys_dup2)
|
||||
CALL(sys_getppid)
|
||||
/* 65 */ CALL(sys_getpgrp)
|
||||
CALL(sys_setsid)
|
||||
CALL(sys_sigaction)
|
||||
CALL(sys_ni_syscall) /* was sys_sgetmask */
|
||||
CALL(sys_ni_syscall) /* was sys_ssetmask */
|
||||
/* 70 */ CALL(sys_setreuid16)
|
||||
CALL(sys_setregid16)
|
||||
CALL(sys_sigsuspend_wrapper)
|
||||
CALL(sys_sigpending)
|
||||
CALL(sys_sethostname)
|
||||
/* 75 */ CALL(sys_setrlimit)
|
||||
CALL(OBSOLETE(sys_old_getrlimit)) /* used by libc4 */
|
||||
CALL(sys_getrusage)
|
||||
CALL(sys_gettimeofday)
|
||||
CALL(sys_settimeofday)
|
||||
/* 80 */ CALL(sys_getgroups16)
|
||||
CALL(sys_setgroups16)
|
||||
CALL(OBSOLETE(old_select)) /* used by libc4 */
|
||||
CALL(sys_symlink)
|
||||
CALL(sys_ni_syscall) /* was sys_lstat */
|
||||
/* 85 */ CALL(sys_readlink)
|
||||
CALL(sys_uselib)
|
||||
CALL(sys_swapon)
|
||||
CALL(sys_reboot)
|
||||
CALL(OBSOLETE(old_readdir)) /* used by libc4 */
|
||||
/* 90 */ CALL(OBSOLETE(old_mmap)) /* used by libc4 */
|
||||
CALL(sys_munmap)
|
||||
CALL(sys_truncate)
|
||||
CALL(sys_ftruncate)
|
||||
CALL(sys_fchmod)
|
||||
/* 95 */ CALL(sys_fchown16)
|
||||
CALL(sys_getpriority)
|
||||
CALL(sys_setpriority)
|
||||
CALL(sys_ni_syscall) /* was sys_profil */
|
||||
CALL(sys_statfs)
|
||||
/* 100 */ CALL(sys_fstatfs)
|
||||
CALL(sys_ni_syscall)
|
||||
CALL(OBSOLETE(sys_socketcall))
|
||||
CALL(sys_syslog)
|
||||
CALL(sys_setitimer)
|
||||
/* 105 */ CALL(sys_getitimer)
|
||||
CALL(sys_newstat)
|
||||
CALL(sys_newlstat)
|
||||
CALL(sys_newfstat)
|
||||
CALL(sys_ni_syscall) /* was sys_uname */
|
||||
/* 110 */ CALL(sys_ni_syscall) /* was sys_iopl */
|
||||
CALL(sys_vhangup)
|
||||
CALL(sys_ni_syscall)
|
||||
CALL(OBSOLETE(sys_syscall)) /* call a syscall */
|
||||
CALL(sys_wait4)
|
||||
/* 115 */ CALL(sys_swapoff)
|
||||
CALL(sys_sysinfo)
|
||||
CALL(OBSOLETE(ABI(sys_ipc, sys_oabi_ipc)))
|
||||
CALL(sys_fsync)
|
||||
CALL(sys_sigreturn_wrapper)
|
||||
/* 120 */ CALL(sys_clone_wrapper)
|
||||
CALL(sys_setdomainname)
|
||||
CALL(sys_newuname)
|
||||
CALL(sys_ni_syscall)
|
||||
CALL(sys_adjtimex)
|
||||
/* 125 */ CALL(sys_mprotect)
|
||||
CALL(sys_sigprocmask)
|
||||
CALL(sys_ni_syscall) /* was sys_create_module */
|
||||
CALL(sys_init_module)
|
||||
CALL(sys_delete_module)
|
||||
/* 130 */ CALL(sys_ni_syscall) /* was sys_get_kernel_syms */
|
||||
CALL(sys_quotactl)
|
||||
CALL(sys_getpgid)
|
||||
CALL(sys_fchdir)
|
||||
CALL(sys_bdflush)
|
||||
/* 135 */ CALL(sys_sysfs)
|
||||
CALL(sys_personality)
|
||||
CALL(sys_ni_syscall) /* CALL(_sys_afs_syscall) */
|
||||
CALL(sys_setfsuid16)
|
||||
CALL(sys_setfsgid16)
|
||||
/* 140 */ CALL(sys_llseek)
|
||||
CALL(sys_getdents)
|
||||
CALL(sys_select)
|
||||
CALL(sys_flock)
|
||||
CALL(sys_msync)
|
||||
/* 145 */ CALL(sys_readv)
|
||||
CALL(sys_writev)
|
||||
CALL(sys_getsid)
|
||||
CALL(sys_fdatasync)
|
||||
CALL(sys_sysctl)
|
||||
/* 150 */ CALL(sys_mlock)
|
||||
CALL(sys_munlock)
|
||||
CALL(sys_mlockall)
|
||||
CALL(sys_munlockall)
|
||||
CALL(sys_sched_setparam)
|
||||
/* 155 */ CALL(sys_sched_getparam)
|
||||
CALL(sys_sched_setscheduler)
|
||||
CALL(sys_sched_getscheduler)
|
||||
CALL(sys_sched_yield)
|
||||
CALL(sys_sched_get_priority_max)
|
||||
/* 160 */ CALL(sys_sched_get_priority_min)
|
||||
CALL(sys_sched_rr_get_interval)
|
||||
CALL(sys_nanosleep)
|
||||
CALL(sys_arm_mremap)
|
||||
CALL(sys_setresuid16)
|
||||
/* 165 */ CALL(sys_getresuid16)
|
||||
CALL(sys_ni_syscall)
|
||||
CALL(sys_ni_syscall) /* was sys_query_module */
|
||||
CALL(sys_poll)
|
||||
CALL(sys_nfsservctl)
|
||||
/* 170 */ CALL(sys_setresgid16)
|
||||
CALL(sys_getresgid16)
|
||||
CALL(sys_prctl)
|
||||
CALL(sys_rt_sigreturn_wrapper)
|
||||
CALL(sys_rt_sigaction)
|
||||
/* 175 */ CALL(sys_rt_sigprocmask)
|
||||
CALL(sys_rt_sigpending)
|
||||
CALL(sys_rt_sigtimedwait)
|
||||
CALL(sys_rt_sigqueueinfo)
|
||||
CALL(sys_rt_sigsuspend_wrapper)
|
||||
/* 180 */ CALL(ABI(sys_pread64, sys_oabi_pread64))
|
||||
CALL(ABI(sys_pwrite64, sys_oabi_pwrite64))
|
||||
CALL(sys_chown16)
|
||||
CALL(sys_getcwd)
|
||||
CALL(sys_capget)
|
||||
/* 185 */ CALL(sys_capset)
|
||||
CALL(sys_sigaltstack_wrapper)
|
||||
CALL(sys_sendfile)
|
||||
CALL(sys_ni_syscall)
|
||||
CALL(sys_ni_syscall)
|
||||
/* 190 */ CALL(sys_vfork_wrapper)
|
||||
CALL(sys_getrlimit)
|
||||
CALL(sys_mmap2)
|
||||
CALL(ABI(sys_truncate64, sys_oabi_truncate64))
|
||||
CALL(ABI(sys_ftruncate64, sys_oabi_ftruncate64))
|
||||
/* 195 */ CALL(ABI(sys_stat64, sys_oabi_stat64))
|
||||
CALL(ABI(sys_lstat64, sys_oabi_lstat64))
|
||||
CALL(ABI(sys_fstat64, sys_oabi_fstat64))
|
||||
CALL(sys_lchown)
|
||||
CALL(sys_getuid)
|
||||
/* 200 */ CALL(sys_getgid)
|
||||
CALL(sys_geteuid)
|
||||
CALL(sys_getegid)
|
||||
CALL(sys_setreuid)
|
||||
CALL(sys_setregid)
|
||||
/* 205 */ CALL(sys_getgroups)
|
||||
CALL(sys_setgroups)
|
||||
CALL(sys_fchown)
|
||||
CALL(sys_setresuid)
|
||||
CALL(sys_getresuid)
|
||||
/* 210 */ CALL(sys_setresgid)
|
||||
CALL(sys_getresgid)
|
||||
CALL(sys_chown)
|
||||
CALL(sys_setuid)
|
||||
CALL(sys_setgid)
|
||||
/* 215 */ CALL(sys_setfsuid)
|
||||
CALL(sys_setfsgid)
|
||||
CALL(sys_getdents64)
|
||||
CALL(sys_pivot_root)
|
||||
CALL(sys_mincore)
|
||||
/* 220 */ CALL(sys_madvise)
|
||||
CALL(ABI(sys_fcntl64, sys_oabi_fcntl64))
|
||||
CALL(sys_ni_syscall) /* TUX */
|
||||
CALL(sys_ni_syscall)
|
||||
CALL(sys_gettid)
|
||||
/* 225 */ CALL(ABI(sys_readahead, sys_oabi_readahead))
|
||||
CALL(sys_setxattr)
|
||||
CALL(sys_lsetxattr)
|
||||
CALL(sys_fsetxattr)
|
||||
CALL(sys_getxattr)
|
||||
/* 230 */ CALL(sys_lgetxattr)
|
||||
CALL(sys_fgetxattr)
|
||||
CALL(sys_listxattr)
|
||||
CALL(sys_llistxattr)
|
||||
CALL(sys_flistxattr)
|
||||
/* 235 */ CALL(sys_removexattr)
|
||||
CALL(sys_lremovexattr)
|
||||
CALL(sys_fremovexattr)
|
||||
CALL(sys_tkill)
|
||||
CALL(sys_sendfile64)
|
||||
/* 240 */ CALL(sys_futex)
|
||||
CALL(sys_sched_setaffinity)
|
||||
CALL(sys_sched_getaffinity)
|
||||
CALL(sys_io_setup)
|
||||
CALL(sys_io_destroy)
|
||||
/* 245 */ CALL(sys_io_getevents)
|
||||
CALL(sys_io_submit)
|
||||
CALL(sys_io_cancel)
|
||||
CALL(sys_exit_group)
|
||||
CALL(sys_lookup_dcookie)
|
||||
/* 250 */ CALL(sys_epoll_create)
|
||||
CALL(ABI(sys_epoll_ctl, sys_oabi_epoll_ctl))
|
||||
CALL(ABI(sys_epoll_wait, sys_oabi_epoll_wait))
|
||||
CALL(sys_remap_file_pages)
|
||||
CALL(sys_ni_syscall) /* sys_set_thread_area */
|
||||
/* 255 */ CALL(sys_ni_syscall) /* sys_get_thread_area */
|
||||
CALL(sys_set_tid_address)
|
||||
CALL(sys_timer_create)
|
||||
CALL(sys_timer_settime)
|
||||
CALL(sys_timer_gettime)
|
||||
/* 260 */ CALL(sys_timer_getoverrun)
|
||||
CALL(sys_timer_delete)
|
||||
CALL(sys_clock_settime)
|
||||
CALL(sys_clock_gettime)
|
||||
CALL(sys_clock_getres)
|
||||
/* 265 */ CALL(sys_clock_nanosleep)
|
||||
CALL(sys_statfs64_wrapper)
|
||||
CALL(sys_fstatfs64_wrapper)
|
||||
CALL(sys_tgkill)
|
||||
CALL(sys_utimes)
|
||||
/* 270 */ CALL(sys_arm_fadvise64_64)
|
||||
CALL(sys_pciconfig_iobase)
|
||||
CALL(sys_pciconfig_read)
|
||||
CALL(sys_pciconfig_write)
|
||||
CALL(sys_mq_open)
|
||||
/* 275 */ CALL(sys_mq_unlink)
|
||||
CALL(sys_mq_timedsend)
|
||||
CALL(sys_mq_timedreceive)
|
||||
CALL(sys_mq_notify)
|
||||
CALL(sys_mq_getsetattr)
|
||||
/* 280 */ CALL(sys_waitid)
|
||||
CALL(sys_socket)
|
||||
CALL(sys_bind)
|
||||
CALL(sys_connect)
|
||||
CALL(sys_listen)
|
||||
/* 285 */ CALL(sys_accept)
|
||||
CALL(sys_getsockname)
|
||||
CALL(sys_getpeername)
|
||||
CALL(sys_socketpair)
|
||||
CALL(sys_send)
|
||||
/* 290 */ CALL(sys_sendto)
|
||||
CALL(sys_recv)
|
||||
CALL(sys_recvfrom)
|
||||
CALL(sys_shutdown)
|
||||
CALL(sys_setsockopt)
|
||||
/* 295 */ CALL(sys_getsockopt)
|
||||
CALL(sys_sendmsg)
|
||||
CALL(sys_recvmsg)
|
||||
CALL(ABI(sys_semop, sys_oabi_semop))
|
||||
CALL(sys_semget)
|
||||
/* 300 */ CALL(sys_semctl)
|
||||
CALL(sys_msgsnd)
|
||||
CALL(sys_msgrcv)
|
||||
CALL(sys_msgget)
|
||||
CALL(sys_msgctl)
|
||||
/* 305 */ CALL(sys_shmat)
|
||||
CALL(sys_shmdt)
|
||||
CALL(sys_shmget)
|
||||
CALL(sys_shmctl)
|
||||
CALL(sys_add_key)
|
||||
/* 310 */ CALL(sys_request_key)
|
||||
CALL(sys_keyctl)
|
||||
CALL(ABI(sys_semtimedop, sys_oabi_semtimedop))
|
||||
/* vserver */ CALL(sys_ni_syscall)
|
||||
CALL(sys_ioprio_set)
|
||||
/* 315 */ CALL(sys_ioprio_get)
|
||||
CALL(sys_inotify_init)
|
||||
CALL(sys_inotify_add_watch)
|
||||
CALL(sys_inotify_rm_watch)
|
||||
CALL(sys_mbind)
|
||||
/* 320 */ CALL(sys_get_mempolicy)
|
||||
CALL(sys_set_mempolicy)
|
||||
#ifndef syscalls_counted
|
||||
.equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls
|
||||
#define syscalls_counted
|
||||
#endif
|
||||
.rept syscalls_padding
|
||||
CALL(sys_ni_syscall)
|
||||
.endr
|
||||
|
||||
@ -87,7 +87,11 @@ ENTRY(ret_from_fork)
|
||||
b ret_slow_syscall
|
||||
|
||||
|
||||
.equ NR_syscalls,0
|
||||
#define CALL(x) .equ NR_syscalls,NR_syscalls+1
|
||||
#include "calls.S"
|
||||
#undef CALL
|
||||
#define CALL(x) .long x
|
||||
|
||||
/*=============================================================================
|
||||
* SWI handler
|
||||
|
||||
@ -469,7 +469,9 @@ static void cp_clcd_enable(struct clcd_fb *fb)
|
||||
if (fb->fb.var.bits_per_pixel <= 8)
|
||||
val = CM_CTRL_LCDMUXSEL_VGA_8421BPP;
|
||||
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
|
||||
val = 0; /* no idea for this, don't trust the docs */
|
||||
|
||||
|
||||
@ -17,11 +17,12 @@
|
||||
* 14-Jan-2005 BJD Added s3c24xx_init_clocks() call
|
||||
* 10-Mar-2005 LCVR Changed S3C2410_{VA,SZ} to S3C24XX_{VA,SZ} & IODESC_ENT
|
||||
* 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 *` */
|
||||
|
||||
#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
|
||||
#define MHZ (1000*1000)
|
||||
|
||||
@ -10,6 +10,7 @@
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* 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-Feb-2005 BJD Added camera from guillaume.gourat@nexvision.tv
|
||||
* 29-Aug-2004 BJD Added timers 0 through 3
|
||||
@ -46,8 +47,8 @@ struct platform_device *s3c24xx_uart_devs[3];
|
||||
|
||||
static struct resource s3c_usb_resource[] = {
|
||||
[0] = {
|
||||
.start = S3C2410_PA_USBHOST,
|
||||
.end = S3C2410_PA_USBHOST + S3C24XX_SZ_USBHOST - 1,
|
||||
.start = S3C24XX_PA_USBHOST,
|
||||
.end = S3C24XX_PA_USBHOST + S3C24XX_SZ_USBHOST - 1,
|
||||
.flags = IORESOURCE_MEM,
|
||||
},
|
||||
[1] = {
|
||||
@ -76,8 +77,8 @@ EXPORT_SYMBOL(s3c_device_usb);
|
||||
|
||||
static struct resource s3c_lcd_resource[] = {
|
||||
[0] = {
|
||||
.start = S3C2410_PA_LCD,
|
||||
.end = S3C2410_PA_LCD + S3C24XX_SZ_LCD - 1,
|
||||
.start = S3C24XX_PA_LCD,
|
||||
.end = S3C24XX_PA_LCD + S3C24XX_SZ_LCD - 1,
|
||||
.flags = IORESOURCE_MEM,
|
||||
},
|
||||
[1] = {
|
||||
@ -139,8 +140,8 @@ EXPORT_SYMBOL(s3c_device_nand);
|
||||
|
||||
static struct resource s3c_usbgadget_resource[] = {
|
||||
[0] = {
|
||||
.start = S3C2410_PA_USBDEV,
|
||||
.end = S3C2410_PA_USBDEV + S3C24XX_SZ_USBDEV - 1,
|
||||
.start = S3C24XX_PA_USBDEV,
|
||||
.end = S3C24XX_PA_USBDEV + S3C24XX_SZ_USBDEV - 1,
|
||||
.flags = IORESOURCE_MEM,
|
||||
},
|
||||
[1] = {
|
||||
@ -164,8 +165,8 @@ EXPORT_SYMBOL(s3c_device_usbgadget);
|
||||
|
||||
static struct resource s3c_wdt_resource[] = {
|
||||
[0] = {
|
||||
.start = S3C2410_PA_WATCHDOG,
|
||||
.end = S3C2410_PA_WATCHDOG + S3C24XX_SZ_WATCHDOG - 1,
|
||||
.start = S3C24XX_PA_WATCHDOG,
|
||||
.end = S3C24XX_PA_WATCHDOG + S3C24XX_SZ_WATCHDOG - 1,
|
||||
.flags = IORESOURCE_MEM,
|
||||
},
|
||||
[1] = {
|
||||
@ -189,8 +190,8 @@ EXPORT_SYMBOL(s3c_device_wdt);
|
||||
|
||||
static struct resource s3c_i2c_resource[] = {
|
||||
[0] = {
|
||||
.start = S3C2410_PA_IIC,
|
||||
.end = S3C2410_PA_IIC + S3C24XX_SZ_IIC - 1,
|
||||
.start = S3C24XX_PA_IIC,
|
||||
.end = S3C24XX_PA_IIC + S3C24XX_SZ_IIC - 1,
|
||||
.flags = IORESOURCE_MEM,
|
||||
},
|
||||
[1] = {
|
||||
@ -214,8 +215,8 @@ EXPORT_SYMBOL(s3c_device_i2c);
|
||||
|
||||
static struct resource s3c_iis_resource[] = {
|
||||
[0] = {
|
||||
.start = S3C2410_PA_IIS,
|
||||
.end = S3C2410_PA_IIS + S3C24XX_SZ_IIS -1,
|
||||
.start = S3C24XX_PA_IIS,
|
||||
.end = S3C24XX_PA_IIS + S3C24XX_SZ_IIS -1,
|
||||
.flags = IORESOURCE_MEM,
|
||||
}
|
||||
};
|
||||
@ -239,8 +240,8 @@ EXPORT_SYMBOL(s3c_device_iis);
|
||||
|
||||
static struct resource s3c_rtc_resource[] = {
|
||||
[0] = {
|
||||
.start = S3C2410_PA_RTC,
|
||||
.end = S3C2410_PA_RTC + 0xff,
|
||||
.start = S3C24XX_PA_RTC,
|
||||
.end = S3C24XX_PA_RTC + 0xff,
|
||||
.flags = IORESOURCE_MEM,
|
||||
},
|
||||
[1] = {
|
||||
@ -268,8 +269,8 @@ EXPORT_SYMBOL(s3c_device_rtc);
|
||||
|
||||
static struct resource s3c_adc_resource[] = {
|
||||
[0] = {
|
||||
.start = S3C2410_PA_ADC,
|
||||
.end = S3C2410_PA_ADC + S3C24XX_SZ_ADC - 1,
|
||||
.start = S3C24XX_PA_ADC,
|
||||
.end = S3C24XX_PA_ADC + S3C24XX_SZ_ADC - 1,
|
||||
.flags = IORESOURCE_MEM,
|
||||
},
|
||||
[1] = {
|
||||
@ -316,8 +317,8 @@ EXPORT_SYMBOL(s3c_device_sdi);
|
||||
|
||||
static struct resource s3c_spi0_resource[] = {
|
||||
[0] = {
|
||||
.start = S3C2410_PA_SPI,
|
||||
.end = S3C2410_PA_SPI + 0x1f,
|
||||
.start = S3C24XX_PA_SPI,
|
||||
.end = S3C24XX_PA_SPI + 0x1f,
|
||||
.flags = IORESOURCE_MEM,
|
||||
},
|
||||
[1] = {
|
||||
@ -341,8 +342,8 @@ EXPORT_SYMBOL(s3c_device_spi0);
|
||||
|
||||
static struct resource s3c_spi1_resource[] = {
|
||||
[0] = {
|
||||
.start = S3C2410_PA_SPI + 0x20,
|
||||
.end = S3C2410_PA_SPI + 0x20 + 0x1f,
|
||||
.start = S3C24XX_PA_SPI + 0x20,
|
||||
.end = S3C24XX_PA_SPI + 0x20 + 0x1f,
|
||||
.flags = IORESOURCE_MEM,
|
||||
},
|
||||
[1] = {
|
||||
@ -366,8 +367,8 @@ EXPORT_SYMBOL(s3c_device_spi1);
|
||||
|
||||
static struct resource s3c_timer0_resource[] = {
|
||||
[0] = {
|
||||
.start = S3C2410_PA_TIMER + 0x0C,
|
||||
.end = S3C2410_PA_TIMER + 0x0C + 0xB,
|
||||
.start = S3C24XX_PA_TIMER + 0x0C,
|
||||
.end = S3C24XX_PA_TIMER + 0x0C + 0xB,
|
||||
.flags = IORESOURCE_MEM,
|
||||
},
|
||||
[1] = {
|
||||
@ -391,8 +392,8 @@ EXPORT_SYMBOL(s3c_device_timer0);
|
||||
|
||||
static struct resource s3c_timer1_resource[] = {
|
||||
[0] = {
|
||||
.start = S3C2410_PA_TIMER + 0x18,
|
||||
.end = S3C2410_PA_TIMER + 0x23,
|
||||
.start = S3C24XX_PA_TIMER + 0x18,
|
||||
.end = S3C24XX_PA_TIMER + 0x23,
|
||||
.flags = IORESOURCE_MEM,
|
||||
},
|
||||
[1] = {
|
||||
@ -416,8 +417,8 @@ EXPORT_SYMBOL(s3c_device_timer1);
|
||||
|
||||
static struct resource s3c_timer2_resource[] = {
|
||||
[0] = {
|
||||
.start = S3C2410_PA_TIMER + 0x24,
|
||||
.end = S3C2410_PA_TIMER + 0x2F,
|
||||
.start = S3C24XX_PA_TIMER + 0x24,
|
||||
.end = S3C24XX_PA_TIMER + 0x2F,
|
||||
.flags = IORESOURCE_MEM,
|
||||
},
|
||||
[1] = {
|
||||
@ -441,8 +442,8 @@ EXPORT_SYMBOL(s3c_device_timer2);
|
||||
|
||||
static struct resource s3c_timer3_resource[] = {
|
||||
[0] = {
|
||||
.start = S3C2410_PA_TIMER + 0x30,
|
||||
.end = S3C2410_PA_TIMER + 0x3B,
|
||||
.start = S3C24XX_PA_TIMER + 0x30,
|
||||
.end = S3C24XX_PA_TIMER + 0x3B,
|
||||
.flags = IORESOURCE_MEM,
|
||||
},
|
||||
[1] = {
|
||||
|
||||
@ -1152,7 +1152,7 @@ static int __init s3c2410_init_dma(void)
|
||||
|
||||
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) {
|
||||
printk(KERN_ERR "dma failed to remap register block\n");
|
||||
return -ENOMEM;
|
||||
|
||||
@ -133,12 +133,12 @@ ENTRY(s3c2410_cpu_resume)
|
||||
@@ load UART to allow us to print the two characters for
|
||||
@@ resume debug
|
||||
|
||||
mov r2, #S3C2410_PA_UART & 0xff000000
|
||||
orr r2, r2, #S3C2410_PA_UART & 0xff000
|
||||
mov r2, #S3C24XX_PA_UART & 0xff000000
|
||||
orr r2, r2, #S3C24XX_PA_UART & 0xff000
|
||||
|
||||
#if 0
|
||||
/* SMDK2440 LED set */
|
||||
mov r14, #S3C2410_PA_GPIO
|
||||
mov r14, #S3C24XX_PA_GPIO
|
||||
ldr r12, [ r14, #0x54 ]
|
||||
bic r12, r12, #3<<4
|
||||
orr r12, r12, #1<<7
|
||||
|
||||
@ -142,7 +142,7 @@ __ioremap_pfn(unsigned long pfn, unsigned long offset, size_t size,
|
||||
return NULL;
|
||||
addr = (unsigned long)area->addr;
|
||||
if (remap_area_pages(addr, pfn, size, flags)) {
|
||||
vfree(addr);
|
||||
vfree((void *)addr);
|
||||
return NULL;
|
||||
}
|
||||
return (void __iomem *) (offset + (char *)addr);
|
||||
|
||||
@ -343,6 +343,12 @@ static struct mem_types mem_types[] __initdata = {
|
||||
PMD_SECT_AP_WRITE | PMD_SECT_BUFFERABLE |
|
||||
PMD_SECT_TEX(1),
|
||||
.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,
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@ -29,9 +29,6 @@
|
||||
#ifdef CONFIG_ARCH_OMAP
|
||||
#include <asm/arch/gpio.h>
|
||||
#endif
|
||||
|
||||
#else
|
||||
#define set_irq_type(irq,type) do{}while(0)
|
||||
#endif
|
||||
|
||||
|
||||
@ -509,14 +506,14 @@ static int __devinit ads7846_probe(struct spi_device *spi)
|
||||
ts->msg.complete = ads7846_rx;
|
||||
ts->msg.context = ts;
|
||||
|
||||
if (request_irq(spi->irq, ads7846_irq, SA_SAMPLE_RANDOM,
|
||||
spi->dev.bus_id, ts)) {
|
||||
if (request_irq(spi->irq, ads7846_irq,
|
||||
SA_SAMPLE_RANDOM | SA_TRIGGER_FALLING,
|
||||
spi->dev.bus_id, ts)) {
|
||||
dev_dbg(&spi->dev, "irq %d busy?\n", spi->irq);
|
||||
input_unregister_device(&ts->input);
|
||||
kfree(ts);
|
||||
return -EBUSY;
|
||||
}
|
||||
set_irq_type(spi->irq, IRQT_FALLING);
|
||||
|
||||
dev_info(&spi->dev, "touchscreen, irq %d\n", spi->irq);
|
||||
|
||||
|
||||
@ -402,10 +402,10 @@ static int imx_startup(struct uart_port *port)
|
||||
DRIVER_NAME, sport);
|
||||
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);
|
||||
if (retval) goto error_out3;
|
||||
set_irq_type(sport->rtsirq, IRQT_BOTHEDGE);
|
||||
|
||||
/*
|
||||
* Finally, clear and enable interrupts
|
||||
|
||||
@ -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);
|
||||
|
||||
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);
|
||||
|
||||
ourport->clk = clk_get(&platdev->dev, "uart");
|
||||
|
||||
@ -116,9 +116,10 @@ clcdfb_set_bitfields(struct clcd_fb *fb, struct fb_var_screeninfo *var)
|
||||
int ret = 0;
|
||||
|
||||
memset(&var->transp, 0, sizeof(var->transp));
|
||||
memset(&var->red, 0, sizeof(var->red));
|
||||
memset(&var->green, 0, sizeof(var->green));
|
||||
memset(&var->blue, 0, sizeof(var->blue));
|
||||
|
||||
var->red.msb_right = 0;
|
||||
var->green.msb_right = 0;
|
||||
var->blue.msb_right = 0;
|
||||
|
||||
switch (var->bits_per_pixel) {
|
||||
case 1:
|
||||
@ -133,34 +134,20 @@ clcdfb_set_bitfields(struct clcd_fb *fb, struct fb_var_screeninfo *var)
|
||||
var->blue.offset = 0;
|
||||
break;
|
||||
case 16:
|
||||
var->red.length = 5;
|
||||
var->green.length = 6;
|
||||
var->blue.length = 5;
|
||||
if (fb->panel->cntl & CNTL_BGR) {
|
||||
var->red.offset = 11;
|
||||
var->green.offset = 5;
|
||||
var->blue.offset = 0;
|
||||
} else {
|
||||
var->red.offset = 0;
|
||||
var->green.offset = 5;
|
||||
var->blue.offset = 11;
|
||||
}
|
||||
var->red.length = 5;
|
||||
var->blue.length = 5;
|
||||
/*
|
||||
* Green length can be 5 or 6 depending whether
|
||||
* we're operating in RGB555 or RGB565 mode.
|
||||
*/
|
||||
if (var->green.length != 5 && var->green.length != 6)
|
||||
var->green.length = 6;
|
||||
break;
|
||||
case 32:
|
||||
if (fb->panel->cntl & CNTL_LCDTFT) {
|
||||
var->red.length = 8;
|
||||
var->green.length = 8;
|
||||
var->blue.length = 8;
|
||||
|
||||
if (fb->panel->cntl & CNTL_BGR) {
|
||||
var->red.offset = 16;
|
||||
var->green.offset = 8;
|
||||
var->blue.offset = 0;
|
||||
} else {
|
||||
var->red.offset = 0;
|
||||
var->green.offset = 8;
|
||||
var->blue.offset = 16;
|
||||
}
|
||||
break;
|
||||
}
|
||||
default:
|
||||
@ -168,6 +155,23 @@ clcdfb_set_bitfields(struct clcd_fb *fb, struct fb_var_screeninfo *var)
|
||||
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) {
|
||||
var->blue.offset = 0;
|
||||
var->green.offset = var->blue.offset + var->blue.length;
|
||||
var->red.offset = var->green.offset + var->green.length;
|
||||
} else {
|
||||
var->red.offset = 0;
|
||||
var->green.offset = var->red.offset + var->red.length;
|
||||
var->blue.offset = var->green.offset + var->green.length;
|
||||
}
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
.macro addruart, rx
|
||||
mrc p15, 0, \rx, c1, c0
|
||||
tst \rx, #1
|
||||
ldreq \rx, = S3C2410_PA_UART
|
||||
ldreq \rx, = S3C24XX_PA_UART
|
||||
ldrne \rx, = S3C24XX_VA_UART
|
||||
#if CONFIG_DEBUG_S3C2410_UART != 0
|
||||
add \rx, \rx, #(S3C2410_UART1_OFF * CONFIG_DEBUG_S3C2410_UART)
|
||||
@ -44,7 +44,7 @@
|
||||
1003:
|
||||
mrc p15, 0, \rd, c1, c0
|
||||
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)
|
||||
bic \rd, \rd, #0xff000
|
||||
ldr \rd, [ \rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0) ]
|
||||
@ -75,7 +75,7 @@
|
||||
1003:
|
||||
mrc p15, 0, \rd, c1, c0
|
||||
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)
|
||||
bic \rd, \rd, #0xff000
|
||||
ldr \rd, [ \rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0) ]
|
||||
|
||||
@ -14,6 +14,7 @@
|
||||
* 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-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
|
||||
@ -188,5 +189,42 @@
|
||||
|
||||
#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 */
|
||||
|
||||
@ -39,9 +39,9 @@
|
||||
#define S3C24XX_VA_UART1 (S3C24XX_VA_UART + 0x4000 )
|
||||
#define S3C24XX_VA_UART2 (S3C24XX_VA_UART + 0x8000 )
|
||||
|
||||
#define S3C2410_PA_UART0 (S3C2410_PA_UART)
|
||||
#define S3C2410_PA_UART1 (S3C2410_PA_UART + 0x4000 )
|
||||
#define S3C2410_PA_UART2 (S3C2410_PA_UART + 0x8000 )
|
||||
#define S3C2410_PA_UART0 (S3C24XX_PA_UART)
|
||||
#define S3C2410_PA_UART1 (S3C24XX_PA_UART + 0x4000 )
|
||||
#define S3C2410_PA_UART2 (S3C24XX_PA_UART + 0x8000 )
|
||||
|
||||
#define S3C2410_URXH (0x24)
|
||||
#define S3C2410_UTXH (0x20)
|
||||
|
||||
@ -35,13 +35,13 @@
|
||||
#undef S3C2410_GPIOREG
|
||||
#undef S3C2410_WDOGREG
|
||||
|
||||
#define S3C2410_GPIOREG(x) ((S3C2410_PA_GPIO + (x)))
|
||||
#define S3C2410_WDOGREG(x) ((S3C2410_PA_WATCHDOG + (x)))
|
||||
#define S3C2410_GPIOREG(x) ((S3C24XX_PA_GPIO + (x)))
|
||||
#define S3C2410_WDOGREG(x) ((S3C24XX_PA_WATCHDOG + (x)))
|
||||
|
||||
/* how many bytes we allow into the FIFO at a time in FIFO mode */
|
||||
#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
|
||||
uart_wr(unsigned int reg, unsigned int val)
|
||||
|
||||
@ -26,6 +26,7 @@ struct meminfo;
|
||||
#define MT_MEMORY 5
|
||||
#define MT_ROM 6
|
||||
#define MT_IXP2000_DEVICE 7
|
||||
#define MT_NONSHARED_DEVICE 8
|
||||
|
||||
extern void create_memmap_holes(struct meminfo *);
|
||||
extern void memtable_init(struct meminfo *);
|
||||
|
||||
@ -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_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_NONSHARED_DEV (PMD_SECT_TEX(2))
|
||||
|
||||
/*
|
||||
* - coarse table (not used)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user