remove arm-davinci-add-skeleton-for-pdata-quirks.patch from 4.9 and 4.10

diff --git a/queue-4.10/arm-davinci-add-skeleton-for-pdata-quirks.patch b/queue-4.10/arm-davinci-add-skeleton-for-pdata-quirks.patch
deleted file mode 100644 (file)
index 3ba5f39..0000000
--- a/queue-4.10/arm-davinci-add-skeleton-for-pdata-quirks.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From foo@baz Mon Apr 10 18:08:16 CEST 2017
-From: alexander.levin@verizon.com
-Date: Tue, 4 Apr 2017 19:32:24 +0000
-Subject: ARM: davinci: add skeleton for pdata-quirks
-To: "gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>
-Cc: "stable@vger.kernel.org" <stable@vger.kernel.org>
-Message-ID: <20170404193158.19041-59-alexander.levin@verizon.com>
-
-From: Kevin Hilman <khilman@baylibre.com>
-
-[ Upstream commit 9c9b1bc25291e275b04f758f2549c81e092954f5 ]
-
-Add skeleton pdata-quirks for davinci.
-
-Signed-off-by: Kevin Hilman <khilman@baylibre.com>
-[nsekhar@ti.com: move changes to build pdata-quirks.c and call
-                to pdata_quirks_init() to this patch]
-Signed-off-by: Sekhar Nori <nsekhar@ti.com>
-Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/arm/mach-davinci/Makefile              |    2 -
- arch/arm/mach-davinci/da8xx-dt.c            |    1 
- arch/arm/mach-davinci/include/mach/common.h |    2 +
- arch/arm/mach-davinci/pdata-quirks.c        |   39 ++++++++++++++++++++++++++++
- 4 files changed, 43 insertions(+), 1 deletion(-)
- create mode 100644 arch/arm/mach-davinci/pdata-quirks.c
-
---- a/arch/arm/mach-davinci/Makefile
-+++ b/arch/arm/mach-davinci/Makefile
-@@ -21,7 +21,7 @@ obj-$(CONFIG_AINTC)                  += irq.o
- obj-$(CONFIG_CP_INTC)                 += cp_intc.o
- 
- # Board specific
--obj-$(CONFIG_MACH_DA8XX_DT)           += da8xx-dt.o
-+obj-$(CONFIG_MACH_DA8XX_DT)           += da8xx-dt.o pdata-quirks.o
- obj-$(CONFIG_MACH_DAVINCI_EVM)        += board-dm644x-evm.o
- obj-$(CONFIG_MACH_SFFSDR)             += board-sffsdr.o
- obj-$(CONFIG_MACH_NEUROS_OSD2)                += board-neuros-osd2.o
---- a/arch/arm/mach-davinci/da8xx-dt.c
-+++ b/arch/arm/mach-davinci/da8xx-dt.c
-@@ -62,6 +62,7 @@ static void __init da850_init_machine(vo
- 
-       of_platform_default_populate(NULL, da850_auxdata_lookup, NULL);
-       davinci_pm_init();
-+      pdata_quirks_init();
- }
- 
- static const char *const da850_boards_compat[] __initconst = {
---- a/arch/arm/mach-davinci/include/mach/common.h
-+++ b/arch/arm/mach-davinci/include/mach/common.h
-@@ -102,6 +102,8 @@ int davinci_pm_init(void);
- static inline int davinci_pm_init(void) { return 0; }
- #endif
- 
-+void __init pdata_quirks_init(void);
-+
- #define SRAM_SIZE     SZ_128K
- 
- #endif /* __ARCH_ARM_MACH_DAVINCI_COMMON_H */
---- /dev/null
-+++ b/arch/arm/mach-davinci/pdata-quirks.c
-@@ -0,0 +1,39 @@
-+/*
-+ * Legacy platform_data quirks
-+ *
-+ * Copyright (C) 2016 BayLibre, Inc
-+ *
-+ * 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.
-+ */
-+#include <linux/kernel.h>
-+#include <linux/of_platform.h>
-+
-+#include <mach/common.h>
-+
-+struct pdata_init {
-+      const char *compatible;
-+      void (*fn)(void);
-+};
-+
-+static void pdata_quirks_check(struct pdata_init *quirks)
-+{
-+      while (quirks->compatible) {
-+              if (of_machine_is_compatible(quirks->compatible)) {
-+                      if (quirks->fn)
-+                              quirks->fn();
-+                      break;
-+              }
-+              quirks++;
-+      }
-+}
-+
-+static struct pdata_init pdata_quirks[] __initdata = {
-+      { /* sentinel */ },
-+};
-+
-+void __init pdata_quirks_init(void)
-+{
-+      pdata_quirks_check(pdata_quirks);
-+}

diff --git a/queue-4.10/series b/queue-4.10/series
index 9ad792444ba1f4df6220d6c93d1561b9782fe1bf..9b1a704255768e009e5781172fd99272b872bc5f 100644 (file)
--- a/queue-4.10/series
+++ b/queue-4.10/series
@@ -73,7 +73,6 @@ drm-i915-actually-drive-the-bdw-reserved-ids.patch
 asoc-intel-bytcr_rt5640-quirks-for-insyde-devices.patch
 usb-chipidea-msm-rely-on-core-to-override-ahbburst.patch
 serial-8250_omap-add-omap_dma_tx_kick-quirk-for-am437x.patch
-arm-davinci-add-skeleton-for-pdata-quirks.patch
 usb-xhci-add-quirk-flag-for-broken-ped-bits.patch
 usb-host-xhci-plat-enable-broken_ped-quirk-if-platform-requested.patch
 usb-dwc3-host-pass-quirk-broken-port-ped-property-for-known-broken-revisions.patch

diff --git a/queue-4.9/arm-davinci-add-skeleton-for-pdata-quirks.patch b/queue-4.9/arm-davinci-add-skeleton-for-pdata-quirks.patch
deleted file mode 100644 (file)
index 697196c..0000000
--- a/queue-4.9/arm-davinci-add-skeleton-for-pdata-quirks.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From foo@baz Mon Apr 10 17:43:56 CEST 2017
-From: alexander.levin@verizon.com
-Date: Tue, 4 Apr 2017 19:32:24 +0000
-Subject: ARM: davinci: add skeleton for pdata-quirks
-To: "gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>
-Cc: "stable@vger.kernel.org" <stable@vger.kernel.org>
-Message-ID: <20170404193158.19041-59-alexander.levin@verizon.com>
-
-From: Kevin Hilman <khilman@baylibre.com>
-
-[ Upstream commit 9c9b1bc25291e275b04f758f2549c81e092954f5 ]
-
-Add skeleton pdata-quirks for davinci.
-
-Signed-off-by: Kevin Hilman <khilman@baylibre.com>
-[nsekhar@ti.com: move changes to build pdata-quirks.c and call
-                to pdata_quirks_init() to this patch]
-Signed-off-by: Sekhar Nori <nsekhar@ti.com>
-Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/arm/mach-davinci/Makefile              |    2 -
- arch/arm/mach-davinci/da8xx-dt.c            |    1 
- arch/arm/mach-davinci/include/mach/common.h |    2 +
- arch/arm/mach-davinci/pdata-quirks.c        |   39 ++++++++++++++++++++++++++++
- 4 files changed, 43 insertions(+), 1 deletion(-)
- create mode 100644 arch/arm/mach-davinci/pdata-quirks.c
-
---- a/arch/arm/mach-davinci/Makefile
-+++ b/arch/arm/mach-davinci/Makefile
-@@ -21,7 +21,7 @@ obj-$(CONFIG_AINTC)                  += irq.o
- obj-$(CONFIG_CP_INTC)                 += cp_intc.o
- 
- # Board specific
--obj-$(CONFIG_MACH_DA8XX_DT)           += da8xx-dt.o
-+obj-$(CONFIG_MACH_DA8XX_DT)           += da8xx-dt.o pdata-quirks.o
- obj-$(CONFIG_MACH_DAVINCI_EVM)        += board-dm644x-evm.o
- obj-$(CONFIG_MACH_SFFSDR)             += board-sffsdr.o
- obj-$(CONFIG_MACH_NEUROS_OSD2)                += board-neuros-osd2.o
---- a/arch/arm/mach-davinci/da8xx-dt.c
-+++ b/arch/arm/mach-davinci/da8xx-dt.c
-@@ -47,6 +47,7 @@ static void __init da850_init_machine(vo
- {
-       of_platform_default_populate(NULL, da850_auxdata_lookup, NULL);
-       davinci_pm_init();
-+      pdata_quirks_init();
- }
- 
- static const char *const da850_boards_compat[] __initconst = {
---- a/arch/arm/mach-davinci/include/mach/common.h
-+++ b/arch/arm/mach-davinci/include/mach/common.h
-@@ -102,6 +102,8 @@ int davinci_pm_init(void);
- static inline int davinci_pm_init(void) { return 0; }
- #endif
- 
-+void __init pdata_quirks_init(void);
-+
- #define SRAM_SIZE     SZ_128K
- 
- #endif /* __ARCH_ARM_MACH_DAVINCI_COMMON_H */
---- /dev/null
-+++ b/arch/arm/mach-davinci/pdata-quirks.c
-@@ -0,0 +1,39 @@
-+/*
-+ * Legacy platform_data quirks
-+ *
-+ * Copyright (C) 2016 BayLibre, Inc
-+ *
-+ * 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.
-+ */
-+#include <linux/kernel.h>
-+#include <linux/of_platform.h>
-+
-+#include <mach/common.h>
-+
-+struct pdata_init {
-+      const char *compatible;
-+      void (*fn)(void);
-+};
-+
-+static void pdata_quirks_check(struct pdata_init *quirks)
-+{
-+      while (quirks->compatible) {
-+              if (of_machine_is_compatible(quirks->compatible)) {
-+                      if (quirks->fn)
-+                              quirks->fn();
-+                      break;
-+              }
-+              quirks++;
-+      }
-+}
-+
-+static struct pdata_init pdata_quirks[] __initdata = {
-+      { /* sentinel */ },
-+};
-+
-+void __init pdata_quirks_init(void)
-+{
-+      pdata_quirks_check(pdata_quirks);
-+}

diff --git a/queue-4.9/series b/queue-4.9/series
index 212b5533fe0111b3c405dad0b44d33b95a3192a6..cb506def028b71d1028a19c8848fab5591712c37 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -99,7 +99,6 @@ usb-chipidea-msm-rely-on-core-to-override-ahbburst.patch
 serial-8250_omap-add-omap_dma_tx_kick-quirk-for-am437x.patch
 input-gpio_keys-add-support-for-gpio-descriptors.patch
 arm-davinci-pm-support-da8xx-dt-platforms.patch
-arm-davinci-add-skeleton-for-pdata-quirks.patch
 usb-xhci-add-quirk-flag-for-broken-ped-bits.patch
 usb-host-xhci-plat-enable-broken_ped-quirk-if-platform-requested.patch
 usb-dwc3-host-pass-quirk-broken-port-ped-property-for-known-broken-revisions.patch