On 01/06/2012 12:21 AM, Paul Gortmaker wrote:
> --- /dev/null
> +++ b/drivers/tty/serial/8250/Makefile
> @@ -0,0 +1,20 @@
> +#
> +# Makefile for the 8250 serial device drivers.
> +#
> +
> +obj-$(CONFIG_SERIAL_8250) += 8250.o
> +obj-$(CONFIG_SERIAL_8250_PNP) += 8250_pnp.o
> +obj-$(CONFIG_SERIAL_8250_GSC) += 8250_gsc.o
> +obj-$(CONFIG_SERIAL_8250_PCI) += 8250_pci.o
> +obj-$(CONFIG_SERIAL_8250_HP300) += 8250_hp300.o
> +obj-$(CONFIG_SERIAL_8250_CS) += serial_cs.o
> +obj-$(CONFIG_SERIAL_8250_ACORN) += 8250_acorn.o
> +obj-$(CONFIG_SERIAL_8250_CONSOLE) += 8250_early.o
> +obj-$(CONFIG_SERIAL_8250_FOURPORT) += 8250_fourport.o
> +obj-$(CONFIG_SERIAL_8250_ACCENT) += 8250_accent.o
> +obj-$(CONFIG_SERIAL_8250_BOCA) += 8250_boca.o
> +obj-$(CONFIG_SERIAL_8250_EXAR_ST16C554) += 8250_exar_st16c554.o
> +obj-$(CONFIG_SERIAL_8250_HUB6) += 8250_hub6.o
> +obj-$(CONFIG_SERIAL_8250_MCA) += 8250_mca.o
> +obj-$(CONFIG_SERIAL_8250_FSL) += 8250_fsl.o
> +obj-$(CONFIG_SERIAL_8250_DW) += 8250_dw.o
...
> diff --git a/drivers/tty/serial/m32r_sio.c b/drivers/tty/serial/8250/m32r_sio.c
> similarity index 100%
> rename from drivers/tty/serial/m32r_sio.c
> rename to drivers/tty/serial/8250/m32r_sio.c
> diff --git a/drivers/tty/serial/m32r_sio.h b/drivers/tty/serial/8250/m32r_sio.h
> similarity index 100%
> rename from drivers/tty/serial/m32r_sio.h
> rename to drivers/tty/serial/8250/m32r_sio.h
> diff --git a/drivers/tty/serial/m32r_sio_reg.h b/drivers/tty/serial/8250/m32r_sio_reg.h
> similarity index 100%
> rename from drivers/tty/serial/m32r_sio_reg.h
> rename to drivers/tty/serial/8250/m32r_sio_reg.h
Hmm, these cannot be built now :(. Why did you move them?
It looks like they should be moved back.
regards,
--
js
Damnit! They didn't manage to forward Greg's email. What a crap.
On 02/08/2012 11:30 AM, Jiri Slaby wrote:
> On 01/06/2012 12:21 AM, Paul Gortmaker wrote:
>> --- /dev/null
>> +++ b/drivers/tty/serial/8250/Makefile
>> @@ -0,0 +1,20 @@
>> +#
>> +# Makefile for the 8250 serial device drivers.
>> +#
>> +
>> +obj-$(CONFIG_SERIAL_8250) += 8250.o
>> +obj-$(CONFIG_SERIAL_8250_PNP) += 8250_pnp.o
>> +obj-$(CONFIG_SERIAL_8250_GSC) += 8250_gsc.o
>> +obj-$(CONFIG_SERIAL_8250_PCI) += 8250_pci.o
>> +obj-$(CONFIG_SERIAL_8250_HP300) += 8250_hp300.o
>> +obj-$(CONFIG_SERIAL_8250_CS) += serial_cs.o
>> +obj-$(CONFIG_SERIAL_8250_ACORN) += 8250_acorn.o
>> +obj-$(CONFIG_SERIAL_8250_CONSOLE) += 8250_early.o
>> +obj-$(CONFIG_SERIAL_8250_FOURPORT) += 8250_fourport.o
>> +obj-$(CONFIG_SERIAL_8250_ACCENT) += 8250_accent.o
>> +obj-$(CONFIG_SERIAL_8250_BOCA) += 8250_boca.o
>> +obj-$(CONFIG_SERIAL_8250_EXAR_ST16C554) += 8250_exar_st16c554.o
>> +obj-$(CONFIG_SERIAL_8250_HUB6) += 8250_hub6.o
>> +obj-$(CONFIG_SERIAL_8250_MCA) += 8250_mca.o
>> +obj-$(CONFIG_SERIAL_8250_FSL) += 8250_fsl.o
>> +obj-$(CONFIG_SERIAL_8250_DW) += 8250_dw.o
>
> ...
>
>> diff --git a/drivers/tty/serial/m32r_sio.c b/drivers/tty/serial/8250/m32r_sio.c
>> similarity index 100%
>> rename from drivers/tty/serial/m32r_sio.c
>> rename to drivers/tty/serial/8250/m32r_sio.c
>> diff --git a/drivers/tty/serial/m32r_sio.h b/drivers/tty/serial/8250/m32r_sio.h
>> similarity index 100%
>> rename from drivers/tty/serial/m32r_sio.h
>> rename to drivers/tty/serial/8250/m32r_sio.h
>> diff --git a/drivers/tty/serial/m32r_sio_reg.h b/drivers/tty/serial/8250/m32r_sio_reg.h
>> similarity index 100%
>> rename from drivers/tty/serial/m32r_sio_reg.h
>> rename to drivers/tty/serial/8250/m32r_sio_reg.h
>
> Hmm, these cannot be built now :(. Why did you move them?
>
> It looks like they should be moved back.
>
> regards,
--
js
On 12-02-08 05:32 AM, Jiri Slaby wrote:
> Damnit! They didn't manage to forward Greg's email. What a crap.
>
> On 02/08/2012 11:30 AM, Jiri Slaby wrote:
>> On 01/06/2012 12:21 AM, Paul Gortmaker wrote:
>>> --- /dev/null
>>> +++ b/drivers/tty/serial/8250/Makefile
>>> @@ -0,0 +1,20 @@
>>> +#
>>> +# Makefile for the 8250 serial device drivers.
>>> +#
>>> +
>>> +obj-$(CONFIG_SERIAL_8250) += 8250.o
>>> +obj-$(CONFIG_SERIAL_8250_PNP) += 8250_pnp.o
>>> +obj-$(CONFIG_SERIAL_8250_GSC) += 8250_gsc.o
>>> +obj-$(CONFIG_SERIAL_8250_PCI) += 8250_pci.o
>>> +obj-$(CONFIG_SERIAL_8250_HP300) += 8250_hp300.o
>>> +obj-$(CONFIG_SERIAL_8250_CS) += serial_cs.o
>>> +obj-$(CONFIG_SERIAL_8250_ACORN) += 8250_acorn.o
>>> +obj-$(CONFIG_SERIAL_8250_CONSOLE) += 8250_early.o
>>> +obj-$(CONFIG_SERIAL_8250_FOURPORT) += 8250_fourport.o
>>> +obj-$(CONFIG_SERIAL_8250_ACCENT) += 8250_accent.o
>>> +obj-$(CONFIG_SERIAL_8250_BOCA) += 8250_boca.o
>>> +obj-$(CONFIG_SERIAL_8250_EXAR_ST16C554) += 8250_exar_st16c554.o
>>> +obj-$(CONFIG_SERIAL_8250_HUB6) += 8250_hub6.o
>>> +obj-$(CONFIG_SERIAL_8250_MCA) += 8250_mca.o
>>> +obj-$(CONFIG_SERIAL_8250_FSL) += 8250_fsl.o
>>> +obj-$(CONFIG_SERIAL_8250_DW) += 8250_dw.o
>>
>> ...
>>
>>> diff --git a/drivers/tty/serial/m32r_sio.c b/drivers/tty/serial/8250/m32r_sio.c
>>> similarity index 100%
>>> rename from drivers/tty/serial/m32r_sio.c
>>> rename to drivers/tty/serial/8250/m32r_sio.c
>>> diff --git a/drivers/tty/serial/m32r_sio.h b/drivers/tty/serial/8250/m32r_sio.h
>>> similarity index 100%
>>> rename from drivers/tty/serial/m32r_sio.h
>>> rename to drivers/tty/serial/8250/m32r_sio.h
>>> diff --git a/drivers/tty/serial/m32r_sio_reg.h b/drivers/tty/serial/8250/m32r_sio_reg.h
>>> similarity index 100%
>>> rename from drivers/tty/serial/m32r_sio_reg.h
>>> rename to drivers/tty/serial/8250/m32r_sio_reg.h
>>
>> Hmm, these cannot be built now :(. Why did you move them?
As near as I can tell, I think I got misled by the comment
in the m32r register file:
* These are the UART port assignments, expressed as offsets from the base
* register. These assignments should hold for any serial port based on
* a 8250, 16450, or 16550(A).
But you are right, they should not have been caught up
in the move. I'll send a fix... Sorry about the hassle.
P.
>>
>> It looks like they should be moved back.
>>
>> regards,
[Re: [PATCH] serial: relocate remaining serial drivers from tty/ to tty/serial/] On 08/02/2012 (Wed 11:32) Jiri Slaby wrote:
>
> Hmm, these cannot be built now :(. Why did you move them?
>
> It looks like they should be moved back.
Once again, sorry for the brown paper bag moment. :(
Greg, can you ensure this gets applied at your earliest convenience?
Thanks a lot.
Paul.
---
>From 309293f382ce9beef6d8a0fd8b3cedc9900f66e1 Mon Sep 17 00:00:00 2001
From: Paul Gortmaker <[email protected]>
Date: Wed, 8 Feb 2012 09:05:42 -0500
Subject: [PATCH] m32r: relocate drivers back out of 8250 dir
Commit 9bef3d4197379a995fa80f81950bbbf8d32e9e8b
"serial: group all the 8250 related code together"
inadvertently swept up the m32r driver in the move, because
it had comments mentioning 8250 registers within it. However
these are only there by nature of the driver being based off
the 8250 source code -- the hardware itself does not actually
have any relation to the original 8250 style UARTs.
Signed-off-by: Paul Gortmaker <[email protected]>
---
drivers/tty/serial/{8250 => }/m32r_sio.c | 0
drivers/tty/serial/{8250 => }/m32r_sio.h | 0
drivers/tty/serial/{8250 => }/m32r_sio_reg.h | 0
3 files changed, 0 insertions(+), 0 deletions(-)
rename drivers/tty/serial/{8250 => }/m32r_sio.c (100%)
rename drivers/tty/serial/{8250 => }/m32r_sio.h (100%)
rename drivers/tty/serial/{8250 => }/m32r_sio_reg.h (100%)
diff --git a/drivers/tty/serial/8250/m32r_sio.c b/drivers/tty/serial/m32r_sio.c
similarity index 100%
rename from drivers/tty/serial/8250/m32r_sio.c
rename to drivers/tty/serial/m32r_sio.c
diff --git a/drivers/tty/serial/8250/m32r_sio.h b/drivers/tty/serial/m32r_sio.h
similarity index 100%
rename from drivers/tty/serial/8250/m32r_sio.h
rename to drivers/tty/serial/m32r_sio.h
diff --git a/drivers/tty/serial/8250/m32r_sio_reg.h b/drivers/tty/serial/m32r_sio_reg.h
similarity index 100%
rename from drivers/tty/serial/8250/m32r_sio_reg.h
rename to drivers/tty/serial/m32r_sio_reg.h
--
1.7.9