Commit 9437a14a authored by Haibo Chen's avatar Haibo Chen Committed by Pratyush Yadav
Browse files

mtd: spi-nor: micron-st: move set_octal_dtr to late_init() 



Move params->set_octal_dtr from flash_info->fixups->default_init()
to spi_nor_manufacturer-> fixups-> late_init(), this can cover
all Micorn and ST chips without repeat in each chip's flash_info.

Reviewed-by: default avatarTudor Ambarus <tudor.ambarus@linaro.org>
Signed-off-by: default avatarHaibo Chen <haibo.chen@nxp.com>
Signed-off-by: default avatarPratyush Yadav <pratyush@kernel.org>
parent 74883acc

drivers/mtd/spi-nor/micron-st.c

+2 −6
Original line number Diff line number Diff line
@@ -159,11 +159,6 @@ static int micron_st_nor_two_die_late_init(struct spi_nor *nor) 
	return spi_nor_set_4byte_addr_mode(nor, true);

}



static void mt35xu512aba_default_init(struct spi_nor *nor)

{

	nor->params->set_octal_dtr = micron_st_nor_set_octal_dtr;

}



static int mt35xu512aba_post_sfdp_fixup(struct spi_nor *nor)

{

	/* Set the Fast Read settings. */
@@ -187,7 +182,6 @@ static int mt35xu512aba_post_sfdp_fixup(struct spi_nor *nor) 
}



static const struct spi_nor_fixups mt35xu512aba_fixups = {

	.default_init = mt35xu512aba_default_init,

	.post_sfdp = mt35xu512aba_post_sfdp_fixup,

};
@@ -635,6 +629,8 @@ static int micron_st_nor_late_init(struct spi_nor *nor) 
	if (!params->set_4byte_addr_mode)

		params->set_4byte_addr_mode = spi_nor_set_4byte_addr_mode_wren_en4b_ex4b;



	params->set_octal_dtr = micron_st_nor_set_octal_dtr;



	return 0;

}