Merge branch 'master' of git://git.denx.de/u-boot-spi

diff --git a/Makefile b/Makefile
index ed8647b707ce65f8e28e550da403811e4dc09ffa..27c09199a44645f3354aef2e3054b2fe96863dd1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -953,6 +953,27 @@ ifeq ($(CONFIG_OF_EMBED),y)
        @echo >&2 "CONFIG_OF_SEPARATE for boards in mainline."
        @echo >&2 "See doc/README.fdt-control for more info."
        @echo >&2 "===================================================="
+endif
+ifeq ($(CONFIG_SPI),y)
+ifneq ($(CONFIG_DM_SPI)$(CONFIG_OF_CONTROL),yy)
+       @echo >&2 "===================== WARNING ======================"
+       @echo >&2 "This board does not use CONFIG_DM_SPI. Please update"
+       @echo >&2 "the board before v2019.04 for no dm conversion"
+       @echo >&2 "and v2019.07 for partially dm converted drivers."
+       @echo >&2 "Failure to update can lead to driver/board removal"
+       @echo >&2 "See doc/driver-model/MIGRATION.txt for more info."
+       @echo >&2 "===================================================="
+endif
+endif
+ifeq ($(CONFIG_SPI_FLASH),y)
+ifneq ($(CONFIG_DM_SPI_FLASH)$(CONFIG_OF_CONTROL),yy)
+       @echo >&2 "===================== WARNING ======================"
+       @echo >&2 "This board does not use CONFIG_DM_SPI_FLASH. Please update"
+       @echo >&2 "the board to use CONFIG_SPI_FLASH before the v2019.07 release."
+       @echo >&2 "Failure to update by the deadline may result in board removal."
+       @echo >&2 "See doc/driver-model/MIGRATION.txt for more info."
+       @echo >&2 "===================================================="
+endif
 endif
        @# Check that this build does not use CONFIG options that we do not
        @# know about unless they are in Kconfig. All the existing CONFIG

diff --git a/doc/driver-model/MIGRATION.txt b/doc/driver-model/MIGRATION.txt
index dce4aa3e1dc99e5ad4fdac6391ee47b9f6276c5c..183d7f52932306ce94235366573a2eedfdf83b01 100644 (file)
--- a/doc/driver-model/MIGRATION.txt
+++ b/doc/driver-model/MIGRATION.txt
@@ -55,9 +55,6 @@ CONFIG_DM_SPI_FLASH
 Board Maintainers should submit the patches for enabling DM_SPI and DM_SPI_FLASH
 to move the migration with in the deadline.
 
-Status: In progress
-Deadline: 2018.09
-
 No dm conversion yet:
        drivers/spi/cf_spi.c
        drivers/spi/fsl_espi.c
@@ -69,6 +66,9 @@ No dm conversion yet:
        drivers/spi/sh_spi.c
        drivers/spi/soft_spi_legacy.c
 
+       Status: In progress
+       Deadline: 2019.04
+
 Partially converted:
        drivers/spi/atcspi200_spi.c
        drivers/spi/davinci_spi.c
@@ -79,6 +79,10 @@ Partially converted:
        drivers/spi/omap3_spi.c
        drivers/spi/ti_qspi.c
 
+       Status: In progress
+       Deadline: 2019.07
+
 --
 Jagan Teki <jagan@openedev.com>
+12/24/2018
 03/14/2018

diff --git a/drivers/mtd/nand/raw/nand_ids.c b/drivers/mtd/nand/raw/nand_ids.c
index 4009d641235242da8a6df688c9d4eab52e488551..3104f879f666f6414ab3c0cca0727e9107f494e7 100644 (file)
--- a/drivers/mtd/nand/raw/nand_ids.c
+++ b/drivers/mtd/nand/raw/nand_ids.c
@@ -61,6 +61,10 @@ struct nand_flash_dev nand_flash_ids[] = {
        {"SDTNRGAMA 64G 3.3V 8-bit",
                { .id = {0x45, 0xde, 0x94, 0x93, 0x76, 0x50} },
                  SZ_16K, SZ_8K, SZ_4M, 0, 6, 1280, NAND_ECC_INFO(40, SZ_1K) },
+       {"H27UBG8T2BTR-BC 32G 3.3V 8-bit",
+               { .id = {0xad, 0xd7, 0x94, 0xda, 0x74, 0xc3} },
+                 SZ_8K, SZ_4K, SZ_2M, NAND_NEED_SCRAMBLING, 6, 640,
+                 NAND_ECC_INFO(40, SZ_1K), 0 },
        {"H27UCG8T2ATR-BC 64G 3.3V 8-bit",
                { .id = {0xad, 0xde, 0x94, 0xda, 0x74, 0xc4} },
                  SZ_8K, SZ_8K, SZ_2M, NAND_NEED_SCRAMBLING, 6, 640,

diff --git a/drivers/spi/sun4i_spi.c b/drivers/spi/sun4i_spi.c
index b86b5a00adb9032672daaa02b640b2199002986d..38cc743c6144d9819d8f4c0fba7e932ef9d5ddf0 100644 (file)
--- a/drivers/spi/sun4i_spi.c
+++ b/drivers/spi/sun4i_spi.c
@@ -129,7 +129,8 @@ static inline void sun4i_spi_drain_fifo(struct sun4i_spi_priv *priv, int len)
 
        while (len--) {
                byte = readb(&priv->regs->rxdata);
-               *priv->rx_buf++ = byte;
+               if (priv->rx_buf)
+                       *priv->rx_buf++ = byte;
        }
 }