* [PATCH 1/3] tty: move hvc drivers to drivers/tty/hvc/
2011-01-20 17:49 [GIT PATCH] TTY/serial driver movement for .38 Greg KH
@ 2011-01-20 18:03 ` Greg Kroah-Hartman
2011-01-20 18:27 ` Arnd Bergmann
2011-01-27 18:29 ` Amit Shah
2011-01-20 18:03 ` [PATCH 2/3] tty: move drivers/serial/ to drivers/tty/serial/ Greg Kroah-Hartman
` (2 subsequent siblings)
3 siblings, 2 replies; 22+ messages in thread
From: Greg Kroah-Hartman @ 2011-01-20 18:03 UTC (permalink / raw)
To: linux-kernel; +Cc: Greg Kroah-Hartman, Arnd Bergmann
As requested by Arnd Bergmann, the hvc drivers are now
moved to the drivers/tty/hvc/ directory. The virtio_console.c driver
was also moved, as it required the hvc_console.h file to be able to be
built, and it really is a hvc driver.
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/char/Makefile | 13 -------------
drivers/tty/Makefile | 1 +
drivers/tty/hvc/Makefile | 13 +++++++++++++
drivers/{char => tty/hvc}/hvc_beat.c | 0
drivers/{char => tty/hvc}/hvc_console.c | 0
drivers/{char => tty/hvc}/hvc_console.h | 0
drivers/{char => tty/hvc}/hvc_dcc.c | 0
drivers/{char => tty/hvc}/hvc_irq.c | 0
drivers/{char => tty/hvc}/hvc_iseries.c | 0
drivers/{char => tty/hvc}/hvc_iucv.c | 0
drivers/{char => tty/hvc}/hvc_rtas.c | 0
drivers/{char => tty/hvc}/hvc_tile.c | 0
drivers/{char => tty/hvc}/hvc_udbg.c | 0
drivers/{char => tty/hvc}/hvc_vio.c | 0
drivers/{char => tty/hvc}/hvc_xen.c | 0
drivers/{char => tty/hvc}/hvcs.c | 0
drivers/{char => tty/hvc}/hvsi.c | 0
drivers/{char => tty/hvc}/virtio_console.c | 0
18 files changed, 14 insertions(+), 13 deletions(-)
create mode 100644 drivers/tty/hvc/Makefile
rename drivers/{char => tty/hvc}/hvc_beat.c (100%)
rename drivers/{char => tty/hvc}/hvc_console.c (100%)
rename drivers/{char => tty/hvc}/hvc_console.h (100%)
rename drivers/{char => tty/hvc}/hvc_dcc.c (100%)
rename drivers/{char => tty/hvc}/hvc_irq.c (100%)
rename drivers/{char => tty/hvc}/hvc_iseries.c (100%)
rename drivers/{char => tty/hvc}/hvc_iucv.c (100%)
rename drivers/{char => tty/hvc}/hvc_rtas.c (100%)
rename drivers/{char => tty/hvc}/hvc_tile.c (100%)
rename drivers/{char => tty/hvc}/hvc_udbg.c (100%)
rename drivers/{char => tty/hvc}/hvc_vio.c (100%)
rename drivers/{char => tty/hvc}/hvc_xen.c (100%)
rename drivers/{char => tty/hvc}/hvcs.c (100%)
rename drivers/{char => tty/hvc}/hvsi.c (100%)
rename drivers/{char => tty/hvc}/virtio_console.c (100%)
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 1e9dffb..5bc765d 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -30,25 +30,12 @@ obj-$(CONFIG_SYNCLINK_GT) += synclink_gt.o
obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o
obj-$(CONFIG_SX) += sx.o generic_serial.o
obj-$(CONFIG_RIO) += rio/ generic_serial.o
-obj-$(CONFIG_HVC_CONSOLE) += hvc_vio.o hvsi.o
-obj-$(CONFIG_HVC_ISERIES) += hvc_iseries.o
-obj-$(CONFIG_HVC_RTAS) += hvc_rtas.o
-obj-$(CONFIG_HVC_TILE) += hvc_tile.o
-obj-$(CONFIG_HVC_DCC) += hvc_dcc.o
-obj-$(CONFIG_HVC_BEAT) += hvc_beat.o
-obj-$(CONFIG_HVC_DRIVER) += hvc_console.o
-obj-$(CONFIG_HVC_IRQ) += hvc_irq.o
-obj-$(CONFIG_HVC_XEN) += hvc_xen.o
-obj-$(CONFIG_HVC_IUCV) += hvc_iucv.o
-obj-$(CONFIG_HVC_UDBG) += hvc_udbg.o
-obj-$(CONFIG_VIRTIO_CONSOLE) += virtio_console.o
obj-$(CONFIG_RAW_DRIVER) += raw.o
obj-$(CONFIG_SGI_SNSC) += snsc.o snsc_event.o
obj-$(CONFIG_MSPEC) += mspec.o
obj-$(CONFIG_MMTIMER) += mmtimer.o
obj-$(CONFIG_UV_MMTIMER) += uv_mmtimer.o
obj-$(CONFIG_VIOTAPE) += viotape.o
-obj-$(CONFIG_HVCS) += hvcs.o
obj-$(CONFIG_IBM_BSR) += bsr.o
obj-$(CONFIG_SGI_MBCS) += mbcs.o
obj-$(CONFIG_BRIQ_PANEL) += briq_panel.o
diff --git a/drivers/tty/Makefile b/drivers/tty/Makefile
index c43ef48..d3685f0 100644
--- a/drivers/tty/Makefile
+++ b/drivers/tty/Makefile
@@ -9,3 +9,4 @@ obj-$(CONFIG_N_GSM) += n_gsm.o
obj-$(CONFIG_R3964) += n_r3964.o
obj-y += vt/
+obj-$(CONFIG_HVC_DRIVER) += hvc/
diff --git a/drivers/tty/hvc/Makefile b/drivers/tty/hvc/Makefile
new file mode 100644
index 0000000..e6bed5f
--- /dev/null
+++ b/drivers/tty/hvc/Makefile
@@ -0,0 +1,13 @@
+obj-$(CONFIG_HVC_CONSOLE) += hvc_vio.o hvsi.o
+obj-$(CONFIG_HVC_ISERIES) += hvc_iseries.o
+obj-$(CONFIG_HVC_RTAS) += hvc_rtas.o
+obj-$(CONFIG_HVC_TILE) += hvc_tile.o
+obj-$(CONFIG_HVC_DCC) += hvc_dcc.o
+obj-$(CONFIG_HVC_BEAT) += hvc_beat.o
+obj-$(CONFIG_HVC_DRIVER) += hvc_console.o
+obj-$(CONFIG_HVC_IRQ) += hvc_irq.o
+obj-$(CONFIG_HVC_XEN) += hvc_xen.o
+obj-$(CONFIG_HVC_IUCV) += hvc_iucv.o
+obj-$(CONFIG_HVC_UDBG) += hvc_udbg.o
+obj-$(CONFIG_HVCS) += hvcs.o
+obj-$(CONFIG_VIRTIO_CONSOLE) += virtio_console.o
diff --git a/drivers/char/hvc_beat.c b/drivers/tty/hvc/hvc_beat.c
similarity index 100%
rename from drivers/char/hvc_beat.c
rename to drivers/tty/hvc/hvc_beat.c
diff --git a/drivers/char/hvc_console.c b/drivers/tty/hvc/hvc_console.c
similarity index 100%
rename from drivers/char/hvc_console.c
rename to drivers/tty/hvc/hvc_console.c
diff --git a/drivers/char/hvc_console.h b/drivers/tty/hvc/hvc_console.h
similarity index 100%
rename from drivers/char/hvc_console.h
rename to drivers/tty/hvc/hvc_console.h
diff --git a/drivers/char/hvc_dcc.c b/drivers/tty/hvc/hvc_dcc.c
similarity index 100%
rename from drivers/char/hvc_dcc.c
rename to drivers/tty/hvc/hvc_dcc.c
diff --git a/drivers/char/hvc_irq.c b/drivers/tty/hvc/hvc_irq.c
similarity index 100%
rename from drivers/char/hvc_irq.c
rename to drivers/tty/hvc/hvc_irq.c
diff --git a/drivers/char/hvc_iseries.c b/drivers/tty/hvc/hvc_iseries.c
similarity index 100%
rename from drivers/char/hvc_iseries.c
rename to drivers/tty/hvc/hvc_iseries.c
diff --git a/drivers/char/hvc_iucv.c b/drivers/tty/hvc/hvc_iucv.c
similarity index 100%
rename from drivers/char/hvc_iucv.c
rename to drivers/tty/hvc/hvc_iucv.c
diff --git a/drivers/char/hvc_rtas.c b/drivers/tty/hvc/hvc_rtas.c
similarity index 100%
rename from drivers/char/hvc_rtas.c
rename to drivers/tty/hvc/hvc_rtas.c
diff --git a/drivers/char/hvc_tile.c b/drivers/tty/hvc/hvc_tile.c
similarity index 100%
rename from drivers/char/hvc_tile.c
rename to drivers/tty/hvc/hvc_tile.c
diff --git a/drivers/char/hvc_udbg.c b/drivers/tty/hvc/hvc_udbg.c
similarity index 100%
rename from drivers/char/hvc_udbg.c
rename to drivers/tty/hvc/hvc_udbg.c
diff --git a/drivers/char/hvc_vio.c b/drivers/tty/hvc/hvc_vio.c
similarity index 100%
rename from drivers/char/hvc_vio.c
rename to drivers/tty/hvc/hvc_vio.c
diff --git a/drivers/char/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c
similarity index 100%
rename from drivers/char/hvc_xen.c
rename to drivers/tty/hvc/hvc_xen.c
diff --git a/drivers/char/hvcs.c b/drivers/tty/hvc/hvcs.c
similarity index 100%
rename from drivers/char/hvcs.c
rename to drivers/tty/hvc/hvcs.c
diff --git a/drivers/char/hvsi.c b/drivers/tty/hvc/hvsi.c
similarity index 100%
rename from drivers/char/hvsi.c
rename to drivers/tty/hvc/hvsi.c
diff --git a/drivers/char/virtio_console.c b/drivers/tty/hvc/virtio_console.c
similarity index 100%
rename from drivers/char/virtio_console.c
rename to drivers/tty/hvc/virtio_console.c
--
1.7.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [PATCH 1/3] tty: move hvc drivers to drivers/tty/hvc/
2011-01-20 18:03 ` [PATCH 1/3] tty: move hvc drivers to drivers/tty/hvc/ Greg Kroah-Hartman
@ 2011-01-20 18:27 ` Arnd Bergmann
2011-01-27 18:29 ` Amit Shah
1 sibling, 0 replies; 22+ messages in thread
From: Arnd Bergmann @ 2011-01-20 18:27 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: linux-kernel
On Thursday 20 January 2011 19:03:43 Greg Kroah-Hartman wrote:
>
> As requested by Arnd Bergmann, the hvc drivers are now
> moved to the drivers/tty/hvc/ directory. The virtio_console.c driver
> was also moved, as it required the hvc_console.h file to be able to be
> built, and it really is a hvc driver.
>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 1/3] tty: move hvc drivers to drivers/tty/hvc/
2011-01-20 18:03 ` [PATCH 1/3] tty: move hvc drivers to drivers/tty/hvc/ Greg Kroah-Hartman
2011-01-20 18:27 ` Arnd Bergmann
@ 2011-01-27 18:29 ` Amit Shah
2011-01-27 21:53 ` Arnd Bergmann
1 sibling, 1 reply; 22+ messages in thread
From: Amit Shah @ 2011-01-27 18:29 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: linux-kernel, Arnd Bergmann, Rusty Russell
On (Thu) Jan 20 2011 [10:03:43], Greg Kroah-Hartman wrote:
> As requested by Arnd Bergmann, the hvc drivers are now
> moved to the drivers/tty/hvc/ directory. The virtio_console.c driver
> was also moved, as it required the hvc_console.h file to be able to be
> built, and it really is a hvc driver.
I just saw this now as a result of this patch entering mainline. I
would have liked to be CC'ed to the patches. Also, I don't like the
move of the virtio_console.c file to drivers/tty/hvc. virtio_console.c
is not only an hvc driver; one of its functions is to hook some ports to
hvc, but it's mostly a generic driver these days.
(I also note the MAINTAINERS entry was ignored and not updated in the
3rd patch of this series.)
Can you please move it back?
I could perhaps think of a way of splitting the file so the hvc bits can
be moved to drivers/tty/hvc/ and having the core stay in drivers/char/,
but that'll have to wait for the next cycle.
Amit
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 1/3] tty: move hvc drivers to drivers/tty/hvc/
2011-01-27 18:29 ` Amit Shah
@ 2011-01-27 21:53 ` Arnd Bergmann
2011-01-28 2:57 ` Amit Shah
0 siblings, 1 reply; 22+ messages in thread
From: Arnd Bergmann @ 2011-01-27 21:53 UTC (permalink / raw)
To: Amit Shah; +Cc: Greg Kroah-Hartman, linux-kernel, Rusty Russell
On Thursday 27 January 2011 19:29:44 Amit Shah wrote:
> On (Thu) Jan 20 2011 [10:03:43], Greg Kroah-Hartman wrote:
> > As requested by Arnd Bergmann, the hvc drivers are now
> > moved to the drivers/tty/hvc/ directory. The virtio_console.c driver
> > was also moved, as it required the hvc_console.h file to be able to be
> > built, and it really is a hvc driver.
>
> I just saw this now as a result of this patch entering mainline. I
> would have liked to be CC'ed to the patches. Also, I don't like the
> move of the virtio_console.c file to drivers/tty/hvc. virtio_console.c
> is not only an hvc driver; one of its functions is to hook some ports to
> hvc, but it's mostly a generic driver these days.
Sorry about this, the idea to move this file was mine and my original
patch did this as well. I remembered the code from when it was a simple
console driver based on hvc and never noticed that it had evolved into
a generic host/guest communication stack.
> Can you please move it back?
No objection from me here in general, though as Greg writes above, it's
a bit ugly when hvc_console.h is in a different directory.
> I could perhaps think of a way of splitting the file so the hvc bits can
> be moved to drivers/tty/hvc/ and having the core stay in drivers/char/,
> but that'll have to wait for the next cycle.
I think that's a really good idea. The main reason for moving the tty
drivers from drivers/char to drivers/tty was to separate the everything
related to tty from everything else. The common part should IMHO then not
be named "console", "tty" os similar but indicate that it's more generic
than that. Maybe virtio-pipe?
Arnd
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 1/3] tty: move hvc drivers to drivers/tty/hvc/
2011-01-27 21:53 ` Arnd Bergmann
@ 2011-01-28 2:57 ` Amit Shah
2011-01-28 4:21 ` Greg KH
0 siblings, 1 reply; 22+ messages in thread
From: Amit Shah @ 2011-01-28 2:57 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: Greg Kroah-Hartman, linux-kernel, Rusty Russell
On (Thu) Jan 27 2011 [22:53:29], Arnd Bergmann wrote:
> On Thursday 27 January 2011 19:29:44 Amit Shah wrote:
> > On (Thu) Jan 20 2011 [10:03:43], Greg Kroah-Hartman wrote:
> > > As requested by Arnd Bergmann, the hvc drivers are now
> > > moved to the drivers/tty/hvc/ directory. The virtio_console.c driver
> > > was also moved, as it required the hvc_console.h file to be able to be
> > > built, and it really is a hvc driver.
> >
> > I just saw this now as a result of this patch entering mainline. I
> > would have liked to be CC'ed to the patches. Also, I don't like the
> > move of the virtio_console.c file to drivers/tty/hvc. virtio_console.c
> > is not only an hvc driver; one of its functions is to hook some ports to
> > hvc, but it's mostly a generic driver these days.
>
> Sorry about this, the idea to move this file was mine and my original
> patch did this as well. I remembered the code from when it was a simple
> console driver based on hvc and never noticed that it had evolved into
> a generic host/guest communication stack.
>
> > Can you please move it back?
>
> No objection from me here in general, though as Greg writes above, it's
> a bit ugly when hvc_console.h is in a different directory.
Greg, can you do this please? (A way to do it with preservig git
history of the file would be great as well, but I think only a revert
will do that?)
> > I could perhaps think of a way of splitting the file so the hvc bits can
> > be moved to drivers/tty/hvc/ and having the core stay in drivers/char/,
> > but that'll have to wait for the next cycle.
>
> I think that's a really good idea. The main reason for moving the tty
> drivers from drivers/char to drivers/tty was to separate the everything
> related to tty from everything else. The common part should IMHO then not
> be named "console", "tty" os similar but indicate that it's more generic
> than that. Maybe virtio-pipe?
Rusty has suggested virtio-ports in the past.
Amit
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 1/3] tty: move hvc drivers to drivers/tty/hvc/
2011-01-28 2:57 ` Amit Shah
@ 2011-01-28 4:21 ` Greg KH
2011-01-28 5:59 ` Amit Shah
0 siblings, 1 reply; 22+ messages in thread
From: Greg KH @ 2011-01-28 4:21 UTC (permalink / raw)
To: Amit Shah; +Cc: Arnd Bergmann, linux-kernel, Rusty Russell
On Fri, Jan 28, 2011 at 08:27:25AM +0530, Amit Shah wrote:
> On (Thu) Jan 27 2011 [22:53:29], Arnd Bergmann wrote:
> > On Thursday 27 January 2011 19:29:44 Amit Shah wrote:
> > > On (Thu) Jan 20 2011 [10:03:43], Greg Kroah-Hartman wrote:
> > > > As requested by Arnd Bergmann, the hvc drivers are now
> > > > moved to the drivers/tty/hvc/ directory. The virtio_console.c driver
> > > > was also moved, as it required the hvc_console.h file to be able to be
> > > > built, and it really is a hvc driver.
> > >
> > > I just saw this now as a result of this patch entering mainline. I
> > > would have liked to be CC'ed to the patches. Also, I don't like the
> > > move of the virtio_console.c file to drivers/tty/hvc. virtio_console.c
> > > is not only an hvc driver; one of its functions is to hook some ports to
> > > hvc, but it's mostly a generic driver these days.
> >
> > Sorry about this, the idea to move this file was mine and my original
> > patch did this as well. I remembered the code from when it was a simple
> > console driver based on hvc and never noticed that it had evolved into
> > a generic host/guest communication stack.
> >
> > > Can you please move it back?
> >
> > No objection from me here in general, though as Greg writes above, it's
> > a bit ugly when hvc_console.h is in a different directory.
>
> Greg, can you do this please? (A way to do it with preservig git
> history of the file would be great as well, but I think only a revert
> will do that?)
So just move the one file, virtio_console.c? If so, yes, I can move it
back.
> > > I could perhaps think of a way of splitting the file so the hvc bits can
> > > be moved to drivers/tty/hvc/ and having the core stay in drivers/char/,
> > > but that'll have to wait for the next cycle.
That would be great, care to send me those patches now so I can queue it
up for .39?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 1/3] tty: move hvc drivers to drivers/tty/hvc/
2011-01-28 4:21 ` Greg KH
@ 2011-01-28 5:59 ` Amit Shah
2011-01-28 15:20 ` Greg KH
2011-01-31 22:14 ` Greg KH
0 siblings, 2 replies; 22+ messages in thread
From: Amit Shah @ 2011-01-28 5:59 UTC (permalink / raw)
To: Greg KH; +Cc: Arnd Bergmann, linux-kernel, Rusty Russell
On (Thu) Jan 27 2011 [20:21:25], Greg KH wrote:
> > > Sorry about this, the idea to move this file was mine and my original
> > > patch did this as well. I remembered the code from when it was a simple
> > > console driver based on hvc and never noticed that it had evolved into
> > > a generic host/guest communication stack.
> > >
> > > > Can you please move it back?
> > >
> > > No objection from me here in general, though as Greg writes above, it's
> > > a bit ugly when hvc_console.h is in a different directory.
> >
> > Greg, can you do this please? (A way to do it with preservig git
> > history of the file would be great as well, but I think only a revert
> > will do that?)
>
> So just move the one file, virtio_console.c? If so, yes, I can move it
> back.
Yes, just the one file.
> > > > I could perhaps think of a way of splitting the file so the hvc bits can
> > > > be moved to drivers/tty/hvc/ and having the core stay in drivers/char/,
> > > > but that'll have to wait for the next cycle.
>
> That would be great, care to send me those patches now so I can queue it
> up for .39?
It was just a thought; I don't have patches yet. I'll send them your
way once they're ready.
Thanks,
Amit
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 1/3] tty: move hvc drivers to drivers/tty/hvc/
2011-01-28 5:59 ` Amit Shah
@ 2011-01-28 15:20 ` Greg KH
2011-01-31 22:14 ` Greg KH
1 sibling, 0 replies; 22+ messages in thread
From: Greg KH @ 2011-01-28 15:20 UTC (permalink / raw)
To: Amit Shah; +Cc: Arnd Bergmann, linux-kernel, Rusty Russell
On Fri, Jan 28, 2011 at 11:29:04AM +0530, Amit Shah wrote:
> On (Thu) Jan 27 2011 [20:21:25], Greg KH wrote:
> > > > Sorry about this, the idea to move this file was mine and my original
> > > > patch did this as well. I remembered the code from when it was a simple
> > > > console driver based on hvc and never noticed that it had evolved into
> > > > a generic host/guest communication stack.
> > > >
> > > > > Can you please move it back?
> > > >
> > > > No objection from me here in general, though as Greg writes above, it's
> > > > a bit ugly when hvc_console.h is in a different directory.
> > >
> > > Greg, can you do this please? (A way to do it with preservig git
> > > history of the file would be great as well, but I think only a revert
> > > will do that?)
> >
> > So just move the one file, virtio_console.c? If so, yes, I can move it
> > back.
>
> Yes, just the one file.
Ok, I'll queue that up later today.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 1/3] tty: move hvc drivers to drivers/tty/hvc/
2011-01-28 5:59 ` Amit Shah
2011-01-28 15:20 ` Greg KH
@ 2011-01-31 22:14 ` Greg KH
2011-02-01 3:27 ` Amit Shah
` (2 more replies)
1 sibling, 3 replies; 22+ messages in thread
From: Greg KH @ 2011-01-31 22:14 UTC (permalink / raw)
To: Amit Shah; +Cc: Greg KH, Arnd Bergmann, linux-kernel, Rusty Russell
On Fri, Jan 28, 2011 at 11:29:04AM +0530, Amit Shah wrote:
> On (Thu) Jan 27 2011 [20:21:25], Greg KH wrote:
> > > > Sorry about this, the idea to move this file was mine and my original
> > > > patch did this as well. I remembered the code from when it was a simple
> > > > console driver based on hvc and never noticed that it had evolved into
> > > > a generic host/guest communication stack.
> > > >
> > > > > Can you please move it back?
> > > >
> > > > No objection from me here in general, though as Greg writes above, it's
> > > > a bit ugly when hvc_console.h is in a different directory.
> > >
> > > Greg, can you do this please? (A way to do it with preservig git
> > > history of the file would be great as well, but I think only a revert
> > > will do that?)
> >
> > So just move the one file, virtio_console.c? If so, yes, I can move it
> > back.
>
> Yes, just the one file.
>
> > > > > I could perhaps think of a way of splitting the file so the hvc bits can
> > > > > be moved to drivers/tty/hvc/ and having the core stay in drivers/char/,
> > > > > but that'll have to wait for the next cycle.
> >
> > That would be great, care to send me those patches now so I can queue it
> > up for .39?
>
> It was just a thought; I don't have patches yet. I'll send them your
> way once they're ready.
Actually, can you send me the patch to do this rename back now? I can't
test the build to verify that I got it correct, and I'd like to properly
credit you with it as well.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH 1/3] tty: move hvc drivers to drivers/tty/hvc/
2011-01-31 22:14 ` Greg KH
@ 2011-02-01 3:27 ` Amit Shah
2011-02-01 4:01 ` [PATCH] virtio: console: Move file back to drivers/char/ Amit Shah
2011-02-01 4:01 ` Amit Shah
2 siblings, 0 replies; 22+ messages in thread
From: Amit Shah @ 2011-02-01 3:27 UTC (permalink / raw)
To: Greg KH; +Cc: Greg KH, Arnd Bergmann, linux-kernel, Rusty Russell
On (Mon) Jan 31 2011 [14:14:54], Greg KH wrote:
> On Fri, Jan 28, 2011 at 11:29:04AM +0530, Amit Shah wrote:
> > On (Thu) Jan 27 2011 [20:21:25], Greg KH wrote:
> > > > > Sorry about this, the idea to move this file was mine and my original
> > > > > patch did this as well. I remembered the code from when it was a simple
> > > > > console driver based on hvc and never noticed that it had evolved into
> > > > > a generic host/guest communication stack.
> > > > >
> > > > > > Can you please move it back?
> > > > >
> > > > > No objection from me here in general, though as Greg writes above, it's
> > > > > a bit ugly when hvc_console.h is in a different directory.
> > > >
> > > > Greg, can you do this please? (A way to do it with preservig git
> > > > history of the file would be great as well, but I think only a revert
> > > > will do that?)
> > >
> > > So just move the one file, virtio_console.c? If so, yes, I can move it
> > > back.
> >
> > Yes, just the one file.
> >
> > > > > > I could perhaps think of a way of splitting the file so the hvc bits can
> > > > > > be moved to drivers/tty/hvc/ and having the core stay in drivers/char/,
> > > > > > but that'll have to wait for the next cycle.
> > >
> > > That would be great, care to send me those patches now so I can queue it
> > > up for .39?
> >
> > It was just a thought; I don't have patches yet. I'll send them your
> > way once they're ready.
>
> Actually, can you send me the patch to do this rename back now? I can't
> test the build to verify that I got it correct, and I'd like to properly
> credit you with it as well.
OK; I'll do that.
Amit
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH] virtio: console: Move file back to drivers/char/
2011-01-31 22:14 ` Greg KH
2011-02-01 3:27 ` Amit Shah
@ 2011-02-01 4:01 ` Amit Shah
2011-02-01 12:40 ` Arnd Bergmann
2011-02-01 12:40 ` Arnd Bergmann
2011-02-01 4:01 ` Amit Shah
2 siblings, 2 replies; 22+ messages in thread
From: Amit Shah @ 2011-02-01 4:01 UTC (permalink / raw)
To: Virtualization List
Cc: linux-kernel, Amit Shah, Rusty Russell, Greg KH, Arnd Bergmann
Commit 728674a7e466628df2aeec6d11a2ae1ef968fb67 moved virtio_console.c
to drivers/tty/hvc/ under the perception of this being an hvc driver.
It was such once, but these days it has generic communication
capabilities as well, so move it to drivers/char/.
In the future, the hvc part from this file can be split off and moved
under drivers/tty/hvc/.
CC: Rusty Russell <rusty@rustcorp.com.au>
CC: Greg KH <greg@kroah.com>
CC: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Amit Shah <amit.shah@redhat.com>
---
drivers/char/Makefile | 1 +
drivers/{tty/hvc => char}/virtio_console.c | 2 +-
drivers/tty/hvc/Makefile | 1 -
3 files changed, 2 insertions(+), 2 deletions(-)
rename drivers/{tty/hvc => char}/virtio_console.c (99%)
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 5bc765d..8238f89 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -30,6 +30,7 @@ obj-$(CONFIG_SYNCLINK_GT) += synclink_gt.o
obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o
obj-$(CONFIG_SX) += sx.o generic_serial.o
obj-$(CONFIG_RIO) += rio/ generic_serial.o
+obj-$(CONFIG_VIRTIO_CONSOLE) += virtio_console.o
obj-$(CONFIG_RAW_DRIVER) += raw.o
obj-$(CONFIG_SGI_SNSC) += snsc.o snsc_event.o
obj-$(CONFIG_MSPEC) += mspec.o
diff --git a/drivers/tty/hvc/virtio_console.c b/drivers/char/virtio_console.c
similarity index 99%
rename from drivers/tty/hvc/virtio_console.c
rename to drivers/char/virtio_console.c
index 896a2ce..5feadee 100644
--- a/drivers/tty/hvc/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -31,7 +31,7 @@
#include <linux/virtio_console.h>
#include <linux/wait.h>
#include <linux/workqueue.h>
-#include "hvc_console.h"
+#include "../tty/hvc/hvc_console.h"
/*
* This is a global struct for storing common data for all the devices
diff --git a/drivers/tty/hvc/Makefile b/drivers/tty/hvc/Makefile
index e6bed5f..d79e7e9 100644
--- a/drivers/tty/hvc/Makefile
+++ b/drivers/tty/hvc/Makefile
@@ -10,4 +10,3 @@ obj-$(CONFIG_HVC_XEN) += hvc_xen.o
obj-$(CONFIG_HVC_IUCV) += hvc_iucv.o
obj-$(CONFIG_HVC_UDBG) += hvc_udbg.o
obj-$(CONFIG_HVCS) += hvcs.o
-obj-$(CONFIG_VIRTIO_CONSOLE) += virtio_console.o
--
1.7.3.5
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [PATCH] virtio: console: Move file back to drivers/char/
2011-02-01 4:01 ` [PATCH] virtio: console: Move file back to drivers/char/ Amit Shah
@ 2011-02-01 12:40 ` Arnd Bergmann
2011-02-01 12:40 ` Arnd Bergmann
1 sibling, 0 replies; 22+ messages in thread
From: Arnd Bergmann @ 2011-02-01 12:40 UTC (permalink / raw)
To: Amit Shah; +Cc: Greg KH, linux-kernel, Virtualization List
On Tuesday 01 February 2011, Amit Shah wrote:
> Commit 728674a7e466628df2aeec6d11a2ae1ef968fb67 moved virtio_console.c
> to drivers/tty/hvc/ under the perception of this being an hvc driver.
> It was such once, but these days it has generic communication
> capabilities as well, so move it to drivers/char/.
>
> In the future, the hvc part from this file can be split off and moved
> under drivers/tty/hvc/.
>
> CC: Rusty Russell <rusty@rustcorp.com.au>
> CC: Greg KH <greg@kroah.com>
> CC: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Amit Shah <amit.shah@redhat.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH] virtio: console: Move file back to drivers/char/
2011-02-01 4:01 ` [PATCH] virtio: console: Move file back to drivers/char/ Amit Shah
2011-02-01 12:40 ` Arnd Bergmann
@ 2011-02-01 12:40 ` Arnd Bergmann
1 sibling, 0 replies; 22+ messages in thread
From: Arnd Bergmann @ 2011-02-01 12:40 UTC (permalink / raw)
To: Amit Shah; +Cc: Virtualization List, linux-kernel, Rusty Russell, Greg KH
On Tuesday 01 February 2011, Amit Shah wrote:
> Commit 728674a7e466628df2aeec6d11a2ae1ef968fb67 moved virtio_console.c
> to drivers/tty/hvc/ under the perception of this being an hvc driver.
> It was such once, but these days it has generic communication
> capabilities as well, so move it to drivers/char/.
>
> In the future, the hvc part from this file can be split off and moved
> under drivers/tty/hvc/.
>
> CC: Rusty Russell <rusty@rustcorp.com.au>
> CC: Greg KH <greg@kroah.com>
> CC: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Amit Shah <amit.shah@redhat.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH] virtio: console: Move file back to drivers/char/
2011-01-31 22:14 ` Greg KH
2011-02-01 3:27 ` Amit Shah
2011-02-01 4:01 ` [PATCH] virtio: console: Move file back to drivers/char/ Amit Shah
@ 2011-02-01 4:01 ` Amit Shah
2 siblings, 0 replies; 22+ messages in thread
From: Amit Shah @ 2011-02-01 4:01 UTC (permalink / raw)
To: Virtualization List; +Cc: Amit Shah, Greg KH, linux-kernel, Arnd Bergmann
Commit 728674a7e466628df2aeec6d11a2ae1ef968fb67 moved virtio_console.c
to drivers/tty/hvc/ under the perception of this being an hvc driver.
It was such once, but these days it has generic communication
capabilities as well, so move it to drivers/char/.
In the future, the hvc part from this file can be split off and moved
under drivers/tty/hvc/.
CC: Rusty Russell <rusty@rustcorp.com.au>
CC: Greg KH <greg@kroah.com>
CC: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Amit Shah <amit.shah@redhat.com>
---
drivers/char/Makefile | 1 +
drivers/{tty/hvc => char}/virtio_console.c | 2 +-
drivers/tty/hvc/Makefile | 1 -
3 files changed, 2 insertions(+), 2 deletions(-)
rename drivers/{tty/hvc => char}/virtio_console.c (99%)
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 5bc765d..8238f89 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -30,6 +30,7 @@ obj-$(CONFIG_SYNCLINK_GT) += synclink_gt.o
obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o
obj-$(CONFIG_SX) += sx.o generic_serial.o
obj-$(CONFIG_RIO) += rio/ generic_serial.o
+obj-$(CONFIG_VIRTIO_CONSOLE) += virtio_console.o
obj-$(CONFIG_RAW_DRIVER) += raw.o
obj-$(CONFIG_SGI_SNSC) += snsc.o snsc_event.o
obj-$(CONFIG_MSPEC) += mspec.o
diff --git a/drivers/tty/hvc/virtio_console.c b/drivers/char/virtio_console.c
similarity index 99%
rename from drivers/tty/hvc/virtio_console.c
rename to drivers/char/virtio_console.c
index 896a2ce..5feadee 100644
--- a/drivers/tty/hvc/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -31,7 +31,7 @@
#include <linux/virtio_console.h>
#include <linux/wait.h>
#include <linux/workqueue.h>
-#include "hvc_console.h"
+#include "../tty/hvc/hvc_console.h"
/*
* This is a global struct for storing common data for all the devices
diff --git a/drivers/tty/hvc/Makefile b/drivers/tty/hvc/Makefile
index e6bed5f..d79e7e9 100644
--- a/drivers/tty/hvc/Makefile
+++ b/drivers/tty/hvc/Makefile
@@ -10,4 +10,3 @@ obj-$(CONFIG_HVC_XEN) += hvc_xen.o
obj-$(CONFIG_HVC_IUCV) += hvc_iucv.o
obj-$(CONFIG_HVC_UDBG) += hvc_udbg.o
obj-$(CONFIG_HVCS) += hvcs.o
-obj-$(CONFIG_VIRTIO_CONSOLE) += virtio_console.o
--
1.7.3.5
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 2/3] tty: move drivers/serial/ to drivers/tty/serial/
2011-01-20 17:49 [GIT PATCH] TTY/serial driver movement for .38 Greg KH
2011-01-20 18:03 ` [PATCH 1/3] tty: move hvc drivers to drivers/tty/hvc/ Greg Kroah-Hartman
@ 2011-01-20 18:03 ` Greg Kroah-Hartman
2011-01-20 18:27 ` Arnd Bergmann
2011-01-20 18:03 ` [PATCH 3/3] tty: update MAINTAINERS file due to driver movement Greg Kroah-Hartman
2011-01-20 18:32 ` [GIT PATCH] TTY/serial driver movement for .38 Arnd Bergmann
3 siblings, 1 reply; 22+ messages in thread
From: Greg Kroah-Hartman @ 2011-01-20 18:03 UTC (permalink / raw)
To: linux-kernel
Cc: Greg Kroah-Hartman, Arnd Bergmann, Alan Cox, Geert Uytterhoeven,
Rogier Wolff, Michael H. Warfield
The serial drivers are really just tty drivers, so move them to
drivers/tty/ to make things a bit neater overall.
This is part of the tty/serial driver movement proceedure as proposed by
Arnd Bergmann and approved by everyone involved a number of months ago.
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Rogier Wolff <R.E.Wolff@bitwizard.nl>
Cc: Michael H. Warfield <mhw@wittsend.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/Makefile | 3 +--
drivers/char/Kconfig | 2 +-
drivers/tty/Makefile | 1 +
drivers/{ => tty}/serial/21285.c | 0
drivers/{ => tty}/serial/68328serial.c | 0
drivers/{ => tty}/serial/68328serial.h | 0
drivers/{ => tty}/serial/68360serial.c | 0
drivers/{ => tty}/serial/8250.c | 0
drivers/{ => tty}/serial/8250.h | 0
drivers/{ => tty}/serial/8250_accent.c | 0
drivers/{ => tty}/serial/8250_acorn.c | 0
drivers/{ => tty}/serial/8250_boca.c | 0
drivers/{ => tty}/serial/8250_early.c | 0
drivers/{ => tty}/serial/8250_exar_st16c554.c | 0
drivers/{ => tty}/serial/8250_fourport.c | 0
drivers/{ => tty}/serial/8250_gsc.c | 0
drivers/{ => tty}/serial/8250_hp300.c | 0
drivers/{ => tty}/serial/8250_hub6.c | 0
drivers/{ => tty}/serial/8250_mca.c | 0
drivers/{ => tty}/serial/8250_pci.c | 0
drivers/{ => tty}/serial/8250_pnp.c | 0
drivers/{ => tty}/serial/Kconfig | 0
drivers/{ => tty}/serial/Makefile | 0
drivers/{ => tty}/serial/altera_jtaguart.c | 0
drivers/{ => tty}/serial/altera_uart.c | 0
drivers/{ => tty}/serial/amba-pl010.c | 0
drivers/{ => tty}/serial/amba-pl011.c | 0
drivers/{ => tty}/serial/apbuart.c | 0
drivers/{ => tty}/serial/apbuart.h | 0
drivers/{ => tty}/serial/atmel_serial.c | 0
drivers/{ => tty}/serial/bcm63xx_uart.c | 0
drivers/{ => tty}/serial/bfin_5xx.c | 0
drivers/{ => tty}/serial/bfin_sport_uart.c | 0
drivers/{ => tty}/serial/bfin_sport_uart.h | 0
drivers/{ => tty}/serial/clps711x.c | 0
drivers/{ => tty}/serial/cpm_uart/Makefile | 0
drivers/{ => tty}/serial/cpm_uart/cpm_uart.h | 0
drivers/{ => tty}/serial/cpm_uart/cpm_uart_core.c | 0
drivers/{ => tty}/serial/cpm_uart/cpm_uart_cpm1.c | 0
drivers/{ => tty}/serial/cpm_uart/cpm_uart_cpm1.h | 0
drivers/{ => tty}/serial/cpm_uart/cpm_uart_cpm2.c | 0
drivers/{ => tty}/serial/cpm_uart/cpm_uart_cpm2.h | 0
drivers/{ => tty}/serial/crisv10.c | 0
drivers/{ => tty}/serial/crisv10.h | 0
drivers/{ => tty}/serial/dz.c | 0
drivers/{ => tty}/serial/dz.h | 0
drivers/{ => tty}/serial/icom.c | 0
drivers/{ => tty}/serial/icom.h | 0
drivers/{ => tty}/serial/ifx6x60.c | 0
drivers/{ => tty}/serial/ifx6x60.h | 0
drivers/{ => tty}/serial/imx.c | 0
drivers/{ => tty}/serial/ioc3_serial.c | 0
drivers/{ => tty}/serial/ioc4_serial.c | 0
drivers/{ => tty}/serial/ip22zilog.c | 0
drivers/{ => tty}/serial/ip22zilog.h | 0
drivers/{ => tty}/serial/jsm/Makefile | 0
drivers/{ => tty}/serial/jsm/jsm.h | 0
drivers/{ => tty}/serial/jsm/jsm_driver.c | 0
drivers/{ => tty}/serial/jsm/jsm_neo.c | 0
drivers/{ => tty}/serial/jsm/jsm_tty.c | 0
drivers/{ => tty}/serial/kgdboc.c | 0
drivers/{ => tty}/serial/m32r_sio.c | 0
drivers/{ => tty}/serial/m32r_sio.h | 0
drivers/{ => tty}/serial/m32r_sio_reg.h | 0
drivers/{ => tty}/serial/max3100.c | 0
drivers/{ => tty}/serial/max3107-aava.c | 0
drivers/{ => tty}/serial/max3107.c | 0
drivers/{ => tty}/serial/max3107.h | 0
drivers/{ => tty}/serial/mcf.c | 0
drivers/{ => tty}/serial/mfd.c | 0
drivers/{ => tty}/serial/mpc52xx_uart.c | 0
drivers/{ => tty}/serial/mpsc.c | 0
drivers/{ => tty}/serial/mrst_max3110.c | 0
drivers/{ => tty}/serial/mrst_max3110.h | 0
drivers/{ => tty}/serial/msm_serial.c | 0
drivers/{ => tty}/serial/msm_serial.h | 0
drivers/{ => tty}/serial/mux.c | 0
drivers/{ => tty}/serial/netx-serial.c | 0
drivers/{ => tty}/serial/nwpserial.c | 0
drivers/{ => tty}/serial/of_serial.c | 0
drivers/{ => tty}/serial/omap-serial.c | 0
drivers/{ => tty}/serial/pch_uart.c | 0
drivers/{ => tty}/serial/pmac_zilog.c | 0
drivers/{ => tty}/serial/pmac_zilog.h | 0
drivers/{ => tty}/serial/pnx8xxx_uart.c | 0
drivers/{ => tty}/serial/pxa.c | 0
drivers/{ => tty}/serial/s3c2400.c | 0
drivers/{ => tty}/serial/s3c2410.c | 0
drivers/{ => tty}/serial/s3c2412.c | 0
drivers/{ => tty}/serial/s3c2440.c | 0
drivers/{ => tty}/serial/s3c24a0.c | 0
drivers/{ => tty}/serial/s3c6400.c | 0
drivers/{ => tty}/serial/s5pv210.c | 0
drivers/{ => tty}/serial/sa1100.c | 0
drivers/{ => tty}/serial/samsung.c | 0
drivers/{ => tty}/serial/samsung.h | 0
drivers/{ => tty}/serial/sb1250-duart.c | 0
drivers/{ => tty}/serial/sc26xx.c | 0
drivers/{ => tty}/serial/serial_core.c | 0
drivers/{ => tty}/serial/serial_cs.c | 0
drivers/{ => tty}/serial/serial_ks8695.c | 0
drivers/{ => tty}/serial/serial_lh7a40x.c | 0
drivers/{ => tty}/serial/serial_txx9.c | 0
drivers/{ => tty}/serial/sh-sci.c | 0
drivers/{ => tty}/serial/sh-sci.h | 0
drivers/{ => tty}/serial/sn_console.c | 0
drivers/{ => tty}/serial/suncore.c | 0
drivers/{ => tty}/serial/suncore.h | 0
drivers/{ => tty}/serial/sunhv.c | 0
drivers/{ => tty}/serial/sunsab.c | 0
drivers/{ => tty}/serial/sunsab.h | 0
drivers/{ => tty}/serial/sunsu.c | 0
drivers/{ => tty}/serial/sunzilog.c | 0
drivers/{ => tty}/serial/sunzilog.h | 0
drivers/{ => tty}/serial/timbuart.c | 0
drivers/{ => tty}/serial/timbuart.h | 0
drivers/{ => tty}/serial/uartlite.c | 0
drivers/{ => tty}/serial/ucc_uart.c | 0
drivers/{ => tty}/serial/vr41xx_siu.c | 0
drivers/{ => tty}/serial/vt8500_serial.c | 0
drivers/{ => tty}/serial/zs.c | 0
drivers/{ => tty}/serial/zs.h | 0
122 files changed, 3 insertions(+), 3 deletions(-)
rename drivers/{ => tty}/serial/21285.c (100%)
rename drivers/{ => tty}/serial/68328serial.c (100%)
rename drivers/{ => tty}/serial/68328serial.h (100%)
rename drivers/{ => tty}/serial/68360serial.c (100%)
rename drivers/{ => tty}/serial/8250.c (100%)
rename drivers/{ => tty}/serial/8250.h (100%)
rename drivers/{ => tty}/serial/8250_accent.c (100%)
rename drivers/{ => tty}/serial/8250_acorn.c (100%)
rename drivers/{ => tty}/serial/8250_boca.c (100%)
rename drivers/{ => tty}/serial/8250_early.c (100%)
rename drivers/{ => tty}/serial/8250_exar_st16c554.c (100%)
rename drivers/{ => tty}/serial/8250_fourport.c (100%)
rename drivers/{ => tty}/serial/8250_gsc.c (100%)
rename drivers/{ => tty}/serial/8250_hp300.c (100%)
rename drivers/{ => tty}/serial/8250_hub6.c (100%)
rename drivers/{ => tty}/serial/8250_mca.c (100%)
rename drivers/{ => tty}/serial/8250_pci.c (100%)
rename drivers/{ => tty}/serial/8250_pnp.c (100%)
rename drivers/{ => tty}/serial/Kconfig (100%)
rename drivers/{ => tty}/serial/Makefile (100%)
rename drivers/{ => tty}/serial/altera_jtaguart.c (100%)
rename drivers/{ => tty}/serial/altera_uart.c (100%)
rename drivers/{ => tty}/serial/amba-pl010.c (100%)
rename drivers/{ => tty}/serial/amba-pl011.c (100%)
rename drivers/{ => tty}/serial/apbuart.c (100%)
rename drivers/{ => tty}/serial/apbuart.h (100%)
rename drivers/{ => tty}/serial/atmel_serial.c (100%)
rename drivers/{ => tty}/serial/bcm63xx_uart.c (100%)
rename drivers/{ => tty}/serial/bfin_5xx.c (100%)
rename drivers/{ => tty}/serial/bfin_sport_uart.c (100%)
rename drivers/{ => tty}/serial/bfin_sport_uart.h (100%)
rename drivers/{ => tty}/serial/clps711x.c (100%)
rename drivers/{ => tty}/serial/cpm_uart/Makefile (100%)
rename drivers/{ => tty}/serial/cpm_uart/cpm_uart.h (100%)
rename drivers/{ => tty}/serial/cpm_uart/cpm_uart_core.c (100%)
rename drivers/{ => tty}/serial/cpm_uart/cpm_uart_cpm1.c (100%)
rename drivers/{ => tty}/serial/cpm_uart/cpm_uart_cpm1.h (100%)
rename drivers/{ => tty}/serial/cpm_uart/cpm_uart_cpm2.c (100%)
rename drivers/{ => tty}/serial/cpm_uart/cpm_uart_cpm2.h (100%)
rename drivers/{ => tty}/serial/crisv10.c (100%)
rename drivers/{ => tty}/serial/crisv10.h (100%)
rename drivers/{ => tty}/serial/dz.c (100%)
rename drivers/{ => tty}/serial/dz.h (100%)
rename drivers/{ => tty}/serial/icom.c (100%)
rename drivers/{ => tty}/serial/icom.h (100%)
rename drivers/{ => tty}/serial/ifx6x60.c (100%)
rename drivers/{ => tty}/serial/ifx6x60.h (100%)
rename drivers/{ => tty}/serial/imx.c (100%)
rename drivers/{ => tty}/serial/ioc3_serial.c (100%)
rename drivers/{ => tty}/serial/ioc4_serial.c (100%)
rename drivers/{ => tty}/serial/ip22zilog.c (100%)
rename drivers/{ => tty}/serial/ip22zilog.h (100%)
rename drivers/{ => tty}/serial/jsm/Makefile (100%)
rename drivers/{ => tty}/serial/jsm/jsm.h (100%)
rename drivers/{ => tty}/serial/jsm/jsm_driver.c (100%)
rename drivers/{ => tty}/serial/jsm/jsm_neo.c (100%)
rename drivers/{ => tty}/serial/jsm/jsm_tty.c (100%)
rename drivers/{ => tty}/serial/kgdboc.c (100%)
rename drivers/{ => tty}/serial/m32r_sio.c (100%)
rename drivers/{ => tty}/serial/m32r_sio.h (100%)
rename drivers/{ => tty}/serial/m32r_sio_reg.h (100%)
rename drivers/{ => tty}/serial/max3100.c (100%)
rename drivers/{ => tty}/serial/max3107-aava.c (100%)
rename drivers/{ => tty}/serial/max3107.c (100%)
rename drivers/{ => tty}/serial/max3107.h (100%)
rename drivers/{ => tty}/serial/mcf.c (100%)
rename drivers/{ => tty}/serial/mfd.c (100%)
rename drivers/{ => tty}/serial/mpc52xx_uart.c (100%)
rename drivers/{ => tty}/serial/mpsc.c (100%)
rename drivers/{ => tty}/serial/mrst_max3110.c (100%)
rename drivers/{ => tty}/serial/mrst_max3110.h (100%)
rename drivers/{ => tty}/serial/msm_serial.c (100%)
rename drivers/{ => tty}/serial/msm_serial.h (100%)
rename drivers/{ => tty}/serial/mux.c (100%)
rename drivers/{ => tty}/serial/netx-serial.c (100%)
rename drivers/{ => tty}/serial/nwpserial.c (100%)
rename drivers/{ => tty}/serial/of_serial.c (100%)
rename drivers/{ => tty}/serial/omap-serial.c (100%)
rename drivers/{ => tty}/serial/pch_uart.c (100%)
rename drivers/{ => tty}/serial/pmac_zilog.c (100%)
rename drivers/{ => tty}/serial/pmac_zilog.h (100%)
rename drivers/{ => tty}/serial/pnx8xxx_uart.c (100%)
rename drivers/{ => tty}/serial/pxa.c (100%)
rename drivers/{ => tty}/serial/s3c2400.c (100%)
rename drivers/{ => tty}/serial/s3c2410.c (100%)
rename drivers/{ => tty}/serial/s3c2412.c (100%)
rename drivers/{ => tty}/serial/s3c2440.c (100%)
rename drivers/{ => tty}/serial/s3c24a0.c (100%)
rename drivers/{ => tty}/serial/s3c6400.c (100%)
rename drivers/{ => tty}/serial/s5pv210.c (100%)
rename drivers/{ => tty}/serial/sa1100.c (100%)
rename drivers/{ => tty}/serial/samsung.c (100%)
rename drivers/{ => tty}/serial/samsung.h (100%)
rename drivers/{ => tty}/serial/sb1250-duart.c (100%)
rename drivers/{ => tty}/serial/sc26xx.c (100%)
rename drivers/{ => tty}/serial/serial_core.c (100%)
rename drivers/{ => tty}/serial/serial_cs.c (100%)
rename drivers/{ => tty}/serial/serial_ks8695.c (100%)
rename drivers/{ => tty}/serial/serial_lh7a40x.c (100%)
rename drivers/{ => tty}/serial/serial_txx9.c (100%)
rename drivers/{ => tty}/serial/sh-sci.c (100%)
rename drivers/{ => tty}/serial/sh-sci.h (100%)
rename drivers/{ => tty}/serial/sn_console.c (100%)
rename drivers/{ => tty}/serial/suncore.c (100%)
rename drivers/{ => tty}/serial/suncore.h (100%)
rename drivers/{ => tty}/serial/sunhv.c (100%)
rename drivers/{ => tty}/serial/sunsab.c (100%)
rename drivers/{ => tty}/serial/sunsab.h (100%)
rename drivers/{ => tty}/serial/sunsu.c (100%)
rename drivers/{ => tty}/serial/sunzilog.c (100%)
rename drivers/{ => tty}/serial/sunzilog.h (100%)
rename drivers/{ => tty}/serial/timbuart.c (100%)
rename drivers/{ => tty}/serial/timbuart.h (100%)
rename drivers/{ => tty}/serial/uartlite.c (100%)
rename drivers/{ => tty}/serial/ucc_uart.c (100%)
rename drivers/{ => tty}/serial/vr41xx_siu.c (100%)
rename drivers/{ => tty}/serial/vt8500_serial.c (100%)
rename drivers/{ => tty}/serial/zs.c (100%)
rename drivers/{ => tty}/serial/zs.h (100%)
diff --git a/drivers/Makefile b/drivers/Makefile
index ef51324..1e2cda1 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -24,7 +24,7 @@ obj-$(CONFIG_XEN) += xen/
# regulators early, since some subsystems rely on them to initialize
obj-$(CONFIG_REGULATOR) += regulator/
-# char/ comes before serial/ etc so that the VT console is the boot-time
+# tty/ comes before char/ so that the VT console is the boot-time
# default.
obj-y += tty/
obj-y += char/
@@ -38,7 +38,6 @@ obj-$(CONFIG_CONNECTOR) += connector/
obj-$(CONFIG_FB_I810) += video/i810/
obj-$(CONFIG_FB_INTEL) += video/intelfb/
-obj-y += serial/
obj-$(CONFIG_PARPORT) += parport/
obj-y += base/ block/ misc/ mfd/ nfc/
obj-$(CONFIG_NUBUS) += nubus/
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 0f175a8..ccac7d0 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -426,7 +426,7 @@ config SGI_MBCS
If you have an SGI Altix with an attached SABrick
say Y or M here, otherwise say N.
-source "drivers/serial/Kconfig"
+source "drivers/tty/serial/Kconfig"
config UNIX98_PTYS
bool "Unix98 PTY support" if EMBEDDED
diff --git a/drivers/tty/Makefile b/drivers/tty/Makefile
index d3685f0..3962772 100644
--- a/drivers/tty/Makefile
+++ b/drivers/tty/Makefile
@@ -10,3 +10,4 @@ obj-$(CONFIG_R3964) += n_r3964.o
obj-y += vt/
obj-$(CONFIG_HVC_DRIVER) += hvc/
+obj-y += serial/
diff --git a/drivers/serial/21285.c b/drivers/tty/serial/21285.c
similarity index 100%
rename from drivers/serial/21285.c
rename to drivers/tty/serial/21285.c
diff --git a/drivers/serial/68328serial.c b/drivers/tty/serial/68328serial.c
similarity index 100%
rename from drivers/serial/68328serial.c
rename to drivers/tty/serial/68328serial.c
diff --git a/drivers/serial/68328serial.h b/drivers/tty/serial/68328serial.h
similarity index 100%
rename from drivers/serial/68328serial.h
rename to drivers/tty/serial/68328serial.h
diff --git a/drivers/serial/68360serial.c b/drivers/tty/serial/68360serial.c
similarity index 100%
rename from drivers/serial/68360serial.c
rename to drivers/tty/serial/68360serial.c
diff --git a/drivers/serial/8250.c b/drivers/tty/serial/8250.c
similarity index 100%
rename from drivers/serial/8250.c
rename to drivers/tty/serial/8250.c
diff --git a/drivers/serial/8250.h b/drivers/tty/serial/8250.h
similarity index 100%
rename from drivers/serial/8250.h
rename to drivers/tty/serial/8250.h
diff --git a/drivers/serial/8250_accent.c b/drivers/tty/serial/8250_accent.c
similarity index 100%
rename from drivers/serial/8250_accent.c
rename to drivers/tty/serial/8250_accent.c
diff --git a/drivers/serial/8250_acorn.c b/drivers/tty/serial/8250_acorn.c
similarity index 100%
rename from drivers/serial/8250_acorn.c
rename to drivers/tty/serial/8250_acorn.c
diff --git a/drivers/serial/8250_boca.c b/drivers/tty/serial/8250_boca.c
similarity index 100%
rename from drivers/serial/8250_boca.c
rename to drivers/tty/serial/8250_boca.c
diff --git a/drivers/serial/8250_early.c b/drivers/tty/serial/8250_early.c
similarity index 100%
rename from drivers/serial/8250_early.c
rename to drivers/tty/serial/8250_early.c
diff --git a/drivers/serial/8250_exar_st16c554.c b/drivers/tty/serial/8250_exar_st16c554.c
similarity index 100%
rename from drivers/serial/8250_exar_st16c554.c
rename to drivers/tty/serial/8250_exar_st16c554.c
diff --git a/drivers/serial/8250_fourport.c b/drivers/tty/serial/8250_fourport.c
similarity index 100%
rename from drivers/serial/8250_fourport.c
rename to drivers/tty/serial/8250_fourport.c
diff --git a/drivers/serial/8250_gsc.c b/drivers/tty/serial/8250_gsc.c
similarity index 100%
rename from drivers/serial/8250_gsc.c
rename to drivers/tty/serial/8250_gsc.c
diff --git a/drivers/serial/8250_hp300.c b/drivers/tty/serial/8250_hp300.c
similarity index 100%
rename from drivers/serial/8250_hp300.c
rename to drivers/tty/serial/8250_hp300.c
diff --git a/drivers/serial/8250_hub6.c b/drivers/tty/serial/8250_hub6.c
similarity index 100%
rename from drivers/serial/8250_hub6.c
rename to drivers/tty/serial/8250_hub6.c
diff --git a/drivers/serial/8250_mca.c b/drivers/tty/serial/8250_mca.c
similarity index 100%
rename from drivers/serial/8250_mca.c
rename to drivers/tty/serial/8250_mca.c
diff --git a/drivers/serial/8250_pci.c b/drivers/tty/serial/8250_pci.c
similarity index 100%
rename from drivers/serial/8250_pci.c
rename to drivers/tty/serial/8250_pci.c
diff --git a/drivers/serial/8250_pnp.c b/drivers/tty/serial/8250_pnp.c
similarity index 100%
rename from drivers/serial/8250_pnp.c
rename to drivers/tty/serial/8250_pnp.c
diff --git a/drivers/serial/Kconfig b/drivers/tty/serial/Kconfig
similarity index 100%
rename from drivers/serial/Kconfig
rename to drivers/tty/serial/Kconfig
diff --git a/drivers/serial/Makefile b/drivers/tty/serial/Makefile
similarity index 100%
rename from drivers/serial/Makefile
rename to drivers/tty/serial/Makefile
diff --git a/drivers/serial/altera_jtaguart.c b/drivers/tty/serial/altera_jtaguart.c
similarity index 100%
rename from drivers/serial/altera_jtaguart.c
rename to drivers/tty/serial/altera_jtaguart.c
diff --git a/drivers/serial/altera_uart.c b/drivers/tty/serial/altera_uart.c
similarity index 100%
rename from drivers/serial/altera_uart.c
rename to drivers/tty/serial/altera_uart.c
diff --git a/drivers/serial/amba-pl010.c b/drivers/tty/serial/amba-pl010.c
similarity index 100%
rename from drivers/serial/amba-pl010.c
rename to drivers/tty/serial/amba-pl010.c
diff --git a/drivers/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
similarity index 100%
rename from drivers/serial/amba-pl011.c
rename to drivers/tty/serial/amba-pl011.c
diff --git a/drivers/serial/apbuart.c b/drivers/tty/serial/apbuart.c
similarity index 100%
rename from drivers/serial/apbuart.c
rename to drivers/tty/serial/apbuart.c
diff --git a/drivers/serial/apbuart.h b/drivers/tty/serial/apbuart.h
similarity index 100%
rename from drivers/serial/apbuart.h
rename to drivers/tty/serial/apbuart.h
diff --git a/drivers/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
similarity index 100%
rename from drivers/serial/atmel_serial.c
rename to drivers/tty/serial/atmel_serial.c
diff --git a/drivers/serial/bcm63xx_uart.c b/drivers/tty/serial/bcm63xx_uart.c
similarity index 100%
rename from drivers/serial/bcm63xx_uart.c
rename to drivers/tty/serial/bcm63xx_uart.c
diff --git a/drivers/serial/bfin_5xx.c b/drivers/tty/serial/bfin_5xx.c
similarity index 100%
rename from drivers/serial/bfin_5xx.c
rename to drivers/tty/serial/bfin_5xx.c
diff --git a/drivers/serial/bfin_sport_uart.c b/drivers/tty/serial/bfin_sport_uart.c
similarity index 100%
rename from drivers/serial/bfin_sport_uart.c
rename to drivers/tty/serial/bfin_sport_uart.c
diff --git a/drivers/serial/bfin_sport_uart.h b/drivers/tty/serial/bfin_sport_uart.h
similarity index 100%
rename from drivers/serial/bfin_sport_uart.h
rename to drivers/tty/serial/bfin_sport_uart.h
diff --git a/drivers/serial/clps711x.c b/drivers/tty/serial/clps711x.c
similarity index 100%
rename from drivers/serial/clps711x.c
rename to drivers/tty/serial/clps711x.c
diff --git a/drivers/serial/cpm_uart/Makefile b/drivers/tty/serial/cpm_uart/Makefile
similarity index 100%
rename from drivers/serial/cpm_uart/Makefile
rename to drivers/tty/serial/cpm_uart/Makefile
diff --git a/drivers/serial/cpm_uart/cpm_uart.h b/drivers/tty/serial/cpm_uart/cpm_uart.h
similarity index 100%
rename from drivers/serial/cpm_uart/cpm_uart.h
rename to drivers/tty/serial/cpm_uart/cpm_uart.h
diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/tty/serial/cpm_uart/cpm_uart_core.c
similarity index 100%
rename from drivers/serial/cpm_uart/cpm_uart_core.c
rename to drivers/tty/serial/cpm_uart/cpm_uart_core.c
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm1.c b/drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c
similarity index 100%
rename from drivers/serial/cpm_uart/cpm_uart_cpm1.c
rename to drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm1.h b/drivers/tty/serial/cpm_uart/cpm_uart_cpm1.h
similarity index 100%
rename from drivers/serial/cpm_uart/cpm_uart_cpm1.h
rename to drivers/tty/serial/cpm_uart/cpm_uart_cpm1.h
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.c b/drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c
similarity index 100%
rename from drivers/serial/cpm_uart/cpm_uart_cpm2.c
rename to drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.h b/drivers/tty/serial/cpm_uart/cpm_uart_cpm2.h
similarity index 100%
rename from drivers/serial/cpm_uart/cpm_uart_cpm2.h
rename to drivers/tty/serial/cpm_uart/cpm_uart_cpm2.h
diff --git a/drivers/serial/crisv10.c b/drivers/tty/serial/crisv10.c
similarity index 100%
rename from drivers/serial/crisv10.c
rename to drivers/tty/serial/crisv10.c
diff --git a/drivers/serial/crisv10.h b/drivers/tty/serial/crisv10.h
similarity index 100%
rename from drivers/serial/crisv10.h
rename to drivers/tty/serial/crisv10.h
diff --git a/drivers/serial/dz.c b/drivers/tty/serial/dz.c
similarity index 100%
rename from drivers/serial/dz.c
rename to drivers/tty/serial/dz.c
diff --git a/drivers/serial/dz.h b/drivers/tty/serial/dz.h
similarity index 100%
rename from drivers/serial/dz.h
rename to drivers/tty/serial/dz.h
diff --git a/drivers/serial/icom.c b/drivers/tty/serial/icom.c
similarity index 100%
rename from drivers/serial/icom.c
rename to drivers/tty/serial/icom.c
diff --git a/drivers/serial/icom.h b/drivers/tty/serial/icom.h
similarity index 100%
rename from drivers/serial/icom.h
rename to drivers/tty/serial/icom.h
diff --git a/drivers/serial/ifx6x60.c b/drivers/tty/serial/ifx6x60.c
similarity index 100%
rename from drivers/serial/ifx6x60.c
rename to drivers/tty/serial/ifx6x60.c
diff --git a/drivers/serial/ifx6x60.h b/drivers/tty/serial/ifx6x60.h
similarity index 100%
rename from drivers/serial/ifx6x60.h
rename to drivers/tty/serial/ifx6x60.h
diff --git a/drivers/serial/imx.c b/drivers/tty/serial/imx.c
similarity index 100%
rename from drivers/serial/imx.c
rename to drivers/tty/serial/imx.c
diff --git a/drivers/serial/ioc3_serial.c b/drivers/tty/serial/ioc3_serial.c
similarity index 100%
rename from drivers/serial/ioc3_serial.c
rename to drivers/tty/serial/ioc3_serial.c
diff --git a/drivers/serial/ioc4_serial.c b/drivers/tty/serial/ioc4_serial.c
similarity index 100%
rename from drivers/serial/ioc4_serial.c
rename to drivers/tty/serial/ioc4_serial.c
diff --git a/drivers/serial/ip22zilog.c b/drivers/tty/serial/ip22zilog.c
similarity index 100%
rename from drivers/serial/ip22zilog.c
rename to drivers/tty/serial/ip22zilog.c
diff --git a/drivers/serial/ip22zilog.h b/drivers/tty/serial/ip22zilog.h
similarity index 100%
rename from drivers/serial/ip22zilog.h
rename to drivers/tty/serial/ip22zilog.h
diff --git a/drivers/serial/jsm/Makefile b/drivers/tty/serial/jsm/Makefile
similarity index 100%
rename from drivers/serial/jsm/Makefile
rename to drivers/tty/serial/jsm/Makefile
diff --git a/drivers/serial/jsm/jsm.h b/drivers/tty/serial/jsm/jsm.h
similarity index 100%
rename from drivers/serial/jsm/jsm.h
rename to drivers/tty/serial/jsm/jsm.h
diff --git a/drivers/serial/jsm/jsm_driver.c b/drivers/tty/serial/jsm/jsm_driver.c
similarity index 100%
rename from drivers/serial/jsm/jsm_driver.c
rename to drivers/tty/serial/jsm/jsm_driver.c
diff --git a/drivers/serial/jsm/jsm_neo.c b/drivers/tty/serial/jsm/jsm_neo.c
similarity index 100%
rename from drivers/serial/jsm/jsm_neo.c
rename to drivers/tty/serial/jsm/jsm_neo.c
diff --git a/drivers/serial/jsm/jsm_tty.c b/drivers/tty/serial/jsm/jsm_tty.c
similarity index 100%
rename from drivers/serial/jsm/jsm_tty.c
rename to drivers/tty/serial/jsm/jsm_tty.c
diff --git a/drivers/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
similarity index 100%
rename from drivers/serial/kgdboc.c
rename to drivers/tty/serial/kgdboc.c
diff --git a/drivers/serial/m32r_sio.c b/drivers/tty/serial/m32r_sio.c
similarity index 100%
rename from drivers/serial/m32r_sio.c
rename to drivers/tty/serial/m32r_sio.c
diff --git a/drivers/serial/m32r_sio.h b/drivers/tty/serial/m32r_sio.h
similarity index 100%
rename from drivers/serial/m32r_sio.h
rename to drivers/tty/serial/m32r_sio.h
diff --git a/drivers/serial/m32r_sio_reg.h b/drivers/tty/serial/m32r_sio_reg.h
similarity index 100%
rename from drivers/serial/m32r_sio_reg.h
rename to drivers/tty/serial/m32r_sio_reg.h
diff --git a/drivers/serial/max3100.c b/drivers/tty/serial/max3100.c
similarity index 100%
rename from drivers/serial/max3100.c
rename to drivers/tty/serial/max3100.c
diff --git a/drivers/serial/max3107-aava.c b/drivers/tty/serial/max3107-aava.c
similarity index 100%
rename from drivers/serial/max3107-aava.c
rename to drivers/tty/serial/max3107-aava.c
diff --git a/drivers/serial/max3107.c b/drivers/tty/serial/max3107.c
similarity index 100%
rename from drivers/serial/max3107.c
rename to drivers/tty/serial/max3107.c
diff --git a/drivers/serial/max3107.h b/drivers/tty/serial/max3107.h
similarity index 100%
rename from drivers/serial/max3107.h
rename to drivers/tty/serial/max3107.h
diff --git a/drivers/serial/mcf.c b/drivers/tty/serial/mcf.c
similarity index 100%
rename from drivers/serial/mcf.c
rename to drivers/tty/serial/mcf.c
diff --git a/drivers/serial/mfd.c b/drivers/tty/serial/mfd.c
similarity index 100%
rename from drivers/serial/mfd.c
rename to drivers/tty/serial/mfd.c
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/tty/serial/mpc52xx_uart.c
similarity index 100%
rename from drivers/serial/mpc52xx_uart.c
rename to drivers/tty/serial/mpc52xx_uart.c
diff --git a/drivers/serial/mpsc.c b/drivers/tty/serial/mpsc.c
similarity index 100%
rename from drivers/serial/mpsc.c
rename to drivers/tty/serial/mpsc.c
diff --git a/drivers/serial/mrst_max3110.c b/drivers/tty/serial/mrst_max3110.c
similarity index 100%
rename from drivers/serial/mrst_max3110.c
rename to drivers/tty/serial/mrst_max3110.c
diff --git a/drivers/serial/mrst_max3110.h b/drivers/tty/serial/mrst_max3110.h
similarity index 100%
rename from drivers/serial/mrst_max3110.h
rename to drivers/tty/serial/mrst_max3110.h
diff --git a/drivers/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
similarity index 100%
rename from drivers/serial/msm_serial.c
rename to drivers/tty/serial/msm_serial.c
diff --git a/drivers/serial/msm_serial.h b/drivers/tty/serial/msm_serial.h
similarity index 100%
rename from drivers/serial/msm_serial.h
rename to drivers/tty/serial/msm_serial.h
diff --git a/drivers/serial/mux.c b/drivers/tty/serial/mux.c
similarity index 100%
rename from drivers/serial/mux.c
rename to drivers/tty/serial/mux.c
diff --git a/drivers/serial/netx-serial.c b/drivers/tty/serial/netx-serial.c
similarity index 100%
rename from drivers/serial/netx-serial.c
rename to drivers/tty/serial/netx-serial.c
diff --git a/drivers/serial/nwpserial.c b/drivers/tty/serial/nwpserial.c
similarity index 100%
rename from drivers/serial/nwpserial.c
rename to drivers/tty/serial/nwpserial.c
diff --git a/drivers/serial/of_serial.c b/drivers/tty/serial/of_serial.c
similarity index 100%
rename from drivers/serial/of_serial.c
rename to drivers/tty/serial/of_serial.c
diff --git a/drivers/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
similarity index 100%
rename from drivers/serial/omap-serial.c
rename to drivers/tty/serial/omap-serial.c
diff --git a/drivers/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c
similarity index 100%
rename from drivers/serial/pch_uart.c
rename to drivers/tty/serial/pch_uart.c
diff --git a/drivers/serial/pmac_zilog.c b/drivers/tty/serial/pmac_zilog.c
similarity index 100%
rename from drivers/serial/pmac_zilog.c
rename to drivers/tty/serial/pmac_zilog.c
diff --git a/drivers/serial/pmac_zilog.h b/drivers/tty/serial/pmac_zilog.h
similarity index 100%
rename from drivers/serial/pmac_zilog.h
rename to drivers/tty/serial/pmac_zilog.h
diff --git a/drivers/serial/pnx8xxx_uart.c b/drivers/tty/serial/pnx8xxx_uart.c
similarity index 100%
rename from drivers/serial/pnx8xxx_uart.c
rename to drivers/tty/serial/pnx8xxx_uart.c
diff --git a/drivers/serial/pxa.c b/drivers/tty/serial/pxa.c
similarity index 100%
rename from drivers/serial/pxa.c
rename to drivers/tty/serial/pxa.c
diff --git a/drivers/serial/s3c2400.c b/drivers/tty/serial/s3c2400.c
similarity index 100%
rename from drivers/serial/s3c2400.c
rename to drivers/tty/serial/s3c2400.c
diff --git a/drivers/serial/s3c2410.c b/drivers/tty/serial/s3c2410.c
similarity index 100%
rename from drivers/serial/s3c2410.c
rename to drivers/tty/serial/s3c2410.c
diff --git a/drivers/serial/s3c2412.c b/drivers/tty/serial/s3c2412.c
similarity index 100%
rename from drivers/serial/s3c2412.c
rename to drivers/tty/serial/s3c2412.c
diff --git a/drivers/serial/s3c2440.c b/drivers/tty/serial/s3c2440.c
similarity index 100%
rename from drivers/serial/s3c2440.c
rename to drivers/tty/serial/s3c2440.c
diff --git a/drivers/serial/s3c24a0.c b/drivers/tty/serial/s3c24a0.c
similarity index 100%
rename from drivers/serial/s3c24a0.c
rename to drivers/tty/serial/s3c24a0.c
diff --git a/drivers/serial/s3c6400.c b/drivers/tty/serial/s3c6400.c
similarity index 100%
rename from drivers/serial/s3c6400.c
rename to drivers/tty/serial/s3c6400.c
diff --git a/drivers/serial/s5pv210.c b/drivers/tty/serial/s5pv210.c
similarity index 100%
rename from drivers/serial/s5pv210.c
rename to drivers/tty/serial/s5pv210.c
diff --git a/drivers/serial/sa1100.c b/drivers/tty/serial/sa1100.c
similarity index 100%
rename from drivers/serial/sa1100.c
rename to drivers/tty/serial/sa1100.c
diff --git a/drivers/serial/samsung.c b/drivers/tty/serial/samsung.c
similarity index 100%
rename from drivers/serial/samsung.c
rename to drivers/tty/serial/samsung.c
diff --git a/drivers/serial/samsung.h b/drivers/tty/serial/samsung.h
similarity index 100%
rename from drivers/serial/samsung.h
rename to drivers/tty/serial/samsung.h
diff --git a/drivers/serial/sb1250-duart.c b/drivers/tty/serial/sb1250-duart.c
similarity index 100%
rename from drivers/serial/sb1250-duart.c
rename to drivers/tty/serial/sb1250-duart.c
diff --git a/drivers/serial/sc26xx.c b/drivers/tty/serial/sc26xx.c
similarity index 100%
rename from drivers/serial/sc26xx.c
rename to drivers/tty/serial/sc26xx.c
diff --git a/drivers/serial/serial_core.c b/drivers/tty/serial/serial_core.c
similarity index 100%
rename from drivers/serial/serial_core.c
rename to drivers/tty/serial/serial_core.c
diff --git a/drivers/serial/serial_cs.c b/drivers/tty/serial/serial_cs.c
similarity index 100%
rename from drivers/serial/serial_cs.c
rename to drivers/tty/serial/serial_cs.c
diff --git a/drivers/serial/serial_ks8695.c b/drivers/tty/serial/serial_ks8695.c
similarity index 100%
rename from drivers/serial/serial_ks8695.c
rename to drivers/tty/serial/serial_ks8695.c
diff --git a/drivers/serial/serial_lh7a40x.c b/drivers/tty/serial/serial_lh7a40x.c
similarity index 100%
rename from drivers/serial/serial_lh7a40x.c
rename to drivers/tty/serial/serial_lh7a40x.c
diff --git a/drivers/serial/serial_txx9.c b/drivers/tty/serial/serial_txx9.c
similarity index 100%
rename from drivers/serial/serial_txx9.c
rename to drivers/tty/serial/serial_txx9.c
diff --git a/drivers/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
similarity index 100%
rename from drivers/serial/sh-sci.c
rename to drivers/tty/serial/sh-sci.c
diff --git a/drivers/serial/sh-sci.h b/drivers/tty/serial/sh-sci.h
similarity index 100%
rename from drivers/serial/sh-sci.h
rename to drivers/tty/serial/sh-sci.h
diff --git a/drivers/serial/sn_console.c b/drivers/tty/serial/sn_console.c
similarity index 100%
rename from drivers/serial/sn_console.c
rename to drivers/tty/serial/sn_console.c
diff --git a/drivers/serial/suncore.c b/drivers/tty/serial/suncore.c
similarity index 100%
rename from drivers/serial/suncore.c
rename to drivers/tty/serial/suncore.c
diff --git a/drivers/serial/suncore.h b/drivers/tty/serial/suncore.h
similarity index 100%
rename from drivers/serial/suncore.h
rename to drivers/tty/serial/suncore.h
diff --git a/drivers/serial/sunhv.c b/drivers/tty/serial/sunhv.c
similarity index 100%
rename from drivers/serial/sunhv.c
rename to drivers/tty/serial/sunhv.c
diff --git a/drivers/serial/sunsab.c b/drivers/tty/serial/sunsab.c
similarity index 100%
rename from drivers/serial/sunsab.c
rename to drivers/tty/serial/sunsab.c
diff --git a/drivers/serial/sunsab.h b/drivers/tty/serial/sunsab.h
similarity index 100%
rename from drivers/serial/sunsab.h
rename to drivers/tty/serial/sunsab.h
diff --git a/drivers/serial/sunsu.c b/drivers/tty/serial/sunsu.c
similarity index 100%
rename from drivers/serial/sunsu.c
rename to drivers/tty/serial/sunsu.c
diff --git a/drivers/serial/sunzilog.c b/drivers/tty/serial/sunzilog.c
similarity index 100%
rename from drivers/serial/sunzilog.c
rename to drivers/tty/serial/sunzilog.c
diff --git a/drivers/serial/sunzilog.h b/drivers/tty/serial/sunzilog.h
similarity index 100%
rename from drivers/serial/sunzilog.h
rename to drivers/tty/serial/sunzilog.h
diff --git a/drivers/serial/timbuart.c b/drivers/tty/serial/timbuart.c
similarity index 100%
rename from drivers/serial/timbuart.c
rename to drivers/tty/serial/timbuart.c
diff --git a/drivers/serial/timbuart.h b/drivers/tty/serial/timbuart.h
similarity index 100%
rename from drivers/serial/timbuart.h
rename to drivers/tty/serial/timbuart.h
diff --git a/drivers/serial/uartlite.c b/drivers/tty/serial/uartlite.c
similarity index 100%
rename from drivers/serial/uartlite.c
rename to drivers/tty/serial/uartlite.c
diff --git a/drivers/serial/ucc_uart.c b/drivers/tty/serial/ucc_uart.c
similarity index 100%
rename from drivers/serial/ucc_uart.c
rename to drivers/tty/serial/ucc_uart.c
diff --git a/drivers/serial/vr41xx_siu.c b/drivers/tty/serial/vr41xx_siu.c
similarity index 100%
rename from drivers/serial/vr41xx_siu.c
rename to drivers/tty/serial/vr41xx_siu.c
diff --git a/drivers/serial/vt8500_serial.c b/drivers/tty/serial/vt8500_serial.c
similarity index 100%
rename from drivers/serial/vt8500_serial.c
rename to drivers/tty/serial/vt8500_serial.c
diff --git a/drivers/serial/zs.c b/drivers/tty/serial/zs.c
similarity index 100%
rename from drivers/serial/zs.c
rename to drivers/tty/serial/zs.c
diff --git a/drivers/serial/zs.h b/drivers/tty/serial/zs.h
similarity index 100%
rename from drivers/serial/zs.h
rename to drivers/tty/serial/zs.h
--
1.7.1
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [PATCH 2/3] tty: move drivers/serial/ to drivers/tty/serial/
2011-01-20 18:03 ` [PATCH 2/3] tty: move drivers/serial/ to drivers/tty/serial/ Greg Kroah-Hartman
@ 2011-01-20 18:27 ` Arnd Bergmann
0 siblings, 0 replies; 22+ messages in thread
From: Arnd Bergmann @ 2011-01-20 18:27 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: linux-kernel, Alan Cox, Geert Uytterhoeven, Rogier Wolff,
Michael H. Warfield
On Thursday 20 January 2011 19:03:44 Greg Kroah-Hartman wrote:
> The serial drivers are really just tty drivers, so move them to
> drivers/tty/ to make things a bit neater overall.
>
> This is part of the tty/serial driver movement proceedure as proposed by
> Arnd Bergmann and approved by everyone involved a number of months ago.
>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
> Cc: Geert Uytterhoeven <geert@linux-m68k.org>
> Cc: Rogier Wolff <R.E.Wolff@bitwizard.nl>
> Cc: Michael H. Warfield <mhw@wittsend.com>
> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 3/3] tty: update MAINTAINERS file due to driver movement
2011-01-20 17:49 [GIT PATCH] TTY/serial driver movement for .38 Greg KH
2011-01-20 18:03 ` [PATCH 1/3] tty: move hvc drivers to drivers/tty/hvc/ Greg Kroah-Hartman
2011-01-20 18:03 ` [PATCH 2/3] tty: move drivers/serial/ to drivers/tty/serial/ Greg Kroah-Hartman
@ 2011-01-20 18:03 ` Greg Kroah-Hartman
2011-01-20 18:32 ` [GIT PATCH] TTY/serial driver movement for .38 Arnd Bergmann
3 siblings, 0 replies; 22+ messages in thread
From: Greg Kroah-Hartman @ 2011-01-20 18:03 UTC (permalink / raw)
To: linux-kernel; +Cc: Greg Kroah-Hartman
This fixes up the MAINTAINERS file due to moving the serial
drivers to the drivers/tty/ directory.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
MAINTAINERS | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 78162c4..fd05bb7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -162,7 +162,7 @@ L: linux-serial@vger.kernel.org
W: http://serial.sourceforge.net
S: Maintained
T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git
-F: drivers/serial/8250*
+F: drivers/tty/serial/8250*
F: include/linux/serial_8250.h
8390 NETWORK DRIVERS [WD80x3/SMC-ELITE, SMC-ULTRA, NE2000, 3C503, etc.]
@@ -888,8 +888,8 @@ F: arch/arm/mach-msm/
F: drivers/video/msm/
F: drivers/mmc/host/msm_sdcc.c
F: drivers/mmc/host/msm_sdcc.h
-F: drivers/serial/msm_serial.h
-F: drivers/serial/msm_serial.c
+F: drivers/tty/serial/msm_serial.h
+F: drivers/tty/serial/msm_serial.c
T: git git://codeaurora.org/quic/kernel/davidb/linux-msm.git
S: Maintained
@@ -1256,7 +1256,7 @@ F: drivers/mmc/host/atmel-mci-regs.h
ATMEL AT91 / AT32 SERIAL DRIVER
M: Nicolas Ferre <nicolas.ferre@atmel.com>
S: Supported
-F: drivers/serial/atmel_serial.c
+F: drivers/tty/serial/atmel_serial.c
ATMEL LCDFB DRIVER
M: Nicolas Ferre <nicolas.ferre@atmel.com>
@@ -1412,7 +1412,7 @@ M: Sonic Zhang <sonic.zhang@analog.com>
L: uclinux-dist-devel@blackfin.uclinux.org
W: http://blackfin.uclinux.org
S: Supported
-F: drivers/serial/bfin_5xx.c
+F: drivers/tty/serial/bfin_5xx.c
BLACKFIN WATCHDOG DRIVER
M: Mike Frysinger <vapier.adi@gmail.com>
@@ -1862,7 +1862,7 @@ L: linux-cris-kernel@axis.com
W: http://developer.axis.com
S: Maintained
F: arch/cris/
-F: drivers/serial/crisv10.*
+F: drivers/tty/serial/crisv10.*
CRYPTO API
M: Herbert Xu <herbert@gondor.apana.org.au>
@@ -2201,7 +2201,7 @@ F: drivers/net/wan/dscc4.c
DZ DECSTATION DZ11 SERIAL DRIVER
M: "Maciej W. Rozycki" <macro@linux-mips.org>
S: Maintained
-F: drivers/serial/dz.*
+F: drivers/tty/serial/dz.*
EATA-DMA SCSI DRIVER
M: Michael Neuffer <mike@i-Connect.Net>
@@ -2621,7 +2621,7 @@ FREESCALE QUICC ENGINE UCC UART DRIVER
M: Timur Tabi <timur@freescale.com>
L: linuxppc-dev@lists.ozlabs.org
S: Supported
-F: drivers/serial/ucc_uart.c
+F: drivers/tty/serial/ucc_uart.c
FREESCALE SOC SOUND DRIVERS
M: Timur Tabi <timur@freescale.com>
@@ -3328,7 +3328,7 @@ IOC3 SERIAL DRIVER
M: Pat Gefre <pfg@sgi.com>
L: linux-serial@vger.kernel.org
S: Maintained
-F: drivers/serial/ioc3_serial.c
+F: drivers/tty/serial/ioc3_serial.c
IP MASQUERADING
M: Juanjo Ciarlante <jjciarla@raiz.uncu.edu.ar>
@@ -3505,7 +3505,7 @@ JSM Neo PCI based serial card
M: Breno Leitao <leitao@linux.vnet.ibm.com>
L: linux-serial@vger.kernel.org
S: Maintained
-F: drivers/serial/jsm/
+F: drivers/tty/serial/jsm/
K8TEMP HARDWARE MONITORING DRIVER
M: Rudolf Marek <r.marek@assembler.cz>
@@ -3648,7 +3648,7 @@ L: kgdb-bugreport@lists.sourceforge.net
S: Maintained
F: Documentation/DocBook/kgdb.tmpl
F: drivers/misc/kgdbts.c
-F: drivers/serial/kgdboc.c
+F: drivers/tty/serial/kgdboc.c
F: include/linux/kdb.h
F: include/linux/kgdb.h
F: kernel/debug/
@@ -5510,7 +5510,7 @@ M: Pat Gefre <pfg@sgi.com>
L: linux-ia64@vger.kernel.org
S: Supported
F: Documentation/ia64/serial.txt
-F: drivers/serial/ioc?_serial.c
+F: drivers/tty/serial/ioc?_serial.c
F: include/linux/ioc?.h
SGI VISUAL WORKSTATION 320 AND 540
@@ -5532,7 +5532,7 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained
F: Documentation/arm/Sharp-LH/ADC-LH7-Touchscreen
F: arch/arm/mach-lh7a40x/
-F: drivers/serial/serial_lh7a40x.c
+F: drivers/tty/serial/serial_lh7a40x.c
F: drivers/usb/gadget/lh7a40*
F: drivers/usb/host/ohci-lh7a40*
@@ -5752,14 +5752,14 @@ L: sparclinux@vger.kernel.org
T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git
T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git
S: Maintained
-F: drivers/serial/suncore.c
-F: drivers/serial/suncore.h
-F: drivers/serial/sunhv.c
-F: drivers/serial/sunsab.c
-F: drivers/serial/sunsab.h
-F: drivers/serial/sunsu.c
-F: drivers/serial/sunzilog.c
-F: drivers/serial/sunzilog.h
+F: drivers/tty/serial/suncore.c
+F: drivers/tty/serial/suncore.h
+F: drivers/tty/serial/sunhv.c
+F: drivers/tty/serial/sunsab.c
+F: drivers/tty/serial/sunsab.h
+F: drivers/tty/serial/sunsu.c
+F: drivers/tty/serial/sunzilog.c
+F: drivers/tty/serial/sunzilog.h
SPEAR PLATFORM SUPPORT
M: Viresh Kumar <viresh.kumar@st.com>
@@ -6089,8 +6089,8 @@ TTY LAYER
M: Greg Kroah-Hartman <gregkh@suse.de>
S: Maintained
T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git
-F: drivers/char/tty_*
-F: drivers/serial/serial_core.c
+F: drivers/tty/*
+F: drivers/tty/serial/serial_core.c
F: include/linux/serial_core.h
F: include/linux/serial.h
F: include/linux/tty.h
@@ -6829,7 +6829,7 @@ XILINX UARTLITE SERIAL DRIVER
M: Peter Korsgaard <jacmet@sunsite.dk>
L: linux-serial@vger.kernel.org
S: Maintained
-F: drivers/serial/uartlite.c
+F: drivers/tty/serial/uartlite.c
YAM DRIVER FOR AX.25
M: Jean-Paul Roubelat <jpr@f6fbb.org>
@@ -6875,7 +6875,7 @@ F: drivers/media/video/zoran/
ZS DECSTATION Z85C30 SERIAL DRIVER
M: "Maciej W. Rozycki" <macro@linux-mips.org>
S: Maintained
-F: drivers/serial/zs.*
+F: drivers/tty/serial/zs.*
GRE DEMULTIPLEXER DRIVER
M: Dmitry Kozlov <xeb@mail.ru>
--
1.7.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [GIT PATCH] TTY/serial driver movement for .38
2011-01-20 17:49 [GIT PATCH] TTY/serial driver movement for .38 Greg KH
` (2 preceding siblings ...)
2011-01-20 18:03 ` [PATCH 3/3] tty: update MAINTAINERS file due to driver movement Greg Kroah-Hartman
@ 2011-01-20 18:32 ` Arnd Bergmann
2011-01-20 18:48 ` Greg KH
2011-01-20 19:45 ` Alan Cox
3 siblings, 2 replies; 22+ messages in thread
From: Arnd Bergmann @ 2011-01-20 18:32 UTC (permalink / raw)
To: Greg KH; +Cc: Linus Torvalds, Andrew Morton, linux-kernel
On Thursday 20 January 2011 18:49:10 Greg KH wrote:
> As mentioned before in previous TTY git pull for .38, here's the big
> movement of the serial drivers into the drivers/tty/ subdirectory that
> needed to wait until after .38-rc1 was out.
>
> It merely moves the hvc drivers to drivers/tty/hvc/ and the
> drivers/serial/ directory to drivers/tty/serial/ and fixes up the
> MAINTAINERS file to point to the proper locations of the files now that
> they have been moved.
Hi Greg,
Thanks for following up on this!
I noticed that this moves the majority of all the tty drivers, but not
the serial drivers from the drivers/char directory as my original patch
series did. Is that something you still plan to do, or would you like
me to respin that part of my patches for the next merge window?
Arnd
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [GIT PATCH] TTY/serial driver movement for .38
2011-01-20 18:32 ` [GIT PATCH] TTY/serial driver movement for .38 Arnd Bergmann
@ 2011-01-20 18:48 ` Greg KH
2011-01-20 19:45 ` Alan Cox
1 sibling, 0 replies; 22+ messages in thread
From: Greg KH @ 2011-01-20 18:48 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: Linus Torvalds, Andrew Morton, linux-kernel
On Thu, Jan 20, 2011 at 07:32:51PM +0100, Arnd Bergmann wrote:
> On Thursday 20 January 2011 18:49:10 Greg KH wrote:
> > As mentioned before in previous TTY git pull for .38, here's the big
> > movement of the serial drivers into the drivers/tty/ subdirectory that
> > needed to wait until after .38-rc1 was out.
> >
> > It merely moves the hvc drivers to drivers/tty/hvc/ and the
> > drivers/serial/ directory to drivers/tty/serial/ and fixes up the
> > MAINTAINERS file to point to the proper locations of the files now that
> > they have been moved.
>
> Hi Greg,
>
> Thanks for following up on this!
>
> I noticed that this moves the majority of all the tty drivers, but not
> the serial drivers from the drivers/char directory as my original patch
> series did. Is that something you still plan to do, or would you like
> me to respin that part of my patches for the next merge window?
I was going to do that for the next set of patches, for .39. I will be
moving some of the drivers into the staging tree as well, as was
discussed. I figured it was better to move things slower, making merges
from other trees easier, than to do it in all one big jump.
I still have your original patch series here which is what I am working
off of, so don't worry, it's not forgotten :)
thanks,
greg k-h
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [GIT PATCH] TTY/serial driver movement for .38
2011-01-20 18:32 ` [GIT PATCH] TTY/serial driver movement for .38 Arnd Bergmann
2011-01-20 18:48 ` Greg KH
@ 2011-01-20 19:45 ` Alan Cox
2011-01-20 20:23 ` Greg KH
1 sibling, 1 reply; 22+ messages in thread
From: Alan Cox @ 2011-01-20 19:45 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: Greg KH, Linus Torvalds, Andrew Morton, linux-kernel
> I noticed that this moves the majority of all the tty drivers, but not
> the serial drivers from the drivers/char directory as my original patch
> series did. Is that something you still plan to do, or would you like
> me to respin that part of my patches for the next merge window?
Please keep the drivers/char ones in another directory. The "serial"
directory is those using the serial_core, plus a pair of old m68k things
that want deleting anyway.
How about drivers/tty/misc for the char ones ?
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [GIT PATCH] TTY/serial driver movement for .38
2011-01-20 19:45 ` Alan Cox
@ 2011-01-20 20:23 ` Greg KH
0 siblings, 0 replies; 22+ messages in thread
From: Greg KH @ 2011-01-20 20:23 UTC (permalink / raw)
To: Alan Cox; +Cc: Arnd Bergmann, Linus Torvalds, Andrew Morton, linux-kernel
On Thu, Jan 20, 2011 at 07:45:10PM +0000, Alan Cox wrote:
> > I noticed that this moves the majority of all the tty drivers, but not
> > the serial drivers from the drivers/char directory as my original patch
> > series did. Is that something you still plan to do, or would you like
> > me to respin that part of my patches for the next merge window?
>
> Please keep the drivers/char ones in another directory. The "serial"
> directory is those using the serial_core, plus a pair of old m68k things
> that want deleting anyway.
>
> How about drivers/tty/misc for the char ones ?
That's fine with me. I'll do the movement in a few weeks.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 22+ messages in thread