central mailinglist for m68k linux kernel development ()

gerg | 25 Jun 2012 03:29

[PATCH 0/2] m68k/net: add support for NS8390 based eth controllers on some ColdFire boards


I have broken up the NS8390 support for ColdFire boards into 2 patches.
The first is the net support side of it, and the other is the ColdFire
platform support.

If no-one has any comments then I'll send the first patch onto the net list
for review. I'll add the second platform patch to the m68knommu git tree
for-next branch.

headers

gerg | 25 Jun 2012 03:29

[PATCH 2/2] m68knommu: platform support for 8390 based ethernet used on some boards

From: Greg Ungerer <gerg <at> uclinux.org>

Quite a few of Freescale's older ColdFire development boards used an NS8390
based ethernet interface. Add a platform definition for the resources used
by these devices so we can use it on these older boards.

Signed-off-by: Greg Ungerer <gerg <at> uclinux.org>
---
 arch/m68k/platform/coldfire/Makefile  |    1 +
 arch/m68k/platform/coldfire/mcf8390.c |   38 +++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 0 deletions(-)
 create mode 100644 arch/m68k/platform/coldfire/mcf8390.c

diff --git a/arch/m68k/platform/coldfire/Makefile b/arch/m68k/platform/coldfire/Makefile
index 76d389d..e62de37 100644
--- a/arch/m68k/platform/coldfire/Makefile
+++ b/arch/m68k/platform/coldfire/Makefile
 <at>  <at>  -31,6 +31,7  <at>  <at>  obj-$(CONFIG_M54xx)	+= m54xx.o sltimers.o intc-2.o
 obj-$(CONFIG_NETtel)	+= nettel.o
 obj-$(CONFIG_CLEOPATRA)	+= nettel.o
 obj-$(CONFIG_FIREBEE)	+= firebee.o
+obj-$(CONFIG_MCF8390)	+= mcf8390.o

 obj-y			+= pinmux.o gpio.o
 extra-y := head.o
diff --git a/arch/m68k/platform/coldfire/mcf8390.c b/arch/m68k/platform/coldfire/mcf8390.c
new file mode 100644
index 0000000..6db9213
--- /dev/null
+++ b/arch/m68k/platform/coldfire/mcf8390.c

(Continue reading)

headers

gerg | 25 Jun 2012 03:29

[PATCH 1/2] net: add support for NS8390 based eth controllers on some ColdFire boards

From: Greg Ungerer <gerg <at> uclinux.org>

A number of older ColdFire based boards use NS8390 based network controllers.
Most use the Davicom 9008F or the UMC 9008F. This driver provides the support
code to get these devices working on these platforms.

The way these devices are wired up to the ColdFire bus is similar but not
completely identical on the various boards. Most use a special region to
access odd register addresses, and still provide for both 8bit and 16bit
accesses. But a couple do have a more advanced hardware decode and use direct
mapping of all registers. It is easy enough to handle all the access
variations in one driver though.

Signed-off-by: Greg Ungerer <gerg <at> uclinux.org>
---
 arch/m68k/include/asm/mcfne.h       |  129 +---------
 drivers/net/ethernet/8390/Kconfig   |   14 +
 drivers/net/ethernet/8390/Makefile  |    1 +
 drivers/net/ethernet/8390/mcf8390.c |  477 +++++++++++++++++++++++++++++++++++
 4 files changed, 501 insertions(+), 120 deletions(-)
 create mode 100644 drivers/net/ethernet/8390/mcf8390.c

diff --git a/arch/m68k/include/asm/mcfne.h b/arch/m68k/include/asm/mcfne.h
index bf638be..f5760b1 100644
--- a/arch/m68k/include/asm/mcfne.h
+++ b/arch/m68k/include/asm/mcfne.h
 <at>  <at>  -37,6 +37,7  <at>  <at> 
 #if defined(CONFIG_ARN5206)
 #define NE2000_ADDR		0x40000300
 #define NE2000_ODDOFFSET	0x00010000

(Continue reading)

headers

Geert Uytterhoeven | 25 Jun 2012 09:59

Re: [PATCH 1/2] net: add support for NS8390 based eth controllers on some ColdFire boards

On Mon, Jun 25, 2012 at 3:29 AM,  <gerg <at> snapgear.com> wrote:
>  arch/m68k/include/asm/mcfne.h       |  129 +---------

mcf8390.h?
mcfne.h is queued for removal.

