Drop regulator-fixed-default-enable-high-on-dt-regulators.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.14/regulator-fixed-default-enable-high-on-dt-regulators.patch b/queue-4.14/regulator-fixed-default-enable-high-on-dt-regulators.patch
deleted file mode 100644 (file)
index c0e3dee..0000000
--- a/queue-4.14/regulator-fixed-default-enable-high-on-dt-regulators.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 2211535df238bcc0f170cdb1f3b727e72f13999e Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 1 Oct 2018 22:43:46 +0200
-Subject: regulator: fixed: Default enable high on DT regulators
-
-From: Linus Walleij <linus.walleij@linaro.org>
-
-[ Upstream commit 28be5f15df2ee6882b0a122693159c96a28203c7 ]
-
-commit efdfeb079cc3
-("regulator: fixed: Convert to use GPIO descriptor only")
-switched to use gpiod_get() to look up the regulator from the
-gpiolib core whether that is device tree or boardfile.
-
-This meant that we activate the code in
-a603a2b8d86e ("gpio: of: Add special quirk to parse regulator flags")
-which means the descriptors coming from the device tree already
-have the right inversion and open drain semantics set up from
-the gpiolib core.
-
-As the fixed regulator was inspected again we got the
-inverted inversion and things broke.
-
-Fix it by ignoring the config in the device tree for now: the
-later patches in the series will push all inversion handling
-over to the gpiolib core and set it up properly in the
-boardfiles for legacy devices, but I did not finish that
-for this kernel cycle.
-
-Fixes: commit efdfeb079cc3 ("regulator: fixed: Convert to use GPIO descriptor only")
-Reported-by: Leonard Crestez <leonard.crestez@nxp.com>
-Reported-by: Fabio Estevam <festevam@gmail.com>
-Reported-by: John Stultz <john.stultz@linaro.org>
-Reported-by: Anders Roxell <anders.roxell@linaro.org>
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-Tested-by: John Stultz <john.stultz@linaro.org>
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/regulator/fixed.c | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c
-index 988a7472c2ab5..d68ff65a5adc9 100644
---- a/drivers/regulator/fixed.c
-+++ b/drivers/regulator/fixed.c
-@@ -84,9 +84,14 @@ of_get_fixed_voltage_config(struct device *dev,
- 
-       of_property_read_u32(np, "startup-delay-us", &config->startup_delay);
- 
--      config->enable_high = of_property_read_bool(np, "enable-active-high");
--      config->gpio_is_open_drain = of_property_read_bool(np,
--                                                         "gpio-open-drain");
-+      /*
-+       * FIXME: we pulled active low/high and open drain handling into
-+       * gpiolib so it will be handled there. Delete this in the second
-+       * step when we also remove the custom inversion handling for all
-+       * legacy boardfiles.
-+       */
-+      config->enable_high = 1;
-+      config->gpio_is_open_drain = 0;
- 
-       if (of_find_property(np, "vin-supply", NULL))
-               config->input_supply = "vin";
--- 
-2.20.1
-

diff --git a/queue-4.14/series b/queue-4.14/series
index 8e751f1504b233c5dff34ee78826f4b42156d4ed..4bdc5fbd4347596ffc7ba7e4c0c0478e3deeae67 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -13,7 +13,6 @@ pci-iproc-remove-paxc-slot-check-to-allow-vf-support.patch
 drm-hisilicon-hibmc-don-t-overwrite-fb-helper-surfac.patch
 ib-rxe-replace-kvfree-with-vfree.patch
 ib-hfi1-add-mtu-check-for-operational-data-vls.patch
-regulator-fixed-default-enable-high-on-dt-regulators.patch
 alsa-usb-audio-update-quirk-for-b-w-px-to-remove-mic.patch
 staging-comedi-ni_mio_common-protect-register-write-.patch
 pwm-lpss-release-runtime-pm-reference-from-the-drive.patch

diff --git a/queue-4.19/regulator-fixed-default-enable-high-on-dt-regulators.patch b/queue-4.19/regulator-fixed-default-enable-high-on-dt-regulators.patch
deleted file mode 100644 (file)
index a3ed5c5..0000000
--- a/queue-4.19/regulator-fixed-default-enable-high-on-dt-regulators.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From fd6de905dc3a2ed5994c2d53e319678d88672019 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 1 Oct 2018 22:43:46 +0200
-Subject: regulator: fixed: Default enable high on DT regulators
-
-From: Linus Walleij <linus.walleij@linaro.org>
-
-[ Upstream commit 28be5f15df2ee6882b0a122693159c96a28203c7 ]
-
-commit efdfeb079cc3
-("regulator: fixed: Convert to use GPIO descriptor only")
-switched to use gpiod_get() to look up the regulator from the
-gpiolib core whether that is device tree or boardfile.
-
-This meant that we activate the code in
-a603a2b8d86e ("gpio: of: Add special quirk to parse regulator flags")
-which means the descriptors coming from the device tree already
-have the right inversion and open drain semantics set up from
-the gpiolib core.
-
-As the fixed regulator was inspected again we got the
-inverted inversion and things broke.
-
-Fix it by ignoring the config in the device tree for now: the
-later patches in the series will push all inversion handling
-over to the gpiolib core and set it up properly in the
-boardfiles for legacy devices, but I did not finish that
-for this kernel cycle.
-
-Fixes: commit efdfeb079cc3 ("regulator: fixed: Convert to use GPIO descriptor only")
-Reported-by: Leonard Crestez <leonard.crestez@nxp.com>
-Reported-by: Fabio Estevam <festevam@gmail.com>
-Reported-by: John Stultz <john.stultz@linaro.org>
-Reported-by: Anders Roxell <anders.roxell@linaro.org>
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-Tested-by: John Stultz <john.stultz@linaro.org>
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/regulator/fixed.c | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c
-index 988a7472c2ab5..d68ff65a5adc9 100644
---- a/drivers/regulator/fixed.c
-+++ b/drivers/regulator/fixed.c
-@@ -84,9 +84,14 @@ of_get_fixed_voltage_config(struct device *dev,
- 
-       of_property_read_u32(np, "startup-delay-us", &config->startup_delay);
- 
--      config->enable_high = of_property_read_bool(np, "enable-active-high");
--      config->gpio_is_open_drain = of_property_read_bool(np,
--                                                         "gpio-open-drain");
-+      /*
-+       * FIXME: we pulled active low/high and open drain handling into
-+       * gpiolib so it will be handled there. Delete this in the second
-+       * step when we also remove the custom inversion handling for all
-+       * legacy boardfiles.
-+       */
-+      config->enable_high = 1;
-+      config->gpio_is_open_drain = 0;
- 
-       if (of_find_property(np, "vin-supply", NULL))
-               config->input_supply = "vin";
--- 
-2.20.1
-

diff --git a/queue-4.19/series b/queue-4.19/series
index 7d645a45cf8c4b9ac0378863940cc37667ebbd59..c97e1c04665656ff14b2e489b2312e9068993f7a 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -39,7 +39,6 @@ genirq-debugfs-reinstate-full-of-path-for-domain-nam.patch
 usb-dwc3-add-extcon-dependency-for-qcom.patch
 usb-gadget-fsl_udc_core-check-allocation-return-valu.patch
 cfg80211-regulatory-make-initialization-more-robust.patch
-regulator-fixed-default-enable-high-on-dt-regulators.patch
 mei-replace-poll-with-epoll-for-write-queues.patch
 drm-msm-fix-unsigned-comparison-with-less-than-zero.patch
 of-fix-property-name-in-of_node_get_device_type.patch

diff --git a/queue-4.4/regulator-fixed-default-enable-high-on-dt-regulators.patch b/queue-4.4/regulator-fixed-default-enable-high-on-dt-regulators.patch
deleted file mode 100644 (file)
index ae7748e..0000000
--- a/queue-4.4/regulator-fixed-default-enable-high-on-dt-regulators.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 0b7d04869c1e40900835e5989701a64e8241c263 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 1 Oct 2018 22:43:46 +0200
-Subject: regulator: fixed: Default enable high on DT regulators
-
-From: Linus Walleij <linus.walleij@linaro.org>
-
-[ Upstream commit 28be5f15df2ee6882b0a122693159c96a28203c7 ]
-
-commit efdfeb079cc3
-("regulator: fixed: Convert to use GPIO descriptor only")
-switched to use gpiod_get() to look up the regulator from the
-gpiolib core whether that is device tree or boardfile.
-
-This meant that we activate the code in
-a603a2b8d86e ("gpio: of: Add special quirk to parse regulator flags")
-which means the descriptors coming from the device tree already
-have the right inversion and open drain semantics set up from
-the gpiolib core.
-
-As the fixed regulator was inspected again we got the
-inverted inversion and things broke.
-
-Fix it by ignoring the config in the device tree for now: the
-later patches in the series will push all inversion handling
-over to the gpiolib core and set it up properly in the
-boardfiles for legacy devices, but I did not finish that
-for this kernel cycle.
-
-Fixes: commit efdfeb079cc3 ("regulator: fixed: Convert to use GPIO descriptor only")
-Reported-by: Leonard Crestez <leonard.crestez@nxp.com>
-Reported-by: Fabio Estevam <festevam@gmail.com>
-Reported-by: John Stultz <john.stultz@linaro.org>
-Reported-by: Anders Roxell <anders.roxell@linaro.org>
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-Tested-by: John Stultz <john.stultz@linaro.org>
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/regulator/fixed.c | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c
-index ff62d69ba0bed..24ad5e6832dfd 100644
---- a/drivers/regulator/fixed.c
-+++ b/drivers/regulator/fixed.c
-@@ -94,9 +94,14 @@ of_get_fixed_voltage_config(struct device *dev,
- 
-       of_property_read_u32(np, "startup-delay-us", &config->startup_delay);
- 
--      config->enable_high = of_property_read_bool(np, "enable-active-high");
--      config->gpio_is_open_drain = of_property_read_bool(np,
--                                                         "gpio-open-drain");
-+      /*
-+       * FIXME: we pulled active low/high and open drain handling into
-+       * gpiolib so it will be handled there. Delete this in the second
-+       * step when we also remove the custom inversion handling for all
-+       * legacy boardfiles.
-+       */
-+      config->enable_high = 1;
-+      config->gpio_is_open_drain = 0;
- 
-       if (of_find_property(np, "vin-supply", NULL))
-               config->input_supply = "vin";
--- 
-2.20.1
-

diff --git a/queue-4.4/series b/queue-4.4/series
index 7a6e3776f4cce27ae20d0dc56d057d58b882def2..70f83ec31be8fd3dee7d05d2d29c287bef8c3e85 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -3,7 +3,6 @@ powerpc-archrandom-fix-arch_get_random_seed_int.patch
 mt7601u-fix-bbp-version-check-in-mt7601u_wait_bbp_ready.patch
 drm-virtio-fix-bounds-check-in-virtio_gpu_cmd_get_ca.patch
 alsa-hda-fix-unused-variable-warning.patch
-regulator-fixed-default-enable-high-on-dt-regulators.patch
 alsa-usb-audio-update-quirk-for-b-w-px-to-remove-mic.patch
 staging-comedi-ni_mio_common-protect-register-write-.patch
 pcrypt-use-format-specifier-in-kobject_add.patch

diff --git a/queue-4.9/regulator-fixed-default-enable-high-on-dt-regulators.patch b/queue-4.9/regulator-fixed-default-enable-high-on-dt-regulators.patch
deleted file mode 100644 (file)
index 9c84583..0000000
--- a/queue-4.9/regulator-fixed-default-enable-high-on-dt-regulators.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From e3e0343fe2602ddb3c47296cfd476f167f132661 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 1 Oct 2018 22:43:46 +0200
-Subject: regulator: fixed: Default enable high on DT regulators
-
-From: Linus Walleij <linus.walleij@linaro.org>
-
-[ Upstream commit 28be5f15df2ee6882b0a122693159c96a28203c7 ]
-
-commit efdfeb079cc3
-("regulator: fixed: Convert to use GPIO descriptor only")
-switched to use gpiod_get() to look up the regulator from the
-gpiolib core whether that is device tree or boardfile.
-
-This meant that we activate the code in
-a603a2b8d86e ("gpio: of: Add special quirk to parse regulator flags")
-which means the descriptors coming from the device tree already
-have the right inversion and open drain semantics set up from
-the gpiolib core.
-
-As the fixed regulator was inspected again we got the
-inverted inversion and things broke.
-
-Fix it by ignoring the config in the device tree for now: the
-later patches in the series will push all inversion handling
-over to the gpiolib core and set it up properly in the
-boardfiles for legacy devices, but I did not finish that
-for this kernel cycle.
-
-Fixes: commit efdfeb079cc3 ("regulator: fixed: Convert to use GPIO descriptor only")
-Reported-by: Leonard Crestez <leonard.crestez@nxp.com>
-Reported-by: Fabio Estevam <festevam@gmail.com>
-Reported-by: John Stultz <john.stultz@linaro.org>
-Reported-by: Anders Roxell <anders.roxell@linaro.org>
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-Tested-by: John Stultz <john.stultz@linaro.org>
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/regulator/fixed.c | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c
-index 988a7472c2ab5..d68ff65a5adc9 100644
---- a/drivers/regulator/fixed.c
-+++ b/drivers/regulator/fixed.c
-@@ -84,9 +84,14 @@ of_get_fixed_voltage_config(struct device *dev,
- 
-       of_property_read_u32(np, "startup-delay-us", &config->startup_delay);
- 
--      config->enable_high = of_property_read_bool(np, "enable-active-high");
--      config->gpio_is_open_drain = of_property_read_bool(np,
--                                                         "gpio-open-drain");
-+      /*
-+       * FIXME: we pulled active low/high and open drain handling into
-+       * gpiolib so it will be handled there. Delete this in the second
-+       * step when we also remove the custom inversion handling for all
-+       * legacy boardfiles.
-+       */
-+      config->enable_high = 1;
-+      config->gpio_is_open_drain = 0;
- 
-       if (of_find_property(np, "vin-supply", NULL))
-               config->input_supply = "vin";
--- 
-2.20.1
-

diff --git a/queue-4.9/series b/queue-4.9/series
index f21ddea4ca7427632d3b99e49fd83d9c97506000..0179f71a1abbd8f40e07f061dfd50ea827790007 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -6,7 +6,6 @@ drm-sti-do-not-remove-the-drm_bridge-that-was-never-.patch
 drm-virtio-fix-bounds-check-in-virtio_gpu_cmd_get_ca.patch
 alsa-hda-fix-unused-variable-warning.patch
 ib-rxe-replace-kvfree-with-vfree.patch
-regulator-fixed-default-enable-high-on-dt-regulators.patch
 alsa-usb-audio-update-quirk-for-b-w-px-to-remove-mic.patch
 staging-comedi-ni_mio_common-protect-register-write-.patch
 pwm-lpss-release-runtime-pm-reference-from-the-drive.patch