Commit 94447751 authored by Miquel Raynal's avatar Miquel Raynal
Browse files

Merge tag 'nand/for-6.13' into mtd/next 

SPI-NAND changes:
A load of fixes to Winbond manufacturer driver have been done, plus a
structure constification.

Raw NAND changes:
The GPMI driver has been improved on the power management side.
The Davinci driver has been cleaned up.
A leak in the Atmel driver plus some typos in the core have been fixed.
parents 34267d3c af264e59

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -9028,6 +9028,7 @@ F: drivers/net/ethernet/freescale/gianfar* 








FREESCALE GPMI NAND DRIVER









M:	Han Xu <han.xu@nxp.com>









L:	imx@lists.linux.dev









L:	linux-mtd@lists.infradead.org









S:	Maintained









F:	drivers/mtd/nand/raw/gpmi-nand/*
































drivers/mtd/nand/ecc-mxic.c



+3
−3






























Original line number
Diff line number
Diff line







@@ -723,21 +723,21 @@ static int mxic_ecc_finish_io_req_pipelined(struct nand_device *nand,







	return ret;









}



















static struct nand_ecc_engine_ops mxic_ecc_engine_external_ops = {









static const struct nand_ecc_engine_ops mxic_ecc_engine_external_ops = {









	.init_ctx = mxic_ecc_init_ctx_external,









	.cleanup_ctx = mxic_ecc_cleanup_ctx,









	.prepare_io_req = mxic_ecc_prepare_io_req_external,









	.finish_io_req = mxic_ecc_finish_io_req_external,









};



















static struct nand_ecc_engine_ops mxic_ecc_engine_pipelined_ops = {









static const struct nand_ecc_engine_ops mxic_ecc_engine_pipelined_ops = {









	.init_ctx = mxic_ecc_init_ctx_pipelined,









	.cleanup_ctx = mxic_ecc_cleanup_ctx,









	.prepare_io_req = mxic_ecc_prepare_io_req_pipelined,









	.finish_io_req = mxic_ecc_finish_io_req_pipelined,









};



















struct nand_ecc_engine_ops *mxic_ecc_get_pipelined_ops(void)









const struct nand_ecc_engine_ops *mxic_ecc_get_pipelined_ops(void)









{









	return &mxic_ecc_engine_pipelined_ops;









}
































drivers/mtd/nand/ecc-sw-bch.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -384,7 +384,7 @@ static int nand_ecc_sw_bch_finish_io_req(struct nand_device *nand,







	return max_bitflips;









}



















static struct nand_ecc_engine_ops nand_ecc_sw_bch_engine_ops = {









static const struct nand_ecc_engine_ops nand_ecc_sw_bch_engine_ops = {









	.init_ctx = nand_ecc_sw_bch_init_ctx,









	.cleanup_ctx = nand_ecc_sw_bch_cleanup_ctx,









	.prepare_io_req = nand_ecc_sw_bch_prepare_io_req,
































drivers/mtd/nand/ecc-sw-hamming.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -638,7 +638,7 @@ static int nand_ecc_sw_hamming_finish_io_req(struct nand_device *nand,







	return max_bitflips;









}



















static struct nand_ecc_engine_ops nand_ecc_sw_hamming_engine_ops = {









static const struct nand_ecc_engine_ops nand_ecc_sw_hamming_engine_ops = {









	.init_ctx = nand_ecc_sw_hamming_init_ctx,









	.cleanup_ctx = nand_ecc_sw_hamming_cleanup_ctx,









	.prepare_io_req = nand_ecc_sw_hamming_prepare_io_req,
































drivers/mtd/nand/raw/atmel/pmecc.c



+1
−7






























Original line number
Diff line number
Diff line







@@ -362,7 +362,7 @@ atmel_pmecc_create_user(struct atmel_pmecc *pmecc,







	size = ALIGN(size, sizeof(s32));









	size += (req->ecc.strength + 1) * sizeof(s32) * 3;



















	user = kzalloc(size, GFP_KERNEL);









	user = devm_kzalloc(pmecc->dev, size, GFP_KERNEL);









	if (!user)









		return ERR_PTR(-ENOMEM);


















@@ -408,12 +408,6 @@ atmel_pmecc_create_user(struct atmel_pmecc *pmecc,







}









EXPORT_SYMBOL_GPL(atmel_pmecc_create_user);



















void atmel_pmecc_destroy_user(struct atmel_pmecc_user *user)









{









	kfree(user);









}









EXPORT_SYMBOL_GPL(atmel_pmecc_destroy_user);



















static int get_strength(struct atmel_pmecc_user *user)









{









	const int *strengths = user->pmecc->caps->strengths;