projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[kernel/2.6.32] MIPS: mark unused variables
[openwrt.git]
/
target
/
linux
/
brcm47xx
/
patches-3.2
/
220-bcm5354.patch
diff --git
a/target/linux/brcm47xx/patches-3.2/220-bcm5354.patch
b/target/linux/brcm47xx/patches-3.2/220-bcm5354.patch
index
e8c7dde
..
1998bbe
100644
(file)
--- a/
target/linux/brcm47xx/patches-3.2/220-bcm5354.patch
+++ b/
target/linux/brcm47xx/patches-3.2/220-bcm5354.patch
@@
-14,8
+14,6
@@
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
drivers/ssb/ssb_private.h | 4 +++
4 files changed, 53 insertions(+), 5 deletions(-)
drivers/ssb/ssb_private.h | 4 +++
4 files changed, 53 insertions(+), 5 deletions(-)
-diff --git a/drivers/ssb/driver_chipcommon_pmu.c b/drivers/ssb/driver_chipcommon_pmu.c
-index e5a2e0e..b58fef7 100644
--- a/drivers/ssb/driver_chipcommon_pmu.c
+++ b/drivers/ssb/driver_chipcommon_pmu.c
@@ -13,6 +13,9 @@
--- a/drivers/ssb/driver_chipcommon_pmu.c
+++ b/drivers/ssb/driver_chipcommon_pmu.c
@@ -13,6 +13,9 @@
@@
-28,7
+26,7
@@
index e5a2e0e..b58fef7 100644
#include "ssb_private.h"
#include "ssb_private.h"
-@@ -92,10 +95,6 @@ static void ssb_pmu0_pllinit_r0(struct s
sb_chipcommon *cc,
+@@ -92,10 +95,6 @@ static void ssb_pmu0_pllinit_r0(struct s
u32 pmuctl, tmp, pllctl;
unsigned int i;
u32 pmuctl, tmp, pllctl;
unsigned int i;
@@
-39,7
+37,7
@@
index e5a2e0e..b58fef7 100644
if (crystalfreq)
e = pmu0_plltab_find_entry(crystalfreq);
if (!e)
if (crystalfreq)
e = pmu0_plltab_find_entry(crystalfreq);
if (!e)
-@@ -321,7 +320,11 @@ static void ssb_pmu_pll_init(struct ssb_
chipcommon *cc)
+@@ -321,7 +320,11 @@ static void ssb_pmu_pll_init(struct ssb_
u32 crystalfreq = 0; /* in kHz. 0 = keep default freq. */
if (bus->bustype == SSB_BUSTYPE_SSB) {
u32 crystalfreq = 0; /* in kHz. 0 = keep default freq. */
if (bus->bustype == SSB_BUSTYPE_SSB) {
@@
-52,7
+50,7
@@
index e5a2e0e..b58fef7 100644
}
switch (bus->chip_id) {
}
switch (bus->chip_id) {
-@@ -330,7 +333,11 @@ static void ssb_pmu_pll_init(struct ssb_
chipcommon *cc)
+@@ -330,7 +333,11 @@ static void ssb_pmu_pll_init(struct ssb_
ssb_pmu1_pllinit_r0(cc, crystalfreq);
break;
case 0x4328:
ssb_pmu1_pllinit_r0(cc, crystalfreq);
break;
case 0x4328:
@@
-64,7
+62,7
@@
index e5a2e0e..b58fef7 100644
ssb_pmu0_pllinit_r0(cc, crystalfreq);
break;
case 0x4322:
ssb_pmu0_pllinit_r0(cc, crystalfreq);
break;
case 0x4322:
-@@ -607,3 +614,34 @@ void ssb_pmu_set_ldo_paref(struct ssb_ch
ipcommon *cc, bool on)
+@@ -607,3 +614,34 @@ void ssb_pmu_set_ldo_paref(struct ssb_ch
EXPORT_SYMBOL(ssb_pmu_set_ldo_voltage);
EXPORT_SYMBOL(ssb_pmu_set_ldo_paref);
EXPORT_SYMBOL(ssb_pmu_set_ldo_voltage);
EXPORT_SYMBOL(ssb_pmu_set_ldo_paref);
@@
-99,11
+97,9
@@
index e5a2e0e..b58fef7 100644
+ return 0;
+ }
+}
+ return 0;
+ }
+}
-diff --git a/drivers/ssb/driver_mipscore.c b/drivers/ssb/driver_mipscore.c
-index ced5015..d784ec8 100644
--- a/drivers/ssb/driver_mipscore.c
+++ b/drivers/ssb/driver_mipscore.c
--- a/drivers/ssb/driver_mipscore.c
+++ b/drivers/ssb/driver_mipscore.c
-@@ -2
08,6 +208,9 @@ u32 ssb_cpu_clock(struct ssb_mipscore *mcore)
+@@ -2
32,6 +232,9 @@ u32 ssb_cpu_clock(struct ssb_mipscore *m
struct ssb_bus *bus = mcore->dev->bus;
u32 pll_type, n, m, rate = 0;
struct ssb_bus *bus = mcore->dev->bus;
u32 pll_type, n, m, rate = 0;
@@
-113,8
+109,6
@@
index ced5015..d784ec8 100644
if (bus->extif.dev) {
ssb_extif_get_clockcontrol(&bus->extif, &pll_type, &n, &m);
} else if (bus->chipco.dev) {
if (bus->extif.dev) {
ssb_extif_get_clockcontrol(&bus->extif, &pll_type, &n, &m);
} else if (bus->chipco.dev) {
-diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
-index bb6317f..d109cf0 100644
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -1094,6 +1094,9 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -1094,6 +1094,9 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
@@
-127,11
+121,9
@@
index bb6317f..d109cf0 100644
if (ssb_extif_available(&bus->extif))
ssb_extif_get_clockcontrol(&bus->extif, &plltype,
&clkctl_n, &clkctl_m);
if (ssb_extif_available(&bus->extif))
ssb_extif_get_clockcontrol(&bus->extif, &plltype,
&clkctl_n, &clkctl_m);
-diff --git a/drivers/ssb/ssb_private.h b/drivers/ssb/ssb_private.h
-index 7765301..a305550 100644
--- a/drivers/ssb/ssb_private.h
+++ b/drivers/ssb/ssb_private.h
--- a/drivers/ssb/ssb_private.h
+++ b/drivers/ssb/ssb_private.h
-@@ -2
07,4 +207,8 @@ static inline void b43_pci_ssb_bridge_exit(void)
+@@ -2
11,4 +211,8 @@ static inline void b43_pci_ssb_bridge_ex
}
#endif /* CONFIG_SSB_B43_PCI_BRIDGE */
}
#endif /* CONFIG_SSB_B43_PCI_BRIDGE */
@@
-140,6
+132,3
@@
index 7765301..a305550 100644
+extern u32 ssb_pmu_get_controlclock(struct ssb_chipcommon *cc);
+
#endif /* LINUX_SSB_PRIVATE_H_ */
+extern u32 ssb_pmu_get_controlclock(struct ssb_chipcommon *cc);
+
#endif /* LINUX_SSB_PRIVATE_H_ */
---
-1.7.5.4
-
This page took
0.025051 seconds
and
4
git commands to generate.