drop some patches from 4.4 and 4.9

diff --git a/queue-4.4/arm-davinci_all_defconfig-set-config_davinci_watchdog-y.patch b/queue-4.4/arm-davinci_all_defconfig-set-config_davinci_watchdog-y.patch
deleted file mode 100644 (file)
index 714cdc0..0000000
--- a/queue-4.4/arm-davinci_all_defconfig-set-config_davinci_watchdog-y.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From foo@baz Wed May  2 11:39:22 PDT 2018
-From: David Lechner <david@lechnology.com>
-Date: Mon, 15 Jan 2018 11:29:31 -0600
-Subject: ARM: davinci_all_defconfig: set CONFIG_DAVINCI_WATCHDOG=y
-
-From: David Lechner <david@lechnology.com>
-
-[ Upstream commit 35ba26772c827dbfc03be8adc3af8ff0d294b38f ]
-
-This changes CONFIG_DAVINCI_WATCHDOG from a module to a compiled-in
-option. Since the reset function has been moved out of the mach code in
-commit 94f2e94514e5 ("ARM: davinci: remove watchdog reset") and into the
-watchdog driver, devices cannot reboot unless the watchdog driver is
-loaded, so make it a compiled-in option so that we can always reboot, even
-when modules are not loaded.
-
-Cc: Sekhar Nori <nsekhar@ti.com>
-Suggested-by: Adam Ford <aford173@gmail.com>
-Signed-off-by: David Lechner <david@lechnology.com>
-Signed-off-by: Sekhar Nori <nsekhar@ti.com>
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/arm/configs/davinci_all_defconfig |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/arm/configs/davinci_all_defconfig
-+++ b/arch/arm/configs/davinci_all_defconfig
-@@ -120,7 +120,7 @@ CONFIG_I2C_DAVINCI=y
- CONFIG_PINCTRL_SINGLE=y
- CONFIG_GPIO_PCF857X=y
- CONFIG_WATCHDOG=y
--CONFIG_DAVINCI_WATCHDOG=m
-+CONFIG_DAVINCI_WATCHDOG=y
- CONFIG_MFD_DM355EVM_MSP=y
- CONFIG_TPS6507X=y
- CONFIG_VIDEO_OUTPUT_CONTROL=m

