9
0
Fork 0
Commit Graph

39 Commits

Author SHA1 Message Date
Sascha Hauer 6d16fbdcd4 net: make the ethernet device a child of the hardware device
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-08-15 09:48:03 +02:00
Sascha Hauer a6aefdeaee Merge branches 'pu-ethaddr', 'pu-fec', 'pu-imx-iim', 'pu-resources' and 'pu-resources1' into next 2011-07-29 12:09:58 +02:00
Sascha Hauer 2fd4fa2e99 ARM i.MX: rework IIM MAC address setting
Switch to the generic way of setting a MAC address for a
device.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-07-29 12:05:26 +02:00
Sascha Hauer 2b2994a4f9 net i.MX fec: rename driver struct to be generic
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-07-28 12:07:39 +02:00
Sascha Hauer 98d9ce9bec net i.MX fec: embed ethernet device into priv
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-07-28 12:07:39 +02:00
Sascha Hauer 0b9bb06a36 net i.MX fec: remove unnecessary alignment
dma_alloc_coherent returns sufficiently aligned memory. While
at it, remove some unnecessary casts.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-07-28 12:07:39 +02:00
Sascha Hauer 7079d33597 net i.MX fec: make multi instance safe
The driver uses a static int once variable to alloc the
rx packets. remove this to make the driver multi instance
safe. While at it, remove the crappy selfmade alignment.
dma_alloc_coherent returns sufficiently aligned memory.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-07-28 12:07:39 +02:00
Sascha Hauer 025807bf89 net i.MX fec: convert to struct resource
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-07-19 00:12:51 +08:00
Juergen Beisert 1f167559e2 Fix end of expression char (some lines forgotten in v1)
Its not a bug fix, just a clean up.

Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-03-03 16:15:56 +01:00
Juergen Beisert 4f72931ba4 Fix end of expression char
Its not a bug fix, just a clean up.

Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-03-03 16:15:56 +01:00
Sascha Hauer e88d86a445 ARM: rename STM arch to mxs
We never supported the sigmatel stm chips and probably
never will. So do the first step and rename the architecture
to mxs just like in the kernel.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-01-20 10:43:24 +01:00
Sascha Hauer 2f0109b1bb Merge branch 'master' into next 2011-01-17 09:43:40 +01:00
Sascha Hauer 06b7cc4875 fec i.MX28: Make it work with MMU on
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-01-17 09:42:56 +01:00
Sascha Hauer d31a7a7eca fec_imx: fix printf compiler warnings
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-01-07 10:37:41 +01:00
Juergen Beisert cf463d7430 MX28: add FEC support
The i.MX28 comes with an extended ethernet controller (ENET/FEC) which
is backwards compatible to the FEC known from other i.MX CPUs. Add a few
adaptions to the existing driver to make it work with the MX28 FEC.

Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-12-14 15:15:07 +01:00
Juergen Beisert 07965c6fa1 Fixup the FEC driver files
Some register bits are not defined in the IMX CPUs using this FEC (at least
I did not find anything about them in the related datasheets) and they will
get (partially) a new meaning in the i.MX28 CPU. So, removing them from the
source seems the best way to avoid any accidental usage on i.MX28.

Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-12-14 15:15:07 +01:00
Sascha Hauer 884273c24f fec_imx: sparse fixes
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-10-21 22:21:23 +02:00
Jean-Christophe PLAGNIOL-VILLARD 12f396a8b0 net: rework the mii support
this rework is done in order to add a phylib and allow to have phy driver support

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-08-27 14:36:03 +02:00
Baruch Siach 9965f8f78a fec_imx: add support for IIM stored mac address
The mac address information is taken from the imx_iim driver if it's present.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-08-17 10:21:26 +02:00
Sascha Hauer c70689d727 network drivers: call net_receive directly instead of NetReceive
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-06-17 08:28:25 +02:00
Jan Weitzel 972d116ada fix miiphy alloc
if fec was allocated using malloc. if fec->miiphy->dev->driver != 0
miiphy_probe is not called

Signed-off-by: Jan Weitzel <J.Weitzel@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-04-14 10:12:51 +02:00
Sascha Hauer 6f5a6b591a pass arguments to dma_* as unsigned long as the kernel does
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-03-30 14:15:03 +02:00
Eric Benard faa8f98ea7 Fix a data abort with fec_imx
edev was allocated using malloc. On one board (NOR boot), we met data abort
in eth_register (at dev_add_param(dev, &edev->param_ip);).
Allocating edev with xzalloc (as in several other drivers) fixed the problem.

Signed-off-by: Eric Benard <eric@eukrea.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-01-11 18:58:16 +01:00
Marc Kleine-Budde c985ea0cb6 fec_imx: remove trailing whitespace
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2009-11-21 19:49:02 +01:00
Jean-Christophe PLAGNIOL-VILLARD f6a579da9c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2009-10-22 14:21:25 +02:00
Sascha Hauer 1b019090f7 fec_imx: do not typedef struct
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-10-13 10:46:49 +02:00
Sascha Hauer 67551e7a76 fec_imx: initialize buffers on open time
We need to redo buffer initialization each time we open
the device, not only once on init time. Otherwise network
does not work if the last transfer was interrupted with
ctrl-c

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-10-09 11:57:07 +02:00
Sascha Hauer 3820307eb0 rename dma macros
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-09-25 13:34:57 +02:00
Sascha Hauer e471a5fd39 fec imx27: Add MMU support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-08-19 10:51:39 +02:00
Sascha Hauer 6437a0156a fec_imx: Make sure MII speed is correct before reading the phy
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-07-30 16:09:59 +02:00
Sascha Hauer 8b09e24a36 ethernet driver: Do not overwrite devname
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-07-21 18:36:47 +02:00
Sascha Hauer 2f8df2a003 add a device_d to ethernet devices
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-07-21 16:41:46 +02:00
Sascha Hauer 6e921fcb3c Get rid of DEVICE_TYPE_ETHER usage
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-07-21 16:41:45 +02:00
Sascha Hauer b7ed4d8fa9 fec: fail on open when autonegotiation fails
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-04-06 11:15:45 +02:00
Sascha Hauer fa38059695 fec_imx: whitespace changes
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-04-06 11:10:49 +02:00
Sascha Hauer 8cf4685826 fec_imx: do not typedef struct types #2
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-04-06 11:08:29 +02:00
Sascha Hauer 63d08b5107 fec_imx: do not typedef struct types
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-04-06 11:08:24 +02:00
Sascha Hauer ec671e3827 fec_imx: Fix RMII mode, remove struct-over-regsiter crap
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-04-06 11:08:16 +02:00
Sascha Hauer 2703e60e43 fec imx27: rename to fec_imx
This driver is not only used on i.MX27 but on i.MX35 and i.MX25, so
rename it to a more generic name

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-03-19 12:21:48 +01:00