aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.31/941-ssb_update.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-04-28 19:59:28 +0000
committerFlorian Fainelli <florian@openwrt.org>2010-04-28 19:59:28 +0000
commit24726a0cdcb7477b5a6d17c5e6e7fa4680ded1c5 (patch)
treed6fe7ad0b6d1ad1f628d5402e3b75cff7ee9b74e /target/linux/generic-2.6/patches-2.6.31/941-ssb_update.patch
parente86e41d6631143bba47565354ac733ae21ca33ad (diff)
downloadupstream-24726a0cdcb7477b5a6d17c5e6e7fa4680ded1c5.tar.gz
upstream-24726a0cdcb7477b5a6d17c5e6e7fa4680ded1c5.tar.bz2
upstream-24726a0cdcb7477b5a6d17c5e6e7fa4680ded1c5.zip
refresh 2.6.31 patches
SVN-Revision: 21240
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.31/941-ssb_update.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.31/941-ssb_update.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.31/941-ssb_update.patch b/target/linux/generic-2.6/patches-2.6.31/941-ssb_update.patch
index c3f179edb9..b8c8c0674c 100644
--- a/target/linux/generic-2.6/patches-2.6.31/941-ssb_update.patch
+++ b/target/linux/generic-2.6/patches-2.6.31/941-ssb_update.patch
@@ -1,6 +1,6 @@
--- a/drivers/ssb/driver_chipcommon_pmu.c
+++ b/drivers/ssb/driver_chipcommon_pmu.c
-@@ -28,6 +28,21 @@ static void ssb_chipco_pll_write(struct
+@@ -28,6 +28,21 @@ static void ssb_chipco_pll_write(struct
chipco_write32(cc, SSB_CHIPCO_PLLCTL_DATA, value);
}
@@ -22,7 +22,7 @@
struct pmu0_plltab_entry {
u16 freq; /* Crystal frequency in kHz.*/
u8 xf; /* Crystal frequency value for PMU control */
-@@ -506,3 +521,82 @@ void ssb_pmu_init(struct ssb_chipcommon
+@@ -506,3 +521,82 @@ void ssb_pmu_init(struct ssb_chipcommon
ssb_pmu_pll_init(cc);
ssb_pmu_resources_init(cc);
}
@@ -227,7 +227,7 @@
/* Extract the antenna gain values. */
SPEX(antenna_gain.ghz24.a0, SSB_SPROM8_AGAIN01,
-@@ -549,6 +600,7 @@ static int sprom_extract(struct ssb_bus
+@@ -549,6 +600,7 @@ static int sprom_extract(struct ssb_bus
ssb_printk(KERN_WARNING PFX "Unsupported SPROM"
" revision %d detected. Will extract"
" v1\n", out->revision);
@@ -264,7 +264,7 @@
}
bus->mmio = NULL;
bus->mapped_device = NULL;
-@@ -230,6 +236,8 @@ static void __iomem *ssb_ioremap(struct
+@@ -230,6 +236,8 @@ static void __iomem *ssb_ioremap(struct
SSB_BUG_ON(1); /* Can't reach this code. */
#endif
break;