>  drivers/net/ethernet/8390/Kconfig   |   14 +
>  drivers/net/ethernet/8390/Makefile  |    1 +
>  drivers/net/ethernet/8390/mcf8390.c |  477 +++++++++++++++++++++++++++++++++++

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert <at> linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

headers

Greg Ungerer | 26 Jun 2012 07:16

Re: [PATCH 1/2] net: add support for NS8390 based eth controllers on some ColdFire boards

Hi Geert,

On 06/25/2012 05:59 PM, Geert Uytterhoeven wrote:
> On Mon, Jun 25, 2012 at 3:29 AM,<gerg <at> snapgear.com>  wrote:
>>   arch/m68k/include/asm/mcfne.h       |  129 +---------
>
> mcf8390.h?
> mcfne.h is queued for removal.

I was trying to save it 
Do you think I should just silently move the modified mcfne.h
to a mcf8390.h?

Regards
Greg

>>   drivers/net/ethernet/8390/Kconfig   |   14 +
>>   drivers/net/ethernet/8390/Makefile  |    1 +
>>   drivers/net/ethernet/8390/mcf8390.c |  477 +++++++++++++++++++++++++++++++++++
>
> Gr{oetje,eeting}s,
>
>                          Geert
>
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert <at> linux-m68k.org
>
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like that.
>                                  -- Linus Torvalds

(Continue reading)

headers

Geert Uytterhoeven | 26 Jun 2012 09:47

Re: [PATCH 1/2] net: add support for NS8390 based eth controllers on some ColdFire boards

On Tue, Jun 26, 2012 at 7:16 AM, Greg Ungerer <gerg <at> snapgear.com> wrote:
> On 06/25/2012 05:59 PM, Geert Uytterhoeven wrote:
>> On Mon, Jun 25, 2012 at 3:29 AM,<gerg <at> snapgear.com>  wrote:
>>>
>>>  arch/m68k/include/asm/mcfne.h       |  129 +---------
>>
>> mcf8390.h?
>> mcfne.h is queued for removal.
>
> I was trying to save it 
> Do you think I should just silently move the modified mcfne.h
> to a mcf8390.h?

Sure. Why not?

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert <at> linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

headers

Greg Ungerer | 26 Jun 2012 11:57

Re: [PATCH 1/2] net: add support for NS8390 based eth controllers on some ColdFire boards

On 06/26/2012 05:47 PM, Geert Uytterhoeven wrote:
> On Tue, Jun 26, 2012 at 7:16 AM, Greg Ungerer<gerg <at> snapgear.com>  wrote:
>> On 06/25/2012 05:59 PM, Geert Uytterhoeven wrote:
>>> On Mon, Jun 25, 2012 at 3:29 AM,<gerg <at> snapgear.com>    wrote:
>>>>
>>>>   arch/m68k/include/asm/mcfne.h       |  129 +---------
>>>
>>> mcf8390.h?
>>> mcfne.h is queued for removal.
>>
>> I was trying to save it 
>> Do you think I should just silently move the modified mcfne.h
>> to a mcf8390.h?
>
> Sure. Why not?

We lose any git history linking the original and new file.

Regards
Greg

------------------------------------------------------------------------
Greg Ungerer  --  Principal Engineer        EMAIL:     gerg <at> snapgear.com
SnapGear Group, McAfee                      PHONE:       +61 7 3435 2888
8 Gardner Close,                            FAX:         +61 7 3891 3630
Milton, QLD, 4064, Australia                WEB: http://www.SnapGear.com

headers

Geert Uytterhoeven | 26 Jun 2012 12:03

Re: [PATCH 1/2] net: add support for NS8390 based eth controllers on some ColdFire boards

On Tue, Jun 26, 2012 at 11:57 AM, Greg Ungerer <gerg <at> snapgear.com> wrote:
> On 06/26/2012 05:47 PM, Geert Uytterhoeven wrote:
>> On Tue, Jun 26, 2012 at 7:16 AM, Greg Ungerer<gerg <at> snapgear.com>  wrote:
>>> On 06/25/2012 05:59 PM, Geert Uytterhoeven wrote:
>>>> On Mon, Jun 25, 2012 at 3:29 AM,<gerg <at> snapgear.com>    wrote:
>>>>>
>>>>>  arch/m68k/include/asm/mcfne.h       |  129 +---------
>>>>
>>>> mcf8390.h?
>>>> mcfne.h is queued for removal.
>>>
>>> I was trying to save it 
>>> Do you think I should just silently move the modified mcfne.h
>>> to a mcf8390.h?
>>
>> Sure. Why not?
>
> We lose any git history linking the original and new file.

