diff options
author | Christian Lamparter <chunkeey@gmail.com> | 2019-11-28 22:28:48 +0100 |
---|---|---|
committer | Petr Štetiar <ynezz@true.cz> | 2019-12-19 22:41:57 +0100 |
commit | 63066d3006958ca52df71f53c6f413ad4fb74974 (patch) | |
tree | 08dd597a38f839e6a14f20fadc6e1d39c69fe3f0 /target/linux/ipq806x/patches-4.19/0074-ipq806x-usb-Control-USB-master-reset.patch | |
parent | 53801ae1c79ecf5153d658951e3c3afed4a16d93 (diff) | |
download | upstream-63066d3006958ca52df71f53c6f413ad4fb74974.tar.gz upstream-63066d3006958ca52df71f53c6f413ad4fb74974.tar.bz2 upstream-63066d3006958ca52df71f53c6f413ad4fb74974.zip |
ipq806x: refresh 4.19 patches
Reworked:
- 0034 patchset update
Added:
- 080 Add support for pinctrl-msm framework
Removed:
- 0074-ipq806x-usb-Control-USB-master-reset.patch
(we now have a dedicated driver for qcom usb)
- 0047-mtd-nand-Create-a-BBT-flag-to-access-bad-block-marke
(merged upstream)
- 310-msm-adhoc-bus-support
(it looks like it was never actually used in any dts)
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
[commit subject and description facelift, SoB fix]
Signed-off-by: Petr Štetiar <ynezz@true.cz>
Diffstat (limited to 'target/linux/ipq806x/patches-4.19/0074-ipq806x-usb-Control-USB-master-reset.patch')
-rw-r--r-- | target/linux/ipq806x/patches-4.19/0074-ipq806x-usb-Control-USB-master-reset.patch | 71 |
1 files changed, 0 insertions, 71 deletions
diff --git a/target/linux/ipq806x/patches-4.19/0074-ipq806x-usb-Control-USB-master-reset.patch b/target/linux/ipq806x/patches-4.19/0074-ipq806x-usb-Control-USB-master-reset.patch deleted file mode 100644 index ee410ca6fa..0000000000 --- a/target/linux/ipq806x/patches-4.19/0074-ipq806x-usb-Control-USB-master-reset.patch +++ /dev/null @@ -1,71 +0,0 @@ -From a86bda9f8a7965f0cedd347a9c04800eb9f41ea3 Mon Sep 17 00:00:00 2001 -From: Vasudevan Murugesan <vmuruges@codeaurora.org> -Date: Tue, 21 Jul 2015 10:22:38 +0530 -Subject: ipq806x: usb: Control USB master reset - -During removal of the glue layer(dwc3-of-simple), -USB master reset is set to active and during insertion -it is de-activated. - -Change-Id: I537dc810f6cb2a46664ee674840145066432b957 -Signed-off-by: Vasudevan Murugesan <vmuruges@codeaurora.org> -(cherry picked from commit 4611e13580a216812f85f0801b95442d02eeb836) ---- - drivers/usb/dwc3/dwc3-of-simple.c | 22 ++++++++++++++++++++++ - 1 file changed, 12 insertions(+) - -(limited to 'drivers/usb/dwc3/dwc3-of-simple.c') - ---- a/drivers/usb/dwc3/dwc3-of-simple.c -+++ b/drivers/usb/dwc3/dwc3-of-simple.c -@@ -25,6 +25,7 @@ - #include <linux/platform_device.h> - #include <linux/dma-mapping.h> - #include <linux/clk.h> -+#include <linux/reset.h> - #include <linux/of.h> - #include <linux/of_platform.h> - #include <linux/pm_runtime.h> -@@ -33,6 +34,8 @@ struct dwc3_of_simple { - struct device *dev; - struct clk **clks; - int num_clocks; -+ struct reset_control *mstr_rst_30_0; -+ struct reset_control *mstr_rst_30_1; - }; - - static int dwc3_of_simple_clk_init(struct dwc3_of_simple *simple, int count) -@@ -102,6 +105,20 @@ static int dwc3_of_simple_probe(struct p - if (ret) - return ret; - -+ simple->mstr_rst_30_0 = devm_reset_control_get(dev, "usb30_0_mstr_rst"); -+ -+ if (!IS_ERR(simple->mstr_rst_30_0)) -+ reset_control_deassert(simple->mstr_rst_30_0); -+ else -+ dev_dbg(simple->dev, "cannot get handle for USB PHY 0 master reset control\n"); -+ -+ simple->mstr_rst_30_1 = devm_reset_control_get(dev, "usb30_1_mstr_rst"); -+ -+ if (!IS_ERR(simple->mstr_rst_30_1)) -+ reset_control_deassert(simple->mstr_rst_30_1); -+ else -+ dev_dbg(simple->dev, "cannot get handle for USB PHY 1 master reset control\n"); -+ - ret = of_platform_populate(np, NULL, NULL, dev); - if (ret) { - for (i = 0; i < simple->num_clocks; i++) { -@@ -130,6 +147,12 @@ static int dwc3_of_simple_remove(struct - clk_put(simple->clks[i]); - } - -+ if (!IS_ERR(simple->mstr_rst_30_0)) -+ reset_control_assert(simple->mstr_rst_30_0); -+ -+ if (!IS_ERR(simple->mstr_rst_30_1)) -+ reset_control_assert(simple->mstr_rst_30_1); -+ - of_platform_depopulate(dev); - - pm_runtime_disable(dev); |