0033-spi-ath79-drop-pdata-support.patch 2.2 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273
  1. From c4e197bbcecc7233aa9e553e7047fa50e4e1fe77 Mon Sep 17 00:00:00 2001
  2. From: John Crispin <john@phrozen.org>
  3. Date: Mon, 25 Jun 2018 15:52:34 +0200
  4. Subject: [PATCH 33/33] spi: ath79: drop pdata support
  5. The target is being converted to pure OF. We can therefore drop all of the
  6. platform data code from the driver.
  7. Cc: linux-spi@vger.kernel.org
  8. Acked-by: Mark Brown <broonie@kernel.org>
  9. Signed-off-by: John Crispin <john@phrozen.org>
  10. ---
  11. arch/mips/include/asm/mach-ath79/ath79_spi_platform.h | 19 -------------------
  12. drivers/spi/spi-ath79.c | 8 --------
  13. 2 files changed, 27 deletions(-)
  14. delete mode 100644 arch/mips/include/asm/mach-ath79/ath79_spi_platform.h
  15. --- a/arch/mips/include/asm/mach-ath79/ath79_spi_platform.h
  16. +++ /dev/null
  17. @@ -1,19 +0,0 @@
  18. -/*
  19. - * Platform data definition for Atheros AR71XX/AR724X/AR913X SPI controller
  20. - *
  21. - * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
  22. - *
  23. - * This program is free software; you can redistribute it and/or modify it
  24. - * under the terms of the GNU General Public License version 2 as published
  25. - * by the Free Software Foundation.
  26. - */
  27. -
  28. -#ifndef _ATH79_SPI_PLATFORM_H
  29. -#define _ATH79_SPI_PLATFORM_H
  30. -
  31. -struct ath79_spi_platform_data {
  32. - unsigned bus_num;
  33. - unsigned num_chipselect;
  34. -};
  35. -
  36. -#endif /* _ATH79_SPI_PLATFORM_H */
  37. --- a/drivers/spi/spi-ath79.c
  38. +++ b/drivers/spi/spi-ath79.c
  39. @@ -26,7 +26,6 @@
  40. #include <linux/err.h>
  41. #include <asm/mach-ath79/ar71xx_regs.h>
  42. -#include <asm/mach-ath79/ath79_spi_platform.h>
  43. #define DRV_NAME "ath79-spi"
  44. @@ -208,7 +207,6 @@ static int ath79_spi_probe(struct platfo
  45. {
  46. struct spi_master *master;
  47. struct ath79_spi *sp;
  48. - struct ath79_spi_platform_data *pdata;
  49. struct resource *r;
  50. unsigned long rate;
  51. int ret;
  52. @@ -223,15 +221,9 @@ static int ath79_spi_probe(struct platfo
  53. master->dev.of_node = pdev->dev.of_node;
  54. platform_set_drvdata(pdev, sp);
  55. - pdata = dev_get_platdata(&pdev->dev);
  56. -
  57. master->bits_per_word_mask = SPI_BPW_RANGE_MASK(1, 32);
  58. master->setup = ath79_spi_setup;
  59. master->cleanup = ath79_spi_cleanup;
  60. - if (pdata) {
  61. - master->bus_num = pdata->bus_num;
  62. - master->num_chipselect = pdata->num_chipselect;
  63. - }
  64. sp->bitbang.master = master;
  65. sp->bitbang.chipselect = ath79_spi_chipselect;