Your commit renaming-and-modifying it will provide the link?

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert <at> linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.

(Continue reading)

headers

Greg Ungerer | 26 Jun 2012 12:14

Re: [PATCH 1/2] net: add support for NS8390 based eth controllers on some ColdFire boards

On 06/26/2012 08:03 PM, Geert Uytterhoeven wrote:
> On Tue, Jun 26, 2012 at 11:57 AM, Greg Ungerer<gerg <at> snapgear.com>  wrote:
>> On 06/26/2012 05:47 PM, Geert Uytterhoeven wrote:
>>> On Tue, Jun 26, 2012 at 7:16 AM, Greg Ungerer<gerg <at> snapgear.com>    wrote:
>>>> On 06/25/2012 05:59 PM, Geert Uytterhoeven wrote:
>>>>> On Mon, Jun 25, 2012 at 3:29 AM,<gerg <at> snapgear.com>      wrote:
>>>>>>
>>>>>>   arch/m68k/include/asm/mcfne.h       |  129 +---------
>>>>>
>>>>> mcf8390.h?
>>>>> mcfne.h is queued for removal.
>>>>
>>>> I was trying to save it 
>>>> Do you think I should just silently move the modified mcfne.h
>>>> to a mcf8390.h?
>>>
>>> Sure. Why not?
>>
>> We lose any git history linking the original and new file.
>
> Your commit renaming-and-modifying it will provide the link?

I would normally do that with a "git mv". But isn't that going to
clash with your "git rm"?  Or am I mis-understanding what you mean?

Regards
Greg

--

-- 
------------------------------------------------------------------------

(Continue reading)

headers

Geert Uytterhoeven | 26 Jun 2012 13:03

Re: [PATCH 1/2] net: add support for NS8390 based eth controllers on some ColdFire boards

Hi Greg,

On Tue, Jun 26, 2012 at 12:14 PM, Greg Ungerer <gerg <at> snapgear.com> wrote:
> On 06/26/2012 08:03 PM, Geert Uytterhoeven wrote:
>> On Tue, Jun 26, 2012 at 11:57 AM, Greg Ungerer<gerg <at> snapgear.com>  wrote:
>>> On 06/26/2012 05:47 PM, Geert Uytterhoeven wrote:
>>>> On Tue, Jun 26, 2012 at 7:16 AM, Greg Ungerer<gerg <at> snapgear.com>
>>>>  wrote:
>>>>> On 06/25/2012 05:59 PM, Geert Uytterhoeven wrote:
>>>>>> On Mon, Jun 25, 2012 at 3:29 AM,<gerg <at> snapgear.com>      wrote:
>>>>>>>  arch/m68k/include/asm/mcfne.h       |  129 +---------
>>>>>>
>>>>>> mcf8390.h?
>>>>>> mcfne.h is queued for removal.
>>>>>
>>>>> I was trying to save it 
>>>>> Do you think I should just silently move the modified mcfne.h
>>>>> to a mcf8390.h?
>>>>
>>>> Sure. Why not?
>>>
>>> We lose any git history linking the original and new file.
>>
>> Your commit renaming-and-modifying it will provide the link?
>
> I would normally do that with a "git mv". But isn't that going to
> clash with your "git rm"?  Or am I mis-understanding what you mean?

It may indeed give a merge conflict.

(Continue reading)

headers

Greg Ungerer | 27 Jun 2012 04:55

Re: [PATCH 1/2] net: add support for NS8390 based eth controllers on some ColdFire boards

Hi Geert,

