Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code »

Commit 092c46498e76904a3c21124131a29edff56ce3ed

Authored by Rafał Miłecki
Committed by John W. Linville
1 parent d28e5e5d96
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

ssb: drop BROKEN from SSB_SFLASH 

With recent patches ssb can fetch info about serial flash and register
it as a platform device. No more reasons to mark it BROKEN.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Cc: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

Showing 2 changed files with 4 additions and 6 deletions Side-by-side Diff

... ... @@ -138,7 +138,7 @@
138 138  
139 139 config SSB_SFLASH
140 140 bool "SSB serial flash support"
141   - depends on SSB_DRIVER_MIPS && BROKEN
  141 + depends on SSB_DRIVER_MIPS
142 142 default y
143 143  
144 144 # Assumption: We are on embedded, if we compile the MIPS core.
drivers/ssb/driver_chipcommon_sflash.c
Diff comments   View file @ 092c464
... ... @@ -151,8 +151,8 @@
151 151 sflash->size = sflash->blocksize * sflash->numblocks;
152 152 sflash->present = true;
153 153  
154   - pr_info("Found %s serial flash (blocksize: 0x%X, blocks: %d)\n",
155   - e->name, e->blocksize, e->numblocks);
  154 + pr_info("Found %s serial flash (size: %dKiB, blocksize: 0x%X, blocks: %d)\n",
  155 + e->name, sflash->size / 1024, e->blocksize, e->numblocks);
156 156  
157 157 /* Prepare platform device, but don't register it yet. It's too early,
158 158 * malloc (required by device_private_init) is not available yet. */
... ... @@ -160,8 +160,6 @@
160 160 sflash->size;
161 161 ssb_sflash_dev.dev.platform_data = sflash;
162 162  
163   - pr_err("Serial flash support is not implemented yet!\n");
164   -
165   - return -ENOTSUPP;
  163 + return 0;
166 164 }