diff --git a/queue-4.4/pinctrl-msm-use-dynamic-gpio-numbering.patch b/queue-4.4/pinctrl-msm-use-dynamic-gpio-numbering.patch
deleted file mode 100644 (file)
index 5bb0eeb..0000000
--- a/queue-4.4/pinctrl-msm-use-dynamic-gpio-numbering.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From foo@baz Wed May  2 11:39:22 PDT 2018
-From: Bjorn Andersson <bjorn.andersson@linaro.org>
-Date: Sun, 28 Jan 2018 16:59:48 -0800
-Subject: pinctrl: msm: Use dynamic GPIO numbering
-
-From: Bjorn Andersson <bjorn.andersson@linaro.org>
-
-[ Upstream commit a7aa75a2a7dba32594291a71c3704000a2fd7089 ]
-
-The base of the TLMM gpiochip should not be statically defined as 0, fix
-this to not artificially restrict the existence of multiple pinctrl-msm
-devices.
-
-Fixes: f365be092572 ("pinctrl: Add Qualcomm TLMM driver")
-Reported-by: Timur Tabi <timur@codeaurora.org>
-Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/pinctrl/qcom/pinctrl-msm.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/pinctrl/qcom/pinctrl-msm.c
-+++ b/drivers/pinctrl/qcom/pinctrl-msm.c
-@@ -793,7 +793,7 @@ static int msm_gpio_init(struct msm_pinc
-               return -EINVAL;
- 
-       chip = &pctrl->chip;
--      chip->base = 0;
-+      chip->base = -1;
-       chip->ngpio = ngpio;
-       chip->label = dev_name(pctrl->dev);
-       chip->dev = pctrl->dev;

diff --git a/queue-4.4/series b/queue-4.4/series
index 3eb6ee4a2c77b7726ba7f5f0a700fd700df49c02..468c56f7c283c3e4d0d14cd13ae928211d84753d 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -241,7 +241,6 @@ pci-add-function-1-dma-alias-quirk-for-marvell-88se9220.patch
 udf-provide-saner-default-for-invalid-uid-gid.patch
 media-vb2-fix-videobuf2-to-map-correct-area.patch
 media-cx25821-prevent-out-of-bounds-read-on-array-card.patch
-arm-davinci_all_defconfig-set-config_davinci_watchdog-y.patch
 clk-samsung-s3c2410-fix-pll-rates.patch
 clk-samsung-exynos5260-fix-pll-rates.patch
 clk-samsung-exynos5433-fix-pll-rates.patch
@@ -261,7 +260,6 @@ scsi-lpfc-fix-issue_lip-if-link-is-disabled.patch
 scsi-lpfc-fix-soft-lockup-in-lpfc-worker-thread-during-lip-testing.patch
 scsi-lpfc-fix-frequency-of-release-wqe-cqes.patch
 regulator-of-add-a-missing-of_node_put-in-an-error-handling-path-of-of_regulator_match.patch
-pinctrl-msm-use-dynamic-gpio-numbering.patch
 asoc-samsung-i2s-ensure-the-rclk-rate-is-properly-determined.patch
 bluetooth-btusb-add-device-id-for-rtl8822be.patch
 kdb-make-mdr-command-repeat.patch

diff --git a/queue-4.9/arm-davinci_all_defconfig-set-config_davinci_watchdog-y.patch b/queue-4.9/arm-davinci_all_defconfig-set-config_davinci_watchdog-y.patch
deleted file mode 100644 (file)
index 980a887..0000000
--- a/queue-4.9/arm-davinci_all_defconfig-set-config_davinci_watchdog-y.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From foo@baz Wed May  2 10:53:12 PDT 2018
-From: David Lechner <david@lechnology.com>
-Date: Mon, 15 Jan 2018 11:29:31 -0600
-Subject: ARM: davinci_all_defconfig: set CONFIG_DAVINCI_WATCHDOG=y
-
-From: David Lechner <david@lechnology.com>
-
-[ Upstream commit 35ba26772c827dbfc03be8adc3af8ff0d294b38f ]
-
-This changes CONFIG_DAVINCI_WATCHDOG from a module to a compiled-in
-option. Since the reset function has been moved out of the mach code in
-commit 94f2e94514e5 ("ARM: davinci: remove watchdog reset") and into the
-watchdog driver, devices cannot reboot unless the watchdog driver is
-loaded, so make it a compiled-in option so that we can always reboot, even
-when modules are not loaded.
-
-Cc: Sekhar Nori <nsekhar@ti.com>
-Suggested-by: Adam Ford <aford173@gmail.com>
-Signed-off-by: David Lechner <david@lechnology.com>
-Signed-off-by: Sekhar Nori <nsekhar@ti.com>
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/arm/configs/davinci_all_defconfig |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/arm/configs/davinci_all_defconfig
-+++ b/arch/arm/configs/davinci_all_defconfig
-@@ -117,7 +117,7 @@ CONFIG_PINCTRL_SINGLE=y
- CONFIG_GPIO_SYSFS=y
- CONFIG_GPIO_PCA953X=y
- CONFIG_WATCHDOG=y
--CONFIG_DAVINCI_WATCHDOG=m
-+CONFIG_DAVINCI_WATCHDOG=y
- CONFIG_MFD_DM355EVM_MSP=y
- CONFIG_TPS6507X=y
- CONFIG_REGULATOR=y

diff --git a/queue-4.9/series b/queue-4.9/series
index 0279dba0a7d26dd3ecbff237e9b52aebfa41e12d..aa9fc0428e884b6fffc3ac5e4aea6765bf894b03 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -362,7 +362,6 @@ udf-provide-saner-default-for-invalid-uid-gid.patch
 media-vb2-fix-videobuf2-to-map-correct-area.patch
 media-vivid-fix-incorrect-capabilities-for-radio.patch
 media-cx25821-prevent-out-of-bounds-read-on-array-card.patch
-arm-davinci_all_defconfig-set-config_davinci_watchdog-y.patch
 clk-samsung-s3c2410-fix-pll-rates.patch
 clk-samsung-exynos7-fix-pll-rates.patch
 clk-samsung-exynos5260-fix-pll-rates.patch