From 8463764f7e4383e1e2339eee174d4151337bc467 Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Wed, 15 Oct 2014 13:44:23 +1100 Subject: libflash: Sync with pflash 0.8.3 Fixes 64MB chip support, improve Macronix settings, add Micron chip support, etc... Signed-off-by: Benjamin Herrenschmidt --- hw/sfc-ctrl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'hw/sfc-ctrl.c') diff --git a/hw/sfc-ctrl.c b/hw/sfc-ctrl.c index de163c5..16922d3 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; -- cgit v1.1