Message ID | E1dnjTy-0006AD-Ox@debutante |
---|---|
State | Not Applicable |
Headers | show |
Series | Applied "spi: spi-falcon: drop check of boot select" to the spi tree | expand |
On Fri, Sep 01, 2017 at 11:47:26AM +0100, Mark Brown wrote: > The patch > > spi: spi-falcon: drop check of boot select > > has been applied to the spi tree at > > git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git Thanks Mark - but there are some ordering dependencies in Hauke's patch series so it would be great if I could have an Acked-by to merge this patch through the MIPS tree along with the rest of Hauke's series. Ralf
On Fri, Sep 01, 2017 at 04:23:55PM +0200, Ralf Baechle wrote: > Thanks Mark - but there are some ordering dependencies in Hauke's > patch series so it would be great if I could have an Acked-by to merge > this patch through the MIPS tree along with the rest of Hauke's series. Ah, I see - I wasn't copied on the cover letter so I didn't know about this. Here's a pull request: The following changes since commit 5771a8c08880cdca3bfb4a3fc6d309d6bba20877: Linux v4.13-rc1 (2017-07-15 15:22:10 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git tags/spi-falcon-no-board-check for you to fetch changes up to 1a41aa1376df9e24d0c760df1a6f59765316c457: spi: spi-falcon: drop check of boot select (2017-09-01 11:33:22 +0100) ---------------------------------------------------------------- spi: Remove board check from the Falcon driver MIPS is removing this board check so support a cross tree merge. ---------------------------------------------------------------- Hauke Mehrtens (1): spi: spi-falcon: drop check of boot select drivers/spi/spi-falcon.c | 5 ----- 1 file changed, 5 deletions(-)
diff --git a/drivers/spi/spi-falcon.c b/drivers/spi/spi-falcon.c index 286b2c81fc6b..f8638e82e5db 100644 --- a/drivers/spi/spi-falcon.c +++ b/drivers/spi/spi-falcon.c @@ -395,11 +395,6 @@ static int falcon_sflash_probe(struct platform_device *pdev) struct spi_master *master; int ret; - if (ltq_boot_select() != BS_SPI) { - dev_err(&pdev->dev, "invalid bootstrap options\n"); - return -ENODEV; - } - master = spi_alloc_master(&pdev->dev, sizeof(*priv)); if (!master) return -ENOMEM;