Eric Lee / smarc-uboot

Download as
Browse Code »

Commit 89831112d46fb19127f3de9cec781e5a9c28b281

Authored by Egli, Samuel
Committed by Tom Rini
1 parent 5745f8c4fd
Exists in v2017.01-smarct4x and in 37 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

mtd, omap: fix case NAND_OMAP_GPMC_PREFETCH not defined 

The patch c316f577b4b72d1a1aeb559e9b3fad20808f1ffd breaks
siemens boards because prefetch mode is not enabled.
I assume it breaks other boards as well that don't use
prefetch.

This patch sets read_buf to nand_read_buf if
NAND_OMAP_GPMC_PREFETCH is not defined.

Signed-off-by: Samuel Egli <samuel.egli@siemens.com>
CC: Daniel Mack <zonque@gmail.com>
CC: Guido Martínez <guido@vanguardiasur.com.ar>
CC: Tom Rini <trini@ti.com>
CC: Heiko Schocher <hs@denx.de>

Showing 1 changed file with 4 additions and 1 deletions Side-by-side Diff

drivers/mtd/nand/omap_gpmc.c
Diff comments   View file @ 8983111
... ... @@ -989,12 +989,15 @@
989 989 if (err)
990 990 return err;
991 991  
992   -#ifdef CONFIG_NAND_OMAP_GPMC_PREFETCH
993 992 /* TODO: Implement for 16-bit bus width */
994 993 if (nand->options & NAND_BUSWIDTH_16)
995 994 nand->read_buf = nand_read_buf16;
  995 +#ifdef CONFIG_NAND_OMAP_GPMC_PREFETCH
996 996 else
997 997 nand->read_buf = omap_nand_read_prefetch8;
  998 +#else
  999 + else
  1000 + nand->read_buf = nand_read_buf;
998 1001 #endif
999 1002  
1000 1003 nand->dev_ready = omap_dev_ready;