mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
kernel: update bcma and ssb to version master-2012-04-12 from wireless-testing
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31278 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -23,7 +23,7 @@
|
||||
bcma-$(CONFIG_BCMA_DRIVER_MIPS) += driver_mips.o
|
||||
--- a/drivers/bcma/bcma_private.h
|
||||
+++ b/drivers/bcma/bcma_private.h
|
||||
@@ -41,6 +41,11 @@ void bcma_chipco_serial_init(struct bcma
|
||||
@@ -42,6 +42,11 @@ void bcma_chipco_serial_init(struct bcma
|
||||
u32 bcma_pmu_alp_clock(struct bcma_drv_cc *cc);
|
||||
u32 bcma_pmu_get_clockcpu(struct bcma_drv_cc *cc);
|
||||
|
||||
@@ -455,7 +455,7 @@
|
||||
pr_info("found parallel flash.\n");
|
||||
--- a/include/linux/bcma/bcma_driver_chipcommon.h
|
||||
+++ b/include/linux/bcma/bcma_driver_chipcommon.h
|
||||
@@ -375,6 +375,7 @@ struct bcma_chipcommon_pmu {
|
||||
@@ -399,6 +399,7 @@ struct bcma_chipcommon_pmu {
|
||||
#ifdef CONFIG_BCMA_DRIVER_MIPS
|
||||
enum bcma_flash_type {
|
||||
BCMA_PFLASH,
|
||||
@@ -463,7 +463,7 @@
|
||||
};
|
||||
|
||||
struct bcma_pflash {
|
||||
@@ -383,6 +384,14 @@ struct bcma_pflash {
|
||||
@@ -407,6 +408,14 @@ struct bcma_pflash {
|
||||
u32 window_size;
|
||||
};
|
||||
|
||||
@@ -478,7 +478,7 @@
|
||||
struct bcma_serial_port {
|
||||
void *regs;
|
||||
unsigned long clockspeed;
|
||||
@@ -405,6 +414,9 @@ struct bcma_drv_cc {
|
||||
@@ -429,6 +438,9 @@ struct bcma_drv_cc {
|
||||
enum bcma_flash_type flash_type;
|
||||
union {
|
||||
struct bcma_pflash pflash;
|
||||
@@ -488,7 +488,7 @@
|
||||
};
|
||||
|
||||
int nr_serial_ports;
|
||||
@@ -459,4 +471,14 @@ extern void bcma_chipco_chipctl_maskset(
|
||||
@@ -483,4 +495,14 @@ extern void bcma_chipco_chipctl_maskset(
|
||||
extern void bcma_chipco_regctl_maskset(struct bcma_drv_cc *cc,
|
||||
u32 offset, u32 mask, u32 set);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user