mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-25 08:21:14 +00:00
f5919b65d4
Patch generation process: - rebase rpi/rpi-4.14.y on v4.14.89 from linux-stable - git format-patch v4.14.89 Patches skipped during rebase: - lan78xx: Read MAC address from DT if present - lan78xx: Enable LEDs and auto-negotiation - Revert "softirq: Let ksoftirqd do its job" - sc16is7xx: Fix for multi-channel stall - lan78xx: Ignore DT MAC address if already valid - lan78xx: Simple patch to prevent some crashes - tcp_write_queue_purge clears all the SKBs in the write queue - Revert "lan78xx: Simple patch to prevent some crashes" - lan78xx: Connect phy early - Arm: mm: ftrace: Only set text back to ro after kernel has been marked ro - Revert "Revert "softirq: Let ksoftirqd do its job"" - ASoC: cs4265: SOC_SINGLE register value error fix - Revert "ASoC: cs4265: SOC_SINGLE register value error fix" - Revert "net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends" - Revert "Revert "net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends"" Patches dropped after rebase: - net: Add non-mainline source for rtl8192cu wlan - net: Fix rtl8192cu build errors on other platforms - brcm: adds support for BCM43341 wifi - brcmfmac: Mute expected startup 'errors' - ARM64: Fix build break for RTL8187/RTL8192CU wifi - ARM64: Enable RTL8187/RTL8192CU wifi in build config - This is the driver for Sony CXD2880 DVB-T2/T tuner + demodulator - brcmfmac: add CLM download support - brcmfmac: request_firmware_direct is quieter - Sets the BCDC priority to constant 0 - brcmfmac: Disable ARP offloading when promiscuous - brcmfmac: Avoid possible out-of-bounds read - brcmfmac: Delete redundant length check - net: rtl8192cu: Normalize indentation - net: rtl8192cu: Fix implicit fallthrough warnings - Revert "Sets the BCDC priority to constant 0" - media: cxd2880: Bump to match 4.18.y version - media: cxd2880-spi: Bump to match 4.18.y version - Revert "mm: alloc_contig: re-allow CMA to compact FS pages" - Revert "Revert "mm: alloc_contig: re-allow CMA to compact FS pages"" - cxd2880: CXD2880_SPI_DRV should select DVB_CXD2880 with MEDIA_SUBDRV_AUTOSELECT - 950-0421-HID-hid-bigbenff-driver-for-BigBen-Interactive-PS3OF.patch - 950-0453-Add-hid-bigbenff-to-list-of-have_special_driver-for-.patch Make I2C built-in instead of modular as in upstream defconfig; also the easiest way to get MFD_ARIZONA enabled, which is required by kmod-sound-soc-rpi-cirrus. Add missing compatible strings from 4.9/960-add-rasbperrypi-compatible.patch, using upstream names for compute modules. Add extra patch to enable the LEDs on lan78xx. Compile-tested: bcm2708, bcm2709, bcm2710 (with CONFIG_ALL_KMODS=y) Runtime-tested: bcm2708, bcm2710 Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
60 lines
2.0 KiB
Diff
60 lines
2.0 KiB
Diff
From 71f116335e08f82f73efec6da10893f545455b5f Mon Sep 17 00:00:00 2001
|
|
From: P33M <p33m@github.com>
|
|
Date: Tue, 9 Jan 2018 15:16:35 +0000
|
|
Subject: [PATCH 147/454] dwc_otg: don't unconditionally force host mode in
|
|
dwc_otg_cil_init()
|
|
|
|
Add the ability to disable force_host_mode for those that want to use
|
|
dwc_otg in both device and host modes.
|
|
---
|
|
drivers/usb/host/dwc_otg/dwc_otg_cil.c | 7 ++++++-
|
|
drivers/usb/host/dwc_otg/dwc_otg_driver.c | 7 +++++++
|
|
2 files changed, 13 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/usb/host/dwc_otg/dwc_otg_cil.c
|
|
+++ b/drivers/usb/host/dwc_otg/dwc_otg_cil.c
|
|
@@ -61,6 +61,8 @@
|
|
#include "dwc_otg_regs.h"
|
|
#include "dwc_otg_cil.h"
|
|
|
|
+extern bool cil_force_host;
|
|
+
|
|
static int dwc_otg_setup_params(dwc_otg_core_if_t * core_if);
|
|
|
|
/**
|
|
@@ -192,7 +194,10 @@ dwc_otg_core_if_t *dwc_otg_cil_init(cons
|
|
core_if->hptxfsiz.d32 =
|
|
DWC_READ_REG32(&core_if->core_global_regs->hptxfsiz);
|
|
gusbcfg.d32 = DWC_READ_REG32(&core_if->core_global_regs->gusbcfg);
|
|
- gusbcfg.b.force_host_mode = 1;
|
|
+ if (cil_force_host)
|
|
+ gusbcfg.b.force_host_mode = 1;
|
|
+ else
|
|
+ gusbcfg.b.force_host_mode = 0;
|
|
DWC_WRITE_REG32(&core_if->core_global_regs->gusbcfg, gusbcfg.d32);
|
|
dwc_mdelay(100);
|
|
}
|
|
--- a/drivers/usb/host/dwc_otg/dwc_otg_driver.c
|
|
+++ b/drivers/usb/host/dwc_otg/dwc_otg_driver.c
|
|
@@ -247,6 +247,9 @@ bool fiq_fsm_enable = true;
|
|
//Bulk split-transaction NAK holdoff in microframes
|
|
uint16_t nak_holdoff = 8;
|
|
|
|
+//Force host mode during CIL re-init
|
|
+bool cil_force_host = true;
|
|
+
|
|
unsigned short fiq_fsm_mask = 0x0F;
|
|
|
|
unsigned short int_ep_interval_min = 0;
|
|
@@ -1403,6 +1406,10 @@ MODULE_PARM_DESC(int_ep_interval_min, "C
|
|
"0..1 = Use endpoint default\n"
|
|
"2..n = Minimum interval n microframes. Use powers of 2.\n");
|
|
|
|
+module_param(cil_force_host, bool, 0644);
|
|
+MODULE_PARM_DESC(cil_force_host, "On a connector-ID status change, "
|
|
+ "force Host Mode regardless of OTG state.");
|
|
+
|
|
/** @page "Module Parameters"
|
|
*
|
|
* The following parameters may be specified when starting the module.
|