diff options
author | Hector Martin <hector@marcansoft.com> | 2011-08-31 02:32:26 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-09-19 19:20:05 -0400 |
commit | c26afe9e8591f306d79aab8071f1d34e4f60b700 (patch) | |
tree | ee3e49fef2343c1bf8e752c4a29be9371c143a24 /drivers/net | |
parent | 8feaa43494cee5e938fd5a57b9e9bf1c827e6ccd (diff) |
powerpc/ps3: Add gelic udbg driver
Add a new udbg driver for the PS3 gelic Ehthernet device.
This driver shares only a few stucture and constant definitions with the
gelic Ethernet device driver, so is implemented as a stand-alone driver
with no dependencies on the gelic Ethernet device driver.
Signed-off-by: Hector Martin <hector@marcansoft.com>
Signed-off-by: Andre Heider <a.heider@gmail.com>
Signed-off-by: Geoff Levand <geoff@infradead.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/ps3_gelic_net.c | 3 | ||||
-rw-r--r-- | drivers/net/ps3_gelic_net.h | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/drivers/net/ps3_gelic_net.c b/drivers/net/ps3_gelic_net.c index d82a82d9870c..e743c9418ac9 100644 --- a/drivers/net/ps3_gelic_net.c +++ b/drivers/net/ps3_gelic_net.c | |||
@@ -1674,6 +1674,9 @@ static int __devinit ps3_gelic_driver_probe(struct ps3_system_bus_device *dev) | |||
1674 | int result; | 1674 | int result; |
1675 | 1675 | ||
1676 | pr_debug("%s: called\n", __func__); | 1676 | pr_debug("%s: called\n", __func__); |
1677 | |||
1678 | udbg_shutdown_ps3gelic(); | ||
1679 | |||
1677 | result = ps3_open_hv_device(dev); | 1680 | result = ps3_open_hv_device(dev); |
1678 | 1681 | ||
1679 | if (result) { | 1682 | if (result) { |
diff --git a/drivers/net/ps3_gelic_net.h b/drivers/net/ps3_gelic_net.h index d3fadfbc3bcc..a93df6ac1909 100644 --- a/drivers/net/ps3_gelic_net.h +++ b/drivers/net/ps3_gelic_net.h | |||
@@ -359,6 +359,12 @@ static inline void *port_priv(struct gelic_port *port) | |||
359 | return port->priv; | 359 | return port->priv; |
360 | } | 360 | } |
361 | 361 | ||
362 | #ifdef CONFIG_PPC_EARLY_DEBUG_PS3GELIC | ||
363 | extern void udbg_shutdown_ps3gelic(void); | ||
364 | #else | ||
365 | static inline void udbg_shutdown_ps3gelic(void) {} | ||
366 | #endif | ||
367 | |||
362 | extern int gelic_card_set_irq_mask(struct gelic_card *card, u64 mask); | 368 | extern int gelic_card_set_irq_mask(struct gelic_card *card, u64 mask); |
363 | /* shared netdev ops */ | 369 | /* shared netdev ops */ |
364 | extern void gelic_card_up(struct gelic_card *card); | 370 | extern void gelic_card_up(struct gelic_card *card); |