Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bbc28cdb authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Tony Lindgren
Browse files

ARM: OMAP2+: gpmc: Move legacy GPMC width setting 



After the introduction of gpmc_set_legacy(), move the GPMC width setting
to be done inside it. Currently, in the DT probed case, this is (wrongly)
done twice: first at gpmc_read_settings_dt(), and then based in the
NAND width setting.
Fix this and use only the value obtained from the DT.

Signed-off-by: default avatarEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent d0020cc6

arch/arm/mach-omap2/gpmc-nand.c

+5 −5
Original line number Diff line number Diff line
@@ -74,6 +74,11 @@ static void gpmc_set_legacy(struct omap_nand_platform_data *gpmc_nand_data, 
		s->wait_on_read = true;

		s->wait_on_write = true;

	}



	if (gpmc_nand_data->devsize == NAND_BUSWIDTH_16)

		s->device_width = GPMC_DEVWIDTH_16BIT;

	else

		s->device_width = GPMC_DEVWIDTH_8BIT;

}



int gpmc_nand_init(struct omap_nand_platform_data *gpmc_nand_data,
@@ -118,11 +123,6 @@ int gpmc_nand_init(struct omap_nand_platform_data *gpmc_nand_data, 


	s.device_nand = true;



	if (gpmc_nand_data->devsize == NAND_BUSWIDTH_16)

		s.device_width = GPMC_DEVWIDTH_16BIT;

	else

		s.device_width = GPMC_DEVWIDTH_8BIT;



	err = gpmc_cs_program_settings(gpmc_nand_data->cs, &s);

	if (err < 0)

		goto out_free_cs;