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

- Fix a conflict in drivers/spi/atcspi200_spi.c related to the riscv
  tree fixing a warning.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --combined drivers/spi/atcspi200_spi.c
index be424e0a6f823a9d70cee41beb9dad178ab6dd95,6233d4978f5395f7e7fa3c959267ac3ec65dda53..af96c6d21e5c5e04220c2936e8586f5b192b4691
--- 1/drivers/spi/atcspi200_spi.c
--- 2/drivers/spi/atcspi200_spi.c
+++ b/drivers/spi/atcspi200_spi.c
@@@ -197,7 -197,7 +197,7 @@@ static int __atcspi200_spi_xfer(struct 
                int num_bytes;
                u8 *cmd_buf = ns->cmd_buf;
                size_t cmd_len = ns->cmd_len;
 -              size_t data_len = bitlen / 8;
 +              unsigned long data_len = bitlen / 8;
                int rf_cnt;
                int ret = 0;
  
@@@ -229,13 -229,15 +229,15 @@@
                        __atcspi200_spi_start(ns);
                        break;
                }
-               debug("spi_xfer: data_out %08X(%p) data_in %08X(%p) data_len %lu\n",
-                     *(uint *)data_out, data_out, *(uint *)data_in, data_in, data_len);
+               if (data_out)
 -                      debug("spi_xfer: data_out %08X(%p) data_in %08X(%p) data_len %u\n",
++                      debug("spi_xfer: data_out %08X(%p) data_in %08X(%p) data_len %lu\n",
+                             *(uint *)data_out, data_out, *(uint *)data_in,
+                             data_in, data_len);
                num_chunks = DIV_ROUND_UP(data_len, max_tran_len);
                din = data_in;
                dout = data_out;
                while (num_chunks--) {
 -                      tran_len = min(data_len, (size_t)max_tran_len);
 +                      tran_len = min((size_t)data_len, (size_t)max_tran_len);
                        ns->tran_len = tran_len;
                        num_blks = DIV_ROUND_UP(tran_len , CHUNK_SIZE);
                        num_bytes = (tran_len) % CHUNK_SIZE;