diff options
| author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-07-02 23:12:58 +0000 |
|---|---|---|
| committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-07-02 23:12:58 +0000 |
| commit | bdc39c62ca913f3444a0f3fb7a8600810ecb6866 (patch) | |
| tree | e19ef1e1bbf76ef1b749a1bcd3cd9ae92eafb89b /target/linux/brcm47xx/patches-3.3/021-bcma-add-serial-flash-support-to-bcma.patch | |
| parent | 9253d87a21cf26b0b6661ed690284493c77edd70 (diff) | |
kernel: ssb/bcma: update to version from wireless-testing tag master-2012-07-02
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32580 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.3/021-bcma-add-serial-flash-support-to-bcma.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.3/021-bcma-add-serial-flash-support-to-bcma.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/brcm47xx/patches-3.3/021-bcma-add-serial-flash-support-to-bcma.patch b/target/linux/brcm47xx/patches-3.3/021-bcma-add-serial-flash-support-to-bcma.patch index 2de4ba0f5..a4c9f4336 100644 --- a/target/linux/brcm47xx/patches-3.3/021-bcma-add-serial-flash-support-to-bcma.patch +++ b/target/linux/brcm47xx/patches-3.3/021-bcma-add-serial-flash-support-to-bcma.patch @@ -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 -@@ -399,6 +399,7 @@ struct bcma_chipcommon_pmu { +@@ -421,6 +421,7 @@ struct bcma_chipcommon_pmu { #ifdef CONFIG_BCMA_DRIVER_MIPS enum bcma_flash_type { BCMA_PFLASH, @@ -463,7 +463,7 @@ }; struct bcma_pflash { -@@ -407,6 +408,14 @@ struct bcma_pflash { +@@ -429,6 +430,14 @@ struct bcma_pflash { u32 window_size; }; @@ -478,7 +478,7 @@ struct bcma_serial_port { void *regs; unsigned long clockspeed; -@@ -429,6 +438,9 @@ struct bcma_drv_cc { +@@ -451,6 +460,9 @@ struct bcma_drv_cc { enum bcma_flash_type flash_type; union { struct bcma_pflash pflash; @@ -488,9 +488,9 @@ }; int nr_serial_ports; -@@ -483,4 +495,14 @@ extern void bcma_chipco_chipctl_maskset( - extern void bcma_chipco_regctl_maskset(struct bcma_drv_cc *cc, +@@ -506,4 +518,14 @@ 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); +#ifdef CONFIG_BCMA_SFLASH +/* Chipcommon sflash support. */ |