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

- drop non-DM code from ti_qspi
- support spi-mem for ti_qspi

diff --combined scripts/config_whitelist.txt
index 7d1ea243b12752df8857ba666d76762244e95779,a5b1600c33b605d83d76cb8236975fe0c293ff4e..5092c3fb4ce573c3a5e6ab759d5291499560259d
--- 1/scripts/config_whitelist.txt
--- 2/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@@ -1555,8 -1555,6 +1555,6 @@@ CONFIG_Q
  CONFIG_QEMU_MIPS
  CONFIG_QIXIS_I2C_ACCESS
  CONFIG_QSPI
- CONFIG_QSPI_QUAD_SUPPORT
- CONFIG_QSPI_SEL_GPIO
  CONFIG_QUOTA
  CONFIG_R7780MP
  CONFIG_R8A66597_BASE_ADDR
@@@ -1939,6 -1937,7 +1937,6 @@@ CONFIG_STV099
  CONFIG_STV0991_HZ
  CONFIG_STV0991_HZ_CLOCK
  CONFIG_ST_SMI
 -CONFIG_SUNXI_AHCI
  CONFIG_SUNXI_GPIO
  CONFIG_SUNXI_MAX_FB_SIZE
  CONFIG_SUPERH_ON_CHIP_R8A66597
@@@ -4399,7 -4398,6 +4397,6 @@@ CONFIG_THUNDER
  CONFIG_TIMESTAMP
  CONFIG_TIZEN
  CONFIG_TI_KSNAV
- CONFIG_TI_SPI_MMAP
  CONFIG_TMU_TIMER
  CONFIG_TPL_PAD_TO
  CONFIG_TPM_TIS_BASE_ADDRESS
@@@ -4513,6 -4511,7 +4510,6 @@@ CONFIG_USB_EHCI_MX
  CONFIG_USB_EHCI_SPEAR
  CONFIG_USB_EHCI_TXFIFO_THRESH
  CONFIG_USB_EHCI_VCT
 -CONFIG_USB_EHCI_VF
  CONFIG_USB_ETH_QMULT
  CONFIG_USB_ETH_SUBSET
  CONFIG_USB_EXT2_BOOT