diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 22:59:04 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 22:59:04 -0400 |
commit | 73ecf3a6e3f0206bf56a0fefe3b3eda042fb7034 (patch) | |
tree | 866f0ebb2b148479e93b5ac955097b1cc94ceb4e /arch | |
parent | b9da0571050c09863e59f94d0b8594a290d61b88 (diff) | |
parent | cd3ecad19aea8debae9a48b53de2ec7a571f24e9 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (49 commits)
serial8250: ratelimit "too much work" error
serial: bfin_sport_uart: speed up sport RX sample rate to be 3% faster
serial: abstraction for 8250 legacy ports
serial/imx: check that the buffer is non-empty before sending it out
serial: mfd: add more baud rates support
jsm: Remove the uart port on errors
Alchemy: Add UART PM methods.
8250: allow platforms to override PM hook.
altera_uart: Don't use plain integer as NULL pointer
altera_uart: Fix missing prototype for registering an early console
altera_uart: Fixup type usage of port flags
altera_uart: Make it possible to use Altera UART and 8250 ports together
altera_uart: Add support for different address strides
altera_uart: Add support for getting mapbase and IRQ from resources
altera_uart: Add support for polling mode (IRQ-less)
serial: Factor out uart_poll_timeout() from 8250 driver
serial: mark the 8250 driver as maintained
serial: 8250: Don't delay after transmitter is ready.
tty: MAINTAINERS: add drivers/serial/jsm/ as maintained driver
vcs: invoke the vt update callback when /dev/vcs* is written to
...
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/include/asm/ioctls.h | 83 | ||||
-rw-r--r-- | arch/avr32/include/asm/ioctls.h | 86 | ||||
-rw-r--r-- | arch/cris/include/asm/ioctls.h | 84 | ||||
-rw-r--r-- | arch/frv/include/asm/ioctls.h | 80 | ||||
-rw-r--r-- | arch/h8300/include/asm/ioctls.h | 81 | ||||
-rw-r--r-- | arch/ia64/hp/sim/simserial.c | 12 | ||||
-rw-r--r-- | arch/ia64/include/asm/ioctls.h | 89 | ||||
-rw-r--r-- | arch/m32r/include/asm/ioctls.h | 83 | ||||
-rw-r--r-- | arch/mips/alchemy/common/platform.c | 28 | ||||
-rw-r--r-- | arch/mips/alchemy/common/power.c | 35 | ||||
-rw-r--r-- | arch/mn10300/include/asm/ioctls.h | 84 | ||||
-rw-r--r-- | arch/s390/include/asm/ioctls.h | 88 |
12 files changed, 38 insertions, 795 deletions
diff --git a/arch/arm/include/asm/ioctls.h b/arch/arm/include/asm/ioctls.h index 0b30894b5482..9c9629816128 100644 --- a/arch/arm/include/asm/ioctls.h +++ b/arch/arm/include/asm/ioctls.h | |||
@@ -1,89 +1,8 @@ | |||
1 | #ifndef __ASM_ARM_IOCTLS_H | 1 | #ifndef __ASM_ARM_IOCTLS_H |
2 | #define __ASM_ARM_IOCTLS_H | 2 | #define __ASM_ARM_IOCTLS_H |
3 | 3 | ||
4 | #include <asm/ioctl.h> | ||
5 | |||
6 | /* 0x54 is just a magic number to make these relatively unique ('T') */ | ||
7 | |||
8 | #define TCGETS 0x5401 | ||
9 | #define TCSETS 0x5402 | ||
10 | #define TCSETSW 0x5403 | ||
11 | #define TCSETSF 0x5404 | ||
12 | #define TCGETA 0x5405 | ||
13 | #define TCSETA 0x5406 | ||
14 | #define TCSETAW 0x5407 | ||
15 | #define TCSETAF 0x5408 | ||
16 | #define TCSBRK 0x5409 | ||
17 | #define TCXONC 0x540A | ||
18 | #define TCFLSH 0x540B | ||
19 | #define TIOCEXCL 0x540C | ||
20 | #define TIOCNXCL 0x540D | ||
21 | #define TIOCSCTTY 0x540E | ||
22 | #define TIOCGPGRP 0x540F | ||
23 | #define TIOCSPGRP 0x5410 | ||
24 | #define TIOCOUTQ 0x5411 | ||
25 | #define TIOCSTI 0x5412 | ||
26 | #define TIOCGWINSZ 0x5413 | ||
27 | #define TIOCSWINSZ 0x5414 | ||
28 | #define TIOCMGET 0x5415 | ||
29 | #define TIOCMBIS 0x5416 | ||
30 | #define TIOCMBIC 0x5417 | ||
31 | #define TIOCMSET 0x5418 | ||
32 | #define TIOCGSOFTCAR 0x5419 | ||
33 | #define TIOCSSOFTCAR 0x541A | ||
34 | #define FIONREAD 0x541B | ||
35 | #define TIOCINQ FIONREAD | ||
36 | #define TIOCLINUX 0x541C | ||
37 | #define TIOCCONS 0x541D | ||
38 | #define TIOCGSERIAL 0x541E | ||
39 | #define TIOCSSERIAL 0x541F | ||
40 | #define TIOCPKT 0x5420 | ||
41 | #define FIONBIO 0x5421 | ||
42 | #define TIOCNOTTY 0x5422 | ||
43 | #define TIOCSETD 0x5423 | ||
44 | #define TIOCGETD 0x5424 | ||
45 | #define TCSBRKP 0x5425 /* Needed for POSIX tcsendbreak() */ | ||
46 | #define TIOCSBRK 0x5427 /* BSD compatibility */ | ||
47 | #define TIOCCBRK 0x5428 /* BSD compatibility */ | ||
48 | #define TIOCGSID 0x5429 /* Return the session ID of FD */ | ||
49 | #define TCGETS2 _IOR('T',0x2A, struct termios2) | ||
50 | #define TCSETS2 _IOW('T',0x2B, struct termios2) | ||
51 | #define TCSETSW2 _IOW('T',0x2C, struct termios2) | ||
52 | #define TCSETSF2 _IOW('T',0x2D, struct termios2) | ||
53 | #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ | ||
54 | #define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */ | ||
55 | #define TIOCSIG _IOW('T',0x36, int) /* Generate signal on Pty slave */ | ||
56 | |||
57 | #define TIOCGRS485 0x542E | ||
58 | #define TIOCSRS485 0x542F | ||
59 | |||
60 | #define FIONCLEX 0x5450 /* these numbers need to be adjusted. */ | ||
61 | #define FIOCLEX 0x5451 | ||
62 | #define FIOASYNC 0x5452 | ||
63 | #define TIOCSERCONFIG 0x5453 | ||
64 | #define TIOCSERGWILD 0x5454 | ||
65 | #define TIOCSERSWILD 0x5455 | ||
66 | #define TIOCGLCKTRMIOS 0x5456 | ||
67 | #define TIOCSLCKTRMIOS 0x5457 | ||
68 | #define TIOCSERGSTRUCT 0x5458 /* For debugging only */ | ||
69 | #define TIOCSERGETLSR 0x5459 /* Get line status register */ | ||
70 | #define TIOCSERGETMULTI 0x545A /* Get multiport config */ | ||
71 | #define TIOCSERSETMULTI 0x545B /* Set multiport config */ | ||
72 | |||
73 | #define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */ | ||
74 | #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ | ||
75 | #define FIOQSIZE 0x545E | 4 | #define FIOQSIZE 0x545E |
76 | 5 | ||
77 | /* Used for packet mode */ | 6 | #include <asm-generic/ioctls.h> |
78 | #define TIOCPKT_DATA 0 | ||
79 | #define TIOCPKT_FLUSHREAD 1 | ||
80 | #define TIOCPKT_FLUSHWRITE 2 | ||
81 | #define TIOCPKT_STOP 4 | ||
82 | #define TIOCPKT_START 8 | ||
83 | #define TIOCPKT_NOSTOP 16 | ||
84 | #define TIOCPKT_DOSTOP 32 | ||
85 | #define TIOCPKT_IOCTL 64 | ||
86 | |||
87 | #define TIOCSER_TEMT 0x01 /* Transmitter physically empty */ | ||
88 | 7 | ||
89 | #endif | 8 | #endif |
diff --git a/arch/avr32/include/asm/ioctls.h b/arch/avr32/include/asm/ioctls.h index b7dd324b46a9..909cf66feaf5 100644 --- a/arch/avr32/include/asm/ioctls.h +++ b/arch/avr32/include/asm/ioctls.h | |||
@@ -1,90 +1,6 @@ | |||
1 | #ifndef __ASM_AVR32_IOCTLS_H | 1 | #ifndef __ASM_AVR32_IOCTLS_H |
2 | #define __ASM_AVR32_IOCTLS_H | 2 | #define __ASM_AVR32_IOCTLS_H |
3 | 3 | ||
4 | #include <asm/ioctl.h> | 4 | #include <asm-generic/ioctls.h> |
5 | |||
6 | /* 0x54 is just a magic number to make these relatively unique ('T') */ | ||
7 | |||
8 | #define TCGETS 0x5401 | ||
9 | #define TCSETS 0x5402 /* Clashes with SNDCTL_TMR_START sound ioctl */ | ||
10 | #define TCSETSW 0x5403 | ||
11 | #define TCSETSF 0x5404 | ||
12 | #define TCGETA 0x5405 | ||
13 | #define TCSETA 0x5406 | ||
14 | #define TCSETAW 0x5407 | ||
15 | #define TCSETAF 0x5408 | ||
16 | #define TCSBRK 0x5409 | ||
17 | #define TCXONC 0x540A | ||
18 | #define TCFLSH 0x540B | ||
19 | #define TIOCEXCL 0x540C | ||
20 | #define TIOCNXCL 0x540D | ||
21 | #define TIOCSCTTY 0x540E | ||
22 | #define TIOCGPGRP 0x540F | ||
23 | #define TIOCSPGRP 0x5410 | ||
24 | #define TIOCOUTQ 0x5411 | ||
25 | #define TIOCSTI 0x5412 | ||
26 | #define TIOCGWINSZ 0x5413 | ||
27 | #define TIOCSWINSZ 0x5414 | ||
28 | #define TIOCMGET 0x5415 | ||
29 | #define TIOCMBIS 0x5416 | ||
30 | #define TIOCMBIC 0x5417 | ||
31 | #define TIOCMSET 0x5418 | ||
32 | #define TIOCGSOFTCAR 0x5419 | ||
33 | #define TIOCSSOFTCAR 0x541A | ||
34 | #define FIONREAD 0x541B | ||
35 | #define TIOCINQ FIONREAD | ||
36 | #define TIOCLINUX 0x541C | ||
37 | #define TIOCCONS 0x541D | ||
38 | #define TIOCGSERIAL 0x541E | ||
39 | #define TIOCSSERIAL 0x541F | ||
40 | #define TIOCPKT 0x5420 | ||
41 | #define FIONBIO 0x5421 | ||
42 | #define TIOCNOTTY 0x5422 | ||
43 | #define TIOCSETD 0x5423 | ||
44 | #define TIOCGETD 0x5424 | ||
45 | #define TCSBRKP 0x5425 /* Needed for POSIX tcsendbreak() */ | ||
46 | /* #define TIOCTTYGSTRUCT 0x5426 - Former debugging-only ioctl */ | ||
47 | #define TIOCSBRK 0x5427 /* BSD compatibility */ | ||
48 | #define TIOCCBRK 0x5428 /* BSD compatibility */ | ||
49 | #define TIOCGSID 0x5429 /* Return the session ID of FD */ | ||
50 | #define TCGETS2 _IOR('T',0x2A, struct termios2) | ||
51 | #define TCSETS2 _IOW('T',0x2B, struct termios2) | ||
52 | #define TCSETSW2 _IOW('T',0x2C, struct termios2) | ||
53 | #define TCSETSF2 _IOW('T',0x2D, struct termios2) | ||
54 | #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ | ||
55 | #define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */ | ||
56 | #define TIOCSIG _IOW('T',0x36, int) /* Generate signal on Pty slave */ | ||
57 | |||
58 | #define TIOCGRS485 0x542E | ||
59 | #define TIOCSRS485 0x542F | ||
60 | |||
61 | #define FIONCLEX 0x5450 | ||
62 | #define FIOCLEX 0x5451 | ||
63 | #define FIOASYNC 0x5452 | ||
64 | #define TIOCSERCONFIG 0x5453 | ||
65 | #define TIOCSERGWILD 0x5454 | ||
66 | #define TIOCSERSWILD 0x5455 | ||
67 | #define TIOCGLCKTRMIOS 0x5456 | ||
68 | #define TIOCSLCKTRMIOS 0x5457 | ||
69 | #define TIOCSERGSTRUCT 0x5458 /* For debugging only */ | ||
70 | #define TIOCSERGETLSR 0x5459 /* Get line status register */ | ||
71 | #define TIOCSERGETMULTI 0x545A /* Get multiport config */ | ||
72 | #define TIOCSERSETMULTI 0x545B /* Set multiport config */ | ||
73 | |||
74 | #define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */ | ||
75 | #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ | ||
76 | #define FIOQSIZE 0x5460 | ||
77 | |||
78 | /* Used for packet mode */ | ||
79 | #define TIOCPKT_DATA 0 | ||
80 | #define TIOCPKT_FLUSHREAD 1 | ||
81 | #define TIOCPKT_FLUSHWRITE 2 | ||
82 | #define TIOCPKT_STOP 4 | ||
83 | #define TIOCPKT_START 8 | ||
84 | #define TIOCPKT_NOSTOP 16 | ||
85 | #define TIOCPKT_DOSTOP 32 | ||
86 | #define TIOCPKT_IOCTL 64 | ||
87 | |||
88 | #define TIOCSER_TEMT 0x01 /* Transmitter physically empty */ | ||
89 | 5 | ||
90 | #endif /* __ASM_AVR32_IOCTLS_H */ | 6 | #endif /* __ASM_AVR32_IOCTLS_H */ |
diff --git a/arch/cris/include/asm/ioctls.h b/arch/cris/include/asm/ioctls.h index c9129ed37443..488fbb3f5e84 100644 --- a/arch/cris/include/asm/ioctls.h +++ b/arch/cris/include/asm/ioctls.h | |||
@@ -1,93 +1,11 @@ | |||
1 | #ifndef __ARCH_CRIS_IOCTLS_H__ | 1 | #ifndef __ARCH_CRIS_IOCTLS_H__ |
2 | #define __ARCH_CRIS_IOCTLS_H__ | 2 | #define __ARCH_CRIS_IOCTLS_H__ |
3 | 3 | ||
4 | /* verbatim copy of asm-i386/ioctls.h */ | ||
5 | |||
6 | #include <asm/ioctl.h> | ||
7 | |||
8 | /* 0x54 is just a magic number to make these relatively unique ('T') */ | ||
9 | |||
10 | #define TCGETS 0x5401 | ||
11 | #define TCSETS 0x5402 | ||
12 | #define TCSETSW 0x5403 | ||
13 | #define TCSETSF 0x5404 | ||
14 | #define TCGETA 0x5405 | ||
15 | #define TCSETA 0x5406 | ||
16 | #define TCSETAW 0x5407 | ||
17 | #define TCSETAF 0x5408 | ||
18 | #define TCSBRK 0x5409 | ||
19 | #define TCXONC 0x540A | ||
20 | #define TCFLSH 0x540B | ||
21 | #define TIOCEXCL 0x540C | ||
22 | #define TIOCNXCL 0x540D | ||
23 | #define TIOCSCTTY 0x540E | ||
24 | #define TIOCGPGRP 0x540F | ||
25 | #define TIOCSPGRP 0x5410 | ||
26 | #define TIOCOUTQ 0x5411 | ||
27 | #define TIOCSTI 0x5412 | ||
28 | #define TIOCGWINSZ 0x5413 | ||
29 | #define TIOCSWINSZ 0x5414 | ||
30 | #define TIOCMGET 0x5415 | ||
31 | #define TIOCMBIS 0x5416 | ||
32 | #define TIOCMBIC 0x5417 | ||
33 | #define TIOCMSET 0x5418 | ||
34 | #define TIOCGSOFTCAR 0x5419 | ||
35 | #define TIOCSSOFTCAR 0x541A | ||
36 | #define FIONREAD 0x541B | ||
37 | #define TIOCINQ FIONREAD | ||
38 | #define TIOCLINUX 0x541C | ||
39 | #define TIOCCONS 0x541D | ||
40 | #define TIOCGSERIAL 0x541E | ||
41 | #define TIOCSSERIAL 0x541F | ||
42 | #define TIOCPKT 0x5420 | ||
43 | #define FIONBIO 0x5421 | ||
44 | #define TIOCNOTTY 0x5422 | ||
45 | #define TIOCSETD 0x5423 | ||
46 | #define TIOCGETD 0x5424 | ||
47 | #define TCSBRKP 0x5425 /* Needed for POSIX tcsendbreak() */ | ||
48 | #define TIOCSBRK 0x5427 /* BSD compatibility */ | ||
49 | #define TIOCCBRK 0x5428 /* BSD compatibility */ | ||
50 | #define TIOCGSID 0x5429 /* Return the session ID of FD */ | ||
51 | #define TCGETS2 _IOR('T',0x2A, struct termios2) | ||
52 | #define TCSETS2 _IOW('T',0x2B, struct termios2) | ||
53 | #define TCSETSW2 _IOW('T',0x2C, struct termios2) | ||
54 | #define TCSETSF2 _IOW('T',0x2D, struct termios2) | ||
55 | #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ | ||
56 | #define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */ | ||
57 | #define TIOCSIG _IOW('T',0x36, int) /* Generate signal on Pty slave */ | ||
58 | |||
59 | #define FIONCLEX 0x5450 /* these numbers need to be adjusted. */ | ||
60 | #define FIOCLEX 0x5451 | ||
61 | #define FIOASYNC 0x5452 | ||
62 | #define TIOCSERCONFIG 0x5453 | ||
63 | #define TIOCSERGWILD 0x5454 | ||
64 | #define TIOCSERSWILD 0x5455 | ||
65 | #define TIOCGLCKTRMIOS 0x5456 | ||
66 | #define TIOCSLCKTRMIOS 0x5457 | ||
67 | #define TIOCSERGSTRUCT 0x5458 /* For debugging only */ | 4 | #define TIOCSERGSTRUCT 0x5458 /* For debugging only */ |
68 | #define TIOCSERGETLSR 0x5459 /* Get line status register */ | ||
69 | #define TIOCSERGETMULTI 0x545A /* Get multiport config */ | ||
70 | #define TIOCSERSETMULTI 0x545B /* Set multiport config */ | ||
71 | |||
72 | #define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */ | ||
73 | #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ | ||
74 | #define FIOQSIZE 0x5460 | ||
75 | |||
76 | #define TIOCSERSETRS485 0x5461 /* enable rs-485 (deprecated) */ | 5 | #define TIOCSERSETRS485 0x5461 /* enable rs-485 (deprecated) */ |
77 | #define TIOCSERWRRS485 0x5462 /* write rs-485 */ | 6 | #define TIOCSERWRRS485 0x5462 /* write rs-485 */ |
78 | #define TIOCSRS485 0x5463 /* enable rs-485 */ | 7 | #define TIOCSRS485 0x5463 /* enable rs-485 */ |
79 | #define TIOCGRS485 0x542E /* get rs-485 */ | ||
80 | |||
81 | /* Used for packet mode */ | ||
82 | #define TIOCPKT_DATA 0 | ||
83 | #define TIOCPKT_FLUSHREAD 1 | ||
84 | #define TIOCPKT_FLUSHWRITE 2 | ||
85 | #define TIOCPKT_STOP 4 | ||
86 | #define TIOCPKT_START 8 | ||
87 | #define TIOCPKT_NOSTOP 16 | ||
88 | #define TIOCPKT_DOSTOP 32 | ||
89 | #define TIOCPKT_IOCTL 64 | ||
90 | 8 | ||
91 | #define TIOCSER_TEMT 0x01 /* Transmitter physically empty */ | 9 | #include <asm-generic/ioctls.h> |
92 | 10 | ||
93 | #endif | 11 | #endif |
diff --git a/arch/frv/include/asm/ioctls.h b/arch/frv/include/asm/ioctls.h index a993e3759ccf..2f9fb436ec3c 100644 --- a/arch/frv/include/asm/ioctls.h +++ b/arch/frv/include/asm/ioctls.h | |||
@@ -1,88 +1,10 @@ | |||
1 | #ifndef __ASM_IOCTLS_H__ | 1 | #ifndef __ASM_IOCTLS_H__ |
2 | #define __ASM_IOCTLS_H__ | 2 | #define __ASM_IOCTLS_H__ |
3 | 3 | ||
4 | #include <asm/ioctl.h> | ||
5 | |||
6 | /* 0x54 is just a magic number to make these relatively unique ('T') */ | ||
7 | |||
8 | #define TCGETS 0x5401 | ||
9 | #define TCSETS 0x5402 | ||
10 | #define TCSETSW 0x5403 | ||
11 | #define TCSETSF 0x5404 | ||
12 | #define TCGETA 0x5405 | ||
13 | #define TCSETA 0x5406 | ||
14 | #define TCSETAW 0x5407 | ||
15 | #define TCSETAF 0x5408 | ||
16 | #define TCSBRK 0x5409 | ||
17 | #define TCXONC 0x540A | ||
18 | #define TCFLSH 0x540B | ||
19 | #define TIOCEXCL 0x540C | ||
20 | #define TIOCNXCL 0x540D | ||
21 | #define TIOCSCTTY 0x540E | ||
22 | #define TIOCGPGRP 0x540F | ||
23 | #define TIOCSPGRP 0x5410 | ||
24 | #define TIOCOUTQ 0x5411 | ||
25 | #define TIOCSTI 0x5412 | ||
26 | #define TIOCGWINSZ 0x5413 | ||
27 | #define TIOCSWINSZ 0x5414 | ||
28 | #define TIOCMGET 0x5415 | ||
29 | #define TIOCMBIS 0x5416 | ||
30 | #define TIOCMBIC 0x5417 | ||
31 | #define TIOCMSET 0x5418 | ||
32 | #define TIOCGSOFTCAR 0x5419 | ||
33 | #define TIOCSSOFTCAR 0x541A | ||
34 | #define FIONREAD 0x541B | ||
35 | #define TIOCINQ FIONREAD | ||
36 | #define TIOCLINUX 0x541C | ||
37 | #define TIOCCONS 0x541D | ||
38 | #define TIOCGSERIAL 0x541E | ||
39 | #define TIOCSSERIAL 0x541F | ||
40 | #define TIOCPKT 0x5420 | ||
41 | #define FIONBIO 0x5421 | ||
42 | #define TIOCNOTTY 0x5422 | ||
43 | #define TIOCSETD 0x5423 | ||
44 | #define TIOCGETD 0x5424 | ||
45 | #define TCSBRKP 0x5425 /* Needed for POSIX tcsendbreak() */ | ||
46 | #define TIOCTTYGSTRUCT 0x5426 /* For debugging only */ | 4 | #define TIOCTTYGSTRUCT 0x5426 /* For debugging only */ |
47 | #define TIOCSBRK 0x5427 /* BSD compatibility */ | ||
48 | #define TIOCCBRK 0x5428 /* BSD compatibility */ | ||
49 | #define TIOCGSID 0x5429 /* Return the session ID of FD */ | ||
50 | #define TCGETS2 _IOR('T',0x2A, struct termios2) | ||
51 | #define TCSETS2 _IOW('T',0x2B, struct termios2) | ||
52 | #define TCSETSW2 _IOW('T',0x2C, struct termios2) | ||
53 | #define TCSETSF2 _IOW('T',0x2D, struct termios2) | ||
54 | #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ | ||
55 | #define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */ | ||
56 | #define TIOCSIG _IOW('T',0x36, int) /* Generate signal on Pty slave */ | ||
57 | |||
58 | #define FIONCLEX 0x5450 /* these numbers need to be adjusted. */ | ||
59 | #define FIOCLEX 0x5451 | ||
60 | #define FIOASYNC 0x5452 | ||
61 | #define TIOCSERCONFIG 0x5453 | ||
62 | #define TIOCSERGWILD 0x5454 | ||
63 | #define TIOCSERSWILD 0x5455 | ||
64 | #define TIOCGLCKTRMIOS 0x5456 | ||
65 | #define TIOCSLCKTRMIOS 0x5457 | ||
66 | #define TIOCSERGSTRUCT 0x5458 /* For debugging only */ | ||
67 | #define TIOCSERGETLSR 0x5459 /* Get line status register */ | ||
68 | #define TIOCSERGETMULTI 0x545A /* Get multiport config */ | ||
69 | #define TIOCSERSETMULTI 0x545B /* Set multiport config */ | ||
70 | |||
71 | #define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */ | ||
72 | #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ | ||
73 | #define FIOQSIZE 0x545E | 5 | #define FIOQSIZE 0x545E |
74 | 6 | ||
75 | /* Used for packet mode */ | 7 | #include <asm-generic/ioctls.h> |
76 | #define TIOCPKT_DATA 0 | ||
77 | #define TIOCPKT_FLUSHREAD 1 | ||
78 | #define TIOCPKT_FLUSHWRITE 2 | ||
79 | #define TIOCPKT_STOP 4 | ||
80 | #define TIOCPKT_START 8 | ||
81 | #define TIOCPKT_NOSTOP 16 | ||
82 | #define TIOCPKT_DOSTOP 32 | ||
83 | #define TIOCPKT_IOCTL 64 | ||
84 | |||
85 | #define TIOCSER_TEMT 0x01 /* Transmitter physically empty */ | ||
86 | 8 | ||
87 | #endif /* __ASM_IOCTLS_H__ */ | 9 | #endif /* __ASM_IOCTLS_H__ */ |
88 | 10 | ||
diff --git a/arch/h8300/include/asm/ioctls.h b/arch/h8300/include/asm/ioctls.h index b6b249f9f308..30eaed2facdb 100644 --- a/arch/h8300/include/asm/ioctls.h +++ b/arch/h8300/include/asm/ioctls.h | |||
@@ -1,87 +1,8 @@ | |||
1 | #ifndef __ARCH_H8300_IOCTLS_H__ | 1 | #ifndef __ARCH_H8300_IOCTLS_H__ |
2 | #define __ARCH_H8300_IOCTLS_H__ | 2 | #define __ARCH_H8300_IOCTLS_H__ |
3 | 3 | ||
4 | #include <asm/ioctl.h> | ||
5 | |||
6 | /* 0x54 is just a magic number to make these relatively unique ('T') */ | ||
7 | |||
8 | #define TCGETS 0x5401 | ||
9 | #define TCSETS 0x5402 | ||
10 | #define TCSETSW 0x5403 | ||
11 | #define TCSETSF 0x5404 | ||
12 | #define TCGETA 0x5405 | ||
13 | #define TCSETA 0x5406 | ||
14 | #define TCSETAW 0x5407 | ||
15 | #define TCSETAF 0x5408 | ||
16 | #define TCSBRK 0x5409 | ||
17 | #define TCXONC 0x540A | ||
18 | #define TCFLSH 0x540B | ||
19 | #define TIOCEXCL 0x540C | ||
20 | #define TIOCNXCL 0x540D | ||
21 | #define TIOCSCTTY 0x540E | ||
22 | #define TIOCGPGRP 0x540F | ||
23 | #define TIOCSPGRP 0x5410 | ||
24 | #define TIOCOUTQ 0x5411 | ||
25 | #define TIOCSTI 0x5412 | ||
26 | #define TIOCGWINSZ 0x5413 | ||
27 | #define TIOCSWINSZ 0x5414 | ||
28 | #define TIOCMGET 0x5415 | ||
29 | #define TIOCMBIS 0x5416 | ||
30 | #define TIOCMBIC 0x5417 | ||
31 | #define TIOCMSET 0x5418 | ||
32 | #define TIOCGSOFTCAR 0x5419 | ||
33 | #define TIOCSSOFTCAR 0x541A | ||
34 | #define FIONREAD 0x541B | ||
35 | #define TIOCINQ FIONREAD | ||
36 | #define TIOCLINUX 0x541C | ||
37 | #define TIOCCONS 0x541D | ||
38 | #define TIOCGSERIAL 0x541E | ||
39 | #define TIOCSSERIAL 0x541F | ||
40 | #define TIOCPKT 0x5420 | ||
41 | #define FIONBIO 0x5421 | ||
42 | #define TIOCNOTTY 0x5422 | ||
43 | #define TIOCSETD 0x5423 | ||
44 | #define TIOCGETD 0x5424 | ||
45 | #define TCSBRKP 0x5425 /* Needed for POSIX tcsendbreak() */ | ||
46 | #define TIOCTTYGSTRUCT 0x5426 /* For debugging only */ | ||
47 | #define TIOCSBRK 0x5427 /* BSD compatibility */ | ||
48 | #define TIOCCBRK 0x5428 /* BSD compatibility */ | ||
49 | #define TIOCGSID 0x5429 /* Return the session ID of FD */ | ||
50 | #define TCGETS2 _IOR('T',0x2A, struct termios2) | ||
51 | #define TCSETS2 _IOW('T',0x2B, struct termios2) | ||
52 | #define TCSETSW2 _IOW('T',0x2C, struct termios2) | ||
53 | #define TCSETSF2 _IOW('T',0x2D, struct termios2) | ||
54 | #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ | ||
55 | #define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */ | ||
56 | #define TIOCSIG _IOW('T',0x36, int) /* Generate signal on Pty slave */ | ||
57 | |||
58 | #define FIONCLEX 0x5450 /* these numbers need to be adjusted. */ | ||
59 | #define FIOCLEX 0x5451 | ||
60 | #define FIOASYNC 0x5452 | ||
61 | #define TIOCSERCONFIG 0x5453 | ||
62 | #define TIOCSERGWILD 0x5454 | ||
63 | #define TIOCSERSWILD 0x5455 | ||
64 | #define TIOCGLCKTRMIOS 0x5456 | ||
65 | #define TIOCSLCKTRMIOS 0x5457 | ||
66 | #define TIOCSERGSTRUCT 0x5458 /* For debugging only */ | ||
67 | #define TIOCSERGETLSR 0x5459 /* Get line status register */ | ||
68 | #define TIOCSERGETMULTI 0x545A /* Get multiport config */ | ||
69 | #define TIOCSERSETMULTI 0x545B /* Set multiport config */ | ||
70 | |||
71 | #define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */ | ||
72 | #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ | ||
73 | #define FIOQSIZE 0x545E | 4 | #define FIOQSIZE 0x545E |
74 | 5 | ||
75 | /* Used for packet mode */ | 6 | #include <asm-generic/ioctls.h> |
76 | #define TIOCPKT_DATA 0 | ||
77 | #define TIOCPKT_FLUSHREAD 1 | ||
78 | #define TIOCPKT_FLUSHWRITE 2 | ||
79 | #define TIOCPKT_STOP 4 | ||
80 | #define TIOCPKT_START 8 | ||
81 | #define TIOCPKT_NOSTOP 16 | ||
82 | #define TIOCPKT_DOSTOP 32 | ||
83 | #define TIOCPKT_IOCTL 64 | ||
84 | |||
85 | #define TIOCSER_TEMT 0x01 /* Transmitter physically empty */ | ||
86 | 7 | ||
87 | #endif /* __ARCH_H8300_IOCTLS_H__ */ | 8 | #endif /* __ARCH_H8300_IOCTLS_H__ */ |
diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c index 1e8d71ad93ef..13633da0d3de 100644 --- a/arch/ia64/hp/sim/simserial.c +++ b/arch/ia64/hp/sim/simserial.c | |||
@@ -395,7 +395,7 @@ static int rs_ioctl(struct tty_struct *tty, struct file * file, | |||
395 | { | 395 | { |
396 | if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) && | 396 | if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) && |
397 | (cmd != TIOCSERCONFIG) && (cmd != TIOCSERGSTRUCT) && | 397 | (cmd != TIOCSERCONFIG) && (cmd != TIOCSERGSTRUCT) && |
398 | (cmd != TIOCMIWAIT) && (cmd != TIOCGICOUNT)) { | 398 | (cmd != TIOCMIWAIT)) { |
399 | if (tty->flags & (1 << TTY_IO_ERROR)) | 399 | if (tty->flags & (1 << TTY_IO_ERROR)) |
400 | return -EIO; | 400 | return -EIO; |
401 | } | 401 | } |
@@ -433,16 +433,6 @@ static int rs_ioctl(struct tty_struct *tty, struct file * file, | |||
433 | case TIOCMIWAIT: | 433 | case TIOCMIWAIT: |
434 | printk(KERN_INFO "rs_ioctl: TIOCMIWAIT: called\n"); | 434 | printk(KERN_INFO "rs_ioctl: TIOCMIWAIT: called\n"); |
435 | return 0; | 435 | return 0; |
436 | /* | ||
437 | * Get counter of input serial line interrupts (DCD,RI,DSR,CTS) | ||
438 | * Return: write counters to the user passed counter struct | ||
439 | * NB: both 1->0 and 0->1 transitions are counted except for | ||
440 | * RI where only 0->1 is counted. | ||
441 | */ | ||
442 | case TIOCGICOUNT: | ||
443 | printk(KERN_INFO "rs_ioctl: TIOCGICOUNT called\n"); | ||
444 | return 0; | ||
445 | |||
446 | case TIOCSERGWILD: | 436 | case TIOCSERGWILD: |
447 | case TIOCSERSWILD: | 437 | case TIOCSERSWILD: |
448 | /* "setserial -W" is called in Debian boot */ | 438 | /* "setserial -W" is called in Debian boot */ |
diff --git a/arch/ia64/include/asm/ioctls.h b/arch/ia64/include/asm/ioctls.h index b79c385114ef..f3aab5512e98 100644 --- a/arch/ia64/include/asm/ioctls.h +++ b/arch/ia64/include/asm/ioctls.h | |||
@@ -1,93 +1,6 @@ | |||
1 | #ifndef _ASM_IA64_IOCTLS_H | 1 | #ifndef _ASM_IA64_IOCTLS_H |
2 | #define _ASM_IA64_IOCTLS_H | 2 | #define _ASM_IA64_IOCTLS_H |
3 | 3 | ||
4 | /* | 4 | #include <asm-generic/ioctls.h> |
5 | * Based on <asm-i386/ioctls.h> | ||
6 | * | ||
7 | * Modified 1998, 1999, 2002 | ||
8 | * David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co | ||
9 | */ | ||
10 | |||
11 | #include <asm/ioctl.h> | ||
12 | |||
13 | /* 0x54 is just a magic number to make these relatively unique ('T') */ | ||
14 | |||
15 | #define TCGETS 0x5401 | ||
16 | #define TCSETS 0x5402 /* Clashes with SNDCTL_TMR_START sound ioctl */ | ||
17 | #define TCSETSW 0x5403 | ||
18 | #define TCSETSF 0x5404 | ||
19 | #define TCGETA 0x5405 | ||
20 | #define TCSETA 0x5406 | ||
21 | #define TCSETAW 0x5407 | ||
22 | #define TCSETAF 0x5408 | ||
23 | #define TCSBRK 0x5409 | ||
24 | #define TCXONC 0x540A | ||
25 | #define TCFLSH 0x540B | ||
26 | #define TIOCEXCL 0x540C | ||
27 | #define TIOCNXCL 0x540D | ||
28 | #define TIOCSCTTY 0x540E | ||
29 | #define TIOCGPGRP 0x540F | ||
30 | #define TIOCSPGRP 0x5410 | ||
31 | #define TIOCOUTQ 0x5411 | ||
32 | #define TIOCSTI 0x5412 | ||
33 | #define TIOCGWINSZ 0x5413 | ||
34 | #define TIOCSWINSZ 0x5414 | ||
35 | #define TIOCMGET 0x5415 | ||
36 | #define TIOCMBIS 0x5416 | ||
37 | #define TIOCMBIC 0x5417 | ||
38 | #define TIOCMSET 0x5418 | ||
39 | #define TIOCGSOFTCAR 0x5419 | ||
40 | #define TIOCSSOFTCAR 0x541A | ||
41 | #define FIONREAD 0x541B | ||
42 | #define TIOCINQ FIONREAD | ||
43 | #define TIOCLINUX 0x541C | ||
44 | #define TIOCCONS 0x541D | ||
45 | #define TIOCGSERIAL 0x541E | ||
46 | #define TIOCSSERIAL 0x541F | ||
47 | #define TIOCPKT 0x5420 | ||
48 | #define FIONBIO 0x5421 | ||
49 | #define TIOCNOTTY 0x5422 | ||
50 | #define TIOCSETD 0x5423 | ||
51 | #define TIOCGETD 0x5424 | ||
52 | #define TCSBRKP 0x5425 /* Needed for POSIX tcsendbreak() */ | ||
53 | #define TIOCSBRK 0x5427 /* BSD compatibility */ | ||
54 | #define TIOCCBRK 0x5428 /* BSD compatibility */ | ||
55 | #define TIOCGSID 0x5429 /* Return the session ID of FD */ | ||
56 | #define TCGETS2 _IOR('T',0x2A, struct termios2) | ||
57 | #define TCSETS2 _IOW('T',0x2B, struct termios2) | ||
58 | #define TCSETSW2 _IOW('T',0x2C, struct termios2) | ||
59 | #define TCSETSF2 _IOW('T',0x2D, struct termios2) | ||
60 | #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ | ||
61 | #define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */ | ||
62 | #define TIOCSIG _IOW('T',0x36, int) /* Generate signal on Pty slave */ | ||
63 | |||
64 | #define FIONCLEX 0x5450 /* these numbers need to be adjusted. */ | ||
65 | #define FIOCLEX 0x5451 | ||
66 | #define FIOASYNC 0x5452 | ||
67 | #define TIOCSERCONFIG 0x5453 | ||
68 | #define TIOCSERGWILD 0x5454 | ||
69 | #define TIOCSERSWILD 0x5455 | ||
70 | #define TIOCGLCKTRMIOS 0x5456 | ||
71 | #define TIOCSLCKTRMIOS 0x5457 | ||
72 | #define TIOCSERGSTRUCT 0x5458 /* For debugging only */ | ||
73 | #define TIOCSERGETLSR 0x5459 /* Get line status register */ | ||
74 | #define TIOCSERGETMULTI 0x545A /* Get multiport config */ | ||
75 | #define TIOCSERSETMULTI 0x545B /* Set multiport config */ | ||
76 | |||
77 | #define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */ | ||
78 | #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ | ||
79 | #define FIOQSIZE 0x5460 | ||
80 | |||
81 | /* Used for packet mode */ | ||
82 | #define TIOCPKT_DATA 0 | ||
83 | #define TIOCPKT_FLUSHREAD 1 | ||
84 | #define TIOCPKT_FLUSHWRITE 2 | ||
85 | #define TIOCPKT_STOP 4 | ||
86 | #define TIOCPKT_START 8 | ||
87 | #define TIOCPKT_NOSTOP 16 | ||
88 | #define TIOCPKT_DOSTOP 32 | ||
89 | #define TIOCPKT_IOCTL 64 | ||
90 | |||
91 | #define TIOCSER_TEMT 0x01 /* Transmitter physically empty */ | ||
92 | 5 | ||
93 | #endif /* _ASM_IA64_IOCTLS_H */ | 6 | #endif /* _ASM_IA64_IOCTLS_H */ |
diff --git a/arch/m32r/include/asm/ioctls.h b/arch/m32r/include/asm/ioctls.h index 66288063a4c0..349bf87bfbd0 100644 --- a/arch/m32r/include/asm/ioctls.h +++ b/arch/m32r/include/asm/ioctls.h | |||
@@ -1,87 +1,6 @@ | |||
1 | #ifndef __ARCH_M32R_IOCTLS_H__ | 1 | #ifndef __ARCH_M32R_IOCTLS_H__ |
2 | #define __ARCH_M32R_IOCTLS_H__ | 2 | #define __ARCH_M32R_IOCTLS_H__ |
3 | 3 | ||
4 | #include <asm/ioctl.h> | 4 | #include <asm-generic/ioctls.h> |
5 | |||
6 | /* 0x54 is just a magic number to make these relatively unique ('T') */ | ||
7 | |||
8 | #define TCGETS 0x5401 | ||
9 | #define TCSETS 0x5402 /* Clashes with SNDCTL_TMR_START sound ioctl */ | ||
10 | #define TCSETSW 0x5403 | ||
11 | #define TCSETSF 0x5404 | ||
12 | #define TCGETA 0x5405 | ||
13 | #define TCSETA 0x5406 | ||
14 | #define TCSETAW 0x5407 | ||
15 | #define TCSETAF 0x5408 | ||
16 | #define TCSBRK 0x5409 | ||
17 | #define TCXONC 0x540A | ||
18 | #define TCFLSH 0x540B | ||
19 | #define TIOCEXCL 0x540C | ||
20 | #define TIOCNXCL 0x540D | ||
21 | #define TIOCSCTTY 0x540E | ||
22 | #define TIOCGPGRP 0x540F | ||
23 | #define TIOCSPGRP 0x5410 | ||
24 | #define TIOCOUTQ 0x5411 | ||
25 | #define TIOCSTI 0x5412 | ||
26 | #define TIOCGWINSZ 0x5413 | ||
27 | #define TIOCSWINSZ 0x5414 | ||
28 | #define TIOCMGET 0x5415 | ||
29 | #define TIOCMBIS 0x5416 | ||
30 | #define TIOCMBIC 0x5417 | ||
31 | #define TIOCMSET 0x5418 | ||
32 | #define TIOCGSOFTCAR 0x5419 | ||
33 | #define TIOCSSOFTCAR 0x541A | ||
34 | #define FIONREAD 0x541B | ||
35 | #define TIOCINQ FIONREAD | ||
36 | #define TIOCLINUX 0x541C | ||
37 | #define TIOCCONS 0x541D | ||
38 | #define TIOCGSERIAL 0x541E | ||
39 | #define TIOCSSERIAL 0x541F | ||
40 | #define TIOCPKT 0x5420 | ||
41 | #define FIONBIO 0x5421 | ||
42 | #define TIOCNOTTY 0x5422 | ||
43 | #define TIOCSETD 0x5423 | ||
44 | #define TIOCGETD 0x5424 | ||
45 | #define TCSBRKP 0x5425 /* Needed for POSIX tcsendbreak() */ | ||
46 | /* #define TIOCTTYGSTRUCT 0x5426 - Former debugging-only ioctl */ | ||
47 | #define TIOCSBRK 0x5427 /* BSD compatibility */ | ||
48 | #define TIOCCBRK 0x5428 /* BSD compatibility */ | ||
49 | #define TIOCGSID 0x5429 /* Return the session ID of FD */ | ||
50 | #define TCGETS2 _IOR('T',0x2A, struct termios2) | ||
51 | #define TCSETS2 _IOW('T',0x2B, struct termios2) | ||
52 | #define TCSETSW2 _IOW('T',0x2C, struct termios2) | ||
53 | #define TCSETSF2 _IOW('T',0x2D, struct termios2) | ||
54 | #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ | ||
55 | #define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */ | ||
56 | #define TIOCSIG _IOW('T',0x36, int) /* Generate signal on Pty slave */ | ||
57 | |||
58 | #define FIONCLEX 0x5450 | ||
59 | #define FIOCLEX 0x5451 | ||
60 | #define FIOASYNC 0x5452 | ||
61 | #define TIOCSERCONFIG 0x5453 | ||
62 | #define TIOCSERGWILD 0x5454 | ||
63 | #define TIOCSERSWILD 0x5455 | ||
64 | #define TIOCGLCKTRMIOS 0x5456 | ||
65 | #define TIOCSLCKTRMIOS 0x5457 | ||
66 | #define TIOCSERGSTRUCT 0x5458 /* For debugging only */ | ||
67 | #define TIOCSERGETLSR 0x5459 /* Get line status register */ | ||
68 | #define TIOCSERGETMULTI 0x545A /* Get multiport config */ | ||
69 | #define TIOCSERSETMULTI 0x545B /* Set multiport config */ | ||
70 | |||
71 | #define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */ | ||
72 | #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ | ||
73 | #define FIOQSIZE 0x5460 | ||
74 | |||
75 | /* Used for packet mode */ | ||
76 | #define TIOCPKT_DATA 0 | ||
77 | #define TIOCPKT_FLUSHREAD 1 | ||
78 | #define TIOCPKT_FLUSHWRITE 2 | ||
79 | #define TIOCPKT_STOP 4 | ||
80 | #define TIOCPKT_START 8 | ||
81 | #define TIOCPKT_NOSTOP 16 | ||
82 | #define TIOCPKT_DOSTOP 32 | ||
83 | #define TIOCPKT_IOCTL 64 | ||
84 | |||
85 | #define TIOCSER_TEMT 0x01 /* Transmitter physically empty */ | ||
86 | 5 | ||
87 | #endif /* __ARCH_M32R_IOCTLS_H__ */ | 6 | #endif /* __ARCH_M32R_IOCTLS_H__ */ |
diff --git a/arch/mips/alchemy/common/platform.c b/arch/mips/alchemy/common/platform.c index 1dc55ee2681b..3691630931d6 100644 --- a/arch/mips/alchemy/common/platform.c +++ b/arch/mips/alchemy/common/platform.c | |||
@@ -24,6 +24,33 @@ | |||
24 | 24 | ||
25 | #include <prom.h> | 25 | #include <prom.h> |
26 | 26 | ||
27 | static void alchemy_8250_pm(struct uart_port *port, unsigned int state, | ||
28 | unsigned int old_state) | ||
29 | { | ||
30 | switch (state) { | ||
31 | case 0: | ||
32 | if ((__raw_readl(port->membase + UART_MOD_CNTRL) & 3) != 3) { | ||
33 | /* power-on sequence as suggested in the databooks */ | ||
34 | __raw_writel(0, port->membase + UART_MOD_CNTRL); | ||
35 | wmb(); | ||
36 | __raw_writel(1, port->membase + UART_MOD_CNTRL); | ||
37 | wmb(); | ||
38 | } | ||
39 | __raw_writel(3, port->membase + UART_MOD_CNTRL); /* full on */ | ||
40 | wmb(); | ||
41 | serial8250_do_pm(port, state, old_state); | ||
42 | break; | ||
43 | case 3: /* power off */ | ||
44 | serial8250_do_pm(port, state, old_state); | ||
45 | __raw_writel(0, port->membase + UART_MOD_CNTRL); | ||
46 | wmb(); | ||
47 | break; | ||
48 | default: | ||
49 | serial8250_do_pm(port, state, old_state); | ||
50 | break; | ||
51 | } | ||
52 | } | ||
53 | |||
27 | #define PORT(_base, _irq) \ | 54 | #define PORT(_base, _irq) \ |
28 | { \ | 55 | { \ |
29 | .mapbase = _base, \ | 56 | .mapbase = _base, \ |
@@ -33,6 +60,7 @@ | |||
33 | .flags = UPF_SKIP_TEST | UPF_IOREMAP | \ | 60 | .flags = UPF_SKIP_TEST | UPF_IOREMAP | \ |
34 | UPF_FIXED_TYPE, \ | 61 | UPF_FIXED_TYPE, \ |
35 | .type = PORT_16550A, \ | 62 | .type = PORT_16550A, \ |
63 | .pm = alchemy_8250_pm, \ | ||
36 | } | 64 | } |
37 | 65 | ||
38 | static struct plat_serial8250_port au1x00_uart_data[] = { | 66 | static struct plat_serial8250_port au1x00_uart_data[] = { |
diff --git a/arch/mips/alchemy/common/power.c b/arch/mips/alchemy/common/power.c index 5ef06a164a82..e5916a516e58 100644 --- a/arch/mips/alchemy/common/power.c +++ b/arch/mips/alchemy/common/power.c | |||
@@ -49,11 +49,6 @@ | |||
49 | * We only have to save/restore registers that aren't otherwise | 49 | * We only have to save/restore registers that aren't otherwise |
50 | * done as part of a driver pm_* function. | 50 | * done as part of a driver pm_* function. |
51 | */ | 51 | */ |
52 | static unsigned int sleep_uart0_inten; | ||
53 | static unsigned int sleep_uart0_fifoctl; | ||
54 | static unsigned int sleep_uart0_linectl; | ||
55 | static unsigned int sleep_uart0_clkdiv; | ||
56 | static unsigned int sleep_uart0_enable; | ||
57 | static unsigned int sleep_usb[2]; | 52 | static unsigned int sleep_usb[2]; |
58 | static unsigned int sleep_sys_clocks[5]; | 53 | static unsigned int sleep_sys_clocks[5]; |
59 | static unsigned int sleep_sys_pinfunc; | 54 | static unsigned int sleep_sys_pinfunc; |
@@ -62,22 +57,6 @@ static unsigned int sleep_static_memctlr[4][3]; | |||
62 | 57 | ||
63 | static void save_core_regs(void) | 58 | static void save_core_regs(void) |
64 | { | 59 | { |
65 | extern void save_au1xxx_intctl(void); | ||
66 | extern void pm_eth0_shutdown(void); | ||
67 | |||
68 | /* | ||
69 | * Do the serial ports.....these really should be a pm_* | ||
70 | * registered function by the driver......but of course the | ||
71 | * standard serial driver doesn't understand our Au1xxx | ||
72 | * unique registers. | ||
73 | */ | ||
74 | sleep_uart0_inten = au_readl(UART0_ADDR + UART_IER); | ||
75 | sleep_uart0_fifoctl = au_readl(UART0_ADDR + UART_FCR); | ||
76 | sleep_uart0_linectl = au_readl(UART0_ADDR + UART_LCR); | ||
77 | sleep_uart0_clkdiv = au_readl(UART0_ADDR + UART_CLK); | ||
78 | sleep_uart0_enable = au_readl(UART0_ADDR + UART_MOD_CNTRL); | ||
79 | au_sync(); | ||
80 | |||
81 | #ifndef CONFIG_SOC_AU1200 | 60 | #ifndef CONFIG_SOC_AU1200 |
82 | /* Shutdown USB host/device. */ | 61 | /* Shutdown USB host/device. */ |
83 | sleep_usb[0] = au_readl(USB_HOST_CONFIG); | 62 | sleep_usb[0] = au_readl(USB_HOST_CONFIG); |
@@ -175,20 +154,6 @@ static void restore_core_regs(void) | |||
175 | au_writel(sleep_static_memctlr[3][0], MEM_STCFG3); | 154 | au_writel(sleep_static_memctlr[3][0], MEM_STCFG3); |
176 | au_writel(sleep_static_memctlr[3][1], MEM_STTIME3); | 155 | au_writel(sleep_static_memctlr[3][1], MEM_STTIME3); |
177 | au_writel(sleep_static_memctlr[3][2], MEM_STADDR3); | 156 | au_writel(sleep_static_memctlr[3][2], MEM_STADDR3); |
178 | |||
179 | /* | ||
180 | * Enable the UART if it was enabled before sleep. | ||
181 | * I guess I should define module control bits........ | ||
182 | */ | ||
183 | if (sleep_uart0_enable & 0x02) { | ||
184 | au_writel(0, UART0_ADDR + UART_MOD_CNTRL); au_sync(); | ||
185 | au_writel(1, UART0_ADDR + UART_MOD_CNTRL); au_sync(); | ||
186 | au_writel(3, UART0_ADDR + UART_MOD_CNTRL); au_sync(); | ||
187 | au_writel(sleep_uart0_inten, UART0_ADDR + UART_IER); au_sync(); | ||
188 | au_writel(sleep_uart0_fifoctl, UART0_ADDR + UART_FCR); au_sync(); | ||
189 | au_writel(sleep_uart0_linectl, UART0_ADDR + UART_LCR); au_sync(); | ||
190 | au_writel(sleep_uart0_clkdiv, UART0_ADDR + UART_CLK); au_sync(); | ||
191 | } | ||
192 | } | 157 | } |
193 | 158 | ||
194 | void au_sleep(void) | 159 | void au_sleep(void) |
diff --git a/arch/mn10300/include/asm/ioctls.h b/arch/mn10300/include/asm/ioctls.h index cb8cf1902234..0212f4b22557 100644 --- a/arch/mn10300/include/asm/ioctls.h +++ b/arch/mn10300/include/asm/ioctls.h | |||
@@ -1,88 +1,6 @@ | |||
1 | #ifndef _ASM_IOCTLS_H | 1 | #ifndef _ASM_IOCTLS_H |
2 | #define _ASM_IOCTLS_H | 2 | #define _ASM_IOCTLS_H |
3 | 3 | ||
4 | #include <asm/ioctl.h> | 4 | #include <asm-generic/ioctls.h> |
5 | |||
6 | /* 0x54 is just a magic number to make these relatively unique ('T') */ | ||
7 | |||
8 | #define TCGETS 0x5401 | ||
9 | #define TCSETS 0x5402 | ||
10 | #define TCSETSW 0x5403 | ||
11 | #define TCSETSF 0x5404 | ||
12 | #define TCGETA 0x5405 | ||
13 | #define TCSETA 0x5406 | ||
14 | #define TCSETAW 0x5407 | ||
15 | #define TCSETAF 0x5408 | ||
16 | #define TCSBRK 0x5409 | ||
17 | #define TCXONC 0x540A | ||
18 | #define TCFLSH 0x540B | ||
19 | #define TIOCEXCL 0x540C | ||
20 | #define TIOCNXCL 0x540D | ||
21 | #define TIOCSCTTY 0x540E | ||
22 | #define TIOCGPGRP 0x540F | ||
23 | #define TIOCSPGRP 0x5410 | ||
24 | #define TIOCOUTQ 0x5411 | ||
25 | #define TIOCSTI 0x5412 | ||
26 | #define TIOCGWINSZ 0x5413 | ||
27 | #define TIOCSWINSZ 0x5414 | ||
28 | #define TIOCMGET 0x5415 | ||
29 | #define TIOCMBIS 0x5416 | ||
30 | #define TIOCMBIC 0x5417 | ||
31 | #define TIOCMSET 0x5418 | ||
32 | #define TIOCGSOFTCAR 0x5419 | ||
33 | #define TIOCSSOFTCAR 0x541A | ||
34 | #define FIONREAD 0x541B | ||
35 | #define TIOCINQ FIONREAD | ||
36 | #define TIOCLINUX 0x541C | ||
37 | #define TIOCCONS 0x541D | ||
38 | #define TIOCGSERIAL 0x541E | ||
39 | #define TIOCSSERIAL 0x541F | ||
40 | #define TIOCPKT 0x5420 | ||
41 | #define FIONBIO 0x5421 | ||
42 | #define TIOCNOTTY 0x5422 | ||
43 | #define TIOCSETD 0x5423 | ||
44 | #define TIOCGETD 0x5424 | ||
45 | #define TCSBRKP 0x5425 /* Needed for POSIX tcsendbreak() */ | ||
46 | /* #define TIOCTTYGSTRUCT 0x5426 - Former debugging-only ioctl */ | ||
47 | #define TIOCSBRK 0x5427 /* BSD compatibility */ | ||
48 | #define TIOCCBRK 0x5428 /* BSD compatibility */ | ||
49 | #define TIOCGSID 0x5429 /* Return the session ID of FD */ | ||
50 | #define TCGETS2 _IOR('T', 0x2A, struct termios2) | ||
51 | #define TCSETS2 _IOW('T', 0x2B, struct termios2) | ||
52 | #define TCSETSW2 _IOW('T', 0x2C, struct termios2) | ||
53 | #define TCSETSF2 _IOW('T', 0x2D, struct termios2) | ||
54 | #define TIOCGPTN _IOR('T', 0x30, unsigned int) /* Get Pty Number | ||
55 | * (of pty-mux device) */ | ||
56 | #define TIOCSPTLCK _IOW('T', 0x31, int) /* Lock/unlock Pty */ | ||
57 | #define TIOCSIG _IOW('T', 0x36, int) /* Generate signal on Pty slave */ | ||
58 | |||
59 | #define FIONCLEX 0x5450 | ||
60 | #define FIOCLEX 0x5451 | ||
61 | #define FIOASYNC 0x5452 | ||
62 | #define TIOCSERCONFIG 0x5453 | ||
63 | #define TIOCSERGWILD 0x5454 | ||
64 | #define TIOCSERSWILD 0x5455 | ||
65 | #define TIOCGLCKTRMIOS 0x5456 | ||
66 | #define TIOCSLCKTRMIOS 0x5457 | ||
67 | #define TIOCSERGSTRUCT 0x5458 /* For debugging only */ | ||
68 | #define TIOCSERGETLSR 0x5459 /* Get line status register */ | ||
69 | #define TIOCSERGETMULTI 0x545A /* Get multiport config */ | ||
70 | #define TIOCSERSETMULTI 0x545B /* Set multiport config */ | ||
71 | |||
72 | #define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */ | ||
73 | #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ | ||
74 | #define FIOQSIZE 0x5460 | ||
75 | |||
76 | /* Used for packet mode */ | ||
77 | #define TIOCPKT_DATA 0 | ||
78 | #define TIOCPKT_FLUSHREAD 1 | ||
79 | #define TIOCPKT_FLUSHWRITE 2 | ||
80 | #define TIOCPKT_STOP 4 | ||
81 | #define TIOCPKT_START 8 | ||
82 | #define TIOCPKT_NOSTOP 16 | ||
83 | #define TIOCPKT_DOSTOP 32 | ||
84 | #define TIOCPKT_IOCTL 64 | ||
85 | |||
86 | #define TIOCSER_TEMT 0x01 /* Transmitter physically empty */ | ||
87 | 5 | ||
88 | #endif /* _ASM_IOCTLS_H */ | 6 | #endif /* _ASM_IOCTLS_H */ |
diff --git a/arch/s390/include/asm/ioctls.h b/arch/s390/include/asm/ioctls.h index 2f3d8736361f..960a4c1ebdf1 100644 --- a/arch/s390/include/asm/ioctls.h +++ b/arch/s390/include/asm/ioctls.h | |||
@@ -1,94 +1,8 @@ | |||
1 | /* | ||
2 | * include/asm-s390/ioctls.h | ||
3 | * | ||
4 | * S390 version | ||
5 | * | ||
6 | * Derived from "include/asm-i386/ioctls.h" | ||
7 | */ | ||
8 | |||
9 | #ifndef __ARCH_S390_IOCTLS_H__ | 1 | #ifndef __ARCH_S390_IOCTLS_H__ |
10 | #define __ARCH_S390_IOCTLS_H__ | 2 | #define __ARCH_S390_IOCTLS_H__ |
11 | 3 | ||
12 | #include <asm/ioctl.h> | ||
13 | |||
14 | /* 0x54 is just a magic number to make these relatively unique ('T') */ | ||
15 | |||
16 | #define TCGETS 0x5401 | ||
17 | #define TCSETS 0x5402 | ||
18 | #define TCSETSW 0x5403 | ||
19 | #define TCSETSF 0x5404 | ||
20 | #define TCGETA 0x5405 | ||
21 | #define TCSETA 0x5406 | ||
22 | #define TCSETAW 0x5407 | ||
23 | #define TCSETAF 0x5408 | ||
24 | #define TCSBRK 0x5409 | ||
25 | #define TCXONC 0x540A | ||
26 | #define TCFLSH 0x540B | ||
27 | #define TIOCEXCL 0x540C | ||
28 | #define TIOCNXCL 0x540D | ||
29 | #define TIOCSCTTY 0x540E | ||
30 | #define TIOCGPGRP 0x540F | ||
31 | #define TIOCSPGRP 0x5410 | ||
32 | #define TIOCOUTQ 0x5411 | ||
33 | #define TIOCSTI 0x5412 | ||
34 | #define TIOCGWINSZ 0x5413 | ||
35 | #define TIOCSWINSZ 0x5414 | ||
36 | #define TIOCMGET 0x5415 | ||
37 | #define TIOCMBIS 0x5416 | ||
38 | #define TIOCMBIC 0x5417 | ||
39 | #define TIOCMSET 0x5418 | ||
40 | #define TIOCGSOFTCAR 0x5419 | ||
41 | #define TIOCSSOFTCAR 0x541A | ||
42 | #define FIONREAD 0x541B | ||
43 | #define TIOCINQ FIONREAD | ||
44 | #define TIOCLINUX 0x541C | ||
45 | #define TIOCCONS 0x541D | ||
46 | #define TIOCGSERIAL 0x541E | ||
47 | #define TIOCSSERIAL 0x541F | ||
48 | #define TIOCPKT 0x5420 | ||
49 | #define FIONBIO 0x5421 | ||
50 | #define TIOCNOTTY 0x5422 | ||
51 | #define TIOCSETD 0x5423 | ||
52 | #define TIOCGETD 0x5424 | ||
53 | #define TCSBRKP 0x5425 /* Needed for POSIX tcsendbreak() */ | ||
54 | #define TIOCSBRK 0x5427 /* BSD compatibility */ | ||
55 | #define TIOCCBRK 0x5428 /* BSD compatibility */ | ||
56 | #define TIOCGSID 0x5429 /* Return the session ID of FD */ | ||
57 | #define TCGETS2 _IOR('T',0x2A, struct termios2) | ||
58 | #define TCSETS2 _IOW('T',0x2B, struct termios2) | ||
59 | #define TCSETSW2 _IOW('T',0x2C, struct termios2) | ||
60 | #define TCSETSF2 _IOW('T',0x2D, struct termios2) | ||
61 | #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ | ||
62 | #define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */ | ||
63 | #define TIOCSIG _IOW('T',0x36, int) /* Generate signal on Pty slave */ | ||
64 | |||
65 | #define FIONCLEX 0x5450 /* these numbers need to be adjusted. */ | ||
66 | #define FIOCLEX 0x5451 | ||
67 | #define FIOASYNC 0x5452 | ||
68 | #define TIOCSERCONFIG 0x5453 | ||
69 | #define TIOCSERGWILD 0x5454 | ||
70 | #define TIOCSERSWILD 0x5455 | ||
71 | #define TIOCGLCKTRMIOS 0x5456 | ||
72 | #define TIOCSLCKTRMIOS 0x5457 | ||
73 | #define TIOCSERGSTRUCT 0x5458 /* For debugging only */ | ||
74 | #define TIOCSERGETLSR 0x5459 /* Get line status register */ | ||
75 | #define TIOCSERGETMULTI 0x545A /* Get multiport config */ | ||
76 | #define TIOCSERSETMULTI 0x545B /* Set multiport config */ | ||
77 | |||
78 | #define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */ | ||
79 | #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ | ||
80 | #define FIOQSIZE 0x545E | 4 | #define FIOQSIZE 0x545E |
81 | 5 | ||
82 | /* Used for packet mode */ | 6 | #include <asm-generic/ioctls.h> |
83 | #define TIOCPKT_DATA 0 | ||
84 | #define TIOCPKT_FLUSHREAD 1 | ||
85 | #define TIOCPKT_FLUSHWRITE 2 | ||
86 | #define TIOCPKT_STOP 4 | ||
87 | #define TIOCPKT_START 8 | ||
88 | #define TIOCPKT_NOSTOP 16 | ||
89 | #define TIOCPKT_DOSTOP 32 | ||
90 | #define TIOCPKT_IOCTL 64 | ||
91 | |||
92 | #define TIOCSER_TEMT 0x01 /* Transmitter physically empty */ | ||
93 | 7 | ||
94 | #endif | 8 | #endif |