From 811c287737892fe00307b9e7afb832fd459f6e6a Mon Sep 17 00:00:00 2001 From: hauke Date: Wed, 12 Dec 2012 22:42:18 +0000 Subject: 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 --- .../071-bcma-add-functions-to-write-to-nand-flash.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'target/linux/brcm47xx/patches-3.6/071-bcma-add-functions-to-write-to-nand-flash.patch') diff --git a/target/linux/brcm47xx/patches-3.6/071-bcma-add-functions-to-write-to-nand-flash.patch b/target/linux/brcm47xx/patches-3.6/071-bcma-add-functions-to-write-to-nand-flash.patch index 27c667720..f1b4f7feb 100644 --- a/target/linux/brcm47xx/patches-3.6/071-bcma-add-functions-to-write-to-nand-flash.patch +++ b/target/linux/brcm47xx/patches-3.6/071-bcma-add-functions-to-write-to-nand-flash.patch @@ -181,15 +181,15 @@ +} --- a/include/linux/bcma/bcma_driver_chipcommon.h +++ b/include/linux/bcma/bcma_driver_chipcommon.h -@@ -2,6 +2,7 @@ - #define LINUX_BCMA_DRIVER_CC_H_ +@@ -4,6 +4,7 @@ + #include #include +#include /** ChipCommon core registers. **/ #define BCMA_CC_ID 0x0000 -@@ -519,17 +520,6 @@ struct bcma_pflash { +@@ -521,17 +522,6 @@ struct bcma_pflash { }; @@ -207,7 +207,7 @@ struct bcma_serial_port { void *regs; unsigned long clockspeed; -@@ -555,7 +545,7 @@ struct bcma_drv_cc { +@@ -557,7 +547,7 @@ struct bcma_drv_cc { struct bcm47xx_sflash sflash; #endif #ifdef CONFIG_BCMA_NFLASH @@ -216,7 +216,7 @@ #endif int nr_serial_ports; -@@ -613,4 +603,13 @@ extern void bcma_chipco_regctl_maskset(s +@@ -616,4 +606,13 @@ extern void bcma_chipco_regctl_maskset(s u32 offset, u32 mask, u32 set); extern void bcma_pmu_spuravoid_pllupdate(struct bcma_drv_cc *cc, int spuravoid); -- cgit v1.2.3 From e676003d8704a75d5ee3b58ccf820e827f836de9 Mon Sep 17 00:00:00 2001 From: hauke Date: Thu, 10 Jan 2013 14:05:18 +0000 Subject: kernel: update bcma and ssb to master-2013-01-09 from wireless-testing git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35080 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../071-bcma-add-functions-to-write-to-nand-flash.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'target/linux/brcm47xx/patches-3.6/071-bcma-add-functions-to-write-to-nand-flash.patch') diff --git a/target/linux/brcm47xx/patches-3.6/071-bcma-add-functions-to-write-to-nand-flash.patch b/target/linux/brcm47xx/patches-3.6/071-bcma-add-functions-to-write-to-nand-flash.patch index f1b4f7feb..7a2129823 100644 --- a/target/linux/brcm47xx/patches-3.6/071-bcma-add-functions-to-write-to-nand-flash.patch +++ b/target/linux/brcm47xx/patches-3.6/071-bcma-add-functions-to-write-to-nand-flash.patch @@ -181,15 +181,15 @@ +} --- a/include/linux/bcma/bcma_driver_chipcommon.h +++ b/include/linux/bcma/bcma_driver_chipcommon.h -@@ -4,6 +4,7 @@ - #include +@@ -5,6 +5,7 @@ + #include #include +#include /** ChipCommon core registers. **/ #define BCMA_CC_ID 0x0000 -@@ -521,17 +522,6 @@ struct bcma_pflash { +@@ -522,17 +523,6 @@ struct bcma_pflash { }; @@ -207,7 +207,7 @@ struct bcma_serial_port { void *regs; unsigned long clockspeed; -@@ -557,7 +547,7 @@ struct bcma_drv_cc { +@@ -558,7 +548,7 @@ struct bcma_drv_cc { struct bcm47xx_sflash sflash; #endif #ifdef CONFIG_BCMA_NFLASH @@ -216,7 +216,7 @@ #endif int nr_serial_ports; -@@ -616,4 +606,13 @@ extern void bcma_chipco_regctl_maskset(s +@@ -625,4 +615,13 @@ extern void bcma_chipco_regctl_maskset(s u32 offset, u32 mask, u32 set); extern void bcma_pmu_spuravoid_pllupdate(struct bcma_drv_cc *cc, int spuravoid); -- cgit v1.2.3 From 01ca6e26f97769bf7e81ca0d0311d726ed0c00f3 Mon Sep 17 00:00:00 2001 From: nbd Date: Fri, 19 Apr 2013 12:39:40 +0000 Subject: kernel: backport SSB/BCMA changes in preparation for a compat-wireless update Signed-off-by: Felix Fietkau git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36367 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../071-bcma-add-functions-to-write-to-nand-flash.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'target/linux/brcm47xx/patches-3.6/071-bcma-add-functions-to-write-to-nand-flash.patch') diff --git a/target/linux/brcm47xx/patches-3.6/071-bcma-add-functions-to-write-to-nand-flash.patch b/target/linux/brcm47xx/patches-3.6/071-bcma-add-functions-to-write-to-nand-flash.patch index 7a2129823..60f27d9ea 100644 --- a/target/linux/brcm47xx/patches-3.6/071-bcma-add-functions-to-write-to-nand-flash.patch +++ b/target/linux/brcm47xx/patches-3.6/071-bcma-add-functions-to-write-to-nand-flash.patch @@ -25,7 +25,7 @@ .num_resources = 0, }; -@@ -31,6 +38,11 @@ int bcma_nflash_init(struct bcma_drv_cc +@@ -31,6 +38,11 @@ int bcma_nflash_init(struct bcma_drv_cc return -ENODEV; } @@ -37,7 +37,7 @@ cc->nflash.present = true; if (cc->core->id.rev == 38 && (cc->status & BCMA_CC_CHIPST_5357_NAND_BOOT)) -@@ -42,3 +54,141 @@ int bcma_nflash_init(struct bcma_drv_cc +@@ -42,3 +54,141 @@ int bcma_nflash_init(struct bcma_drv_cc return 0; } @@ -189,7 +189,7 @@ /** ChipCommon core registers. **/ #define BCMA_CC_ID 0x0000 -@@ -522,17 +523,6 @@ struct bcma_pflash { +@@ -523,17 +524,6 @@ struct bcma_pflash { }; @@ -207,7 +207,7 @@ struct bcma_serial_port { void *regs; unsigned long clockspeed; -@@ -558,7 +548,7 @@ struct bcma_drv_cc { +@@ -559,7 +549,7 @@ struct bcma_drv_cc { struct bcm47xx_sflash sflash; #endif #ifdef CONFIG_BCMA_NFLASH @@ -216,7 +216,7 @@ #endif int nr_serial_ports; -@@ -625,4 +615,13 @@ extern void bcma_chipco_regctl_maskset(s +@@ -628,4 +618,13 @@ extern void bcma_chipco_regctl_maskset(s u32 offset, u32 mask, u32 set); extern void bcma_pmu_spuravoid_pllupdate(struct bcma_drv_cc *cc, int spuravoid); -- cgit v1.2.3