diff options
author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-12-12 22:42:18 +0000 |
---|---|---|
committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-12-12 22:42:18 +0000 |
commit | 811c287737892fe00307b9e7afb832fd459f6e6a (patch) | |
tree | 361f1acf0bb77a59cdddefa0a8427afb494fe932 /target/linux/brcm47xx/patches-3.6/545-bcma-add-bcma_chipco_alp_clock.patch | |
parent | 9c0265ae1924e58fd92470bc395ea63f1e9c81cf (diff) |
kernel: update bcma and ssb to master-2012-12-11-2 from wireless-testing
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34651 3c298f89-4303-0410-b956-a3cf2f4a3e73
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, 0 insertions, 35 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 deleted file mode 100644 index f6f0012a7..000000000 --- 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, |