diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-10-15 13:44:23 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-10-15 14:45:27 +1100 |
| commit | 8463764f7e4383e1e2339eee174d4151337bc467 (patch) | |
| tree | 56db78dfd6b9a8df3d8045292c631030f22232c7 /hw/sfc-ctrl.c | |
| parent | a9efc5faa0ef2d8126a8a217a3f9f806071fe1db (diff) | |
| download | talos-skiboot-8463764f7e4383e1e2339eee174d4151337bc467.tar.gz talos-skiboot-8463764f7e4383e1e2339eee174d4151337bc467.zip | |
libflash: Sync with pflash 0.8.3
Fixes 64MB chip support, improve Macronix settings, add Micron
chip support, etc...
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'hw/sfc-ctrl.c')
| -rw-r--r-- | hw/sfc-ctrl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/sfc-ctrl.c b/hw/sfc-ctrl.c index de163c57..16922d38 100644 --- a/hw/sfc-ctrl.c +++ b/hw/sfc-ctrl.c @@ -383,10 +383,10 @@ static int sfc_erase(struct spi_flash_ctrl *ctrl, uint32_t addr, return 0; } -static int sfc_setup(struct spi_flash_ctrl *ctrl, struct flash_info *info, - uint32_t *tsize) +static int sfc_setup(struct spi_flash_ctrl *ctrl, uint32_t *tsize) { struct sfc_ctrl *ct = container_of(ctrl, struct sfc_ctrl, ops); + struct flash_info *info = ctrl->finfo; uint32_t er_flags; (void)tsize; |
