diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-09-28 09:23:29 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-09-28 09:23:29 +0200 |
| commit | 4dbe7250eb72412a21c687b2f69c765088f03ada (patch) | |
| tree | 44daee0b98750b868bcd65a8dc02f22498358c3f /drivers | |
| parent | d25d8fe2a77613c53f2a45044684a4364916f0ad (diff) | |
| parent | 7d593c776542c44f9512311b5b1e42ff39c8a8bb (diff) | |
| download | barebox-4dbe7250eb72412a21c687b2f69c765088f03ada.tar.gz barebox-4dbe7250eb72412a21c687b2f69c765088f03ada.tar.xz | |
Merge branch 'pu-ppc' into next
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/fec_mpc5200.c | 8 | ||||
| -rw-r--r-- | drivers/serial/serial_mpc5xxx.c | 25 |
2 files changed, 8 insertions, 25 deletions
diff --git a/drivers/net/fec_mpc5200.c b/drivers/net/fec_mpc5200.c index 403aad5235..001a3a0355 100644 --- a/drivers/net/fec_mpc5200.c +++ b/drivers/net/fec_mpc5200.c @@ -697,9 +697,17 @@ int mpc5xxx_fec_probe(struct device_d *dev) return 0; } +static void mpc5xxx_fec_remove(struct device_d *dev) +{ + struct eth_device *edev = dev->type_data; + + mpc5xxx_fec_halt(edev); +} + static struct driver_d mpc5xxx_driver = { .name = "fec_mpc5xxx", .probe = mpc5xxx_fec_probe, + .remove = mpc5xxx_fec_remove, }; static int mpc5xxx_fec_register(void) diff --git a/drivers/serial/serial_mpc5xxx.c b/drivers/serial/serial_mpc5xxx.c index fb580cf1fd..b00b442bce 100644 --- a/drivers/serial/serial_mpc5xxx.c +++ b/drivers/serial/serial_mpc5xxx.c @@ -39,7 +39,6 @@ #include <init.h> #include <console.h> #include <xfuncs.h> -#include <reloc.h> #include <mach/clocks.h> static int __mpc5xxx_serial_setbaudrate(struct mpc5xxx_psc *psc, int baudrate) @@ -180,27 +179,3 @@ static int mpc5xxx_serial_register(void) } console_initcall(mpc5xxx_serial_register); - -#ifdef CONFIG_MPC5XXX_EARLY_CONSOLE - -void early_console_putc(void *base, char c) -{ - struct mpc5xxx_psc *psc = - (struct mpc5xxx_psc *)base; - - /* Wait for last character to go. */ - while (!(psc->psc_status & PSC_SR_TXEMP)) - ; - - psc->psc_buffer_8 = c; -} - -void early_console_init(void *base, int baudrate) -{ - struct mpc5xxx_psc *psc = - (struct mpc5xxx_psc *)base; - __mpc5xxx_serial_init(psc); - __mpc5xxx_serial_setbaudrate(psc, baudrate); -} - -#endif |