4c52ed50d7
This is now the version which was send for mainline Linux kernel inclusion. The data needed to detection a board is now stored in init data. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 38036
108 lines
2.5 KiB
Diff
108 lines
2.5 KiB
Diff
--- a/arch/mips/bcm47xx/setup.c
|
|
+++ b/arch/mips/bcm47xx/setup.c
|
|
@@ -33,11 +33,13 @@
|
|
#include <linux/bcma/bcma_soc.h>
|
|
#include <linux/serial.h>
|
|
#include <linux/serial_8250.h>
|
|
+#include <linux/gpio_wdt.h>
|
|
#include <asm/bootinfo.h>
|
|
#include <asm/reboot.h>
|
|
#include <asm/time.h>
|
|
#include <bcm47xx.h>
|
|
#include <bcm47xx_nvram.h>
|
|
+#include <bcm47xx_board.h>
|
|
|
|
union bcm47xx_bus bcm47xx_bus;
|
|
EXPORT_SYMBOL(bcm47xx_bus);
|
|
@@ -255,6 +257,33 @@ void __init plat_mem_setup(void)
|
|
bcm47xx_board_detect();
|
|
}
|
|
|
|
+static struct gpio_wdt_platform_data gpio_wdt_data;
|
|
+
|
|
+static struct platform_device gpio_wdt_device = {
|
|
+ .name = "gpio-wdt",
|
|
+ .id = 0,
|
|
+ .dev = {
|
|
+ .platform_data = &gpio_wdt_data,
|
|
+ },
|
|
+};
|
|
+
|
|
+static int __init bcm47xx_register_gpio_watchdog(void)
|
|
+{
|
|
+ enum bcm47xx_board board = bcm47xx_board_get();
|
|
+
|
|
+ switch (board) {
|
|
+ case BCM47XX_BOARD_HUAWEI_E970:
|
|
+ pr_info("bcm47xx: detected Huawei E970 or similar, starting early gpio_wdt timer\n");
|
|
+ gpio_wdt_data.gpio = 7;
|
|
+ gpio_wdt_data.interval = HZ;
|
|
+ gpio_wdt_data.first_interval = HZ / 5;
|
|
+ return platform_device_register(&gpio_wdt_device);
|
|
+ default:
|
|
+ /* Nothing to do */
|
|
+ return 0;
|
|
+ }
|
|
+}
|
|
+
|
|
static int __init bcm47xx_register_bus_complete(void)
|
|
{
|
|
switch (bcm47xx_bus_type) {
|
|
@@ -269,6 +298,8 @@ static int __init bcm47xx_register_bus_c
|
|
break;
|
|
#endif
|
|
}
|
|
+ bcm47xx_register_gpio_watchdog();
|
|
+
|
|
return 0;
|
|
}
|
|
device_initcall(bcm47xx_register_bus_complete);
|
|
--- a/arch/mips/configs/bcm47xx_defconfig
|
|
+++ b/arch/mips/configs/bcm47xx_defconfig
|
|
@@ -379,6 +379,7 @@ CONFIG_THERMAL=y
|
|
CONFIG_WATCHDOG=y
|
|
CONFIG_WATCHDOG_NOWAYOUT=y
|
|
CONFIG_BCM47XX_WDT=y
|
|
+CONFIG_GPIO_WDT=y
|
|
CONFIG_SSB_DRIVER_GIGE=y
|
|
CONFIG_DISPLAY_SUPPORT=m
|
|
CONFIG_SOUND=m
|
|
--- a/drivers/ssb/embedded.c
|
|
+++ b/drivers/ssb/embedded.c
|
|
@@ -34,11 +34,36 @@ int ssb_watchdog_timer_set(struct ssb_bu
|
|
}
|
|
EXPORT_SYMBOL(ssb_watchdog_timer_set);
|
|
|
|
+#ifdef CONFIG_BCM47XX
|
|
+#include <bcm47xx_board.h>
|
|
+
|
|
+static bool ssb_watchdog_supported(void)
|
|
+{
|
|
+ enum bcm47xx_board board = bcm47xx_board_get();
|
|
+
|
|
+ /* The Huawei E970 has a hardware watchdog using a GPIO */
|
|
+ switch (board) {
|
|
+ case BCM47XX_BOARD_HUAWEI_E970:
|
|
+ return false;
|
|
+ default:
|
|
+ return true;
|
|
+ }
|
|
+}
|
|
+#else
|
|
+static bool ssb_watchdog_supported(void)
|
|
+{
|
|
+ return true;
|
|
+}
|
|
+#endif
|
|
+
|
|
int ssb_watchdog_register(struct ssb_bus *bus)
|
|
{
|
|
struct bcm47xx_wdt wdt = {};
|
|
struct platform_device *pdev;
|
|
|
|
+ if (!ssb_watchdog_supported())
|
|
+ return 0;
|
|
+
|
|
if (ssb_chipco_available(&bus->chipco)) {
|
|
wdt.driver_data = &bus->chipco;
|
|
wdt.timer_set = ssb_chipco_watchdog_timer_set_wdt;
|