summaryrefslogtreecommitdiffstats
path: root/0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2020-07-13 10:05:15 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2020-07-13 10:05:15 -0500
commitaa5ab7f890a036ab6802c7a0c8cf8459a324e3c2 (patch)
treef637c079f5bb221193d2a33f5520f477a02bae0e /0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch
parentd8d578bfa82493a49b71c8665b2f48c3e6df3617 (diff)
downloadkernel-aa5ab7f890a036ab6802c7a0c8cf8459a324e3c2.tar.gz
kernel-aa5ab7f890a036ab6802c7a0c8cf8459a324e3c2.tar.xz
kernel-aa5ab7f890a036ab6802c7a0c8cf8459a324e3c2.zip
kernel-5.8.0-0.rc5.1
* Mon Jul 13 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc5.1] - v5.8-rc5 rebase - arm64: dts: sun50i-a64-pinephone: Add touchscreen support (Ondrej Jirman) - arm64: dts: sun50i-a64-pinephone: Enable LCD support on PinePhone (Icenowy Zheng) - drm/panel: st7703: Assert reset prior to powering down the regulators (Ondrej Jirman) - drm/panel: st7703: Enter sleep after display off (Ondrej Jirman) - drm/panel: st7703: Add support for Xingbangda XBD599 (Ondrej Jirman) - drm/panel: st7703: Move generic part of init sequence to enable callback (Ondrej Jirman) - drm/panel: st7703: Move code specific to jh057n closer together (Ondrej Jirman) - drm/panel: st7703: Prepare for supporting multiple panels (Ondrej Jirman) - drm/panel: st7703: Rename functions from jh057n prefix to st7703 (Ondrej Jirman) - drm/panel: rocktech-jh057n00900: Rename the driver to st7703 (Ondrej Jirman) - dt-bindings: panel: Add compatible for Xingbangda XBD599 panel (Ondrej Jirman) - dt-bindings: panel: Convert rocktech, jh057n00900 to yaml (Ondrej Jirman) - dt-bindings: vendor-prefixes: Add Xingbangda (Icenowy Zheng) - Revert "arm64: allwinner: dts: a64: add LCD-related device nodes for PinePhone" (Peter Robinson) - Revert "drm/sun4i: sun6i_mipi_dsi: fix horizontal timing calculation" (Peter Robinson) - Revert "drm: panel: add Xingbangda XBD599 panel" (Peter Robinson) - Revert "dt-bindings: panel: add binding for Xingbangda XBD599 panel" (Peter Robinson) - selinux: allow reading labels before policy is loaded (Jonathan Lebon) - Fixes "acpi: prefer booting with ACPI over DTS" to be RHEL only (Peter Robinson) - Update config for renamed panel driver. (Peter Robinson) - Enable SERIAL_SC16IS7XX for SPI interfaces (Peter Robinson) - Updated changelog for the release based on dcde237b9b0e (Fedora Kernel Team) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to '0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch')
-rw-r--r--0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch b/0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch
new file mode 100644
index 000000000..67a889b30
--- /dev/null
+++ b/0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch
@@ -0,0 +1,36 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson@gmail.com>
+Date: Fri, 10 Jul 2020 16:18:59 +0100
+Subject: [PATCH] Fixes "acpi: prefer booting with ACPI over DTS" to be RHEL
+ only
+
+The ACPI prefernce is RHEL specific, in Fedora we use upstream defaults so
+it doesn't randomly change the expectations as to how certain hardware works
+that generally isn't classed as "enterprise". So wrap it in the special RHEL
+check as it should be for the ARK kernels.
+
+Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
+CC: Mark Salter <msalter@redhat.com>
+---
+ arch/arm64/kernel/acpi.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
+index c2a7e30e2143..169b753903d1 100644
+--- a/arch/arm64/kernel/acpi.c
++++ b/arch/arm64/kernel/acpi.c
+@@ -40,7 +40,11 @@ int acpi_pci_disabled = 1; /* skip ACPI PCI scan and IRQ initialization */
+ EXPORT_SYMBOL(acpi_pci_disabled);
+
+ static bool param_acpi_off __initdata;
++#ifdef CONFIG_RHEL_DIFFERENCES
+ static bool param_acpi_on __initdata = true;
++#else
++static bool param_acpi_on __initdata;
++#endif
+ static bool param_acpi_force __initdata;
+
+ static int __init parse_acpi(char *arg)
+--
+2.26.2
+