diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2012-11-24 20:07:25 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2012-11-24 20:07:25 +0000 |
| commit | c62d86ecb87f695d9065a29e6ec4cd49ea5f21ad (patch) | |
| tree | 2780e1b6c67e659e1139bdf4ac01364588a84de2 /target/linux/brcm47xx/patches-3.6/545-bcma-add-bcma_chipco_alp_clock.patch | |
| parent | 60e0e0d6e64604de77dd6a5daf641b80408c1701 (diff) | |
| download | upstream-c62d86ecb87f695d9065a29e6ec4cd49ea5f21ad.tar.gz upstream-c62d86ecb87f695d9065a29e6ec4cd49ea5f21ad.tar.bz2 upstream-c62d86ecb87f695d9065a29e6ec4cd49ea5f21ad.zip | |
brcm47xx: update watchdog driver
This watchdog driver should work with SoC having a PMU.
This fixes #11720.
SVN-Revision: 34323
Diffstat (limited to 'target/linux/brcm47xx/patches-3.6/545-bcma-add-bcma_chipco_alp_clock.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.6/545-bcma-add-bcma_chipco_alp_clock.patch | 35 |
1 files changed, 35 insertions, 0 deletions
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 new file mode 100644 index 0000000000..f6f0012a7a --- /dev/null +++ b/target/linux/brcm47xx/patches-3.6/545-bcma-add-bcma_chipco_alp_clock.patch @@ -0,0 +1,35 @@ +--- 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, |