diff options
author | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
---|---|---|
committer | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
commit | 8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch) | |
tree | a8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /drivers/ssb/embedded.c | |
parent | 406089d01562f1e2bf9f089fd7637009ebaad589 (diff) |
Patched in Tegra support.
Diffstat (limited to 'drivers/ssb/embedded.c')
-rw-r--r-- | drivers/ssb/embedded.c | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/drivers/ssb/embedded.c b/drivers/ssb/embedded.c index bb18d76f9f2..eec3e267be4 100644 --- a/drivers/ssb/embedded.c +++ b/drivers/ssb/embedded.c | |||
@@ -4,13 +4,10 @@ | |||
4 | * | 4 | * |
5 | * Copyright 2005-2008, Broadcom Corporation | 5 | * Copyright 2005-2008, Broadcom Corporation |
6 | * Copyright 2006-2008, Michael Buesch <m@bues.ch> | 6 | * Copyright 2006-2008, Michael Buesch <m@bues.ch> |
7 | * Copyright 2012, Hauke Mehrtens <hauke@hauke-m.de> | ||
8 | * | 7 | * |
9 | * Licensed under the GNU/GPL. See COPYING for details. | 8 | * Licensed under the GNU/GPL. See COPYING for details. |
10 | */ | 9 | */ |
11 | 10 | ||
12 | #include <linux/export.h> | ||
13 | #include <linux/platform_device.h> | ||
14 | #include <linux/ssb/ssb.h> | 11 | #include <linux/ssb/ssb.h> |
15 | #include <linux/ssb/ssb_embedded.h> | 12 | #include <linux/ssb/ssb_embedded.h> |
16 | #include <linux/ssb/ssb_driver_pci.h> | 13 | #include <linux/ssb/ssb_driver_pci.h> |
@@ -34,39 +31,6 @@ int ssb_watchdog_timer_set(struct ssb_bus *bus, u32 ticks) | |||
34 | } | 31 | } |
35 | EXPORT_SYMBOL(ssb_watchdog_timer_set); | 32 | EXPORT_SYMBOL(ssb_watchdog_timer_set); |
36 | 33 | ||
37 | int ssb_watchdog_register(struct ssb_bus *bus) | ||
38 | { | ||
39 | struct bcm47xx_wdt wdt = {}; | ||
40 | struct platform_device *pdev; | ||
41 | |||
42 | if (ssb_chipco_available(&bus->chipco)) { | ||
43 | wdt.driver_data = &bus->chipco; | ||
44 | wdt.timer_set = ssb_chipco_watchdog_timer_set_wdt; | ||
45 | wdt.timer_set_ms = ssb_chipco_watchdog_timer_set_ms; | ||
46 | wdt.max_timer_ms = bus->chipco.max_timer_ms; | ||
47 | } else if (ssb_extif_available(&bus->extif)) { | ||
48 | wdt.driver_data = &bus->extif; | ||
49 | wdt.timer_set = ssb_extif_watchdog_timer_set_wdt; | ||
50 | wdt.timer_set_ms = ssb_extif_watchdog_timer_set_ms; | ||
51 | wdt.max_timer_ms = SSB_EXTIF_WATCHDOG_MAX_TIMER_MS; | ||
52 | } else { | ||
53 | return -ENODEV; | ||
54 | } | ||
55 | |||
56 | pdev = platform_device_register_data(NULL, "bcm47xx-wdt", | ||
57 | bus->busnumber, &wdt, | ||
58 | sizeof(wdt)); | ||
59 | if (IS_ERR(pdev)) { | ||
60 | ssb_dprintk(KERN_INFO PFX | ||
61 | "can not register watchdog device, err: %li\n", | ||
62 | PTR_ERR(pdev)); | ||
63 | return PTR_ERR(pdev); | ||
64 | } | ||
65 | |||
66 | bus->watchdog = pdev; | ||
67 | return 0; | ||
68 | } | ||
69 | |||
70 | u32 ssb_gpio_in(struct ssb_bus *bus, u32 mask) | 34 | u32 ssb_gpio_in(struct ssb_bus *bus, u32 mask) |
71 | { | 35 | { |
72 | unsigned long flags; | 36 | unsigned long flags; |