| Message ID | 20180626145959.C26D7440070@finisterre.ee.mobilebroadband (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Mark, On Tue, Jun 26, 2018 at 03:59:59PM +0100, Mark Brown wrote: > The patch > > spi: ath79: drop pdata support > > has been applied to the spi tree at > > https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git This is going to be problematic if it goes in before the corresponding conversion of the MIPS platform code to use device tree, which is currently being reviewed. To quote John's patch email: > Hi Mark, > Once Acked, this patch should ideally go upstream via the mips tree to > avoid merge order conflicts with the series converting the target to > OF. > John Could you possibly drop this from your tree & ack it to go through the MIPS tree along with the relevant platform/board changes? Thanks, Paul -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 27/06/18 18:07, Paul Burton wrote: > Hi Mark, > > On Tue, Jun 26, 2018 at 03:59:59PM +0100, Mark Brown wrote: >> The patch >> >> spi: ath79: drop pdata support >> >> has been applied to the spi tree at >> >> https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git > This is going to be problematic if it goes in before the corresponding > conversion of the MIPS platform code to use device tree, which is > currently being reviewed. > > To quote John's patch email: > >> Hi Mark, >> Once Acked, this patch should ideally go upstream via the mips tree to >> avoid merge order conflicts with the series converting the target to >> OF. >> John > Could you possibly drop this from your tree & ack it to go through the > MIPS tree along with the relevant platform/board changes? > > Thanks, > Paul Hi Paul, Mark dropped the patch and Ack'ed it for being merged via the LMO tree John -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Jun 27, 2018 at 09:07:23AM -0700, Paul Burton wrote: > On Tue, Jun 26, 2018 at 03:59:59PM +0100, Mark Brown wrote: > > Once Acked, this patch should ideally go upstream via the mips tree to > > avoid merge order conflicts with the series converting the target to > > OF. > Could you possibly drop this from your tree & ack it to go through the > MIPS tree along with the relevant platform/board changes? Like I said in reply to John that says "should ... to avoid conflicts" not "must because of build dependencies", in general it is better to just wait for the removal to hit mainline with things like this as it makes everything simpler and there's no urgency about something like removing platform data support.
diff --git a/arch/mips/include/asm/mach-ath79/ath79_spi_platform.h b/arch/mips/include/asm/mach-ath79/ath79_spi_platform.h deleted file mode 100644 index aa71216edf99..000000000000 --- a/arch/mips/include/asm/mach-ath79/ath79_spi_platform.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Platform data definition for Atheros AR71XX/AR724X/AR913X SPI controller - * - * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org> - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 as published - * by the Free Software Foundation. - */ - -#ifndef _ATH79_SPI_PLATFORM_H -#define _ATH79_SPI_PLATFORM_H - -struct ath79_spi_platform_data { - unsigned bus_num; - unsigned num_chipselect; -}; - -#endif /* _ATH79_SPI_PLATFORM_H */ diff --git a/drivers/spi/spi-ath79.c b/drivers/spi/spi-ath79.c index 0719bd484891..6eb7255558df 100644 --- a/drivers/spi/spi-ath79.c +++ b/drivers/spi/spi-ath79.c @@ -26,7 +26,6 @@ #include <linux/err.h> #include <asm/mach-ath79/ar71xx_regs.h> -#include <asm/mach-ath79/ath79_spi_platform.h> #define DRV_NAME "ath79-spi" @@ -208,7 +207,6 @@ static int ath79_spi_probe(struct platform_device *pdev) { struct spi_master *master; struct ath79_spi *sp; - struct ath79_spi_platform_data *pdata; struct resource *r; unsigned long rate; int ret; @@ -223,15 +221,9 @@ static int ath79_spi_probe(struct platform_device *pdev) master->dev.of_node = pdev->dev.of_node; platform_set_drvdata(pdev, sp); - pdata = dev_get_platdata(&pdev->dev); - master->bits_per_word_mask = SPI_BPW_RANGE_MASK(1, 32); master->setup = ath79_spi_setup; master->cleanup = ath79_spi_cleanup; - if (pdata) { - master->bus_num = pdata->bus_num; - master->num_chipselect = pdata->num_chipselect; - } sp->bitbang.master = master; sp->bitbang.chipselect = ath79_spi_chipselect;