drop unnessary patches
This commit is contained in:
Peter Robinson
parent
cbe47dcd6f
commit
42cd4b6b22
|
|
@ -1,41 +0,0 @@
|
|||
From patchwork Thu Jan 18 12:34:18 2018
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: ARM: dts: imx6qdl-udoo: Disable usbh1 to avoid kernel hang
|
||||
From: Fabio Estevam <fabio.estevam@nxp.com>
|
||||
X-Patchwork-Id: 10173115
|
||||
Message-Id: <1516278858-15464-1-git-send-email-fabio.estevam@nxp.com>
|
||||
To: <shawnguo@kernel.org>
|
||||
Cc: maggu2810@gmail.com, peter.chen@nxp.com, mail@maciej.szmigiero.name,
|
||||
Fabio Estevam <fabio.estevam@nxp.com>, linux-arm-kernel@lists.infradead.org
|
||||
Date: Thu, 18 Jan 2018 10:34:18 -0200
|
||||
|
||||
Currently the kernel hangs when USB Host1 is enabled due to the lack of
|
||||
support for controlling the USB hub clock and GPIO reset line.
|
||||
|
||||
Peter Chen has made several attempts to fix this problem, but his series
|
||||
has not been applied yet, so better disable USB host1 for now to avoid
|
||||
the kernel hang.
|
||||
|
||||
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
|
||||
Acked-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name>
|
||||
Tested-by: Markus Rathgeb <maggu2810@gmail.com>
|
||||
---
|
||||
arch/arm/boot/dts/imx6qdl-udoo.dtsi | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/arm/boot/dts/imx6qdl-udoo.dtsi b/arch/arm/boot/dts/imx6qdl-udoo.dtsi
|
||||
index 4161b7d..1f0b9f6 100644
|
||||
--- a/arch/arm/boot/dts/imx6qdl-udoo.dtsi
|
||||
+++ b/arch/arm/boot/dts/imx6qdl-udoo.dtsi
|
||||
@@ -274,7 +274,8 @@
|
||||
pinctrl-0 = <&pinctrl_usbh>;
|
||||
vbus-supply = <®_usb_h1_vbus>;
|
||||
clocks = <&clks IMX6QDL_CLK_CKO>;
|
||||
- status = "okay";
|
||||
+ /* currently USB support causes a kernel hang. Disable it for now */
|
||||
+ status = "disabled";
|
||||
};
|
||||
|
||||
&usdhc3 {
|
||||
|
|
@ -1,55 +0,0 @@
|
|||
From 1b6867ee05d84cc6ec23b5ec0b78684187d3190a Mon Sep 17 00:00:00 2001
|
||||
From: Boris Brezillon <boris.brezillon@bootlin.com>
|
||||
Date: Wed, 7 Mar 2018 15:41:14 +0100
|
||||
Subject: [PATCH] clk: bcm2835: Make sure the PLL is gated before changing its
|
||||
rate
|
||||
|
||||
All bcm2835 PLLs should be gated before their rate can be changed.
|
||||
Setting CLK_SET_RATE_GATE will let the core enforce that, but this is
|
||||
not enough to make the code work in all situations. Indeed, the
|
||||
CLK_SET_RATE_GATE flag prevents a user from changing the rate while
|
||||
the clock is enabled, but this check only guarantees there's no Linux
|
||||
users. In our case, the clock might have been enabled by the
|
||||
bootloader/FW, and, because we have CLK_IGNORE_UNUSED set, Linux never
|
||||
disables the PLL. So we have to make sure the PLL is actually disabled
|
||||
before changing the rate.
|
||||
|
||||
Fixes: 41691b8862e2 ("clk: bcm2835: Add support for programming the audio domain clocks")
|
||||
Cc: <stable@vger.kernel.org>
|
||||
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
|
||||
---
|
||||
drivers/clk/bcm/clk-bcm2835.c | 14 +++++++++++++-
|
||||
1 file changed, 13 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c
|
||||
index 6c5d4a8e426c..051ce769c109 100644
|
||||
--- a/drivers/clk/bcm/clk-bcm2835.c
|
||||
+++ b/drivers/clk/bcm/clk-bcm2835.c
|
||||
@@ -678,6 +678,18 @@ static int bcm2835_pll_set_rate(struct clk_hw *hw,
|
||||
u32 ana[4];
|
||||
int i;
|
||||
|
||||
+ /*
|
||||
+ * Normally, the CLK_SET_RATE_GATE flag prevents a user from changing
|
||||
+ * the rate while the clock is enabled, but this check only makes sure
|
||||
+ * there's no Linux users.
|
||||
+ * In our case, the clock might have been enabled by the bootloader/FW,
|
||||
+ * and, since CLK_IGNORE_UNUSED flag is set, Linux never disables it.
|
||||
+ * So we have to make sure the clk is actually disabled before changing
|
||||
+ * the rate.
|
||||
+ */
|
||||
+ if (bcm2835_pll_is_on(hw))
|
||||
+ bcm2835_pll_off(hw);
|
||||
+
|
||||
if (rate > data->max_fb_rate) {
|
||||
use_fb_prediv = true;
|
||||
rate /= 2;
|
||||
@@ -1318,7 +1330,7 @@ static struct clk_hw *bcm2835_register_pll(struct bcm2835_cprman *cprman,
|
||||
init.num_parents = 1;
|
||||
init.name = data->name;
|
||||
init.ops = &bcm2835_pll_clk_ops;
|
||||
- init.flags = CLK_IGNORE_UNUSED;
|
||||
+ init.flags = CLK_IGNORE_UNUSED | CLK_SET_RATE_GATE;
|
||||
|
||||
pll = kzalloc(sizeof(*pll), GFP_KERNEL);
|
||||
if (!pll)
|
||||
|
|
@ -583,9 +583,6 @@ Patch304: ACPI-irq-Workaround-firmware-issue-on-X-Gene-based-m400.patch
|
|||
# https://patchwork.kernel.org/patch/9820417/
|
||||
Patch305: qcom-msm89xx-fixes.patch
|
||||
|
||||
# https://patchwork.kernel.org/patch/10173115/
|
||||
Patch306: arm-dts-imx6qdl-udoo-Disable-usbh1-to-avoid-kernel-hang.patch
|
||||
|
||||
# https://marc.info/?l=linux-kernel&m=152328880417846&w=2
|
||||
Patch307: arm64-thunderx-crypto-zip-fixes.patch
|
||||
|
||||
|
|
@ -609,8 +606,6 @@ Patch312: arm64-msm8916-fix-gic_irq_domain_translate-warnings.patch
|
|||
# https://patchwork.kernel.org/patch/10133165/
|
||||
Patch313: mvebu-a37xx-fixes.patch
|
||||
|
||||
Patch324: bcm283x-clk-audio-fixes.patch
|
||||
|
||||
# Enabling Patches for the RPi3+
|
||||
Patch330: bcm2837-rpi-initial-3plus-support.patch
|
||||
Patch332: bcm2837-enable-pmu.patch
|
||||
|
|
|
|||
Loading…
Reference in New Issue