Merge tag 'mtd/fixes-for-5.10-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux (7f376f19) · Commits · 戴 / test

Pull mtd fixes from Miquel Raynal: "Second series of fixes for raw NAND drivers initiated because of a rework of the ECC engine subsystem. The location of the DT parsing logic got moved, breaking several drivers which in fact were not doing the ECC engine initialization at the right place. These drivers have been fixed by enforcing a particular ECC engine type and algorithm, software Hamming, while the algorithm may be overwritten by a DT property. This merge request fixes this in the xway, socrates, plat_nand, pasemi, orion, mpc5121, gpio, au1550 and ams-delta controller drivers" * tag 'mtd/fixes-for-5.10-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux: mtd: rawnand: xway: Do not force a particular software ECC engine mtd: rawnand: socrates: Do not force a particular software ECC engine mtd: rawnand: plat_nand: Do not force a particular software ECC engine mtd: rawnand: pasemi: Do not force a particular software ECC engine mtd: rawnand: orion: Do not force a particular software ECC engine mtd: rawnand: mpc5121: Do not force a particular software ECC engine mtd: rawnand: gpio: Do not force a particular software ECC engine mtd: rawnand: au1550: Do not force a particular software ECC engine mtd: rawnand: ams-delta: Do not force a particular software ECC engine

drivers/mtd/nand/raw/ams-delta.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -218,6 +218,8 @@ static int gpio_nand_setup_interface(struct nand_chip *this, int csline,
		static int gpio_nand_attach_chip(struct nand_chip *chip)
		{
		chip->ecc.engine_type = NAND_ECC_ENGINE_TYPE_SOFT;

		if (chip->ecc.algo == NAND_ECC_ALGO_UNKNOWN)
		chip->ecc.algo = NAND_ECC_ALGO_HAMMING;

		return 0;

drivers/mtd/nand/raw/au1550nd.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -239,6 +239,8 @@ static int au1550nd_exec_op(struct nand_chip *this,
		static int au1550nd_attach_chip(struct nand_chip *chip)
		{
		chip->ecc.engine_type = NAND_ECC_ENGINE_TYPE_SOFT;

		if (chip->ecc.algo == NAND_ECC_ALGO_UNKNOWN)
		chip->ecc.algo = NAND_ECC_ALGO_HAMMING;

		return 0;

drivers/mtd/nand/raw/gpio.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -164,6 +164,8 @@ static int gpio_nand_exec_op(struct nand_chip *chip,
		static int gpio_nand_attach_chip(struct nand_chip *chip)
		{
		chip->ecc.engine_type = NAND_ECC_ENGINE_TYPE_SOFT;

		if (chip->ecc.algo == NAND_ECC_ALGO_UNKNOWN)
		chip->ecc.algo = NAND_ECC_ALGO_HAMMING;

		return 0;

drivers/mtd/nand/raw/mpc5121_nfc.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -606,6 +606,8 @@ static void mpc5121_nfc_free(struct device dev, struct mtd_info mtd)
		static int mpc5121_nfc_attach_chip(struct nand_chip *chip)
		{
		chip->ecc.engine_type = NAND_ECC_ENGINE_TYPE_SOFT;

		if (chip->ecc.algo == NAND_ECC_ALGO_UNKNOWN)
		chip->ecc.algo = NAND_ECC_ALGO_HAMMING;

		return 0;

drivers/mtd/nand/raw/orion_nand.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -86,6 +86,8 @@ static void orion_nand_read_buf(struct nand_chip chip, uint8_t buf, int len)
		static int orion_nand_attach_chip(struct nand_chip *chip)
		{
		chip->ecc.engine_type = NAND_ECC_ENGINE_TYPE_SOFT;

		if (chip->ecc.algo == NAND_ECC_ALGO_UNKNOWN)
		chip->ecc.algo = NAND_ECC_ALGO_HAMMING;

		return 0;

Admin message