diff options
| author | Sean Anderson <seanga2@gmail.com> | 2020-10-04 21:39:45 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-10-15 18:36:56 -0400 |
| commit | baed179d2f846a86297203545059bcd209207ca1 (patch) | |
| tree | 6a4b75fd42f60a8cefd539a69993e0540208ed84 | |
| parent | 66e7348fe7cbd40091dad017363f0d788ea69739 (diff) | |
| download | u-boot-baed179d2f846a86297203545059bcd209207ca1.tar.gz u-boot-baed179d2f846a86297203545059bcd209207ca1.tar.xz u-boot-baed179d2f846a86297203545059bcd209207ca1.zip | |
mtd: mxs_nand: Fix not calling dev_xxx with a device
This includes device_compat.h, and fixes several calls to dev_xxx.
Signed-off-by: Sean Anderson <seanga2@gmail.com>
| -rw-r--r-- | drivers/mtd/nand/raw/mxs_nand.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/drivers/mtd/nand/raw/mxs_nand.c b/drivers/mtd/nand/raw/mxs_nand.c index a7852a841c..e6bbfac4d6 100644 --- a/drivers/mtd/nand/raw/mxs_nand.c +++ b/drivers/mtd/nand/raw/mxs_nand.c @@ -16,19 +16,20 @@ #include <common.h> #include <cpu_func.h> #include <dm.h> -#include <asm/cache.h> -#include <linux/mtd/rawnand.h> -#include <linux/sizes.h> -#include <linux/types.h> +#include <dm/device_compat.h> #include <malloc.h> -#include <linux/errno.h> -#include <asm/io.h> +#include <mxs_nand.h> #include <asm/arch/clock.h> #include <asm/arch/imx-regs.h> +#include <asm/arch/sys_proto.h> +#include <asm/cache.h> +#include <asm/io.h> #include <asm/mach-imx/regs-bch.h> #include <asm/mach-imx/regs-gpmi.h> -#include <asm/arch/sys_proto.h> -#include <mxs_nand.h> +#include <linux/errno.h> +#include <linux/mtd/rawnand.h> +#include <linux/sizes.h> +#include <linux/types.h> #define MXS_NAND_DMA_DESCRIPTOR_COUNT 4 @@ -115,13 +116,14 @@ static uint32_t mxs_nand_aux_status_offset(void) return (MXS_NAND_METADATA_SIZE + 0x3) & ~0x3; } -static inline bool mxs_nand_bbm_in_data_chunk(struct bch_geometry *geo, struct mtd_info *mtd, - unsigned int *chunk_num) +static inline bool mxs_nand_bbm_in_data_chunk(struct bch_geometry *geo, + struct mtd_info *mtd, + unsigned int *chunk_num) { unsigned int i, j; if (geo->ecc_chunk0_size != geo->ecc_chunkn_size) { - dev_err(this->dev, "The size of chunk0 must equal to chunkn\n"); + dev_err(mtd->dev, "The size of chunk0 must equal to chunkn\n"); return false; } @@ -135,7 +137,7 @@ static inline bool mxs_nand_bbm_in_data_chunk(struct bch_geometry *geo, struct m if (j < geo->ecc_chunkn_size * 8) { *chunk_num = i + 1; - dev_dbg(this->dev, "Set ecc to %d and bbm in chunk %d\n", + dev_dbg(mtd->dev, "Set ecc to %d and bbm in chunk %d\n", geo->ecc_strength, *chunk_num); return true; } @@ -1118,7 +1120,7 @@ static int mxs_nand_set_geometry(struct mtd_info *mtd, struct bch_geometry *geo) if ((!(chip->ecc_strength_ds > 0 && chip->ecc_step_ds > 0) && mtd->oobsize < 1024) || nand_info->legacy_bch_geometry) { - dev_warn(this->dev, "use legacy bch geometry\n"); + dev_warn(mtd->dev, "use legacy bch geometry\n"); return mxs_nand_legacy_calc_ecc_layout(geo, mtd); } |