diff options
author | Hauke Mehrtens <hauke@openwrt.org> | 2013-09-12 22:03:45 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@openwrt.org> | 2013-09-12 22:03:45 +0000 |
commit | 86cc5185d198ecfa04e6afb9bfa555cfba734256 (patch) | |
tree | 4f7f3241e3055ae7524893da85395d23923af610 /target/linux/generic/patches-3.8/020-ssb_update.patch | |
parent | 6cd1deaeaaf3a5b74c23b4a2ccb9d538382d7944 (diff) | |
download | master-187ad058-86cc5185d198ecfa04e6afb9bfa555cfba734256.tar.gz master-187ad058-86cc5185d198ecfa04e6afb9bfa555cfba734256.tar.bz2 master-187ad058-86cc5185d198ecfa04e6afb9bfa555cfba734256.zip |
kernel: update bcma and ssb to wireless-testing master-2013-09-09
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37957 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.8/020-ssb_update.patch')
-rw-r--r-- | target/linux/generic/patches-3.8/020-ssb_update.patch | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/target/linux/generic/patches-3.8/020-ssb_update.patch b/target/linux/generic/patches-3.8/020-ssb_update.patch index 22dae59498..95a224600b 100644 --- a/target/linux/generic/patches-3.8/020-ssb_update.patch +++ b/target/linux/generic/patches-3.8/020-ssb_update.patch @@ -6,7 +6,7 @@ +config SSB_SFLASH + bool "SSB serial flash support" -+ depends on SSB_DRIVER_MIPS && BROKEN ++ depends on SSB_DRIVER_MIPS + default y + # Assumption: We are on embedded, if we compile the MIPS core. @@ -179,7 +179,7 @@ "Unknown spuravoidance settings for chip 0x%04X, not changing PLL\n", --- /dev/null +++ b/drivers/ssb/driver_chipcommon_sflash.c -@@ -0,0 +1,166 @@ +@@ -0,0 +1,164 @@ +/* + * Sonics Silicon Backplane + * ChipCommon serial flash interface @@ -333,8 +333,8 @@ + sflash->size = sflash->blocksize * sflash->numblocks; + sflash->present = true; + -+ pr_info("Found %s serial flash (blocksize: 0x%X, blocks: %d)\n", -+ e->name, e->blocksize, e->numblocks); ++ pr_info("Found %s serial flash (size: %dKiB, blocksize: 0x%X, blocks: %d)\n", ++ e->name, sflash->size / 1024, e->blocksize, e->numblocks); + + /* Prepare platform device, but don't register it yet. It's too early, + * malloc (required by device_private_init) is not available yet. */ @@ -342,9 +342,7 @@ + sflash->size; + ssb_sflash_dev.dev.platform_data = sflash; + -+ pr_err("Serial flash support is not implemented yet!\n"); -+ -+ return -ENOTSUPP; ++ return 0; +} --- a/drivers/ssb/driver_gpio.c +++ b/drivers/ssb/driver_gpio.c |