On 06/26/2012 09:03 PM, Geert Uytterhoeven wrote:
> On Tue, Jun 26, 2012 at 12:14 PM, Greg Ungerer<gerg <at> snapgear.com>  wrote:
>> On 06/26/2012 08:03 PM, Geert Uytterhoeven wrote:
>>> On Tue, Jun 26, 2012 at 11:57 AM, Greg Ungerer<gerg <at> snapgear.com> wrote:
>>>> On 06/26/2012 05:47 PM, Geert Uytterhoeven wrote:
>>>>> On Tue, Jun 26, 2012 at 7:16 AM, Greg Ungerer<gerg <at> snapgear.com>
>>>>> wrote:
>>>>>> On 06/25/2012 05:59 PM, Geert Uytterhoeven wrote:
>>>>>>> On Mon, Jun 25, 2012 at 3:29 AM,<gerg <at> snapgear.com> wrote:
>>>>>>>> arch/m68k/include/asm/mcfne.h		129 +---------
>>>>>>>
>>>>>>> mcf8390.h?
>>>>>>> mcfne.h is queued for removal.
>>>>>>
>>>>>> I was trying to save it 
>>>>>> Do you think I should just silently move the modified mcfne.h
>>>>>> to a mcf8390.h?
>>>>>
>>>>> Sure. Why not?
>>>>
>>>> We lose any git history linking the original and new file.
>>>
>>> Your commit renaming-and-modifying it will provide the link?
>>
>> I would normally do that with a "git mv". But isn't that going to
>> clash with your "git rm"? Or am I mis-understanding what you mean?
>
> It may indeed give a merge conflict.

(Continue reading)

headers

Geert Uytterhoeven | 27 Jun 2012 09:34

Re: [PATCH 1/2] net: add support for NS8390 based eth controllers on some ColdFire boards

Hi Greg,

On Wed, Jun 27, 2012 at 4:55 AM, Greg Ungerer <gerg <at> snapgear.com> wrote:
> On 06/26/2012 09:03 PM, Geert Uytterhoeven wrote:
>> On Tue, Jun 26, 2012 at 12:14 PM, Greg Ungerer<gerg <at> snapgear.com>  wrote:
>>> On 06/26/2012 08:03 PM, Geert Uytterhoeven wrote:
>>>> On Tue, Jun 26, 2012 at 11:57 AM, Greg Ungerer<gerg <at> snapgear.com> wrote:
>>>>> On 06/26/2012 05:47 PM, Geert Uytterhoeven wrote:
>>>>>>> Do you think I should just silently move the modified mcfne.h
>>>>>>> to a mcf8390.h?
>>>>>>
>>>>>> Sure. Why not?
>>>>>
>>>>> We lose any git history linking the original and new file.
>>>>
>>>> Your commit renaming-and-modifying it will provide the link?
>>>
>>> I would normally do that with a "git mv". But isn't that going to
>>> clash with your "git rm"? Or am I mis-understanding what you mean?
>>
>> It may indeed give a merge conflict.
>>
>> If the conflict is too complicated (we'll see in -next), I can remove its
>> scheduled deletion.
>
> My concern here is that I expect that patch will go through DaveM's
> netdev tree. And he may get a little annoyed when a merge conflict

Point taken.

(Continue reading)

headers

Greg Ungerer | 27 Jun 2012 14:48

Re: [PATCH 1/2] net: add support for NS8390 based eth controllers on some ColdFire boards

Hi Geert,

On 06/27/2012 05:34 PM, Geert Uytterhoeven wrote:
> On Wed, Jun 27, 2012 at 4:55 AM, Greg Ungerer<gerg <at> snapgear.com>  wrote:
>> On 06/26/2012 09:03 PM, Geert Uytterhoeven wrote:
>>> On Tue, Jun 26, 2012 at 12:14 PM, Greg Ungerer<gerg <at> snapgear.com>    wrote:
>>>> On 06/26/2012 08:03 PM, Geert Uytterhoeven wrote:
>>>>> On Tue, Jun 26, 2012 at 11:57 AM, Greg Ungerer<gerg <at> snapgear.com>  wrote:
>>>>>> On 06/26/2012 05:47 PM, Geert Uytterhoeven wrote:
>>>>>>>> Do you think I should just silently move the modified mcfne.h
>>>>>>>> to a mcf8390.h?
>>>>>>>
>>>>>>> Sure. Why not?
>>>>>>
>>>>>> We lose any git history linking the original and new file.
>>>>>
>>>>> Your commit renaming-and-modifying it will provide the link?
>>>>
>>>> I would normally do that with a "git mv". But isn't that going to
>>>> clash with your "git rm"? Or am I mis-understanding what you mean?
>>>
>>> It may indeed give a merge conflict.
>>>
>>> If the conflict is too complicated (we'll see in -next), I can remove its
>>> scheduled deletion.
>>
>> My concern here is that I expect that patch will go through DaveM's
>> netdev tree. And he may get a little annoyed when a merge conflict
>
> Point taken.

(Continue reading)