From: Greg Kroah-Hartman Date: Tue, 11 Apr 2017 14:32:34 +0000 (+0200) Subject: remove arm-davinci-add-skeleton-for-pdata-quirks.patch from 4.9 and 4.10 X-Git-Tag: v4.4.61~4 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=403f36a52797f7949a757d5047698a808eb682f3;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 3ba5f394f63..00000000000 --- 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" -Cc: "stable@vger.kernel.org" -Message-ID: <20170404193158.19041-59-alexander.levin@verizon.com> - -From: Kevin Hilman - -[ Upstream commit 9c9b1bc25291e275b04f758f2549c81e092954f5 ] - -Add skeleton pdata-quirks for davinci. - -Signed-off-by: Kevin Hilman -[nsekhar@ti.com: move changes to build pdata-quirks.c and call - to pdata_quirks_init() to this patch] -Signed-off-by: Sekhar Nori -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - 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 -+#include -+ -+#include -+ -+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 9ad792444ba..9b1a7042557 100644 --- 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 index 697196cf4b5..00000000000 --- 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" -Cc: "stable@vger.kernel.org" -Message-ID: <20170404193158.19041-59-alexander.levin@verizon.com> - -From: Kevin Hilman - -[ Upstream commit 9c9b1bc25291e275b04f758f2549c81e092954f5 ] - -Add skeleton pdata-quirks for davinci. - -Signed-off-by: Kevin Hilman -[nsekhar@ti.com: move changes to build pdata-quirks.c and call - to pdata_quirks_init() to this patch] -Signed-off-by: Sekhar Nori -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - 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 -+#include -+ -+#include -+ -+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 212b5533fe0..cb506def028 100644 --- 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