diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2015-02-11 10:11:00 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2015-02-11 10:11:00 +0000 |
| commit | 6bafb2f810694619ba65317cd349af3b1ca97617 (patch) | |
| tree | defc7aa2e4c43e5c7f2945e1acbca9ff3a508d5e /target/linux/bcm53xx/patches-3.18/081-watchdog-bcm47xx_wdt.c-allow-enabling-on-BCM5301X-ar.patch | |
| parent | 658a33688e8a250b4ca205003ff57c29abee0724 (diff) | |
| download | upstream-6bafb2f810694619ba65317cd349af3b1ca97617.tar.gz upstream-6bafb2f810694619ba65317cd349af3b1ca97617.tar.bz2 upstream-6bafb2f810694619ba65317cd349af3b1ca97617.zip | |
bcm53xx: backport bcm47xx_wdt changes to 3.18 to use this driver in future
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 44390
Diffstat (limited to 'target/linux/bcm53xx/patches-3.18/081-watchdog-bcm47xx_wdt.c-allow-enabling-on-BCM5301X-ar.patch')
| -rw-r--r-- | target/linux/bcm53xx/patches-3.18/081-watchdog-bcm47xx_wdt.c-allow-enabling-on-BCM5301X-ar.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/target/linux/bcm53xx/patches-3.18/081-watchdog-bcm47xx_wdt.c-allow-enabling-on-BCM5301X-ar.patch b/target/linux/bcm53xx/patches-3.18/081-watchdog-bcm47xx_wdt.c-allow-enabling-on-BCM5301X-ar.patch new file mode 100644 index 0000000000..890b7cffc8 --- /dev/null +++ b/target/linux/bcm53xx/patches-3.18/081-watchdog-bcm47xx_wdt.c-allow-enabling-on-BCM5301X-ar.patch @@ -0,0 +1,34 @@ +From b08c144e3a1089cdb725e393fa4f68f83a73e31b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com> +Date: Sat, 7 Feb 2015 18:04:10 +0100 +Subject: [PATCH] watchdog: bcm47xx_wdt.c: allow enabling on BCM5301X arch +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +BCM5301X (ARCH_BCM_5301X) is a new Broadcom architecture using the same +SoC bus driver (bcma) as BCM47XX but based on ARM instead of MIPS. + +Signed-off-by: Rafał Miłecki <zajec5@gmail.com> +Reviewed-by: Guenter Roeck <linux@roeck-us.net> +Signed-off-by: Wim Van Sebroeck <wim@iguana.be> +--- + drivers/watchdog/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig +index 2aaef7b..ca6c949 100644 +--- a/drivers/watchdog/Kconfig ++++ b/drivers/watchdog/Kconfig +@@ -1113,7 +1113,7 @@ config ATH79_WDT + + config BCM47XX_WDT + tristate "Broadcom BCM47xx Watchdog Timer" +- depends on BCM47XX ++ depends on BCM47XX || ARCH_BCM_5301X + select WATCHDOG_CORE + help + Hardware driver for the Broadcom BCM47xx Watchdog Timer. +-- +1.8.4.5 + |