From: Greg Kroah-Hartman Date: Wed, 21 Mar 2018 11:02:32 +0000 (+0100) Subject: drop arm-dra7-hwmod_data-prevent-wait_target_disable-error-for-usb_otg_ss.patch from... X-Git-Tag: v4.15.12~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=55b69e6fb06ed5a2845ec86ab016ec97f1fbba99;p=thirdparty%2Fkernel%2Fstable-queue.git drop arm-dra7-hwmod_data-prevent-wait_target_disable-error-for-usb_otg_ss.patch from 3.18 --- diff --git a/queue-3.18/arm-dra7-hwmod_data-prevent-wait_target_disable-error-for-usb_otg_ss.patch b/queue-3.18/arm-dra7-hwmod_data-prevent-wait_target_disable-error-for-usb_otg_ss.patch deleted file mode 100644 index 3d8f243b249..00000000000 --- a/queue-3.18/arm-dra7-hwmod_data-prevent-wait_target_disable-error-for-usb_otg_ss.patch +++ /dev/null @@ -1,47 +0,0 @@ -From foo@baz Mon Mar 19 10:11:52 CET 2018 -From: Roger Quadros -Date: Mon, 13 Mar 2017 13:53:16 +0200 -Subject: ARM: DRA7: hwmod_data: Prevent wait_target_disable error for usb_otg_ss - -From: Roger Quadros - - -[ Upstream commit e2d54fe76997301b49311bde7ba8ef52b47896f9 ] - -It seems that if L3_INIT clkdomain is kept in HW_AUTO while usb_otg_ss -is in use then there are random chances that the usb_otg_ss module -will fail to completely idle. i.e. IDLEST = 0x2 instead of 0x3. - -Preventing L3_INIT from HW_AUTO while usb_otg_ss module is in use -fixes this issue. - -We don't know yet if usb_otg_ss instances 3 and 4 are affected by this -issue or not so don't add this flag for those instances. - -Cc: Tero Kristo -Signed-off-by: Roger Quadros -Signed-off-by: Tony Lindgren -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c -+++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c -@@ -2106,6 +2106,7 @@ static struct omap_hwmod dra7xx_usb_otg_ - .class = &dra7xx_usb_otg_ss_hwmod_class, - .clkdm_name = "l3init_clkdm", - .main_clk = "dpll_core_h13x2_ck", -+ .flags = HWMOD_CLKDM_NOAUTO, - .prcm = { - .omap4 = { - .clkctrl_offs = DRA7XX_CM_L3INIT_USB_OTG_SS1_CLKCTRL_OFFSET, -@@ -2127,6 +2128,7 @@ static struct omap_hwmod dra7xx_usb_otg_ - .class = &dra7xx_usb_otg_ss_hwmod_class, - .clkdm_name = "l3init_clkdm", - .main_clk = "dpll_core_h13x2_ck", -+ .flags = HWMOD_CLKDM_NOAUTO, - .prcm = { - .omap4 = { - .clkctrl_offs = DRA7XX_CM_L3INIT_USB_OTG_SS2_CLKCTRL_OFFSET, diff --git a/queue-3.18/series b/queue-3.18/series index 8029fd1d8af..2500367ec88 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -18,7 +18,6 @@ spi-omap2-mcspi-poll-omap2_mcspi_chstat_rxs-for-pio-transfer.patch tcp-sysctl-fix-a-race-to-avoid-unexpected-0-window-from-space.patch mm-fix-false-positive-vm_bug_on-in-page_cache_-get-add-_speculative.patch blk-throttle-make-sure-expire-time-isn-t-too-big.patch -arm-dra7-hwmod_data-prevent-wait_target_disable-error-for-usb_otg_ss.patch braille-console-fix-value-returned-by-_braille_console_setup.patch arm-dts-r8a7790-correct-parent-of-ssi-clocks.patch arm-dts-r8a7791-correct-parent-of-ssi-clocks.patch