| Message ID | 1494642810-22796-10-git-send-email-trini@konsulko.com |
|---|---|
| State | Accepted |
| Commit | 25eaa288016beef4e4229a729e1c732f545ee1f7 |
| Delegated to: | Tom Rini |
| Headers | show |
On Fri, May 12, 2017 at 10:33:23PM -0400, Tom Rini wrote: > This particular quirk is not enabled in any config files today. It does > however exist and is handled correctly in device trees and via > CONFIG_DM_SPI. So we drop the symbol now and add a comment to indicate > that any (new) boards that require this quirk need to enable DM_SPI > instead. > > Signed-off-by: Tom Rini <trini@konsulko.com> Applied to u-boot/master, thanks!
diff --git a/drivers/spi/omap3_spi.c b/drivers/spi/omap3_spi.c index 76d376ac4450..3caea151c548 100644 --- a/drivers/spi/omap3_spi.c +++ b/drivers/spi/omap3_spi.c @@ -568,7 +568,8 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, priv->freq = max_hz; priv->mode = mode; priv->wordlen = priv->slave.wordlen; -#ifdef CONFIG_OMAP3_SPI_D0_D1_SWAPPED +#if 0 + /* Please migrate to DM_SPI support for this feature. */ priv->pin_dir = MCSPI_PINDIR_D0_OUT_D1_IN; #endif diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index ee8f215c2f7f..ebe3fd7996de 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1981,7 +1981,6 @@ CONFIG_OF_STDOUT_PATH CONFIG_OF_SUPPORT_OLD_DEVICE_TREES CONFIG_OMAP3_LOGIC_USE_NEW_PRODUCT_ID CONFIG_OMAP3_MICRON_DDR -CONFIG_OMAP3_SPI_D0_D1_SWAPPED CONFIG_OMAP_EHCI_PHY1_RESET_GPIO CONFIG_OMAP_EHCI_PHY2_RESET_GPIO CONFIG_OMAP_EHCI_PHY3_RESET_GPIO
This particular quirk is not enabled in any config files today. It does however exist and is handled correctly in device trees and via CONFIG_DM_SPI. So we drop the symbol now and add a comment to indicate that any (new) boards that require this quirk need to enable DM_SPI instead. Signed-off-by: Tom Rini <trini@konsulko.com> --- drivers/spi/omap3_spi.c | 3 ++- scripts/config_whitelist.txt | 1 - 2 files changed, 2 insertions(+), 2 deletions(-)