diff options
Diffstat (limited to 'target/linux/brcm47xx/patches-3.6')
21 files changed, 75 insertions, 871 deletions
diff --git a/target/linux/brcm47xx/patches-3.6/060-ssb-add-serial-flash-driver.patch b/target/linux/brcm47xx/patches-3.6/060-ssb-add-serial-flash-driver.patch index d65fc0a..8b218f3 100644 --- a/target/linux/brcm47xx/patches-3.6/060-ssb-add-serial-flash-driver.patch +++ b/target/linux/brcm47xx/patches-3.6/060-ssb-add-serial-flash-driver.patch @@ -434,7 +434,7 @@ pr_debug("Found parallel flash\n"); --- a/drivers/ssb/main.c +++ b/drivers/ssb/main.c -@@ -18,6 +18,7 @@ +@@ -19,6 +19,7 @@ #include <linux/ssb/ssb_driver_gige.h> #include <linux/dma-mapping.h> #include <linux/pci.h> @@ -442,7 +442,7 @@ #include <linux/mmc/sdio_func.h> #include <linux/slab.h> -@@ -534,6 +535,15 @@ static int ssb_devices_register(struct s +@@ -540,6 +541,15 @@ static int ssb_devices_register(struct s dev_idx++; } @@ -460,9 +460,9 @@ /* Unwind the already registered devices. */ --- a/drivers/ssb/ssb_private.h +++ b/drivers/ssb/ssb_private.h -@@ -211,4 +211,16 @@ static inline void b43_pci_ssb_bridge_ex - extern u32 ssb_pmu_get_cpu_clock(struct ssb_chipcommon *cc); - extern u32 ssb_pmu_get_controlclock(struct ssb_chipcommon *cc); +@@ -242,4 +242,16 @@ static inline int ssb_watchdog_register( + } + #endif /* CONFIG_SSB_EMBEDDED */ +#ifdef CONFIG_SSB_SFLASH +/* driver_chipcommon_sflash.c */ @@ -515,10 +515,10 @@ #define SSB_CHIPCO_FLASHCTL_ST_RES 0x03AB /* Read Electronic Signature */ #define SSB_CHIPCO_FLASHCTL_ST_CSA 0x1000 /* Keep chip select asserted */ #define SSB_CHIPCO_FLASHCTL_ST_SSE 0x0220 /* Sub-sector Erase */ -@@ -591,6 +604,9 @@ struct ssb_chipcommon { - /* Fast Powerup Delay constant */ - u16 fast_pwrup_delay; +@@ -593,6 +606,9 @@ struct ssb_chipcommon { struct ssb_chipcommon_pmu pmu; + u32 ticks_per_ms; + u32 max_timer_ms; +#ifdef CONFIG_SSB_SFLASH + struct bcm47xx_sflash sflash; +#endif diff --git a/target/linux/brcm47xx/patches-3.6/061-ssb-register-parallel-flash-device.patch b/target/linux/brcm47xx/patches-3.6/061-ssb-register-parallel-flash-device.patch index 6e0d491..b2f85ae 100644 --- a/target/linux/brcm47xx/patches-3.6/061-ssb-register-parallel-flash-device.patch +++ b/target/linux/brcm47xx/patches-3.6/061-ssb-register-parallel-flash-device.patch @@ -50,7 +50,7 @@ } --- a/drivers/ssb/main.c +++ b/drivers/ssb/main.c -@@ -543,6 +543,14 @@ static int ssb_devices_register(struct s +@@ -549,6 +549,14 @@ static int ssb_devices_register(struct s "Error registering serial flash\n"); } #endif @@ -67,7 +67,7 @@ error: --- a/drivers/ssb/ssb_private.h +++ b/drivers/ssb/ssb_private.h -@@ -223,4 +223,6 @@ static inline int ssb_sflash_init(struct +@@ -254,4 +254,6 @@ static inline int ssb_sflash_init(struct } #endif /* CONFIG_SSB_SFLASH */ diff --git a/target/linux/brcm47xx/patches-3.6/070-bcma-add-functions-to-write-to-serial-flash.patch b/target/linux/brcm47xx/patches-3.6/070-bcma-add-functions-to-write-to-serial-flash.patch index 8fb70d6..5acc2cf 100644 --- a/target/linux/brcm47xx/patches-3.6/070-bcma-add-functions-to-write-to-serial-flash.patch +++ b/target/linux/brcm47xx/patches-3.6/070-bcma-add-functions-to-write-to-serial-flash.patch @@ -307,16 +307,16 @@ e->name, sflash->size / 1024, sflash->blocksize, --- a/include/linux/bcma/bcma_driver_chipcommon.h +++ b/include/linux/bcma/bcma_driver_chipcommon.h -@@ -1,6 +1,8 @@ - #ifndef LINUX_BCMA_DRIVER_CC_H_ - #define LINUX_BCMA_DRIVER_CC_H_ +@@ -3,6 +3,8 @@ + + #include <linux/platform_device.h> +#include <linux/mtd/bcm47xx_sflash.h> + /** ChipCommon core registers. **/ #define BCMA_CC_ID 0x0000 #define BCMA_CC_ID_ID 0x0000FFFF -@@ -516,17 +518,6 @@ struct bcma_pflash { +@@ -518,17 +520,6 @@ struct bcma_pflash { u32 window_size; }; @@ -334,7 +334,7 @@ #ifdef CONFIG_BCMA_NFLASH struct mtd_info; -@@ -561,7 +552,7 @@ struct bcma_drv_cc { +@@ -563,7 +554,7 @@ struct bcma_drv_cc { #ifdef CONFIG_BCMA_DRIVER_MIPS struct bcma_pflash pflash; #ifdef CONFIG_BCMA_SFLASH diff --git a/target/linux/brcm47xx/patches-3.6/071-bcma-add-functions-to-write-to-nand-flash.patch b/target/linux/brcm47xx/patches-3.6/071-bcma-add-functions-to-write-to-nand-flash.patch index 27c6677..f1b4f7f 100644 --- a/target/linux/brcm47xx/patches-3.6/071-bcma-add-functions-to-write-to-nand-flash.patch +++ b/target/linux/brcm47xx/patches-3.6/071-bcma-add-functions-to-write-to-nand-flash.patch @@ -181,15 +181,15 @@ +} --- a/include/linux/bcma/bcma_driver_chipcommon.h +++ b/include/linux/bcma/bcma_driver_chipcommon.h -@@ -2,6 +2,7 @@ - #define LINUX_BCMA_DRIVER_CC_H_ +@@ -4,6 +4,7 @@ + #include <linux/platform_device.h> #include <linux/mtd/bcm47xx_sflash.h> +#include <linux/mtd/bcm47xx_nand.h> /** ChipCommon core registers. **/ #define BCMA_CC_ID 0x0000 -@@ -519,17 +520,6 @@ struct bcma_pflash { +@@ -521,17 +522,6 @@ struct bcma_pflash { }; @@ -207,7 +207,7 @@ struct bcma_serial_port { void *regs; unsigned long clockspeed; -@@ -555,7 +545,7 @@ struct bcma_drv_cc { +@@ -557,7 +547,7 @@ struct bcma_drv_cc { struct bcm47xx_sflash sflash; #endif #ifdef CONFIG_BCMA_NFLASH @@ -216,7 +216,7 @@ #endif int nr_serial_ports; -@@ -613,4 +603,13 @@ extern void bcma_chipco_regctl_maskset(s +@@ -616,4 +606,13 @@ extern void bcma_chipco_regctl_maskset(s u32 offset, u32 mask, u32 set); extern void bcma_pmu_spuravoid_pllupdate(struct bcma_drv_cc *cc, int spuravoid); diff --git a/target/linux/brcm47xx/patches-3.6/500-ssb-add-function-to-return-number-of-gpio-lines.patch b/target/linux/brcm47xx/patches-3.6/500-ssb-add-function-to-return-number-of-gpio-lines.patch index f1b483e..8c4634c 100644 --- a/target/linux/brcm47xx/patches-3.6/500-ssb-add-function-to-return-number-of-gpio-lines.patch +++ b/target/linux/brcm47xx/patches-3.6/500-ssb-add-function-to-return-number-of-gpio-lines.patch @@ -1,6 +1,6 @@ --- a/drivers/ssb/embedded.c +++ b/drivers/ssb/embedded.c -@@ -136,6 +136,18 @@ u32 ssb_gpio_polarity(struct ssb_bus *bu +@@ -171,6 +171,18 @@ u32 ssb_gpio_polarity(struct ssb_bus *bu } EXPORT_SYMBOL(ssb_gpio_polarity); diff --git a/target/linux/brcm47xx/patches-3.6/501-bcma-add-gpio-driver.patch b/target/linux/brcm47xx/patches-3.6/501-bcma-add-gpio-driver.patch index b8f72a1..d00a164 100644 --- a/target/linux/brcm47xx/patches-3.6/501-bcma-add-gpio-driver.patch +++ b/target/linux/brcm47xx/patches-3.6/501-bcma-add-gpio-driver.patch @@ -1,15 +1,15 @@ --- a/drivers/bcma/driver_chipcommon.c +++ b/drivers/bcma/driver_chipcommon.c -@@ -70,6 +70,8 @@ void bcma_core_chipcommon_init(struct bc - (leddc_off << BCMA_CC_GPIOTIMER_OFFTIME_SHIFT))); +@@ -158,6 +158,8 @@ void bcma_core_chipcommon_init(struct bc } + cc->ticks_per_ms = bcma_chipco_watchdog_ticks_per_ms(cc); + spin_lock_init(&cc->gpio_lock); + cc->setup_done = true; } -@@ -92,34 +94,81 @@ u32 bcma_chipco_irq_status(struct bcma_d +@@ -197,34 +199,81 @@ u32 bcma_chipco_irq_status(struct bcma_d u32 bcma_chipco_gpio_in(struct bcma_drv_cc *cc, u32 mask) { @@ -99,17 +99,17 @@ void bcma_chipco_serial_init(struct bcma_drv_cc *cc) --- a/include/linux/bcma/bcma_driver_chipcommon.h +++ b/include/linux/bcma/bcma_driver_chipcommon.h -@@ -551,6 +551,9 @@ struct bcma_drv_cc { - int nr_serial_ports; - struct bcma_serial_port serial_ports[4]; +@@ -555,6 +555,9 @@ struct bcma_drv_cc { #endif /* CONFIG_BCMA_DRIVER_MIPS */ + u32 ticks_per_ms; + struct platform_device *watchdog; + + /* Lock for GPIO register access. */ + spinlock_t gpio_lock; }; /* Register access */ -@@ -581,13 +584,22 @@ void bcma_chipco_irq_mask(struct bcma_dr +@@ -584,13 +587,22 @@ void bcma_chipco_irq_mask(struct bcma_dr u32 bcma_chipco_irq_status(struct bcma_drv_cc *cc, u32 mask); diff --git a/target/linux/brcm47xx/patches-3.6/540-watchdog-bcm47xx_wdt.c-convert-to-watchdog-core-api.patch b/target/linux/brcm47xx/patches-3.6/540-watchdog-bcm47xx_wdt.c-convert-to-watchdog-core-api.patch index 21136c0..1765638 100644 --- a/target/linux/brcm47xx/patches-3.6/540-watchdog-bcm47xx_wdt.c-convert-to-watchdog-core-api.patch +++ b/target/linux/brcm47xx/patches-3.6/540-watchdog-bcm47xx_wdt.c-convert-to-watchdog-core-api.patch @@ -239,7 +239,7 @@ if (ret) { unregister_reboot_notifier(&bcm47xx_wdt_notifier); return ret; -@@ -292,10 +188,8 @@ static int __init bcm47xx_wdt_init(void) +@@ -292,10 +188,7 @@ static int __init bcm47xx_wdt_init(void) static void __exit bcm47xx_wdt_exit(void) { @@ -247,12 +247,11 @@ - bcm47xx_wdt_stop(); - - misc_deregister(&bcm47xx_wdt_miscdev); -+ watchdog_stop(&bcm47xx_wdt_wdd); + watchdog_unregister_device(&bcm47xx_wdt_wdd); unregister_reboot_notifier(&bcm47xx_wdt_notifier); } -@@ -306,4 +200,3 @@ module_exit(bcm47xx_wdt_exit); +@@ -306,4 +199,3 @@ module_exit(bcm47xx_wdt_exit); MODULE_AUTHOR("Aleksandar Radovanovic"); MODULE_DESCRIPTION("Watchdog driver for Broadcom BCM47xx"); MODULE_LICENSE("GPL"); diff --git a/target/linux/brcm47xx/patches-3.6/541-watchdog-bcm47xx_wdt.c-use-platform-device.patch b/target/linux/brcm47xx/patches-3.6/541-watchdog-bcm47xx_wdt.c-use-platform-device.patch index 593aace..1f589f1 100644 --- a/target/linux/brcm47xx/patches-3.6/541-watchdog-bcm47xx_wdt.c-use-platform-device.patch +++ b/target/linux/brcm47xx/patches-3.6/541-watchdog-bcm47xx_wdt.c-use-platform-device.patch @@ -151,7 +151,7 @@ return NOTIFY_DONE; } -@@ -146,57 +130,72 @@ static struct watchdog_ops bcm47xx_wdt_o +@@ -146,56 +130,72 @@ static struct watchdog_ops bcm47xx_wdt_o .set_timeout = bcm47xx_wdt_set_timeout, }; @@ -225,7 +225,6 @@ -static void __exit bcm47xx_wdt_exit(void) +static int __devexit bcm47xx_wdt_remove(struct platform_device *pdev) { -- watchdog_stop(&bcm47xx_wdt_wdd); - watchdog_unregister_device(&bcm47xx_wdt_wdd); + struct bcm47xx_wdt *wdt = dev_get_platdata(&pdev->dev); + @@ -256,33 +255,29 @@ +MODULE_AUTHOR("Hauke Mehrtens <hauke@hauke-m.de>"); MODULE_DESCRIPTION("Watchdog driver for Broadcom BCM47xx"); MODULE_LICENSE("GPL"); ---- /dev/null +--- a/include/linux/bcm47xx_wdt.h +++ b/include/linux/bcm47xx_wdt.h -@@ -0,0 +1,27 @@ -+#ifndef LINUX_BCM47XX_WDT_H_ -+#define LINUX_BCM47XX_WDT_H_ -+ +@@ -1,7 +1,10 @@ + #ifndef LINUX_BCM47XX_WDT_H_ + #define LINUX_BCM47XX_WDT_H_ + +#include <linux/notifier.h> +#include <linux/timer.h> -+#include <linux/types.h> + #include <linux/types.h> +#include <linux/watchdog.h> -+ -+ -+struct bcm47xx_wdt { -+ u32 (*timer_set)(struct bcm47xx_wdt *, u32); -+ u32 (*timer_set_ms)(struct bcm47xx_wdt *, u32); -+ -+ void *driver_data; + + + struct bcm47xx_wdt { +@@ -10,6 +13,12 @@ struct bcm47xx_wdt { + u32 max_timer_ms; + + void *driver_data; + + struct watchdog_device wdd; + struct notifier_block notifier; + + struct timer_list soft_timer; + atomic_t soft_ticks; -+}; -+ -+static inline void *bcm47xx_wdt_get_drvdata(struct bcm47xx_wdt *wdt) -+{ -+ return wdt->driver_data; -+} -+#endif /* LINUX_BCM47XX_WDT_H_ */ + }; + + static inline void *bcm47xx_wdt_get_drvdata(struct bcm47xx_wdt *wdt) diff --git a/target/linux/brcm47xx/patches-3.6/542-watchdog-bcm47xx_wdt.c-rename-ops-methods.patch b/target/linux/brcm47xx/patches-3.6/542-watchdog-bcm47xx_wdt.c-rename-ops-methods.patch index 8d85303..dcabc1b 100644 --- a/target/linux/brcm47xx/patches-3.6/542-watchdog-bcm47xx_wdt.c-rename-ops-methods.patch +++ b/target/linux/brcm47xx/patches-3.6/542-watchdog-bcm47xx_wdt.c-rename-ops-methods.patch @@ -1,12 +1,15 @@ --- a/drivers/watchdog/bcm47xx_wdt.c +++ b/drivers/watchdog/bcm47xx_wdt.c -@@ -44,12 +44,13 @@ MODULE_PARM_DESC(nowayout, - "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); +@@ -30,7 +30,7 @@ + #define DRV_NAME "bcm47xx_wdt" -+ - static inline struct bcm47xx_wdt *bcm47xx_wdt_get(struct watchdog_device *wdd) - { + #define WDT_DEFAULT_TIME 30 /* seconds */ +-#define WDT_MAX_TIME 255 /* seconds */ ++#define WDT_SOFTTIMER_MAX 255 /* seconds */ + + static int wdt_time = WDT_DEFAULT_TIME; + static bool nowayout = WATCHDOG_NOWAYOUT; +@@ -49,7 +49,7 @@ static inline struct bcm47xx_wdt *bcm47x return container_of(wdd, struct bcm47xx_wdt, wdd); } @@ -15,7 +18,7 @@ { struct bcm47xx_wdt *wdt = (struct bcm47xx_wdt *)data; u32 next_tick = min(wdt->wdd.timeout * 1000, wdt->max_timer_ms); -@@ -62,7 +63,7 @@ static void bcm47xx_timer_tick(unsigned +@@ -62,7 +62,7 @@ static void bcm47xx_timer_tick(unsigned } } @@ -24,7 +27,7 @@ { struct bcm47xx_wdt *wdt = bcm47xx_wdt_get(wdd); -@@ -71,17 +72,17 @@ static int bcm47xx_wdt_keepalive(struct +@@ -71,17 +71,17 @@ static int bcm47xx_wdt_keepalive(struct return 0; } @@ -46,7 +49,7 @@ { struct bcm47xx_wdt *wdt = bcm47xx_wdt_get(wdd); -@@ -91,8 +92,8 @@ static int bcm47xx_wdt_stop(struct watch +@@ -91,12 +91,12 @@ static int bcm47xx_wdt_stop(struct watch return 0; } @@ -55,9 +58,15 @@ +static int bcm47xx_wdt_soft_set_timeout(struct watchdog_device *wdd, + unsigned int new_time) { - if (new_time < 1 || new_time > WDT_MAX_TIME) { +- if (new_time < 1 || new_time > WDT_MAX_TIME) { ++ if (new_time < 1 || new_time > WDT_SOFTTIMER_MAX) { pr_warn("timeout value must be 1<=x<=%d, using %d\n", -@@ -122,12 +123,12 @@ static int bcm47xx_wdt_notify_sys(struct +- WDT_MAX_TIME, new_time); ++ WDT_SOFTTIMER_MAX, new_time); + return -EINVAL; + } + +@@ -122,12 +122,12 @@ static int bcm47xx_wdt_notify_sys(struct return NOTIFY_DONE; } @@ -75,7 +84,7 @@ }; static int __devinit bcm47xx_wdt_probe(struct platform_device *pdev) -@@ -138,10 +139,10 @@ static int __devinit bcm47xx_wdt_probe(s +@@ -138,10 +138,10 @@ static int __devinit bcm47xx_wdt_probe(s if (!wdt) return -ENXIO; diff --git a/target/linux/brcm47xx/patches-3.6/543-watchdog-bcm47xx_wdt.c-rename-wdt_timeout-to-timeout.patch b/target/linux/brcm47xx/patches-3.6/543-watchdog-bcm47xx_wdt.c-rename-wdt_time-to-timeout.patch index 568581f..cbfa462 100644 --- a/target/linux/brcm47xx/patches-3.6/543-watchdog-bcm47xx_wdt.c-rename-wdt_timeout-to-timeout.patch +++ b/target/linux/brcm47xx/patches-3.6/543-watchdog-bcm47xx_wdt.c-rename-wdt_time-to-timeout.patch @@ -1,11 +1,8 @@ --- a/drivers/watchdog/bcm47xx_wdt.c +++ b/drivers/watchdog/bcm47xx_wdt.c -@@ -30,13 +30,13 @@ - #define DRV_NAME "bcm47xx_wdt" - +@@ -32,11 +32,11 @@ #define WDT_DEFAULT_TIME 30 /* seconds */ --#define WDT_MAX_TIME 255 /* seconds */ -+#define WDT_SOFTTIMER_MAX 3600 /* seconds */ + #define WDT_SOFTTIMER_MAX 255 /* seconds */ -static int wdt_time = WDT_DEFAULT_TIME; +static int timeout = WDT_DEFAULT_TIME; @@ -18,19 +15,7 @@ __MODULE_STRING(WDT_DEFAULT_TIME) ")"); module_param(nowayout, bool, 0); -@@ -95,9 +95,9 @@ static int bcm47xx_wdt_soft_stop(struct - static int bcm47xx_wdt_soft_set_timeout(struct watchdog_device *wdd, - unsigned int new_time) - { -- if (new_time < 1 || new_time > WDT_MAX_TIME) { -+ if (new_time < 1 || new_time > WDT_SOFTTIMER_MAX) { - pr_warn("timeout value must be 1<=x<=%d, using %d\n", -- WDT_MAX_TIME, new_time); -+ WDT_SOFTTIMER_MAX, new_time); - return -EINVAL; - } - -@@ -161,7 +161,7 @@ static int __devinit bcm47xx_wdt_probe(s +@@ -160,7 +160,7 @@ static int __devinit bcm47xx_wdt_probe(s goto err_notifier; pr_info("BCM47xx Watchdog Timer enabled (%d seconds%s)\n", diff --git a/target/linux/brcm47xx/patches-3.6/544-watchdog-bcm47xx_wdt.c-add-hard-timer.patch b/target/linux/brcm47xx/patches-3.6/544-watchdog-bcm47xx_wdt.c-add-hard-timer.patch index 6970e10..3c61cce 100644 --- a/target/linux/brcm47xx/patches-3.6/544-watchdog-bcm47xx_wdt.c-add-hard-timer.patch +++ b/target/linux/brcm47xx/patches-3.6/544-watchdog-bcm47xx_wdt.c-add-hard-timer.patch @@ -3,12 +3,12 @@ @@ -31,6 +31,7 @@ #define WDT_DEFAULT_TIME 30 /* seconds */ - #define WDT_SOFTTIMER_MAX 3600 /* seconds */ + #define WDT_SOFTTIMER_MAX 255 /* seconds */ +#define WDT_SOFTTIMER_THRESHOLD 60 /* seconds */ static int timeout = WDT_DEFAULT_TIME; static bool nowayout = WATCHDOG_NOWAYOUT; -@@ -50,6 +51,53 @@ static inline struct bcm47xx_wdt *bcm47x +@@ -49,6 +50,53 @@ static inline struct bcm47xx_wdt *bcm47x return container_of(wdd, struct bcm47xx_wdt, wdd); } @@ -62,7 +62,7 @@ static void bcm47xx_wdt_soft_timer_tick(unsigned long data) { struct bcm47xx_wdt *wdt = (struct bcm47xx_wdt *)data; -@@ -134,15 +182,22 @@ static struct watchdog_ops bcm47xx_wdt_s +@@ -133,15 +181,22 @@ static struct watchdog_ops bcm47xx_wdt_s static int __devinit bcm47xx_wdt_probe(struct platform_device *pdev) { int ret; @@ -88,7 +88,7 @@ wdt->wdd.info = &bcm47xx_wdt_info; wdt->wdd.timeout = WDT_DEFAULT_TIME; ret = wdt->wdd.ops->set_timeout(&wdt->wdd, timeout); -@@ -160,14 +215,16 @@ static int __devinit bcm47xx_wdt_probe(s +@@ -159,14 +214,16 @@ static int __devinit bcm47xx_wdt_probe(s if (ret) goto err_notifier; @@ -108,13 +108,3 @@ return ret; } ---- a/include/linux/bcm47xx_wdt.h -+++ b/include/linux/bcm47xx_wdt.h -@@ -10,6 +10,7 @@ - struct bcm47xx_wdt { - u32 (*timer_set)(struct bcm47xx_wdt *, u32); - u32 (*timer_set_ms)(struct bcm47xx_wdt *, u32); -+ u32 max_timer_ms; - - void *driver_data; - diff --git a/target/linux/brcm47xx/patches-3.6/545-bcma-add-bcma_chipco_alp_clock.patch b/target/linux/brcm47xx/patches-3.6/545-bcma-add-bcma_chipco_alp_clock.patch deleted file mode 100644 index f6f0012..0000000 --- a/target/linux/brcm47xx/patches-3.6/545-bcma-add-bcma_chipco_alp_clock.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- a/drivers/bcma/driver_chipcommon.c -+++ b/drivers/bcma/driver_chipcommon.c -@@ -4,6 +4,7 @@ - * - * Copyright 2005, Broadcom Corporation - * Copyright 2006, 2007, Michael Buesch <m@bues.ch> -+ * Copyright 2012, Hauke Mehrtens <hauke@hauke-m.de> - * - * Licensed under the GNU/GPL. See COPYING for details. - */ -@@ -22,6 +23,14 @@ static inline u32 bcma_cc_write32_masked - return value; - } - -+static u32 bcma_chipco_alp_clock(struct bcma_drv_cc *cc) -+{ -+ if (cc->capabilities & BCMA_CC_CAP_PMU) -+ return bcma_pmu_alp_clock(cc); -+ -+ return 20000000; -+} -+ - void bcma_core_chipcommon_early_init(struct bcma_drv_cc *cc) - { - if (cc->early_setup_done) -@@ -180,8 +189,7 @@ void bcma_chipco_serial_init(struct bcma - struct bcma_serial_port *ports = cc->serial_ports; - - if (ccrev >= 11 && ccrev != 15) { -- /* Fixed ALP clock */ -- baud_base = bcma_pmu_alp_clock(cc); -+ baud_base = bcma_chipco_alp_clock(cc); - if (ccrev >= 21) { - /* Turn off UART clock before switching clocksource. */ - bcma_cc_write32(cc, BCMA_CC_CORECTL, diff --git a/target/linux/brcm47xx/patches-3.6/546-bcma-set-the-pmu-watchdog-if-available.patch b/target/linux/brcm47xx/patches-3.6/546-bcma-set-the-pmu-watchdog-if-available.patch deleted file mode 100644 index 651415e..0000000 --- a/target/linux/brcm47xx/patches-3.6/546-bcma-set-the-pmu-watchdog-if-available.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- a/drivers/bcma/driver_chipcommon.c -+++ b/drivers/bcma/driver_chipcommon.c -@@ -31,6 +31,28 @@ static u32 bcma_chipco_alp_clock(struct - return 20000000; - } - -+static u32 bcma_chipco_watchdog_get_max_timer(struct bcma_drv_cc *cc) -+{ -+ struct bcma_bus *bus = cc->core->bus; -+ u32 nb; -+ -+ if (cc->capabilities & BCMA_CC_CAP_PMU) { -+ if (bus->chipinfo.id == BCMA_CHIP_ID_BCM4706) -+ nb = 32; -+ else if (cc->core->id.rev < 26) -+ nb = 16; -+ else -+ nb = (cc->core->id.rev >= 37) ? 32 : 24; -+ } else { -+ nb = 28; -+ } -+ if (nb == 32) -+ return 0xffffffff; -+ else -+ return (1 << nb) - 1; -+} -+ -+ - void bcma_core_chipcommon_early_init(struct bcma_drv_cc *cc) - { - if (cc->early_setup_done) -@@ -87,8 +109,23 @@ void bcma_core_chipcommon_init(struct bc - /* Set chip watchdog reset timer to fire in 'ticks' backplane cycles */ - void bcma_chipco_watchdog_timer_set(struct bcma_drv_cc *cc, u32 ticks) - { -- /* instant NMI */ -- bcma_cc_write32(cc, BCMA_CC_WATCHDOG, ticks); -+ u32 maxt; -+ enum bcma_clkmode clkmode; -+ -+ maxt = bcma_chipco_watchdog_get_max_timer(cc); -+ if (cc->capabilities & BCMA_CC_CAP_PMU) { -+ if (ticks == 1) -+ ticks = 2; -+ else if (ticks > maxt) -+ ticks = maxt; -+ bcma_cc_write32(cc, BCMA_CC_PMU_WATCHDOG, ticks); -+ } else { -+ clkmode = ticks ? BCMA_CLKMODE_FAST : BCMA_CLKMODE_DYNAMIC; -+ bcma_core_set_clockmode(cc->core, clkmode); -+ if (ticks > maxt) -+ ticks = maxt; -+ bcma_cc_write32(cc, BCMA_CC_WATCHDOG, ticks); -+ } - } - - void bcma_chipco_irq_mask(struct bcma_drv_cc *cc, u32 mask, u32 value) diff --git a/target/linux/brcm47xx/patches-3.6/547-bcma-add-methods-for-watchdog-driver.patch b/target/linux/brcm47xx/patches-3.6/547-bcma-add-methods-for-watchdog-driver.patch deleted file mode 100644 index 1be2476..0000000 --- a/target/linux/brcm47xx/patches-3.6/547-bcma-add-methods-for-watchdog-driver.patch +++ /dev/null @@ -1,93 +0,0 @@ ---- a/drivers/bcma/driver_chipcommon.c -+++ b/drivers/bcma/driver_chipcommon.c -@@ -10,6 +10,7 @@ - */ - - #include "bcma_private.h" -+#include <linux/bcm47xx_wdt.h> - #include <linux/export.h> - #include <linux/bcma/bcma.h> - -@@ -52,6 +53,39 @@ static u32 bcma_chipco_watchdog_get_max_ - return (1 << nb) - 1; - } - -+static u32 bcma_chipco_watchdog_timer_set_wdt(struct bcm47xx_wdt *wdt, -+ u32 ticks) -+{ -+ struct bcma_drv_cc *cc = bcm47xx_wdt_get_drvdata(wdt); -+ -+ return bcma_chipco_watchdog_timer_set(cc, ticks); -+} -+ -+static u32 bcma_chipco_watchdog_timer_set_ms_wdt(struct bcm47xx_wdt *wdt, -+ u32 ms) -+{ -+ struct bcma_drv_cc *cc = bcm47xx_wdt_get_drvdata(wdt); -+ u32 ticks; -+ -+ ticks = bcma_chipco_watchdog_timer_set(cc, cc->ticks_per_ms * ms); -+ return ticks / cc->ticks_per_ms; -+} -+ -+static int bcma_chipco_watchdog_ticks_per_ms(struct bcma_drv_cc *cc) -+{ -+ struct bcma_bus *bus = cc->core->bus; -+ -+ if (cc->capabilities & BCMA_CC_CAP_PMU) { -+ if (bus->chipinfo.id == BCMA_CHIP_ID_BCM4706) -+ /* 4706 CC and PMU watchdogs are clocked at 1/4 of ALP clock */ -+ return bcma_chipco_alp_clock(cc) / 4000; -+ else -+ /* based on 32KHz ILP clock */ -+ return 32; -+ } else { -+ return bcma_chipco_alp_clock(cc) / 1000; -+ } -+} - - void bcma_core_chipcommon_early_init(struct bcma_drv_cc *cc) - { -@@ -102,12 +136,13 @@ void bcma_core_chipcommon_init(struct bc - } - - spin_lock_init(&cc->gpio_lock); -+ cc->ticks_per_ms = bcma_chipco_watchdog_ticks_per_ms(cc); - - cc->setup_done = true; - } - - /* Set chip watchdog reset timer to fire in 'ticks' backplane cycles */ --void bcma_chipco_watchdog_timer_set(struct bcma_drv_cc *cc, u32 ticks) -+u32 bcma_chipco_watchdog_timer_set(struct bcma_drv_cc *cc, u32 ticks) - { - u32 maxt; - enum bcma_clkmode clkmode; -@@ -126,6 +161,7 @@ void bcma_chipco_watchdog_timer_set(stru - ticks = maxt; - bcma_cc_write32(cc, BCMA_CC_WATCHDOG, ticks); - } -+ return ticks; - } - - void bcma_chipco_irq_mask(struct bcma_drv_cc *cc, u32 mask, u32 value) ---- a/include/linux/bcma/bcma_driver_chipcommon.h -+++ b/include/linux/bcma/bcma_driver_chipcommon.h -@@ -554,6 +554,7 @@ struct bcma_drv_cc { - - /* Lock for GPIO register access. */ - spinlock_t gpio_lock; -+ u32 ticks_per_ms; - }; - - /* Register access */ -@@ -577,8 +578,7 @@ extern void bcma_chipco_resume(struct bc - - void bcma_chipco_bcm4331_ext_pa_lines_ctl(struct bcma_drv_cc *cc, bool enable); - --extern void bcma_chipco_watchdog_timer_set(struct bcma_drv_cc *cc, -- u32 ticks); -+extern u32 bcma_chipco_watchdog_timer_set(struct bcma_drv_cc *cc, u32 ticks); - - void bcma_chipco_irq_mask(struct bcma_drv_cc *cc, u32 mask, u32 value); - diff --git a/target/linux/brcm47xx/patches-3.6/548-bcma-register-watchdog-driver.patch b/target/linux/brcm47xx/patches-3.6/548-bcma-register-watchdog-driver.patch deleted file mode 100644 index 457df36..0000000 --- a/target/linux/brcm47xx/patches-3.6/548-bcma-register-watchdog-driver.patch +++ /dev/null @@ -1,92 +0,0 @@ ---- a/drivers/bcma/bcma_private.h -+++ b/drivers/bcma/bcma_private.h -@@ -85,6 +85,8 @@ extern void __exit bcma_host_pci_exit(vo - /* driver_pci.c */ - u32 bcma_pcie_read(struct bcma_drv_pci *pc, u32 address); - -+extern int bcma_chipco_watchdog_register(struct bcma_drv_cc *cc); -+ - #ifdef CONFIG_BCMA_DRIVER_PCI_HOSTMODE - bool __devinit bcma_core_pci_is_in_hostmode(struct bcma_drv_pci *pc); - void __devinit bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc); ---- a/drivers/bcma/driver_chipcommon.c -+++ b/drivers/bcma/driver_chipcommon.c -@@ -12,6 +12,7 @@ - #include "bcma_private.h" - #include <linux/bcm47xx_wdt.h> - #include <linux/export.h> -+#include <linux/platform_device.h> - #include <linux/bcma/bcma.h> - - static inline u32 bcma_cc_write32_masked(struct bcma_drv_cc *cc, u16 offset, -@@ -87,6 +88,27 @@ static int bcma_chipco_watchdog_ticks_pe - } - } - -+int bcma_chipco_watchdog_register(struct bcma_drv_cc *cc) -+{ -+ struct bcm47xx_wdt wdt = {}; -+ struct platform_device *pdev; -+ -+ wdt.driver_data = cc; -+ wdt.timer_set = bcma_chipco_watchdog_timer_set_wdt; -+ wdt.timer_set_ms = bcma_chipco_watchdog_timer_set_ms_wdt; -+ wdt.max_timer_ms = bcma_chipco_watchdog_get_max_timer(cc) / cc->ticks_per_ms; -+ -+ pdev = platform_device_register_data(NULL, "bcm47xx-wdt", -+ cc->core->bus->num, &wdt, -+ sizeof(wdt)); -+ if (IS_ERR(pdev)) -+ return PTR_ERR(pdev); -+ -+ cc->watchdog = pdev; -+ -+ return 0; -+} -+ - void bcma_core_chipcommon_early_init(struct bcma_drv_cc *cc) - { - if (cc->early_setup_done) ---- a/drivers/bcma/main.c -+++ b/drivers/bcma/main.c -@@ -173,6 +173,12 @@ static int bcma_register_cores(struct bc - } - #endif - -+ if (bus->hosttype == BCMA_HOSTTYPE_SOC) { -+ err = bcma_chipco_watchdog_register(&bus->drv_cc); -+ if (err) -+ bcma_err(bus, "Error registering watchdog driver\n"); -+ } -+ - return 0; - } - -@@ -185,6 +191,8 @@ static void bcma_unregister_cores(struct - if (core->dev_registered) - device_unregister(&core->dev); - } -+ if (bus->hosttype == BCMA_HOSTTYPE_SOC) -+ platform_device_unregister(bus->drv_cc.watchdog); - } - - int __devinit bcma_bus_register(struct bcma_bus *bus) ---- a/include/linux/bcma/bcma_driver_chipcommon.h -+++ b/include/linux/bcma/bcma_driver_chipcommon.h -@@ -4,6 +4,8 @@ - #include <linux/mtd/bcm47xx_sflash.h> - #include <linux/mtd/bcm47xx_nand.h> - -+#include <linux/platform_device.h> -+ - /** ChipCommon core registers. **/ - #define BCMA_CC_ID 0x0000 - #define BCMA_CC_ID_ID 0x0000FFFF -@@ -555,6 +557,7 @@ struct bcma_drv_cc { - /* Lock for GPIO register access. */ - spinlock_t gpio_lock; - u32 ticks_per_ms; -+ struct platform_device *watchdog; - }; - - /* Register access */ diff --git a/target/linux/brcm47xx/patches-3.6/549-ssb-get-alp-clock-from-devices-with-PMU.patch b/target/linux/brcm47xx/patches-3.6/549-ssb-get-alp-clock-from-devices-with-PMU.patch deleted file mode 100644 index f591298..0000000 --- a/target/linux/brcm47xx/patches-3.6/549-ssb-get-alp-clock-from-devices-with-PMU.patch +++ /dev/null @@ -1,76 +0,0 @@ ---- a/drivers/ssb/driver_chipcommon.c -+++ b/drivers/ssb/driver_chipcommon.c -@@ -280,6 +280,14 @@ static void calc_fast_powerup_delay(stru - cc->fast_pwrup_delay = tmp; - } - -+static u32 ssb_chipco_alp_clock(struct ssb_chipcommon *cc) -+{ -+ if (cc->capabilities & SSB_CHIPCO_CAP_PMU) -+ return ssb_pmu_get_alp_clock(cc); -+ -+ return 20000000; -+} -+ - void ssb_chipcommon_init(struct ssb_chipcommon *cc) - { - if (!cc->dev) -@@ -474,11 +482,7 @@ int ssb_chipco_serial_init(struct ssb_ch - | SSB_CHIPCO_CORECTL_UARTCLK0); - } else if ((ccrev >= 11) && (ccrev != 15)) { - /* Fixed ALP clock */ -- baud_base = 20000000; -- if (cc->capabilities & SSB_CHIPCO_CAP_PMU) { -- /* FIXME: baud_base is different for devices with a PMU */ -- SSB_WARN_ON(1); -- } -+ baud_base = ssb_chipco_alp_clock(cc); - div = 1; - if (ccrev >= 21) { - /* Turn off UART clock before switching clocksource. */ ---- a/drivers/ssb/driver_chipcommon_pmu.c -+++ b/drivers/ssb/driver_chipcommon_pmu.c -@@ -618,6 +618,33 @@ void ssb_pmu_set_ldo_paref(struct ssb_ch - EXPORT_SYMBOL(ssb_pmu_set_ldo_voltage); - EXPORT_SYMBOL(ssb_pmu_set_ldo_paref); - -+static u32 ssb_pmu_get_alp_clock_clk0(struct ssb_chipcommon *cc) -+{ -+ u32 crystalfreq; -+ const struct pmu0_plltab_entry *e = NULL; -+ -+ crystalfreq = chipco_read32(cc, SSB_CHIPCO_PMU_CTL) & -+ SSB_CHIPCO_PMU_CTL_XTALFREQ >> SSB_CHIPCO_PMU_CTL_XTALFREQ_SHIFT; -+ e = pmu0_plltab_find_entry(crystalfreq); -+ BUG_ON(!e); -+ return e->freq * 1000; -+} -+ -+u32 ssb_pmu_get_alp_clock(struct ssb_chipcommon *cc) -+{ -+ struct ssb_bus *bus = cc->dev->bus; -+ -+ switch (bus->chip_id) { -+ case 0x5354: -+ ssb_pmu_get_alp_clock_clk0(cc); -+ default: -+ ssb_printk(KERN_ERR PFX -+ "ERROR: PMU alp clock unknown for device %04X\n", -+ bus->chip_id); -+ return 0; -+ } -+} -+ - u32 ssb_pmu_get_cpu_clock(struct ssb_chipcommon *cc) - { - struct ssb_bus *bus = cc->dev->bus; ---- a/drivers/ssb/ssb_private.h -+++ b/drivers/ssb/ssb_private.h -@@ -210,6 +210,7 @@ static inline void b43_pci_ssb_bridge_ex - /* driver_chipcommon_pmu.c */ - extern u32 ssb_pmu_get_cpu_clock(struct ssb_chipcommon *cc); - extern u32 ssb_pmu_get_controlclock(struct ssb_chipcommon *cc); -+extern u32 ssb_pmu_get_alp_clock(struct ssb_chipcommon *cc); - - #ifdef CONFIG_SSB_SFLASH - /* driver_chipcommon_sflash.c */ diff --git a/target/linux/brcm47xx/patches-3.6/550-ssb-set-the-pmu-watchdog-if-available.patch b/target/linux/brcm47xx/patches-3.6/550-ssb-set-the-pmu-watchdog-if-available.patch deleted file mode 100644 index f7cc07b..0000000 --- a/target/linux/brcm47xx/patches-3.6/550-ssb-set-the-pmu-watchdog-if-available.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- a/drivers/ssb/driver_chipcommon.c -+++ b/drivers/ssb/driver_chipcommon.c -@@ -288,6 +288,24 @@ static u32 ssb_chipco_alp_clock(struct s - return 20000000; - } - -+static u32 ssb_chipco_watchdog_get_max_timer(struct ssb_chipcommon *cc) -+{ -+ u32 nb; -+ -+ if (cc->capabilities & SSB_CHIPCO_CAP_PMU) { -+ if (cc->dev->id.revision < 26) -+ nb = 16; -+ else -+ nb = (cc->dev->id.revision >= 37) ? 32 : 24; -+ } else { -+ nb = 28; -+ } -+ if (nb == 32) -+ return 0xffffffff; -+ else -+ return (1 << nb) - 1; -+} -+ - void ssb_chipcommon_init(struct ssb_chipcommon *cc) - { - if (!cc->dev) -@@ -405,8 +423,24 @@ void ssb_chipco_timing_init(struct ssb_c - /* Set chip watchdog reset timer to fire in 'ticks' backplane cycles */ - void ssb_chipco_watchdog_timer_set(struct ssb_chipcommon *cc, u32 ticks) - { -- /* instant NMI */ -- chipco_write32(cc, SSB_CHIPCO_WATCHDOG, ticks); -+ u32 maxt; -+ enum ssb_clkmode clkmode; -+ -+ maxt = ssb_chipco_watchdog_get_max_timer(cc); -+ if (cc->capabilities & SSB_CHIPCO_CAP_PMU) { -+ if (ticks == 1) -+ ticks = 2; -+ else if (ticks > maxt) -+ ticks = maxt; -+ chipco_write32(cc, SSB_CHIPCO_PMU_WATCHDOG, ticks); -+ } else { -+ clkmode = ticks ? SSB_CLKMODE_FAST : SSB_CLKMODE_DYNAMIC; -+ ssb_chipco_set_clockmode(cc, clkmode); -+ if (ticks > maxt) -+ ticks = maxt; -+ /* instant NMI */ -+ chipco_write32(cc, SSB_CHIPCO_WATCHDOG, ticks); -+ } - } - - void ssb_chipco_irq_mask(struct ssb_chipcommon *cc, u32 mask, u32 value) diff --git a/target/linux/brcm47xx/patches-3.6/551-ssb-add-methods-for-watchdog-driver.patch b/target/linux/brcm47xx/patches-3.6/551-ssb-add-methods-for-watchdog-driver.patch deleted file mode 100644 index 46911d1..0000000 --- a/target/linux/brcm47xx/patches-3.6/551-ssb-add-methods-for-watchdog-driver.patch +++ /dev/null @@ -1,131 +0,0 @@ ---- a/drivers/ssb/driver_chipcommon.c -+++ b/drivers/ssb/driver_chipcommon.c -@@ -4,6 +4,7 @@ - * - * Copyright 2005, Broadcom Corporation - * Copyright 2006, 2007, Michael Buesch <m@bues.ch> -+ * Copyright 2012, Hauke Mehrtens <hauke@hauke-m.de> - * - * Licensed under the GNU/GPL. See COPYING for details. - */ -@@ -12,6 +13,7 @@ - #include <linux/ssb/ssb_regs.h> - #include <linux/export.h> - #include <linux/pci.h> -+#include <linux/bcm47xx_wdt.h> - - #include "ssb_private.h" - -@@ -306,6 +308,43 @@ static u32 ssb_chipco_watchdog_get_max_t - return (1 << nb) - 1; - } - -+u32 ssb_chipco_watchdog_timer_set_wdt(struct bcm47xx_wdt *wdt, u32 ticks) -+{ -+ struct ssb_chipcommon *cc = bcm47xx_wdt_get_drvdata(wdt); -+ -+ if (cc->dev->bus->bustype != SSB_BUSTYPE_SSB) -+ return 0; -+ -+ return ssb_chipco_watchdog_timer_set(cc, ticks); -+} -+ -+u32 ssb_chipco_watchdog_timer_set_ms(struct bcm47xx_wdt *wdt, u32 ms) -+{ -+ struct ssb_chipcommon *cc = bcm47xx_wdt_get_drvdata(wdt); -+ u32 ticks; -+ -+ if (cc->dev->bus->bustype != SSB_BUSTYPE_SSB) -+ return 0; -+ -+ ticks = ssb_chipco_watchdog_timer_set(cc, cc->ticks_per_ms * ms); -+ return ticks / cc->ticks_per_ms; -+} -+ -+static int ssb_chipco_watchdog_ticks_per_ms(struct ssb_chipcommon *cc) -+{ -+ struct ssb_bus *bus = cc->dev->bus; -+ -+ if (cc->capabilities & SSB_CHIPCO_CAP_PMU) { -+ /* based on 32KHz ILP clock */ -+ return 32; -+ } else { -+ if (cc->dev->id.revision < 18) -+ return ssb_clockspeed(bus) / 1000; -+ else -+ return ssb_chipco_alp_clock(cc) / 1000; -+ } -+} -+ - void ssb_chipcommon_init(struct ssb_chipcommon *cc) - { - if (!cc->dev) -@@ -323,6 +362,11 @@ void ssb_chipcommon_init(struct ssb_chip - chipco_powercontrol_init(cc); - ssb_chipco_set_clockmode(cc, SSB_CLKMODE_FAST); - calc_fast_powerup_delay(cc); -+ -+ if (cc->dev->bus->bustype == SSB_BUSTYPE_SSB) { -+ cc->ticks_per_ms = ssb_chipco_watchdog_ticks_per_ms(cc); -+ cc->max_timer_ms = ssb_chipco_watchdog_get_max_timer(cc) / cc->ticks_per_ms; -+ } - } - - void ssb_chipco_suspend(struct ssb_chipcommon *cc) -@@ -421,7 +465,7 @@ void ssb_chipco_timing_init(struct ssb_c - } - - /* Set chip watchdog reset timer to fire in 'ticks' backplane cycles */ --void ssb_chipco_watchdog_timer_set(struct ssb_chipcommon *cc, u32 ticks) -+u32 ssb_chipco_watchdog_timer_set(struct ssb_chipcommon *cc, u32 ticks) - { - u32 maxt; - enum ssb_clkmode clkmode; -@@ -441,6 +485,7 @@ void ssb_chipco_watchdog_timer_set(struc - /* instant NMI */ - chipco_write32(cc, SSB_CHIPCO_WATCHDOG, ticks); - } -+ return ticks; - } - - void ssb_chipco_irq_mask(struct ssb_chipcommon *cc, u32 mask, u32 value) ---- a/drivers/ssb/ssb_private.h -+++ b/drivers/ssb/ssb_private.h -@@ -3,6 +3,7 @@ - - #include <linux/ssb/ssb.h> - #include <linux/types.h> -+#include <linux/bcm47xx_wdt.h> - - - #define PFX "ssb: " -@@ -226,4 +227,8 @@ static inline int ssb_sflash_init(struct - - extern struct platform_device ssb_pflash_dev; - -+extern u32 ssb_chipco_watchdog_timer_set_wdt(struct bcm47xx_wdt *wdt, -+ u32 ticks); -+extern u32 ssb_chipco_watchdog_timer_set_ms(struct bcm47xx_wdt *wdt, u32 ms); -+ - #endif /* LINUX_SSB_PRIVATE_H_ */ ---- a/include/linux/ssb/ssb_driver_chipcommon.h -+++ b/include/linux/ssb/ssb_driver_chipcommon.h -@@ -607,6 +607,8 @@ struct ssb_chipcommon { - #ifdef CONFIG_SSB_SFLASH - struct bcm47xx_sflash sflash; - #endif -+ u32 ticks_per_ms; -+ u32 max_timer_ms; - }; - - static inline bool ssb_chipco_available(struct ssb_chipcommon *cc) -@@ -646,8 +648,7 @@ enum ssb_clkmode { - extern void ssb_chipco_set_clockmode(struct ssb_chipcommon *cc, - enum ssb_clkmode mode); - --extern void ssb_chipco_watchdog_timer_set(struct ssb_chipcommon *cc, -- u32 ticks); -+extern u32 ssb_chipco_watchdog_timer_set(struct ssb_chipcommon *cc, u32 ticks); - - void ssb_chipco_irq_mask(struct ssb_chipcommon *cc, u32 mask, u32 value); - diff --git a/target/linux/brcm47xx/patches-3.6/552-ssb-extif-add-check-for-max-value-in-watchdog.patch b/target/linux/brcm47xx/patches-3.6/552-ssb-extif-add-check-for-max-value-in-watchdog.patch deleted file mode 100644 index c6756dd..0000000 --- a/target/linux/brcm47xx/patches-3.6/552-ssb-extif-add-check-for-max-value-in-watchdog.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/drivers/ssb/driver_extif.c -+++ b/drivers/ssb/driver_extif.c -@@ -112,9 +112,10 @@ void ssb_extif_get_clockcontrol(struct s - *m = extif_read32(extif, SSB_EXTIF_CLOCK_SB); - } - --void ssb_extif_watchdog_timer_set(struct ssb_extif *extif, -- u32 ticks) -+void ssb_extif_watchdog_timer_set(struct ssb_extif *extif, u32 ticks) - { -+ if (ticks > SSB_EXTIF_WATCHDOG_MAX_TIMER) -+ ticks = SSB_EXTIF_WATCHDOG_MAX_TIMER; - extif_write32(extif, SSB_EXTIF_WATCHDOG, ticks); - } - ---- a/include/linux/ssb/ssb_driver_extif.h -+++ b/include/linux/ssb/ssb_driver_extif.h -@@ -152,6 +152,7 @@ - /* watchdog */ - #define SSB_EXTIF_WATCHDOG_CLK 48000000 /* Hz */ - -+#define SSB_EXTIF_WATCHDOG_MAX_TIMER ((1 << 28) - 1) - - - #ifdef CONFIG_SSB_DRIVER_EXTIF diff --git a/target/linux/brcm47xx/patches-3.6/553-ssb-extif-add-methods-for-watchdog-driver.patch b/target/linux/brcm47xx/patches-3.6/553-ssb-extif-add-methods-for-watchdog-driver.patch deleted file mode 100644 index 555cf64..0000000 --- a/target/linux/brcm47xx/patches-3.6/553-ssb-extif-add-methods-for-watchdog-driver.patch +++ /dev/null @@ -1,89 +0,0 @@ ---- a/drivers/ssb/driver_extif.c -+++ b/drivers/ssb/driver_extif.c -@@ -112,11 +112,30 @@ void ssb_extif_get_clockcontrol(struct s - *m = extif_read32(extif, SSB_EXTIF_CLOCK_SB); - } - --void ssb_extif_watchdog_timer_set(struct ssb_extif *extif, u32 ticks) -+u32 ssb_extif_watchdog_timer_set_wdt(struct bcm47xx_wdt *wdt, u32 ticks) -+{ -+ struct ssb_extif *extif = bcm47xx_wdt_get_drvdata(wdt); -+ -+ return ssb_extif_watchdog_timer_set(extif, ticks); -+} -+ -+u32 ssb_extif_watchdog_timer_set_ms(struct bcm47xx_wdt *wdt, u32 ms) -+{ -+ struct ssb_extif *extif = bcm47xx_wdt_get_drvdata(wdt); -+ u32 ticks = (SSB_EXTIF_WATCHDOG_CLK / 1000) * ms; -+ -+ ticks = ssb_extif_watchdog_timer_set(extif, ticks); -+ -+ return (ticks * 1000) / SSB_EXTIF_WATCHDOG_CLK; -+} -+ -+u32 ssb_extif_watchdog_timer_set(struct ssb_extif *extif, u32 ticks) - { - if (ticks > SSB_EXTIF_WATCHDOG_MAX_TIMER) - ticks = SSB_EXTIF_WATCHDOG_MAX_TIMER; - extif_write32(extif, SSB_EXTIF_WATCHDOG, ticks); -+ -+ return ticks; - } - - u32 ssb_extif_gpio_in(struct ssb_extif *extif, u32 mask) ---- a/drivers/ssb/ssb_private.h -+++ b/drivers/ssb/ssb_private.h -@@ -231,4 +231,19 @@ extern u32 ssb_chipco_watchdog_timer_set - u32 ticks); - extern u32 ssb_chipco_watchdog_timer_set_ms(struct bcm47xx_wdt *wdt, u32 ms); - -+#ifdef CONFIG_SSB_DRIVER_EXTIF -+extern u32 ssb_extif_watchdog_timer_set_wdt(struct bcm47xx_wdt *wdt, u32 ticks); -+extern u32 ssb_extif_watchdog_timer_set_ms(struct bcm47xx_wdt *wdt, u32 ms); -+#else -+static inline u32 ssb_extif_watchdog_timer_set_wdt(struct bcm47xx_wdt *wdt, -+ u32 ticks) -+{ -+ return 0; -+} -+static inline u32 ssb_extif_watchdog_timer_set_ms(struct bcm47xx_wdt *wdt, -+ u32 ms) -+{ -+ return 0; -+} -+#endif - #endif /* LINUX_SSB_PRIVATE_H_ */ ---- a/include/linux/ssb/ssb_driver_extif.h -+++ b/include/linux/ssb/ssb_driver_extif.h -@@ -153,6 +153,8 @@ - #define SSB_EXTIF_WATCHDOG_CLK 48000000 /* Hz */ - - #define SSB_EXTIF_WATCHDOG_MAX_TIMER ((1 << 28) - 1) -+#define SSB_EXTIF_WATCHDOG_MAX_TIMER_MS (SSB_EXTIF_WATCHDOG_MAX_TIMER \ -+ / (SSB_EXTIF_WATCHDOG_CLK / 1000)) - - - #ifdef CONFIG_SSB_DRIVER_EXTIF -@@ -172,8 +174,7 @@ extern void ssb_extif_get_clockcontrol(s - extern void ssb_extif_timing_init(struct ssb_extif *extif, - unsigned long ns); - --extern void ssb_extif_watchdog_timer_set(struct ssb_extif *extif, -- u32 ticks); -+extern u32 ssb_extif_watchdog_timer_set(struct ssb_extif *extif, u32 ticks); - - /* Extif GPIO pin access */ - u32 ssb_extif_gpio_in(struct ssb_extif *extif, u32 mask); -@@ -206,9 +207,9 @@ void ssb_extif_get_clockcontrol(struct s - } - - static inline --void ssb_extif_watchdog_timer_set(struct ssb_extif *extif, -- u32 ticks) -+u32 ssb_extif_watchdog_timer_set(struct ssb_extif *extif, u32 ticks) - { -+ return 0; - } - - #endif /* CONFIG_SSB_DRIVER_EXTIF */ diff --git a/target/linux/brcm47xx/patches-3.6/554-ssb-register-watchdog-driver.patch b/target/linux/brcm47xx/patches-3.6/554-ssb-register-watchdog-driver.patch deleted file mode 100644 index c814c54..0000000 --- a/target/linux/brcm47xx/patches-3.6/554-ssb-register-watchdog-driver.patch +++ /dev/null @@ -1,122 +0,0 @@ ---- a/drivers/ssb/embedded.c -+++ b/drivers/ssb/embedded.c -@@ -4,11 +4,13 @@ - * - * Copyright 2005-2008, Broadcom Corporation - * Copyright 2006-2008, Michael Buesch <m@bues.ch> -+ * Copyright 2012, Hauke Mehrtens <hauke@hauke-m.de> - * - * Licensed under the GNU/GPL. See COPYING for details. - */ - - #include <linux/export.h> -+#include <linux/platform_device.h> - #include <linux/ssb/ssb.h> - #include <linux/ssb/ssb_embedded.h> - #include <linux/ssb/ssb_driver_pci.h> -@@ -32,6 +34,39 @@ int ssb_watchdog_timer_set(struct ssb_bu - } - EXPORT_SYMBOL(ssb_watchdog_timer_set); - -+int ssb_watchdog_register(struct ssb_bus *bus) -+{ -+ struct bcm47xx_wdt wdt = {}; -+ struct platform_device *pdev; -+ -+ if (ssb_chipco_available(&bus->chipco)) { -+ wdt.driver_data = &bus->chipco; -+ wdt.timer_set = ssb_chipco_watchdog_timer_set_wdt; -+ wdt.timer_set_ms = ssb_chipco_watchdog_timer_set_ms; -+ wdt.max_timer_ms = bus->chipco.max_timer_ms; -+ } else if (ssb_extif_available(&bus->extif)) { -+ wdt.driver_data = &bus->extif; -+ wdt.timer_set = ssb_extif_watchdog_timer_set_wdt; -+ wdt.timer_set_ms = ssb_extif_watchdog_timer_set_ms; -+ wdt.max_timer_ms = SSB_EXTIF_WATCHDOG_MAX_TIMER_MS; -+ } else { -+ return -ENODEV; -+ } -+ -+ pdev = platform_device_register_data(NULL, "bcm47xx-wdt", -+ bus->busnumber, &wdt, -+ sizeof(wdt)); -+ if (IS_ERR(pdev)) { -+ ssb_dprintk(KERN_INFO PFX -+ "can not register watchdog device, err: %li\n", -+ PTR_ERR(pdev)); -+ return PTR_ERR(pdev); -+ } -+ -+ bus->watchdog = pdev; -+ return 0; -+} -+ - u32 ssb_gpio_in(struct ssb_bus *bus, u32 mask) - { - unsigned long flags; ---- a/drivers/ssb/main.c -+++ b/drivers/ssb/main.c -@@ -13,6 +13,7 @@ - #include <linux/delay.h> - #include <linux/io.h> - #include <linux/module.h> -+#include <linux/platform_device.h> - #include <linux/ssb/ssb.h> - #include <linux/ssb/ssb_regs.h> - #include <linux/ssb/ssb_driver_gige.h> -@@ -434,6 +435,11 @@ static void ssb_devices_unregister(struc - if (sdev->dev) - device_unregister(sdev->dev); - } -+ -+#ifdef CONFIG_SSB_EMBEDDED -+ if (bus->bustype == SSB_BUSTYPE_SSB) -+ platform_device_unregister(bus->watchdog); -+#endif - } - - void ssb_bus_unregister(struct ssb_bus *bus) -@@ -579,6 +585,8 @@ static int __devinit ssb_attach_queued_b - if (err) - goto error; - ssb_pcicore_init(&bus->pcicore); -+ if (bus->bustype == SSB_BUSTYPE_SSB) -+ ssb_watchdog_register(bus); - ssb_bus_may_powerdown(bus); - - err = ssb_devices_register(bus); ---- a/drivers/ssb/ssb_private.h -+++ b/drivers/ssb/ssb_private.h -@@ -246,4 +246,14 @@ static inline u32 ssb_extif_watchdog_tim - return 0; - } - #endif -+ -+#ifdef CONFIG_SSB_EMBEDDED -+extern int ssb_watchdog_register(struct ssb_bus *bus); -+#else /* CONFIG_SSB_EMBEDDED */ -+static inline int ssb_watchdog_register(struct ssb_bus *bus) -+{ -+ return 0; -+} -+#endif /* CONFIG_SSB_EMBEDDED */ -+ - #endif /* LINUX_SSB_PRIVATE_H_ */ ---- a/include/linux/ssb/ssb.h -+++ b/include/linux/ssb/ssb.h -@@ -8,6 +8,7 @@ - #include <linux/pci.h> - #include <linux/mod_devicetable.h> - #include <linux/dma-mapping.h> -+#include <linux/platform_device.h> - - #include <linux/ssb/ssb_regs.h> - -@@ -432,6 +433,7 @@ struct ssb_bus { - #ifdef CONFIG_SSB_EMBEDDED - /* Lock for GPIO register access. */ - spinlock_t gpio_lock; -+ struct platform_device *watchdog; - #endif /* EMBEDDED */ - - /* Internal-only stuff follows. Do not touch. */ |