Merge git://git.denx.de/u-boot-sh

- Convert some R-Car Gen3 platforms to DM_SPI{,_FLASH}

diff --cc configs/gose_defconfig
index dc8b871bd1990fbde320f3e77c9485d48dba3d61,6a3a1d2dd7b9a9f9c405c9d047376a2be8c18df5..50a3a5adc98e467b61edf726ca77d414da86cb17
--- 1/configs/gose_defconfig
--- 2/configs/gose_defconfig
+++ b/configs/gose_defconfig
@@@ -68,8 -67,8 +67,8 @@@ CONFIG_SYS_I2C_RCAR_IIC=
  CONFIG_DM_MMC=y
  CONFIG_RENESAS_SDHI=y
  CONFIG_MTD=y
 -CONFIG_MTD_DEVICE=y
 +CONFIG_DM_MTD=y
- CONFIG_SPI_FLASH=y
+ CONFIG_DM_SPI_FLASH=y
  CONFIG_SPI_FLASH_SPANSION=y
  CONFIG_SPI_FLASH_MTD=y
  CONFIG_PHY_MICREL=y

diff --cc configs/koelsch_defconfig
index 4b4c4e54e61f8b44248034f2e9aa4b921e0913c2,75ee093655d12797913b7557bcfcaef9d6febd59..a41e01596e8515d689671cdd53774d75b5732176
--- 1/configs/koelsch_defconfig
--- 2/configs/koelsch_defconfig
+++ b/configs/koelsch_defconfig
@@@ -68,8 -67,8 +67,8 @@@ CONFIG_SYS_I2C_RCAR_IIC=
  CONFIG_DM_MMC=y
  CONFIG_RENESAS_SDHI=y
  CONFIG_MTD=y
 -CONFIG_MTD_DEVICE=y
 +CONFIG_DM_MTD=y
- CONFIG_SPI_FLASH=y
+ CONFIG_DM_SPI_FLASH=y
  CONFIG_SPI_FLASH_SPANSION=y
  CONFIG_SPI_FLASH_MTD=y
  CONFIG_PHY_MICREL=y

diff --cc configs/lager_defconfig
index 1d8bbd5307c9e69181b90801d3f8b358a36472db,6dff5234c6244c7856957373e1660fb54fe82b01..2bf7fc9c497b14f09b8a53bf9a6dda390e95d464
--- 1/configs/lager_defconfig
--- 2/configs/lager_defconfig
+++ b/configs/lager_defconfig
@@@ -70,8 -69,8 +69,8 @@@ CONFIG_DM_MMC=
  CONFIG_SH_MMCIF=y
  CONFIG_RENESAS_SDHI=y
  CONFIG_MTD=y
 -CONFIG_MTD_DEVICE=y
 +CONFIG_DM_MTD=y
- CONFIG_SPI_FLASH=y
+ CONFIG_DM_SPI_FLASH=y
  CONFIG_SPI_FLASH_SPANSION=y
  CONFIG_SPI_FLASH_MTD=y
  CONFIG_PHY_MICREL=y