summaryrefslogtreecommitdiffstats
path: root/patch-5.11-redhat.patch
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2021-03-17 12:34:33 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2021-03-17 12:34:33 -0500
commitee22e4872dec1ab1f08fabe765e18b945ebcc29e (patch)
treee3aab8d4f9d60b9d21824c1afe5f6d104735d522 /patch-5.11-redhat.patch
parent7a6f123bd34c17ddaecab36a3541de8843d958e6 (diff)
downloadkernel-ee22e4872dec1ab1f08fabe765e18b945ebcc29e.tar.gz
kernel-ee22e4872dec1ab1f08fabe765e18b945ebcc29e.tar.xz
kernel-ee22e4872dec1ab1f08fabe765e18b945ebcc29e.zip
kernel-5.11.7-9
* Wed Mar 17 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.11.7-9] - Disable weak-modules again rhbz 1828455 (Justin M. Forbes) - More config updates for gcc-plugin turn off (Justin M. Forbes) - fedora: the PCH_CAN driver is x86-32 only (Peter Robinson) - common: disable legacy CAN device support (Peter Robinson) - common: Enable Microchip MCP251x/MCP251xFD CAN controllers (Peter Robinson) - common: Bosch MCAN support for Intel Elkhart Lake (Peter Robinson) - common: enable CAN_PEAK_PCIEFD PCI-E driver (Peter Robinson) - common: disable CAN_PEAK_PCIEC PCAN-ExpressCard (Peter Robinson) - common: enable common CAN layer 2 protocols (Peter Robinson) - ark: disable CAN_LEDS option (Peter Robinson) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to 'patch-5.11-redhat.patch')
-rw-r--r--patch-5.11-redhat.patch37
1 files changed, 2 insertions, 35 deletions
diff --git a/patch-5.11-redhat.patch b/patch-5.11-redhat.patch
index 9bae3f2be..d5ebaa20f 100644
--- a/patch-5.11-redhat.patch
+++ b/patch-5.11-redhat.patch
@@ -33,7 +33,6 @@
drivers/hid/hid-rmi.c | 64 ---
drivers/input/rmi4/rmi_driver.c | 124 +++---
drivers/iommu/iommu.c | 22 +
- drivers/mmc/host/sdhci-iproc.c | 18 +
drivers/pci/controller/dwc/Kconfig | 10 +-
drivers/pci/controller/dwc/Makefile | 2 +-
drivers/pci/controller/dwc/pcie-tegra194.c | 102 +++++
@@ -60,7 +59,7 @@
security/security.c | 6 +
sound/hda/Kconfig | 14 +
sound/hda/intel-dsp-config.c | 29 +-
- 62 files changed, 2144 insertions(+), 213 deletions(-)
+ 61 files changed, 2126 insertions(+), 213 deletions(-)
diff --git a/Documentation/ABI/testing/sysfs-platform_profile b/Documentation/ABI/testing/sysfs-platform_profile
new file mode 100644
@@ -274,7 +273,7 @@ index 000000000000..c33a71263d9e
+ 2. Add the new profile name, along with a clear description of the
+ expected behaviour, to the sysfs-platform_profile ABI documentation.
diff --git a/Makefile b/Makefile
-index 472136a7881e..d390837b5d91 100644
+index 6ba32b82c480..20d2cb6a8bad 100644
--- a/Makefile
+++ b/Makefile
@@ -494,6 +494,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE
@@ -1836,38 +1835,6 @@ index fd5f59373fc6..8a11aa9e0318 100644
/*
* Changes the default domain of an iommu group that has *only* one device
*
-diff --git a/drivers/mmc/host/sdhci-iproc.c b/drivers/mmc/host/sdhci-iproc.c
-index c9434b461aab..ddeaf8e1f72f 100644
---- a/drivers/mmc/host/sdhci-iproc.c
-+++ b/drivers/mmc/host/sdhci-iproc.c
-@@ -296,9 +296,27 @@ static const struct of_device_id sdhci_iproc_of_match[] = {
- MODULE_DEVICE_TABLE(of, sdhci_iproc_of_match);
-
- #ifdef CONFIG_ACPI
-+/*
-+ * This is a duplicate of bcm2835_(pltfrm_)data without caps quirks
-+ * which are provided by the ACPI table.
-+ */
-+static const struct sdhci_pltfm_data sdhci_bcm_arasan_data = {
-+ .quirks = SDHCI_QUIRK_BROKEN_CARD_DETECTION |
-+ SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK |
-+ SDHCI_QUIRK_NO_HISPD_BIT,
-+ .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN,
-+ .ops = &sdhci_iproc_32only_ops,
-+};
-+
-+static const struct sdhci_iproc_data bcm_arasan_data = {
-+ .pdata = &sdhci_bcm_arasan_data,
-+};
-+
- static const struct acpi_device_id sdhci_iproc_acpi_ids[] = {
- { .id = "BRCM5871", .driver_data = (kernel_ulong_t)&iproc_cygnus_data },
- { .id = "BRCM5872", .driver_data = (kernel_ulong_t)&iproc_data },
-+ { .id = "BCM2847", .driver_data = (kernel_ulong_t)&bcm_arasan_data },
-+ { .id = "BRCME88C", .driver_data = (kernel_ulong_t)&bcm2711_data },
- { /* sentinel */ }
- };
- MODULE_DEVICE_TABLE(acpi, sdhci_iproc_acpi_ids);
diff --git a/drivers/pci/controller/dwc/Kconfig b/drivers/pci/controller/dwc/Kconfig
index 22c5529e9a65..259ff5ff3f24 100644
--- a/drivers/pci/controller/dwc/Kconfig