From 142d1dbc8748e066ce794a391416b045d570be71 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Thu, 13 Aug 2020 09:58:16 -0500 Subject: Quick changes for an ELN build while toolchain is worked out Signed-off-by: Justin M. Forbes --- ...-remove-cdomain-from-sphinx-documentation.patch | 29 ++++++++++++++++++++++ kernel.spec | 4 ++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch diff --git a/0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch b/0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch new file mode 100644 index 000000000..75fa78c7d --- /dev/null +++ b/0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch @@ -0,0 +1,29 @@ +From 4940e1f82f28200ca0a42186016b3d460d16e320 Mon Sep 17 00:00:00 2001 +From: "Justin M. Forbes" +Date: Mon, 10 Aug 2020 08:06:05 -0500 +Subject: [PATCH] Temporarily remove cdomain from sphinx documentation + +The documentation subpackage will not build currently. +https://github.com/sphinx-doc/sphinx/issues/7421 + +Signed-off-by: Justin M. Forbes +--- + Documentation/conf.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Documentation/conf.py b/Documentation/conf.py +index c503188880d9..b5b2be8eec22 100644 +--- a/Documentation/conf.py ++++ b/Documentation/conf.py +@@ -36,7 +36,7 @@ needs_sphinx = '1.3' + # Add any Sphinx extension module names here, as strings. They can be + # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom + # ones. +-extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', 'cdomain', ++extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', + 'kfigure', 'sphinx.ext.ifconfig', 'automarkup', + 'maintainers_include', 'sphinx.ext.autosectionlabel' ] + +-- +2.26.2 + diff --git a/kernel.spec b/kernel.spec index e78f6e081..8ab157f9b 100644 --- a/kernel.spec +++ b/kernel.spec @@ -181,11 +181,11 @@ Summary: The Linux kernel %define with_ipaclones 0 # no whitelist %define with_kernel_abi_whitelists 0 +%endif # Fedora builds these separately %define with_perf 0 %define with_tools 0 %define with_bpftool 0 -%endif %if %{with_verbose} %define make_opts V=1 @@ -815,6 +815,7 @@ Patch97: 0001-drm-panel-st7703-Assert-reset-prior-to-powering-down.patch Patch98: 0001-arm64-dts-sun50i-a64-pinephone-Enable-LCD-support-on.patch Patch99: 0001-arm64-dts-sun50i-a64-pinephone-Add-touchscreen-suppo.patch Patch100: 0001-Work-around-for-gcc-bug-https-gcc.gnu.org-bugzilla-s.patch +Patch101: 0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch %endif @@ -1417,6 +1418,7 @@ ApplyOptionalPatch 0001-drm-panel-st7703-Assert-reset-prior-to-powering-down.pat ApplyOptionalPatch 0001-arm64-dts-sun50i-a64-pinephone-Enable-LCD-support-on.patch ApplyOptionalPatch 0001-arm64-dts-sun50i-a64-pinephone-Add-touchscreen-suppo.patch ApplyOptionalPatch 0001-Work-around-for-gcc-bug-https-gcc.gnu.org-bugzilla-s.patch +ApplyOptionalPatch 0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch %endif -- cgit From f7a3bf654752fa0e92c7ab3e57e48d3415632852 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Thu, 13 Aug 2020 12:44:32 -0500 Subject: kernel-5.9.0-0.rc0.20200813gitdc06fe51d26e.1 * Thu Aug 13 2020 Fedora Kernel Team [5.9.0-0.rc0.20200813gitdc06fe51d26e.1] - dc06fe51d26e rebase - More mismatches ("Justin M. Forbes") - Fedora config change due to deps ("Justin M. Forbes") - CONFIG_SND_SOC_MAX98390 is now selected by SND_SOC_INTEL_DA7219_MAX98357A_GENERIC ("Justin M. Forbes") - Config change required for build part 2 ("Justin M. Forbes") - Config change required for build ("Justin M. Forbes") - Fedora config update ("Justin M. Forbes") - Revert "Merge branch 'make_configs_fix' into 'os-build'" (Justin Forbes) - redhat/configs/process_configs.sh: Remove *.config.orig files (Prarit Bhargava) - redhat/configs/process_configs.sh: Add process_configs_known_broken flag (Prarit Bhargava) - redhat/Makefile: Fix '*-configs' targets (Prarit Bhargava) - Updated changelog for the release based on v5.8 (Fedora Kernel Team) - Add ability to sync upstream through Makefile (Don Zickus) - Add master merge check (Don Zickus) - Replace hardcoded values 'os-build' and project id with variables (Don Zickus) - gitattributes: Remove unnecesary export restrictions (Prarit Bhargava) - redhat/Makefile.common: Fix MARKER (Prarit Bhargava) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- ...rm64-Ignore-broken-HPE-moonshot-APEI-supp.patch | 2 +- ...et_user_check-in-case-uaccess_-calls-are-.patch | 6 +- 0001-ARM-tegra-usb-no-reset.patch | 2 +- 0001-Add-Red-Hat-tainting.patch | 17 +- ...tatus_to_str-and-rework-efi_status_to_err.patch | 4 +- ...-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch | 2 +- 0001-Add-support-for-deprecating-processors.patch | 12 +- 0001-Drop-that-for-now.patch | 4 +- ...prefer-booting-with-ACPI-over-DTS-to-be-R.patch | 2 +- ...-Soft-RoCE-Transport-driver-as-tech-previ.patch | 4 +- ...remove-the-need-for-artificial-IRQ-in-cas.patch | 2 +- ...a-Revert-raw_violation_fixup-for-tegra124.patch | 65 -- ...RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch | 23 +- ...4-allwinner-dts-a64-add-LCD-related-devic.patch | 76 -- ...ert-drm-panel-add-Xingbangda-XBD599-panel.patch | 418 --------- ...sun4i-sun6i_mipi_dsi-fix-horizontal-timin.patch | 56 -- ...-bindings-Add-doc-for-Pine64-Pinebook-Pro.patch | 32 - ...indings-panel-add-binding-for-Xingbangda-.patch | 71 -- ...-remove-cdomain-from-sphinx-documentation.patch | 29 - ...-PCI-bar-fix-for-Broadcom-Vulcan-early-si.patch | 2 +- ...ove-depreciated-device-and-vendor-PCI-id-.patch | 2 +- ...i-scan-Fix-regression-related-to-X-Gene-U.patch | 4 +- 0001-acpi-prefer-booting-with-ACPI-over-DTS.patch | 2 +- 0001-add-Red-Hat-specific-taint-flags.patch | 6 +- 0001-add-pci_hw_vendor_status.patch | 8 +- ...-x86-Remove-vendor-specific-CPU-ID-checks.patch | 6 +- ...-Drop-the-EXPERT-setting-from-ARM64_FORCE.patch | 2 +- ...NFIG_HIGHPTE-optional-without-CONFIG_EXPE.patch | 4 +- ...nner-dts-a64-add-LCD-related-device-nodes.patch | 81 -- ...un50i-a64-pinephone-Add-touchscreen-suppo.patch | 46 - ...un50i-a64-pinephone-Enable-LCD-support-on.patch | 112 --- 0001-be2iscsi-remove-unsupported-device-IDs.patch | 2 +- 0001-bpf-Add-tech-preview-taint-for-syscall.patch | 4 +- ...rivileged_bpf_disabled-to-1-by-default-ad.patch | 12 +- 0001-drm-panel-add-Xingbangda-XBD599-panel.patch | 4 +- ...ocktech-jh057n00900-Rename-the-driver-to-.patch | 948 --------------------- ...-st7703-Add-support-for-Xingbangda-XBD599.patch | 251 ------ ...t7703-Assert-reset-prior-to-powering-down.patch | 29 - ...anel-st7703-Enter-sleep-after-display-off.patch | 41 - ...t7703-Move-code-specific-to-jh057n-closer.patch | 84 -- ...t7703-Move-generic-part-of-init-sequence-.patch | 84 -- ...t7703-Prepare-for-supporting-multiple-pan.patch | 128 --- ...t7703-Rename-functions-from-jh057n-prefix.patch | 265 ------ ...-bindings-Add-doc-for-Pine64-Pinebook-Pro.patch | 32 - ...-panel-Add-compatible-for-Xingbangda-XBD5.patch | 37 - ...-panel-Convert-rocktech-jh057n00900-to-ya.patch | 119 --- ...t-bindings-vendor-prefixes-Add-Xingbangda.patch | 33 - ...-up-timeout-to-wait-when-ME-un-configure-.patch | 2 +- ...EFI_SECURE_BOOT-flag-to-indicate-secure-b.patch | 14 +- ...wn-the-kernel-if-booted-in-secure-boot-mo.patch | 4 +- ...remove-old-cciss-based-smartarray-pci-ids.patch | 2 +- 0001-ice-mark-driver-as-tech-preview.patch | 6 +- ...iommu-arm-smmu-workaround-DMA-mode-issues.patch | 4 +- 0001-ipmi-do-not-configure-ipmi-for-HPE-m400.patch | 4 +- 0001-kdump-add-support-for-crashkernel-auto.patch | 4 +- ...p-fix-a-grammar-issue-in-a-kernel-message.patch | 4 +- ...-up-the-total-memory-size-to-128M-for-cra.patch | 6 +- 0001-kernel-add-SUPPORT_REMOVED-kernel-taint.patch | 6 +- 0001-megaraid_sas-remove-deprecated-pci-ids.patch | 2 +- 0001-modules-add-rhelversion-MODULE_INFO-tag.patch | 2 +- 0001-put-RHEL-info-into-generated-headers.patch | 4 +- ...2xxx-Remove-PCI-IDs-of-deprecated-adapter.patch | 6 +- ...xxx-Remove-deprecated-PCI-IDs-from-RHEL-8.patch | 6 +- ...own-the-kernel-when-the-IPL-secure-flag-i.patch | 4 +- 0001-scsi-smartpqi-add-inspur-advantech-ids.patch | 6 +- ...ckdown-expose-a-hook-to-lock-the-kernel-d.patch | 4 +- ...ow-reading-labels-before-policy-is-loaded.patch | 49 -- 0001-tags.sh-Ignore-redhat-rpm.patch | 2 +- ...dd-a-few-new-vmmdev-request-types-to-the-.patch | 58 -- ...dd-support-for-the-new-VBG_IOCTL_ACQUIRE_.patch | 320 ------- ...dd-vbg_set_host_capabilities-helper-funct.patch | 130 --- ...-vbox-Log-unknown-ioctl-requests-as-error.patch | 30 - ...ename-guest_caps-struct-members-to-set_gu.patch | 103 --- ...ix-compile-issues-with-rh_check_supported.patch | 8 +- Patchlist | 27 - kernel-aarch64-debug-fedora.config | 90 +- kernel-aarch64-debug-rhel.config | 48 +- kernel-aarch64-fedora.config | 90 +- kernel-aarch64-rhel.config | 48 +- kernel-armv7hl-debug-fedora.config | 89 +- kernel-armv7hl-fedora.config | 89 +- kernel-armv7hl-lpae-debug-fedora.config | 89 +- kernel-armv7hl-lpae-fedora.config | 89 +- kernel-i686-debug-fedora.config | 91 +- kernel-i686-fedora.config | 91 +- kernel-ppc64le-debug-fedora.config | 93 +- kernel-ppc64le-debug-rhel.config | 47 +- kernel-ppc64le-fedora.config | 93 +- kernel-ppc64le-rhel.config | 47 +- kernel-s390x-debug-fedora.config | 91 +- kernel-s390x-debug-rhel.config | 47 +- kernel-s390x-fedora.config | 91 +- kernel-s390x-rhel.config | 47 +- kernel-s390x-zfcpdump-rhel.config | 47 +- kernel-x86_64-debug-fedora.config | 91 +- kernel-x86_64-debug-rhel.config | 48 +- kernel-x86_64-fedora.config | 91 +- kernel-x86_64-rhel.config | 48 +- kernel.spec | 127 +-- sources | 6 +- 100 files changed, 1827 insertions(+), 3993 deletions(-) delete mode 100644 0001-PCI-tegra-Revert-raw_violation_fixup-for-tegra124.patch delete mode 100644 0001-Revert-arm64-allwinner-dts-a64-add-LCD-related-devic.patch delete mode 100644 0001-Revert-drm-panel-add-Xingbangda-XBD599-panel.patch delete mode 100644 0001-Revert-drm-sun4i-sun6i_mipi_dsi-fix-horizontal-timin.patch delete mode 100644 0001-Revert-dt-bindings-Add-doc-for-Pine64-Pinebook-Pro.patch delete mode 100644 0001-Revert-dt-bindings-panel-add-binding-for-Xingbangda-.patch delete mode 100644 0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch delete mode 100644 0001-arm64-allwinner-dts-a64-add-LCD-related-device-nodes.patch delete mode 100644 0001-arm64-dts-sun50i-a64-pinephone-Add-touchscreen-suppo.patch delete mode 100644 0001-arm64-dts-sun50i-a64-pinephone-Enable-LCD-support-on.patch delete mode 100644 0001-drm-panel-rocktech-jh057n00900-Rename-the-driver-to-.patch delete mode 100644 0001-drm-panel-st7703-Add-support-for-Xingbangda-XBD599.patch delete mode 100644 0001-drm-panel-st7703-Assert-reset-prior-to-powering-down.patch delete mode 100644 0001-drm-panel-st7703-Enter-sleep-after-display-off.patch delete mode 100644 0001-drm-panel-st7703-Move-code-specific-to-jh057n-closer.patch delete mode 100644 0001-drm-panel-st7703-Move-generic-part-of-init-sequence-.patch delete mode 100644 0001-drm-panel-st7703-Prepare-for-supporting-multiple-pan.patch delete mode 100644 0001-drm-panel-st7703-Rename-functions-from-jh057n-prefix.patch delete mode 100644 0001-dt-bindings-Add-doc-for-Pine64-Pinebook-Pro.patch delete mode 100644 0001-dt-bindings-panel-Add-compatible-for-Xingbangda-XBD5.patch delete mode 100644 0001-dt-bindings-panel-Convert-rocktech-jh057n00900-to-ya.patch delete mode 100644 0001-dt-bindings-vendor-prefixes-Add-Xingbangda.patch delete mode 100644 0001-selinux-allow-reading-labels-before-policy-is-loaded.patch delete mode 100644 0001-virt-vbox-Add-a-few-new-vmmdev-request-types-to-the-.patch delete mode 100644 0001-virt-vbox-Add-support-for-the-new-VBG_IOCTL_ACQUIRE_.patch delete mode 100644 0001-virt-vbox-Add-vbg_set_host_capabilities-helper-funct.patch delete mode 100644 0001-virt-vbox-Log-unknown-ioctl-requests-as-error.patch delete mode 100644 0001-virt-vbox-Rename-guest_caps-struct-members-to-set_gu.patch diff --git a/0001-ACPI-APEI-arm64-Ignore-broken-HPE-moonshot-APEI-supp.patch b/0001-ACPI-APEI-arm64-Ignore-broken-HPE-moonshot-APEI-supp.patch index 1a5bec6ce..46f9bf535 100644 --- a/0001-ACPI-APEI-arm64-Ignore-broken-HPE-moonshot-APEI-supp.patch +++ b/0001-ACPI-APEI-arm64-Ignore-broken-HPE-moonshot-APEI-supp.patch @@ -48,7 +48,7 @@ Signed-off-by: Herton R. Krzesinski 1 file changed, 8 insertions(+) diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c -index 953a2fae8b15..7ea07f7da582 100644 +index 6e980fe16772..37bc003e7a83 100644 --- a/drivers/acpi/apei/hest.c +++ b/drivers/acpi/apei/hest.c @@ -88,6 +88,14 @@ int apei_hest_parse(apei_hest_func_t func, void *data) diff --git a/0001-ARM-fix-__get_user_check-in-case-uaccess_-calls-are-.patch b/0001-ARM-fix-__get_user_check-in-case-uaccess_-calls-are-.patch index c5a43608f..0aa663fbf 100644 --- a/0001-ARM-fix-__get_user_check-in-case-uaccess_-calls-are-.patch +++ b/0001-ARM-fix-__get_user_check-in-case-uaccess_-calls-are-.patch @@ -51,10 +51,10 @@ Tested-by: Geert Uytterhoeven 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h -index 98c6b91be4a8..60055827dddc 100644 +index a13d90206472..6a6aae01755b 100644 --- a/arch/arm/include/asm/uaccess.h +++ b/arch/arm/include/asm/uaccess.h -@@ -191,11 +191,12 @@ extern int __get_user_64t_4(void *); +@@ -195,11 +195,12 @@ extern int __get_user_64t_4(void *); #define __get_user_check(x, p) \ ({ \ unsigned long __limit = current_thread_info()->addr_limit - 1; \ @@ -68,7 +68,7 @@ index 98c6b91be4a8..60055827dddc 100644 switch (sizeof(*(__p))) { \ case 1: \ if (sizeof((x)) >= 8) \ -@@ -223,9 +224,10 @@ extern int __get_user_64t_4(void *); +@@ -227,9 +228,10 @@ extern int __get_user_64t_4(void *); break; \ default: __e = __get_user_bad(); break; \ } \ diff --git a/0001-ARM-tegra-usb-no-reset.patch b/0001-ARM-tegra-usb-no-reset.patch index 21ebad41e..bddec8739 100644 --- a/0001-ARM-tegra-usb-no-reset.patch +++ b/0001-ARM-tegra-usb-no-reset.patch @@ -10,7 +10,7 @@ Patch for disconnect issues with storage attached to a 1 file changed, 7 insertions(+) diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index b1e14beaac5f..b28779779058 100644 +index 052d5accfe9b..fac58cf619da 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -5517,6 +5517,13 @@ static void hub_event(struct work_struct *work) diff --git a/0001-Add-Red-Hat-tainting.patch b/0001-Add-Red-Hat-tainting.patch index 04ffd5df4..fe8a026f3 100644 --- a/0001-Add-Red-Hat-tainting.patch +++ b/0001-Add-Red-Hat-tainting.patch @@ -94,16 +94,16 @@ Upstream Status: RHEL only Signed-off-by: Philipp Rudo --- include/linux/kernel.h | 15 +++++++ - kernel/Makefile | 2 + + kernel/Makefile | 1 + kernel/rh_taint.c | 93 ++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 110 insertions(+) + 3 files changed, 109 insertions(+) create mode 100644 kernel/rh_taint.c diff --git a/include/linux/kernel.h b/include/linux/kernel.h -index 82d91547d122..b82db0c0caec 100644 +index 500def620d8f..c352ecdfcb43 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h -@@ -1038,4 +1038,19 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { } +@@ -1037,4 +1037,19 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { } /* OTHER_WRITABLE? Generally considered a bad idea. */ \ BUILD_BUG_ON_ZERO((perms) & 2) + \ (perms)) @@ -124,15 +124,14 @@ index 82d91547d122..b82db0c0caec 100644 + #endif diff --git a/kernel/Makefile b/kernel/Makefile -index f3218bc5ec69..c0a4904413b5 100644 +index b3da548691c9..931e726455f4 100644 --- a/kernel/Makefile +++ b/kernel/Makefile -@@ -12,6 +12,8 @@ obj-y = fork.o exec_domain.o panic.o \ - notifier.o ksysfs.o cred.o reboot.o \ - async.o range.o smpboot.o ucount.o +@@ -13,6 +13,7 @@ obj-y = fork.o exec_domain.o panic.o \ + async.o range.o smpboot.o ucount.o regset.o + obj-$(CONFIG_BPFILTER) += usermode_driver.o +obj-$(CONFIG_RH_DISABLE_DEPRECATED) += rh_taint.o -+ obj-$(CONFIG_MODULES) += kmod.o obj-$(CONFIG_MULTIUSER) += groups.o diff --git a/0001-Add-efi_status_to_str-and-rework-efi_status_to_err.patch b/0001-Add-efi_status_to_str-and-rework-efi_status_to_err.patch index 9fa2f1a8e..507ba5cd7 100644 --- a/0001-Add-efi_status_to_str-and-rework-efi_status_to_err.patch +++ b/0001-Add-efi_status_to_str-and-rework-efi_status_to_err.patch @@ -160,7 +160,7 @@ index fdd1db025dbf..8ef7d1df09dd 100644 static DEFINE_SPINLOCK(efi_mem_reserve_persistent_lock); diff --git a/include/linux/efi.h b/include/linux/efi.h -index 05c47f857383..2e2f9f608f68 100644 +index 73db1ae04cef..92aa4697f558 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -43,6 +43,8 @@ @@ -172,7 +172,7 @@ index 05c47f857383..2e2f9f608f68 100644 typedef unsigned long efi_status_t; typedef u8 efi_bool_t; typedef u16 efi_char16_t; /* UNICODE character */ -@@ -828,6 +830,7 @@ static inline bool efi_rt_services_supported(unsigned int mask) +@@ -832,6 +834,7 @@ static inline bool efi_rt_services_supported(unsigned int mask) #endif extern int efi_status_to_err(efi_status_t status); diff --git a/0001-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch b/0001-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch index 64cdd4136..dfb45b55e 100644 --- a/0001-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch +++ b/0001-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch @@ -16,7 +16,7 @@ Signed-off-by: Jeremy Cline 1 file changed, 1 insertion(+) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index 2e0700a451e5..77e7e749d7e5 100644 +index 60a89b5e57b3..165d602481fe 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1133,6 +1133,7 @@ config XEN diff --git a/0001-Add-support-for-deprecating-processors.patch b/0001-Add-support-for-deprecating-processors.patch index 189a97156..0789cfe38 100644 --- a/0001-Add-support-for-deprecating-processors.patch +++ b/0001-Add-support-for-deprecating-processors.patch @@ -130,10 +130,10 @@ Signed-off-by: Herton R. Krzesinski 2 files changed, 132 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c -index 95c090a45b4b..bcc6d2df56c0 100644 +index c5d6f17d9b9d..9bf902c26a6e 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c -@@ -1236,6 +1236,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c) +@@ -1253,6 +1253,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c) cpu_detect(c); get_cpu_vendor(c); get_cpu_cap(c); @@ -142,10 +142,10 @@ index 95c090a45b4b..bcc6d2df56c0 100644 setup_force_cpu_cap(X86_FEATURE_CPUID); diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c -index a3767e74c758..a1b8cb9a2579 100644 +index 3511736fbc74..112efbef3414 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c -@@ -44,6 +44,7 @@ +@@ -45,6 +45,7 @@ #include #include #include @@ -153,7 +153,7 @@ index a3767e74c758..a1b8cb9a2579 100644 /* * max_low_pfn_mapped: highest directly mapped pfn < 4 GB -@@ -753,7 +754,132 @@ static void __init trim_low_memory_range(void) +@@ -754,7 +755,132 @@ static void __init trim_low_memory_range(void) { memblock_reserve(0, ALIGN(reserve_low, PAGE_SIZE)); } @@ -287,7 +287,7 @@ index a3767e74c758..a1b8cb9a2579 100644 /* * Dump out kernel offset information on panic. */ -@@ -1250,6 +1376,10 @@ void __init setup_arch(char **cmdline_p) +@@ -1249,6 +1375,10 @@ void __init setup_arch(char **cmdline_p) efi_apply_memmap_quirks(); #endif diff --git a/0001-Drop-that-for-now.patch b/0001-Drop-that-for-now.patch index c26066ec6..2d945f71d 100644 --- a/0001-Drop-that-for-now.patch +++ b/0001-Drop-that-for-now.patch @@ -8,10 +8,10 @@ Subject: [PATCH] Drop that for now 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 37cfb39d77af..c65a263990ae 100644 +index 7542f496ff1e..0eb0eb74f883 100644 --- a/Makefile +++ b/Makefile -@@ -496,7 +496,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE +@@ -498,7 +498,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE KBUILD_CFLAGS := -Wall -Wundef -Werror=strict-prototypes -Wno-trigraphs \ -fno-strict-aliasing -fno-common -fshort-wchar -fno-PIE \ -Werror=implicit-function-declaration -Werror=implicit-int \ 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 index 67a889b30..a6868a946 100644 --- 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 @@ -16,7 +16,7 @@ CC: Mark Salter 1 file changed, 4 insertions(+) diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c -index c2a7e30e2143..169b753903d1 100644 +index 5cb0d548ec25..999f0a232e57 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 */ diff --git a/0001-IB-rxe-Mark-Soft-RoCE-Transport-driver-as-tech-previ.patch b/0001-IB-rxe-Mark-Soft-RoCE-Transport-driver-as-tech-previ.patch index c0280ed39..14aee9b97 100644 --- a/0001-IB-rxe-Mark-Soft-RoCE-Transport-driver-as-tech-previ.patch +++ b/0001-IB-rxe-Mark-Soft-RoCE-Transport-driver-as-tech-previ.patch @@ -41,10 +41,10 @@ Signed-off-by: Herton R. Krzesinski 1 file changed, 2 insertions(+) diff --git a/drivers/infiniband/sw/rxe/rxe.c b/drivers/infiniband/sw/rxe/rxe.c -index 5642eefb4ba1..01c8d750b9e0 100644 +index 907203afbd99..6fbbe2b109d1 100644 --- a/drivers/infiniband/sw/rxe/rxe.c +++ b/drivers/infiniband/sw/rxe/rxe.c -@@ -336,6 +336,8 @@ static int __init rxe_module_init(void) +@@ -303,6 +303,8 @@ static int __init rxe_module_init(void) { int err; diff --git a/0001-Input-rmi4-remove-the-need-for-artificial-IRQ-in-cas.patch b/0001-Input-rmi4-remove-the-need-for-artificial-IRQ-in-cas.patch index 4d7bef554..1556e88da 100644 --- a/0001-Input-rmi4-remove-the-need-for-artificial-IRQ-in-cas.patch +++ b/0001-Input-rmi4-remove-the-need-for-artificial-IRQ-in-cas.patch @@ -314,7 +314,7 @@ index 258d5fe3d395..f7298e3dc8f3 100644 if (data->f01_container->dev.driver) { /* Driver already bound, so enable ATTN now. */ diff --git a/include/linux/rmi.h b/include/linux/rmi.h -index 7b22366d0065..307a651b2755 100644 +index 8ed37f93f3c8..d7ad35a15acb 100644 --- a/include/linux/rmi.h +++ b/include/linux/rmi.h @@ -363,6 +363,7 @@ struct rmi_driver_data { diff --git a/0001-PCI-tegra-Revert-raw_violation_fixup-for-tegra124.patch b/0001-PCI-tegra-Revert-raw_violation_fixup-for-tegra124.patch deleted file mode 100644 index 0af11db2d..000000000 --- a/0001-PCI-tegra-Revert-raw_violation_fixup-for-tegra124.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nicolas Chauvet -Date: Mon, 20 Apr 2020 18:43:04 +0200 -Subject: [PATCH] PCI: tegra: Revert raw_violation_fixup for tegra124 - -As reported in https://bugzilla.kernel.org/206217 , raw_violation_fixup -is causing more harm than good in some common use-cases. - -This patch as RFC is a partial revert of the 191cd6fb5 commit: - "PCI: tegra: Add SW fixup for RAW violations" -that was first introduced in 5.3 kernel. -This fix the following regression since then. - -When using both the network NIC and I/O on MMC this can lead to the -following message on jetson-tk1: - - NETDEV WATCHDOG: enp1s0 (r8169): transmit queue 0 timed out - -and - - pcieport 0000:00:02.0: AER: Uncorrected (Non-Fatal) error received: 0000:01:00.0 - r8169 0000:01:00.0: AER: PCIe Bus Error: severity=Uncorrected (Non-Fatal), type=Transaction Layer, (Requester ID) - r8169 0000:01:00.0: AER: device [10ec:8168] error status/mask=00004000/00400000 - r8169 0000:01:00.0: AER: [14] CmpltTO (First) - r8169 0000:01:00.0: AER: can't recover (no error_detected callback) - pcieport 0000:00:02.0: AER: device recovery failed - -After that, the ethernet NIC isn't functional anymore even after reloading -the module. -After a reboot, this is reproducible by copying a large file over the -ethernet NIC to the MMC. -For some reasons this cannot be reproduced when the same file is copied -to a tmpfs. - -This patch is RFC because it requires more understanding from Nvidia. - - Is the fixup (available in l4t downstrem) still needed for upstream ? - - Is there a need to update the fixup values for upstream ? - - If the fixup is reverted, does the hw bug can still be seen with - upstream ? - -Others can also provides more understanding: - - Conditions to reproduce the bug (or not)... - -Signed-off-by: Nicolas Chauvet -Reviewed-by: Manikanta Maddireddy ---- - drivers/pci/controller/pci-tegra.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/pci/controller/pci-tegra.c b/drivers/pci/controller/pci-tegra.c -index 235b456698fc..d5a4a167ffa1 100644 ---- a/drivers/pci/controller/pci-tegra.c -+++ b/drivers/pci/controller/pci-tegra.c -@@ -2470,7 +2470,7 @@ static const struct tegra_pcie_soc tegra124_pcie = { - .program_uphy = true, - .update_clamp_threshold = true, - .program_deskew_time = false, -- .raw_violation_fixup = true, -+ .raw_violation_fixup = false, - .update_fc_timer = false, - .has_cache_bars = false, - .ectl.enable = false, --- -2.26.2 - diff --git a/0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch b/0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch index dd77c307a..3918158a9 100644 --- a/0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch +++ b/0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch @@ -21,8 +21,8 @@ Upstream Status: RHEL only Kconfig.redhat | 2 +- arch/x86/kernel/setup.c | 2 +- include/linux/kernel.h | 2 +- - kernel/Makefile | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) + kernel/Makefile | 1 + + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Kconfig.redhat b/Kconfig.redhat index 733a26bd887a..effb81d04bfd 100644 @@ -38,10 +38,10 @@ index 733a26bd887a..effb81d04bfd 100644 help Red Hat may choose to deprecate certain features in its kernels. diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c -index 19d57bfc12f9..e677bb144835 100644 +index a1a012702915..b57e6dd6d7ef 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c -@@ -1372,7 +1372,7 @@ void __init setup_arch(char **cmdline_p) +@@ -1371,7 +1371,7 @@ void __init setup_arch(char **cmdline_p) efi_apply_memmap_quirks(); #endif @@ -51,10 +51,10 @@ index 19d57bfc12f9..e677bb144835 100644 #endif diff --git a/include/linux/kernel.h b/include/linux/kernel.h -index 0a0081b10edb..cfaaa6a234d4 100644 +index c93ba7fc65da..2803ec062a16 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h -@@ -1058,7 +1058,7 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { } +@@ -1057,7 +1057,7 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { } struct module; @@ -64,18 +64,17 @@ index 0a0081b10edb..cfaaa6a234d4 100644 void mark_hardware_deprecated(const char *msg); void mark_tech_preview(const char *msg, struct module *mod); diff --git a/kernel/Makefile b/kernel/Makefile -index c0a4904413b5..1a0c362cddfb 100644 +index 931e726455f4..362464775992 100644 --- a/kernel/Makefile +++ b/kernel/Makefile -@@ -12,7 +12,7 @@ obj-y = fork.o exec_domain.o panic.o \ - notifier.o ksysfs.o cred.o reboot.o \ - async.o range.o smpboot.o ucount.o +@@ -14,6 +14,7 @@ obj-y = fork.o exec_domain.o panic.o \ --obj-$(CONFIG_RH_DISABLE_DEPRECATED) += rh_taint.o + obj-$(CONFIG_BPFILTER) += usermode_driver.o + obj-$(CONFIG_RH_DISABLE_DEPRECATED) += rh_taint.o +obj-$(CONFIG_RHEL_DIFFERENCES) += rh_taint.o - obj-$(CONFIG_MODULES) += kmod.o obj-$(CONFIG_MULTIUSER) += groups.o + -- 2.26.2 diff --git a/0001-Revert-arm64-allwinner-dts-a64-add-LCD-related-devic.patch b/0001-Revert-arm64-allwinner-dts-a64-add-LCD-related-devic.patch deleted file mode 100644 index 0ea8f7da8..000000000 --- a/0001-Revert-arm64-allwinner-dts-a64-add-LCD-related-devic.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Sun, 12 Jul 2020 13:42:14 +0100 -Subject: [PATCH] Revert "arm64: allwinner: dts: a64: add LCD-related device - nodes for PinePhone" - -This reverts commit 6b9deda8c30064a254bc66e3f6763281c96db7db. ---- - .../dts/allwinner/sun50i-a64-pinephone.dtsi | 37 ------------------- - 1 file changed, 37 deletions(-) - -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi -index 96d9150423e0..cefda145c3c9 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi -+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi -@@ -16,15 +16,6 @@ aliases { - serial0 = &uart0; - }; - -- backlight: backlight { -- compatible = "pwm-backlight"; -- pwms = <&r_pwm 0 50000 PWM_POLARITY_INVERTED>; -- brightness-levels = <0 16 18 20 22 24 26 29 32 35 38 42 46 51 56 62 68 75 83 91 100>; -- default-brightness-level = <15>; -- enable-gpios = <&pio 7 10 GPIO_ACTIVE_HIGH>; /* PH10 */ -- power-supply = <®_ldo_io0>; -- }; -- - chosen { - stdout-path = "serial0:115200n8"; - }; -@@ -93,30 +84,6 @@ &dai { - status = "okay"; - }; - --&de { -- status = "okay"; --}; -- --&dphy { -- status = "okay"; --}; -- --&dsi { -- vcc-dsi-supply = <®_dldo1>; -- #address-cells = <1>; -- #size-cells = <0>; -- status = "okay"; -- -- panel@0 { -- compatible = "xingbangda,xbd599"; -- reg = <0>; -- reset-gpios = <&pio 3 23 GPIO_ACTIVE_LOW>; /* PD23 */ -- iovcc-supply = <®_dldo2>; -- vcc-supply = <®_ldo_io0>; -- backlight = <&backlight>; -- }; --}; -- - &ehci0 { - status = "okay"; - }; -@@ -221,10 +188,6 @@ &r_pio { - */ - }; - --&r_pwm { -- status = "okay"; --}; -- - &r_rsb { - status = "okay"; - --- -2.26.2 - diff --git a/0001-Revert-drm-panel-add-Xingbangda-XBD599-panel.patch b/0001-Revert-drm-panel-add-Xingbangda-XBD599-panel.patch deleted file mode 100644 index 2950f8a79..000000000 --- a/0001-Revert-drm-panel-add-Xingbangda-XBD599-panel.patch +++ /dev/null @@ -1,418 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Sun, 12 Jul 2020 13:41:56 +0100 -Subject: [PATCH] Revert "drm: panel: add Xingbangda XBD599 panel" - -This reverts commit 5d53795bb19e39f048ac8028ec36ff04765e1237. ---- - drivers/gpu/drm/panel/Kconfig | 9 - - drivers/gpu/drm/panel/Makefile | 1 - - .../gpu/drm/panel/panel-xingbangda-xbd599.c | 366 ------------------ - 3 files changed, 376 deletions(-) - delete mode 100644 drivers/gpu/drm/panel/panel-xingbangda-xbd599.c - -diff --git a/drivers/gpu/drm/panel/Kconfig b/drivers/gpu/drm/panel/Kconfig -index 1f55a87bb657..39055c1f0e2f 100644 ---- a/drivers/gpu/drm/panel/Kconfig -+++ b/drivers/gpu/drm/panel/Kconfig -@@ -462,15 +462,6 @@ config DRM_PANEL_VISIONOX_RM69299 - Say Y here if you want to enable support for Visionox - RM69299 DSI Video Mode panel. - --config DRM_PANEL_XINGBANGDA_XBD599 -- tristate "Xingbangda XBD599 panel" -- depends on OF -- depends on DRM_MIPI_DSI -- depends on BACKLIGHT_CLASS_DEVICE -- help -- Say Y here if you want to enable support for the Xingbangda XBD599 -- MIPI DSI Video Mode panel. -- - config DRM_PANEL_XINPENG_XPP055C272 - tristate "Xinpeng XPP055C272 panel driver" - depends on OF -diff --git a/drivers/gpu/drm/panel/Makefile b/drivers/gpu/drm/panel/Makefile -index 7b6b0c0397d6..de74f282c433 100644 ---- a/drivers/gpu/drm/panel/Makefile -+++ b/drivers/gpu/drm/panel/Makefile -@@ -49,5 +49,4 @@ obj-$(CONFIG_DRM_PANEL_TPO_TD043MTEA1) += panel-tpo-td043mtea1.o - obj-$(CONFIG_DRM_PANEL_TPO_TPG110) += panel-tpo-tpg110.o - obj-$(CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA) += panel-truly-nt35597.o - obj-$(CONFIG_DRM_PANEL_VISIONOX_RM69299) += panel-visionox-rm69299.o --obj-$(CONFIG_DRM_PANEL_XINGBANGDA_XBD599) += panel-xingbangda-xbd599.o - obj-$(CONFIG_DRM_PANEL_XINPENG_XPP055C272) += panel-xinpeng-xpp055c272.o -diff --git a/drivers/gpu/drm/panel/panel-xingbangda-xbd599.c b/drivers/gpu/drm/panel/panel-xingbangda-xbd599.c -deleted file mode 100644 -index b483f96ee1db..000000000000 ---- a/drivers/gpu/drm/panel/panel-xingbangda-xbd599.c -+++ /dev/null -@@ -1,366 +0,0 @@ --// SPDX-License-Identifier: GPL-2.0 --/* -- * Xingbangda XBD599 MIPI-DSI panel driver -- * -- * Copyright (C) 2019-2020 Icenowy Zheng -- * -- * Based on panel-rocktech-jh057n00900.c, which is: -- * Copyright (C) Purism SPC 2019 -- */ -- --#include --#include --#include --#include --#include --#include -- --#include --#include --#include --#include -- --/* Manufacturer specific Commands send via DSI */ --#define ST7703_CMD_ALL_PIXEL_OFF 0x22 --#define ST7703_CMD_ALL_PIXEL_ON 0x23 --#define ST7703_CMD_SETDISP 0xB2 --#define ST7703_CMD_SETRGBIF 0xB3 --#define ST7703_CMD_SETCYC 0xB4 --#define ST7703_CMD_SETBGP 0xB5 --#define ST7703_CMD_SETVCOM 0xB6 --#define ST7703_CMD_SETOTP 0xB7 --#define ST7703_CMD_SETPOWER_EXT 0xB8 --#define ST7703_CMD_SETEXTC 0xB9 --#define ST7703_CMD_SETMIPI 0xBA --#define ST7703_CMD_SETVDC 0xBC --#define ST7703_CMD_SETSCR 0xC0 --#define ST7703_CMD_SETPOWER 0xC1 --#define ST7703_CMD_UNK_C6 0xC6 --#define ST7703_CMD_SETPANEL 0xCC --#define ST7703_CMD_SETGAMMA 0xE0 --#define ST7703_CMD_SETEQ 0xE3 --#define ST7703_CMD_SETGIP1 0xE9 --#define ST7703_CMD_SETGIP2 0xEA -- --static const char * const regulator_names[] = { -- "iovcc", -- "vcc", --}; -- --struct xbd599 { -- struct device *dev; -- struct drm_panel panel; -- struct gpio_desc *reset_gpio; -- struct regulator_bulk_data supplies[ARRAY_SIZE(regulator_names)]; -- bool prepared; --}; -- --static inline struct xbd599 *panel_to_xbd599(struct drm_panel *panel) --{ -- return container_of(panel, struct xbd599, panel); --} -- --#define dsi_dcs_write_seq(dsi, cmd, seq...) do { \ -- static const u8 d[] = { seq }; \ -- int ret; \ -- ret = mipi_dsi_dcs_write(dsi, cmd, d, ARRAY_SIZE(d)); \ -- if (ret < 0) \ -- return ret; \ -- } while (0) -- --static int xbd599_init_sequence(struct xbd599 *ctx) --{ -- struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev); -- struct device *dev = ctx->dev; -- int ret; -- -- /* -- * Init sequence was supplied by the panel vendor. -- */ -- dsi_dcs_write_seq(dsi, ST7703_CMD_SETEXTC, -- 0xF1, 0x12, 0x83); -- dsi_dcs_write_seq(dsi, ST7703_CMD_SETMIPI, -- 0x33, 0x81, 0x05, 0xF9, 0x0E, 0x0E, 0x20, 0x00, -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x25, -- 0x00, 0x91, 0x0a, 0x00, 0x00, 0x02, 0x4F, 0x11, -- 0x00, 0x00, 0x37); -- dsi_dcs_write_seq(dsi, ST7703_CMD_SETPOWER_EXT, -- 0x25, 0x22, 0x20, 0x03); -- dsi_dcs_write_seq(dsi, ST7703_CMD_SETRGBIF, -- 0x10, 0x10, 0x05, 0x05, 0x03, 0xFF, 0x00, 0x00, -- 0x00, 0x00); -- dsi_dcs_write_seq(dsi, ST7703_CMD_SETSCR, -- 0x73, 0x73, 0x50, 0x50, 0x00, 0xC0, 0x08, 0x70, -- 0x00); -- dsi_dcs_write_seq(dsi, ST7703_CMD_SETVDC, 0x4E); -- dsi_dcs_write_seq(dsi, ST7703_CMD_SETPANEL, 0x0B); -- dsi_dcs_write_seq(dsi, ST7703_CMD_SETCYC, 0x80); -- dsi_dcs_write_seq(dsi, ST7703_CMD_SETDISP, 0xF0, 0x12, 0xF0); -- dsi_dcs_write_seq(dsi, ST7703_CMD_SETEQ, -- 0x00, 0x00, 0x0B, 0x0B, 0x10, 0x10, 0x00, 0x00, -- 0x00, 0x00, 0xFF, 0x00, 0xC0, 0x10); -- dsi_dcs_write_seq(dsi, 0xC6, 0x01, 0x00, 0xFF, 0xFF, 0x00); -- dsi_dcs_write_seq(dsi, ST7703_CMD_SETPOWER, -- 0x74, 0x00, 0x32, 0x32, 0x77, 0xF1, 0xFF, 0xFF, -- 0xCC, 0xCC, 0x77, 0x77); -- dsi_dcs_write_seq(dsi, ST7703_CMD_SETBGP, 0x07, 0x07); -- dsi_dcs_write_seq(dsi, ST7703_CMD_SETVCOM, 0x2C, 0x2C); -- dsi_dcs_write_seq(dsi, 0xBF, 0x02, 0x11, 0x00); -- -- dsi_dcs_write_seq(dsi, ST7703_CMD_SETGIP1, -- 0x82, 0x10, 0x06, 0x05, 0xA2, 0x0A, 0xA5, 0x12, -- 0x31, 0x23, 0x37, 0x83, 0x04, 0xBC, 0x27, 0x38, -- 0x0C, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0x00, -- 0x03, 0x00, 0x00, 0x00, 0x75, 0x75, 0x31, 0x88, -- 0x88, 0x88, 0x88, 0x88, 0x88, 0x13, 0x88, 0x64, -- 0x64, 0x20, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, -- 0x02, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00); -- dsi_dcs_write_seq(dsi, ST7703_CMD_SETGIP2, -- 0x02, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -- 0x00, 0x00, 0x00, 0x00, 0x02, 0x46, 0x02, 0x88, -- 0x88, 0x88, 0x88, 0x88, 0x88, 0x64, 0x88, 0x13, -- 0x57, 0x13, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, -- 0x75, 0x88, 0x23, 0x14, 0x00, 0x00, 0x02, 0x00, -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0A, -- 0xA5, 0x00, 0x00, 0x00, 0x00); -- dsi_dcs_write_seq(dsi, ST7703_CMD_SETGAMMA, -- 0x00, 0x09, 0x0D, 0x23, 0x27, 0x3C, 0x41, 0x35, -- 0x07, 0x0D, 0x0E, 0x12, 0x13, 0x10, 0x12, 0x12, -- 0x18, 0x00, 0x09, 0x0D, 0x23, 0x27, 0x3C, 0x41, -- 0x35, 0x07, 0x0D, 0x0E, 0x12, 0x13, 0x10, 0x12, -- 0x12, 0x18); -- msleep(20); -- -- ret = mipi_dsi_dcs_exit_sleep_mode(dsi); -- if (ret < 0) { -- DRM_DEV_ERROR(dev, "Failed to exit sleep mode\n"); -- return ret; -- } -- msleep(250); -- -- ret = mipi_dsi_dcs_set_display_on(dsi); -- if (ret) -- return ret; -- msleep(50); -- -- DRM_DEV_DEBUG_DRIVER(dev, "Panel init sequence done\n"); -- return 0; --} -- --static int xbd599_prepare(struct drm_panel *panel) --{ -- struct xbd599 *ctx = panel_to_xbd599(panel); -- int ret; -- -- if (ctx->prepared) -- return 0; -- -- ret = regulator_bulk_enable(ARRAY_SIZE(ctx->supplies), ctx->supplies); -- if (ret) -- return ret; -- -- DRM_DEV_DEBUG_DRIVER(ctx->dev, "Resetting the panel\n"); -- gpiod_set_value_cansleep(ctx->reset_gpio, 1); -- usleep_range(20, 40); -- gpiod_set_value_cansleep(ctx->reset_gpio, 0); -- msleep(20); -- -- ctx->prepared = true; -- -- return 0; --} -- --static int xbd599_enable(struct drm_panel *panel) --{ -- struct xbd599 *ctx = panel_to_xbd599(panel); -- int ret; -- -- ret = xbd599_init_sequence(ctx); -- if (ret < 0) { -- DRM_DEV_ERROR(ctx->dev, "Panel init sequence failed: %d\n", -- ret); -- return ret; -- } -- -- return 0; --} -- --static int xbd599_disable(struct drm_panel *panel) --{ -- struct xbd599 *ctx = panel_to_xbd599(panel); -- struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev); -- -- return mipi_dsi_dcs_set_display_off(dsi); --} -- --static int xbd599_unprepare(struct drm_panel *panel) --{ -- struct xbd599 *ctx = panel_to_xbd599(panel); -- -- if (!ctx->prepared) -- return 0; -- -- gpiod_set_value_cansleep(ctx->reset_gpio, 1); -- regulator_bulk_disable(ARRAY_SIZE(ctx->supplies), ctx->supplies); -- ctx->prepared = false; -- -- return 0; --} -- --static const struct drm_display_mode xbd599_default_mode = { -- .hdisplay = 720, -- .hsync_start = 720 + 40, -- .hsync_end = 720 + 40 + 40, -- .htotal = 720 + 40 + 40 + 40, -- .vdisplay = 1440, -- .vsync_start = 1440 + 18, -- .vsync_end = 1440 + 18 + 10, -- .vtotal = 1440 + 18 + 10 + 17, -- .vrefresh = 60, -- .clock = 69000, -- .flags = DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC, -- -- .width_mm = 68, -- .height_mm = 136, -- .type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED, --}; -- --static int xbd599_get_modes(struct drm_panel *panel, -- struct drm_connector *connector) --{ -- struct xbd599 *ctx = panel_to_xbd599(panel); -- struct drm_display_mode *mode; -- -- mode = drm_mode_duplicate(connector->dev, &xbd599_default_mode); -- if (!mode) { -- DRM_DEV_ERROR(ctx->dev, "Failed to add mode\n"); -- return -ENOMEM; -- } -- -- drm_mode_set_name(mode); -- -- mode->type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED; -- connector->display_info.width_mm = mode->width_mm; -- connector->display_info.height_mm = mode->height_mm; -- drm_mode_probed_add(connector, mode); -- -- return 1; --} -- --static const struct drm_panel_funcs xbd599_drm_funcs = { -- .prepare = xbd599_prepare, -- .enable = xbd599_enable, -- .disable = xbd599_disable, -- .unprepare = xbd599_unprepare, -- .get_modes = xbd599_get_modes, --}; -- --static int xbd599_probe(struct mipi_dsi_device *dsi) --{ -- struct device *dev = &dsi->dev; -- struct xbd599 *ctx; -- int i, ret; -- -- ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL); -- if (!ctx) -- return -ENOMEM; -- -- for (i = 0; i < ARRAY_SIZE(ctx->supplies); i++) -- ctx->supplies[i].supply = regulator_names[i]; -- -- ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(ctx->supplies), -- ctx->supplies); -- if (ret < 0) { -- DRM_DEV_ERROR(&dsi->dev, "cannot get regulators\n"); -- return ret; -- } -- -- ctx->reset_gpio = devm_gpiod_get(dev, "reset", GPIOD_OUT_LOW); -- if (IS_ERR(ctx->reset_gpio)) { -- DRM_DEV_ERROR(dev, "cannot get reset gpio\n"); -- return PTR_ERR(ctx->reset_gpio); -- } -- -- mipi_dsi_set_drvdata(dsi, ctx); -- -- ctx->dev = dev; -- -- dsi->lanes = 4; -- dsi->format = MIPI_DSI_FMT_RGB888; -- dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_SYNC_PULSE; -- -- drm_panel_init(&ctx->panel, &dsi->dev, &xbd599_drm_funcs, -- DRM_MODE_CONNECTOR_DSI); -- -- ret = drm_panel_of_backlight(&ctx->panel); -- if (ret) -- return ret; -- -- drm_panel_add(&ctx->panel); -- -- ret = mipi_dsi_attach(dsi); -- if (ret < 0) { -- DRM_DEV_ERROR(dev, "mipi_dsi_attach failed. Is host ready?\n"); -- drm_panel_remove(&ctx->panel); -- return ret; -- } -- -- DRM_DEV_INFO(dev, "%ux%u@%u %ubpp dsi %udl - ready\n", -- xbd599_default_mode.hdisplay, -- xbd599_default_mode.vdisplay, -- xbd599_default_mode.vrefresh, -- mipi_dsi_pixel_format_to_bpp(dsi->format), dsi->lanes); -- -- return 0; --} -- --static void xbd599_shutdown(struct mipi_dsi_device *dsi) --{ -- struct xbd599 *ctx = mipi_dsi_get_drvdata(dsi); -- int ret; -- -- ret = drm_panel_unprepare(&ctx->panel); -- if (ret < 0) -- DRM_DEV_ERROR(&dsi->dev, "Failed to unprepare panel: %d\n", -- ret); --} -- --static int xbd599_remove(struct mipi_dsi_device *dsi) --{ -- struct xbd599 *ctx = mipi_dsi_get_drvdata(dsi); -- int ret; -- -- xbd599_shutdown(dsi); -- -- ret = mipi_dsi_detach(dsi); -- if (ret < 0) -- DRM_DEV_ERROR(&dsi->dev, "Failed to detach from DSI host: %d\n", -- ret); -- -- drm_panel_remove(&ctx->panel); -- -- return 0; --} -- --static const struct of_device_id xbd599_of_match[] = { -- { .compatible = "xingbangda,xbd599", }, -- { /* sentinel */ } --}; --MODULE_DEVICE_TABLE(of, xbd599_of_match); -- --static struct mipi_dsi_driver xbd599_driver = { -- .probe = xbd599_probe, -- .remove = xbd599_remove, -- .shutdown = xbd599_shutdown, -- .driver = { -- .name = "panel-xingbangda-xbd599", -- .of_match_table = xbd599_of_match, -- }, --}; --module_mipi_dsi_driver(xbd599_driver); -- --MODULE_AUTHOR("Icenowy Zheng "); --MODULE_DESCRIPTION("DRM driver for Xingbangda XBD599 MIPI DSI panel"); --MODULE_LICENSE("GPL v2"); --- -2.26.2 - diff --git a/0001-Revert-drm-sun4i-sun6i_mipi_dsi-fix-horizontal-timin.patch b/0001-Revert-drm-sun4i-sun6i_mipi_dsi-fix-horizontal-timin.patch deleted file mode 100644 index c290e7ab7..000000000 --- a/0001-Revert-drm-sun4i-sun6i_mipi_dsi-fix-horizontal-timin.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Sun, 12 Jul 2020 13:42:04 +0100 -Subject: [PATCH] Revert "drm/sun4i: sun6i_mipi_dsi: fix horizontal timing - calculation" - -This reverts commit d20a2ac9c6ecf514e115f06b6744b584bbc7c1b8. ---- - drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c -index 52e009dc632b..aa67cb037e9d 100644 ---- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c -+++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c -@@ -556,7 +556,7 @@ static void sun6i_dsi_setup_timings(struct sun6i_dsi *dsi, - */ - #define HSA_PACKET_OVERHEAD 10 - hsa = max((unsigned int)HSA_PACKET_OVERHEAD, -- (mode->hsync_end - mode->hsync_start) * Bpp) - HSA_PACKET_OVERHEAD; -+ (mode->hsync_end - mode->hsync_start) * Bpp - HSA_PACKET_OVERHEAD); - - /* - * The backporch is set using a blanking packet (4 -@@ -565,7 +565,7 @@ static void sun6i_dsi_setup_timings(struct sun6i_dsi *dsi, - */ - #define HBP_PACKET_OVERHEAD 6 - hbp = max((unsigned int)HBP_PACKET_OVERHEAD, -- (mode->htotal - mode->hsync_end) * Bpp) - HBP_PACKET_OVERHEAD; -+ (mode->htotal - mode->hsync_end) * Bpp - HBP_PACKET_OVERHEAD); - - /* - * The frontporch is set using a sync event (4 bytes) -@@ -575,7 +575,7 @@ static void sun6i_dsi_setup_timings(struct sun6i_dsi *dsi, - */ - #define HFP_PACKET_OVERHEAD 16 - hfp = max((unsigned int)HFP_PACKET_OVERHEAD, -- (mode->hsync_start - mode->hdisplay) * Bpp) - HFP_PACKET_OVERHEAD; -+ (mode->hsync_start - mode->hdisplay) * Bpp - HFP_PACKET_OVERHEAD); - - /* - * The blanking is set using a sync event (4 bytes) -@@ -584,8 +584,8 @@ static void sun6i_dsi_setup_timings(struct sun6i_dsi *dsi, - */ - #define HBLK_PACKET_OVERHEAD 10 - hblk = max((unsigned int)HBLK_PACKET_OVERHEAD, -- (mode->htotal - (mode->hsync_end - mode->hsync_start)) * Bpp) - -- HBLK_PACKET_OVERHEAD; -+ (mode->htotal - (mode->hsync_end - mode->hsync_start)) * Bpp - -+ HBLK_PACKET_OVERHEAD); - - /* - * And I'm not entirely sure what vblk is about. The driver in --- -2.26.2 - diff --git a/0001-Revert-dt-bindings-Add-doc-for-Pine64-Pinebook-Pro.patch b/0001-Revert-dt-bindings-Add-doc-for-Pine64-Pinebook-Pro.patch deleted file mode 100644 index 6dd594d45..000000000 --- a/0001-Revert-dt-bindings-Add-doc-for-Pine64-Pinebook-Pro.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Sun, 12 Jul 2020 13:39:32 +0100 -Subject: [PATCH] Revert "dt-bindings: Add doc for Pine64 Pinebook Pro" - -This reverts commit ec0f66d2bc5ffd2a06eaf254ad314153e557cb7c. - -This is already upstream and not sure why it still applies but we -don't need it any more. ---- - Documentation/devicetree/bindings/arm/rockchip.yaml | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml -index ed808148b6a7..d4a4045092df 100644 ---- a/Documentation/devicetree/bindings/arm/rockchip.yaml -+++ b/Documentation/devicetree/bindings/arm/rockchip.yaml -@@ -425,11 +425,6 @@ properties: - - const: pine64,rockpro64 - - const: rockchip,rk3399 - -- - description: Pine64 PinebookPro -- items: -- - const: pine64,pinebook-pro -- - const: rockchip,rk3399 -- - - description: Radxa Rock - items: - - const: radxa,rock --- -2.26.2 - diff --git a/0001-Revert-dt-bindings-panel-add-binding-for-Xingbangda-.patch b/0001-Revert-dt-bindings-panel-add-binding-for-Xingbangda-.patch deleted file mode 100644 index 990e624d3..000000000 --- a/0001-Revert-dt-bindings-panel-add-binding-for-Xingbangda-.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Sun, 12 Jul 2020 13:41:49 +0100 -Subject: [PATCH] Revert "dt-bindings: panel: add binding for Xingbangda XBD599 - panel" - -This reverts commit 8a717270db2000ff734d89e9448b32fbc038c49a. ---- - .../display/panel/xingbangda,xbd599.yaml | 50 ------------------- - 1 file changed, 50 deletions(-) - delete mode 100644 Documentation/devicetree/bindings/display/panel/xingbangda,xbd599.yaml - -diff --git a/Documentation/devicetree/bindings/display/panel/xingbangda,xbd599.yaml b/Documentation/devicetree/bindings/display/panel/xingbangda,xbd599.yaml -deleted file mode 100644 -index b27bcf11198f..000000000000 ---- a/Documentation/devicetree/bindings/display/panel/xingbangda,xbd599.yaml -+++ /dev/null -@@ -1,50 +0,0 @@ --# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) --%YAML 1.2 ----- --$id: http://devicetree.org/schemas/display/panel/xingbangda,xbd599.yaml# --$schema: http://devicetree.org/meta-schemas/core.yaml# -- --title: Xingbangda XBD599 5.99in MIPI-DSI LCD panel -- --maintainers: -- - Icenowy Zheng -- --allOf: -- - $ref: panel-common.yaml# -- --properties: -- compatible: -- const: xingbangda,xbd599 -- reg: true -- backlight: true -- reset-gpios: true -- vcc-supply: -- description: regulator that supplies the VCC voltage -- iovcc-supply: -- description: regulator that supplies the IOVCC voltage -- --required: -- - compatible -- - reg -- - backlight -- - vcc-supply -- - iovcc-supply -- --additionalProperties: false -- --examples: -- - | -- dsi { -- #address-cells = <1>; -- #size-cells = <0>; -- -- panel@0 { -- compatible = "xingbangda,xbd599"; -- reg = <0>; -- backlight = <&backlight>; -- iovcc-supply = <®_dldo2>; -- vcc-supply = <®_ldo_io0>; -- }; -- }; -- --... --- -2.26.2 - diff --git a/0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch b/0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch deleted file mode 100644 index 75fa78c7d..000000000 --- a/0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 4940e1f82f28200ca0a42186016b3d460d16e320 Mon Sep 17 00:00:00 2001 -From: "Justin M. Forbes" -Date: Mon, 10 Aug 2020 08:06:05 -0500 -Subject: [PATCH] Temporarily remove cdomain from sphinx documentation - -The documentation subpackage will not build currently. -https://github.com/sphinx-doc/sphinx/issues/7421 - -Signed-off-by: Justin M. Forbes ---- - Documentation/conf.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Documentation/conf.py b/Documentation/conf.py -index c503188880d9..b5b2be8eec22 100644 ---- a/Documentation/conf.py -+++ b/Documentation/conf.py -@@ -36,7 +36,7 @@ needs_sphinx = '1.3' - # Add any Sphinx extension module names here, as strings. They can be - # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom - # ones. --extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', 'cdomain', -+extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', - 'kfigure', 'sphinx.ext.ifconfig', 'automarkup', - 'maintainers_include', 'sphinx.ext.autosectionlabel' ] - --- -2.26.2 - diff --git a/0001-Vulcan-AHCI-PCI-bar-fix-for-Broadcom-Vulcan-early-si.patch b/0001-Vulcan-AHCI-PCI-bar-fix-for-Broadcom-Vulcan-early-si.patch index 6352ff73a..9d80c90d8 100644 --- a/0001-Vulcan-AHCI-PCI-bar-fix-for-Broadcom-Vulcan-early-si.patch +++ b/0001-Vulcan-AHCI-PCI-bar-fix-for-Broadcom-Vulcan-early-si.patch @@ -36,7 +36,7 @@ Signed-off-by: Herton R. Krzesinski 1 file changed, 24 insertions(+) diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index 2ea61abd5830..abb314891f5b 100644 +index bdf9b52567e0..1e98e20b7cc2 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -4196,6 +4196,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000, diff --git a/0001-aacraid-Remove-depreciated-device-and-vendor-PCI-id-.patch b/0001-aacraid-Remove-depreciated-device-and-vendor-PCI-id-.patch index 0d4fac8bd..91b7a1fa4 100644 --- a/0001-aacraid-Remove-depreciated-device-and-vendor-PCI-id-.patch +++ b/0001-aacraid-Remove-depreciated-device-and-vendor-PCI-id-.patch @@ -27,7 +27,7 @@ Signed-off-by: Herton R. Krzesinski 1 file changed, 2 insertions(+) diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c -index a308e86a97f1..4d84f95a50ce 100644 +index 8588da0a0655..2bc9157fb5d3 100644 --- a/drivers/scsi/aacraid/linit.c +++ b/drivers/scsi/aacraid/linit.c @@ -78,6 +78,7 @@ char aac_driver_version[] = AAC_DRIVER_FULL_VERSION; diff --git a/0001-aarch64-acpi-scan-Fix-regression-related-to-X-Gene-U.patch b/0001-aarch64-acpi-scan-Fix-regression-related-to-X-Gene-U.patch index eea0deea2..8a80f3ded 100644 --- a/0001-aarch64-acpi-scan-Fix-regression-related-to-X-Gene-U.patch +++ b/0001-aarch64-acpi-scan-Fix-regression-related-to-X-Gene-U.patch @@ -28,10 +28,10 @@ Signed-off-by: Herton R. Krzesinski 1 file changed, 9 insertions(+) diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c -index 8777faced51a..2e60d792005f 100644 +index 2142f1554761..f5fdf6f3650c 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c -@@ -1572,6 +1572,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) +@@ -1574,6 +1574,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) if (!acpi_match_device_ids(device, i2c_multi_instantiate_ids)) return false; diff --git a/0001-acpi-prefer-booting-with-ACPI-over-DTS.patch b/0001-acpi-prefer-booting-with-ACPI-over-DTS.patch index a3352a436..f54e6fbcd 100644 --- a/0001-acpi-prefer-booting-with-ACPI-over-DTS.patch +++ b/0001-acpi-prefer-booting-with-ACPI-over-DTS.patch @@ -39,7 +39,7 @@ Signed-off-by: Herton R. Krzesinski 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c -index a7586a4db142..c2a7e30e2143 100644 +index 455966401102..5cb0d548ec25 100644 --- a/arch/arm64/kernel/acpi.c +++ b/arch/arm64/kernel/acpi.c @@ -40,7 +40,7 @@ int acpi_pci_disabled = 1; /* skip ACPI PCI scan and IRQ initialization */ diff --git a/0001-add-Red-Hat-specific-taint-flags.patch b/0001-add-Red-Hat-specific-taint-flags.patch index 12d4809b9..8dfd61c5f 100644 --- a/0001-add-Red-Hat-specific-taint-flags.patch +++ b/0001-add-Red-Hat-specific-taint-flags.patch @@ -24,10 +24,10 @@ Signed-off-by: Herton R. Krzesinski 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/include/linux/kernel.h b/include/linux/kernel.h -index b82db0c0caec..28be75396242 100644 +index c352ecdfcb43..8d3eaa27b082 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h -@@ -603,7 +603,24 @@ extern enum system_states { +@@ -602,7 +602,24 @@ extern enum system_states { #define TAINT_LIVEPATCH 15 #define TAINT_AUX 16 #define TAINT_RANDSTRUCT 17 @@ -54,7 +54,7 @@ index b82db0c0caec..28be75396242 100644 struct taint_flag { diff --git a/kernel/panic.c b/kernel/panic.c -index e2157ca387c8..534bc76e43da 100644 +index aef8872ba843..fe1d3decf61c 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -386,6 +386,20 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = { diff --git a/0001-add-pci_hw_vendor_status.patch b/0001-add-pci_hw_vendor_status.patch index c64ca91f5..d27519548 100644 --- a/0001-add-pci_hw_vendor_status.patch +++ b/0001-add-pci_hw_vendor_status.patch @@ -30,10 +30,10 @@ Signed-off-by: Herton R. Krzesinski 2 files changed, 33 insertions(+) diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c -index da6510af1221..2ec02cbfda72 100644 +index 449466f71040..f5678ed743bf 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c -@@ -18,6 +18,7 @@ +@@ -19,6 +19,7 @@ #include #include #include @@ -41,7 +41,7 @@ index da6510af1221..2ec02cbfda72 100644 #include "pci.h" #include "pcie/portdrv.h" -@@ -278,6 +279,34 @@ static const struct pci_device_id *pci_match_device(struct pci_driver *drv, +@@ -279,6 +280,34 @@ static const struct pci_device_id *pci_match_device(struct pci_driver *drv, return found_id; } @@ -77,7 +77,7 @@ index da6510af1221..2ec02cbfda72 100644 struct pci_driver *drv; struct pci_dev *dev; diff --git a/include/linux/pci.h b/include/linux/pci.h -index 34c1c4f45288..6d9a405feea5 100644 +index 835530605c0d..1a5afb3b706f 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1406,6 +1406,10 @@ int pci_add_dynid(struct pci_driver *drv, diff --git a/0001-arch-x86-Remove-vendor-specific-CPU-ID-checks.patch b/0001-arch-x86-Remove-vendor-specific-CPU-ID-checks.patch index 924c4393d..183f1e10d 100644 --- a/0001-arch-x86-Remove-vendor-specific-CPU-ID-checks.patch +++ b/0001-arch-x86-Remove-vendor-specific-CPU-ID-checks.patch @@ -19,10 +19,10 @@ Cc: David Arcari 1 file changed, 85 deletions(-) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c -index 6d31895c8e92..4e43f6957621 100644 +index 66441cb9c1af..6100995124f9 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c -@@ -757,72 +757,6 @@ static void __init trim_low_memory_range(void) +@@ -758,72 +758,6 @@ static void __init trim_low_memory_range(void) } #ifdef CONFIG_RHEL_DIFFERENCES @@ -95,7 +95,7 @@ index 6d31895c8e92..4e43f6957621 100644 static void rh_check_supported(void) { -@@ -843,27 +777,8 @@ static void rh_check_supported(void) +@@ -844,27 +778,8 @@ static void rh_check_supported(void) */ switch (boot_cpu_data.x86_vendor) { case X86_VENDOR_AMD: diff --git a/0001-arm-aarch64-Drop-the-EXPERT-setting-from-ARM64_FORCE.patch b/0001-arm-aarch64-Drop-the-EXPERT-setting-from-ARM64_FORCE.patch index 89eea8f8b..81b84901f 100644 --- a/0001-arm-aarch64-Drop-the-EXPERT-setting-from-ARM64_FORCE.patch +++ b/0001-arm-aarch64-Drop-the-EXPERT-setting-from-ARM64_FORCE.patch @@ -21,7 +21,7 @@ Signed-off-by: Jeremy Cline 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index 66dc41fd49f2..2e0700a451e5 100644 +index 6d232837cbee..60a89b5e57b3 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -861,7 +861,7 @@ endchoice diff --git a/0001-arm-make-CONFIG_HIGHPTE-optional-without-CONFIG_EXPE.patch b/0001-arm-make-CONFIG_HIGHPTE-optional-without-CONFIG_EXPE.patch index 498ffaf18..e7267bee8 100644 --- a/0001-arm-make-CONFIG_HIGHPTE-optional-without-CONFIG_EXPE.patch +++ b/0001-arm-make-CONFIG_HIGHPTE-optional-without-CONFIG_EXPE.patch @@ -11,10 +11,10 @@ Signed-off-by: Jon Masters 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 2ac74904a3ce..f0094424f76a 100644 +index e00d94b16658..4db48405b23a 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -1549,9 +1549,9 @@ config HIGHMEM +@@ -1514,9 +1514,9 @@ config HIGHMEM If unsure, say n. config HIGHPTE diff --git a/0001-arm64-allwinner-dts-a64-add-LCD-related-device-nodes.patch b/0001-arm64-allwinner-dts-a64-add-LCD-related-device-nodes.patch deleted file mode 100644 index e3b07c2bb..000000000 --- a/0001-arm64-allwinner-dts-a64-add-LCD-related-device-nodes.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Icenowy Zheng -Date: Mon, 16 Mar 2020 21:35:03 +0800 -Subject: [PATCH] arm64: allwinner: dts: a64: add LCD-related device nodes for - PinePhone - -PinePhone uses PWM backlight and a XBD599 LCD panel over DSI for -display. - -Add its device nodes. - -Signed-off-by: Icenowy Zheng ---- - .../dts/allwinner/sun50i-a64-pinephone.dtsi | 37 +++++++++++++++++++ - 1 file changed, 37 insertions(+) - -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi -index cefda145c3c9..96d9150423e0 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi -+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi -@@ -16,6 +16,15 @@ aliases { - serial0 = &uart0; - }; - -+ backlight: backlight { -+ compatible = "pwm-backlight"; -+ pwms = <&r_pwm 0 50000 PWM_POLARITY_INVERTED>; -+ brightness-levels = <0 16 18 20 22 24 26 29 32 35 38 42 46 51 56 62 68 75 83 91 100>; -+ default-brightness-level = <15>; -+ enable-gpios = <&pio 7 10 GPIO_ACTIVE_HIGH>; /* PH10 */ -+ power-supply = <®_ldo_io0>; -+ }; -+ - chosen { - stdout-path = "serial0:115200n8"; - }; -@@ -84,6 +93,30 @@ &dai { - status = "okay"; - }; - -+&de { -+ status = "okay"; -+}; -+ -+&dphy { -+ status = "okay"; -+}; -+ -+&dsi { -+ vcc-dsi-supply = <®_dldo1>; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ status = "okay"; -+ -+ panel@0 { -+ compatible = "xingbangda,xbd599"; -+ reg = <0>; -+ reset-gpios = <&pio 3 23 GPIO_ACTIVE_LOW>; /* PD23 */ -+ iovcc-supply = <®_dldo2>; -+ vcc-supply = <®_ldo_io0>; -+ backlight = <&backlight>; -+ }; -+}; -+ - &ehci0 { - status = "okay"; - }; -@@ -188,6 +221,10 @@ &r_pio { - */ - }; - -+&r_pwm { -+ status = "okay"; -+}; -+ - &r_rsb { - status = "okay"; - --- -2.26.2 - diff --git a/0001-arm64-dts-sun50i-a64-pinephone-Add-touchscreen-suppo.patch b/0001-arm64-dts-sun50i-a64-pinephone-Add-touchscreen-suppo.patch deleted file mode 100644 index d2511ae64..000000000 --- a/0001-arm64-dts-sun50i-a64-pinephone-Add-touchscreen-suppo.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Ondrej Jirman -Date: Fri, 26 Jun 2020 02:56:01 +0200 -Subject: [PATCH] arm64: dts: sun50i-a64-pinephone: Add touchscreen support - -Pinephone has a Goodix GT917S capacitive touchscreen controller on -I2C0 bus. Add support for it. - -Signed-off-by: Ondrej Jirman ---- - .../dts/allwinner/sun50i-a64-pinephone.dtsi | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) - -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi -index 85a7aa5efd32..2d5694446d17 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi -+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi -@@ -123,6 +123,25 @@ &ehci1 { - status = "okay"; - }; - -+&i2c0 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&i2c0_pins>; -+ status = "okay"; -+ -+ touchscreen@5d { -+ compatible = "goodix,gt917s", "goodix,gt911"; -+ reg = <0x5d>; -+ interrupt-parent = <&pio>; -+ interrupts = <7 4 IRQ_TYPE_LEVEL_HIGH>; /* PH4 */ -+ irq-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ -+ reset-gpios = <&pio 7 11 GPIO_ACTIVE_HIGH>; /* PH11 */ -+ AVDD28-supply = <®_ldo_io0>; -+ VDDIO-supply = <®_ldo_io0>; -+ touchscreen-size-x = <720>; -+ touchscreen-size-y = <1440>; -+ }; -+}; -+ - &i2c1 { - status = "okay"; - --- -2.26.2 - diff --git a/0001-arm64-dts-sun50i-a64-pinephone-Enable-LCD-support-on.patch b/0001-arm64-dts-sun50i-a64-pinephone-Enable-LCD-support-on.patch deleted file mode 100644 index a38cd7250..000000000 --- a/0001-arm64-dts-sun50i-a64-pinephone-Enable-LCD-support-on.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Icenowy Zheng -Date: Fri, 26 Jun 2020 02:56:00 +0200 -Subject: [PATCH] arm64: dts: sun50i-a64-pinephone: Enable LCD support on - PinePhone - -PinePhone uses PWM backlight and a XBD599 LCD panel over DSI for -display. - -Backlight levels curve was optimized by Martijn Braam using a -lux meter. - -Add its device nodes. - -Signed-off-by: Icenowy Zheng -Signed-off-by: Martijn Braam -Signed-off-by: Ondrej Jirman ---- - .../allwinner/sun50i-a64-pinephone-1.1.dts | 19 ++++++++++ - .../dts/allwinner/sun50i-a64-pinephone.dtsi | 35 +++++++++++++++++++ - 2 files changed, 54 insertions(+) - -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts -index 06a775c41664..3e99a87e9ce5 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts -+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts -@@ -9,3 +9,22 @@ / { - model = "Pine64 PinePhone Braveheart (1.1)"; - compatible = "pine64,pinephone-1.1", "allwinner,sun50i-a64"; - }; -+ -+&backlight { -+ power-supply = <®_ldo_io0>; -+ /* -+ * PWM backlight circuit on this PinePhone revision was changed since -+ * 1.0, and the lowest PWM duty cycle that doesn't lead to backlight -+ * being off is around 20%. Duty cycle for the lowest brightness level -+ * also varries quite a bit between individual boards, so the lowest -+ * value here was chosen as a safe default. -+ */ -+ brightness-levels = < -+ 774 793 814 842 -+ 882 935 1003 1088 -+ 1192 1316 1462 1633 -+ 1830 2054 2309 2596 -+ 2916 3271 3664 4096>; -+ num-interpolated-steps = <50>; -+ default-brightness-level = <400>; -+}; -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi -index cefda145c3c9..85a7aa5efd32 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi -+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi -@@ -16,6 +16,13 @@ aliases { - serial0 = &uart0; - }; - -+ backlight: backlight { -+ compatible = "pwm-backlight"; -+ pwms = <&r_pwm 0 50000 PWM_POLARITY_INVERTED>; -+ enable-gpios = <&pio 7 10 GPIO_ACTIVE_HIGH>; /* PH10 */ -+ /* Backlight configuration differs per PinePhone revision. */ -+ }; -+ - chosen { - stdout-path = "serial0:115200n8"; - }; -@@ -84,6 +91,30 @@ &dai { - status = "okay"; - }; - -+&de { -+ status = "okay"; -+}; -+ -+&dphy { -+ status = "okay"; -+}; -+ -+&dsi { -+ vcc-dsi-supply = <®_dldo1>; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ status = "okay"; -+ -+ panel@0 { -+ compatible = "xingbangda,xbd599"; -+ reg = <0>; -+ reset-gpios = <&pio 3 23 GPIO_ACTIVE_LOW>; /* PD23 */ -+ iovcc-supply = <®_dldo2>; -+ vcc-supply = <®_ldo_io0>; -+ backlight = <&backlight>; -+ }; -+}; -+ - &ehci0 { - status = "okay"; - }; -@@ -188,6 +219,10 @@ &r_pio { - */ - }; - -+&r_pwm { -+ status = "okay"; -+}; -+ - &r_rsb { - status = "okay"; - --- -2.26.2 - diff --git a/0001-be2iscsi-remove-unsupported-device-IDs.patch b/0001-be2iscsi-remove-unsupported-device-IDs.patch index 81bd1dd9c..2bcf994f1 100644 --- a/0001-be2iscsi-remove-unsupported-device-IDs.patch +++ b/0001-be2iscsi-remove-unsupported-device-IDs.patch @@ -49,7 +49,7 @@ Signed-off-by: Herton R. Krzesinski 1 file changed, 2 insertions(+) diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c -index 9b81cfbbc5c5..1ca08297939c 100644 +index 8dc2e0824ad7..dfb9d0ae3247 100644 --- a/drivers/scsi/be2iscsi/be_main.c +++ b/drivers/scsi/be2iscsi/be_main.c @@ -370,11 +370,13 @@ static int beiscsi_eh_device_reset(struct scsi_cmnd *sc) diff --git a/0001-bpf-Add-tech-preview-taint-for-syscall.patch b/0001-bpf-Add-tech-preview-taint-for-syscall.patch index 2487c60f1..dc882100b 100644 --- a/0001-bpf-Add-tech-preview-taint-for-syscall.patch +++ b/0001-bpf-Add-tech-preview-taint-for-syscall.patch @@ -27,10 +27,10 @@ Signed-off-by: Herton R. Krzesinski 1 file changed, 6 insertions(+) diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c -index 60f70f31060e..628d0ba68106 100644 +index f7e570292afe..56c39dc8995e 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c -@@ -4094,11 +4094,17 @@ static int bpf_iter_create(union bpf_attr *attr) +@@ -4155,11 +4155,17 @@ static int bpf_iter_create(union bpf_attr *attr) SYSCALL_DEFINE3(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, size) { union bpf_attr attr; diff --git a/0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch b/0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch index 042d8b999..3832fffbf 100644 --- a/0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch +++ b/0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch @@ -34,10 +34,10 @@ Signed-off-by: Herton R. Krzesinski 4 files changed, 30 insertions(+), 3 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index fb95fad81c79..a43287854f8a 100644 +index 98ea67f27809..352afb16f424 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -5277,6 +5277,14 @@ +@@ -5373,6 +5373,14 @@ unknown_nmi_panic [X86] Cause panic on unknown NMI. @@ -53,10 +53,10 @@ index fb95fad81c79..a43287854f8a 100644 [USB] Default USB device authorization: (default -1 = authorized except for wireless USB, diff --git a/include/linux/kernel.h b/include/linux/kernel.h -index 28be75396242..0a0081b10edb 100644 +index 8d3eaa27b082..c93ba7fc65da 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h -@@ -618,7 +618,7 @@ extern enum system_states { +@@ -617,7 +617,7 @@ extern enum system_states { #define TAINT_RESERVED28 28 #define TAINT_RESERVED29 29 #define TAINT_RESERVED30 30 @@ -66,7 +66,7 @@ index 28be75396242..0a0081b10edb 100644 #define TAINT_FLAGS_COUNT 32 #define TAINT_FLAGS_MAX ((1UL << TAINT_FLAGS_COUNT) - 1) diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c -index 0fd80ac81f70..60f70f31060e 100644 +index 2f343ce15747..f7e570292afe 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -24,6 +24,7 @@ @@ -105,7 +105,7 @@ index 0fd80ac81f70..60f70f31060e 100644 static const struct bpf_map_ops * const bpf_map_types[] = { #define BPF_PROG_TYPE(_id, _name, prog_ctx_type, kern_ctx_type) diff --git a/kernel/panic.c b/kernel/panic.c -index 534bc76e43da..e3bae852d92f 100644 +index fe1d3decf61c..2c483bec82d6 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -399,7 +399,7 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = { diff --git a/0001-drm-panel-add-Xingbangda-XBD599-panel.patch b/0001-drm-panel-add-Xingbangda-XBD599-panel.patch index 6866d5f69..9e43122d3 100644 --- a/0001-drm-panel-add-Xingbangda-XBD599-panel.patch +++ b/0001-drm-panel-add-Xingbangda-XBD599-panel.patch @@ -17,7 +17,7 @@ Signed-off-by: Icenowy Zheng create mode 100644 drivers/gpu/drm/panel/panel-xingbangda-xbd599.c diff --git a/drivers/gpu/drm/panel/Kconfig b/drivers/gpu/drm/panel/Kconfig -index 39055c1f0e2f..1f55a87bb657 100644 +index de2f2a452be5..3ce658de416b 100644 --- a/drivers/gpu/drm/panel/Kconfig +++ b/drivers/gpu/drm/panel/Kconfig @@ -462,6 +462,15 @@ config DRM_PANEL_VISIONOX_RM69299 @@ -37,7 +37,7 @@ index 39055c1f0e2f..1f55a87bb657 100644 tristate "Xinpeng XPP055C272 panel driver" depends on OF diff --git a/drivers/gpu/drm/panel/Makefile b/drivers/gpu/drm/panel/Makefile -index de74f282c433..7b6b0c0397d6 100644 +index e45ceac6286f..bd10617430ec 100644 --- a/drivers/gpu/drm/panel/Makefile +++ b/drivers/gpu/drm/panel/Makefile @@ -49,4 +49,5 @@ obj-$(CONFIG_DRM_PANEL_TPO_TD043MTEA1) += panel-tpo-td043mtea1.o diff --git a/0001-drm-panel-rocktech-jh057n00900-Rename-the-driver-to-.patch b/0001-drm-panel-rocktech-jh057n00900-Rename-the-driver-to-.patch deleted file mode 100644 index d78bf5644..000000000 --- a/0001-drm-panel-rocktech-jh057n00900-Rename-the-driver-to-.patch +++ /dev/null @@ -1,948 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Ondrej Jirman -Date: Fri, 26 Jun 2020 02:55:52 +0200 -Subject: [PATCH] drm/panel: rocktech-jh057n00900: Rename the driver to st7703 - -This rename is done so that the driver matches the name of the -display controller and in preparation for adding support for more -panels to the driver. - -This is just a basic file rename, with no code changes. - -Signed-off-by: Ondrej Jirman ---- - drivers/gpu/drm/panel/Kconfig | 26 +- - drivers/gpu/drm/panel/Makefile | 2 +- - .../drm/panel/panel-rocktech-jh057n00900.c | 424 ------------------ - drivers/gpu/drm/panel/panel-sitronix-st7703.c | 424 ++++++++++++++++++ - 4 files changed, 438 insertions(+), 438 deletions(-) - delete mode 100644 drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c - create mode 100644 drivers/gpu/drm/panel/panel-sitronix-st7703.c - -diff --git a/drivers/gpu/drm/panel/Kconfig b/drivers/gpu/drm/panel/Kconfig -index 39055c1f0e2f..de2f2a452be5 100644 ---- a/drivers/gpu/drm/panel/Kconfig -+++ b/drivers/gpu/drm/panel/Kconfig -@@ -283,19 +283,6 @@ config DRM_PANEL_RAYDIUM_RM68200 - Say Y here if you want to enable support for Raydium RM68200 - 720x1280 DSI video mode panel. - --config DRM_PANEL_ROCKTECH_JH057N00900 -- tristate "Rocktech JH057N00900 MIPI touchscreen panel" -- depends on OF -- depends on DRM_MIPI_DSI -- depends on BACKLIGHT_CLASS_DEVICE -- help -- Say Y here if you want to enable support for Rocktech JH057N00900 -- MIPI DSI panel as e.g. used in the Librem 5 devkit. It has a -- resolution of 720x1440 pixels, a built in backlight and touch -- controller. -- Touch input support is provided by the goodix driver and needs to be -- selected separately. -- - config DRM_PANEL_RONBO_RB070D30 - tristate "Ronbo Electronics RB070D30 panel" - depends on OF -@@ -395,6 +382,19 @@ config DRM_PANEL_SITRONIX_ST7701 - ST7701 controller for 480X864 LCD panels with MIPI/RGB/SPI - system interfaces. - -+config DRM_PANEL_SITRONIX_ST7703 -+ tristate "Sitronix ST7703 based MIPI touchscreen panels" -+ depends on OF -+ depends on DRM_MIPI_DSI -+ depends on BACKLIGHT_CLASS_DEVICE -+ help -+ Say Y here if you want to enable support for Sitronix ST7703 based -+ panels, souch as Rocktech JH057N00900 MIPI DSI panel as e.g. used in -+ the Librem 5 devkit. It has a resolution of 720x1440 pixels, a built -+ in backlight and touch controller. -+ Touch input support is provided by the goodix driver and needs to be -+ selected separately. -+ - config DRM_PANEL_SITRONIX_ST7789V - tristate "Sitronix ST7789V panel" - depends on OF && SPI -diff --git a/drivers/gpu/drm/panel/Makefile b/drivers/gpu/drm/panel/Makefile -index de74f282c433..e45ceac6286f 100644 ---- a/drivers/gpu/drm/panel/Makefile -+++ b/drivers/gpu/drm/panel/Makefile -@@ -27,7 +27,6 @@ obj-$(CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00) += panel-panasonic-vvx10f034n00.o - obj-$(CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN) += panel-raspberrypi-touchscreen.o - obj-$(CONFIG_DRM_PANEL_RAYDIUM_RM67191) += panel-raydium-rm67191.o - obj-$(CONFIG_DRM_PANEL_RAYDIUM_RM68200) += panel-raydium-rm68200.o --obj-$(CONFIG_DRM_PANEL_ROCKTECH_JH057N00900) += panel-rocktech-jh057n00900.o - obj-$(CONFIG_DRM_PANEL_RONBO_RB070D30) += panel-ronbo-rb070d30.o - obj-$(CONFIG_DRM_PANEL_SAMSUNG_LD9040) += panel-samsung-ld9040.o - obj-$(CONFIG_DRM_PANEL_SAMSUNG_S6D16D0) += panel-samsung-s6d16d0.o -@@ -41,6 +40,7 @@ obj-$(CONFIG_DRM_PANEL_SHARP_LQ101R1SX01) += panel-sharp-lq101r1sx01.o - obj-$(CONFIG_DRM_PANEL_SHARP_LS037V7DW01) += panel-sharp-ls037v7dw01.o - obj-$(CONFIG_DRM_PANEL_SHARP_LS043T1LE01) += panel-sharp-ls043t1le01.o - obj-$(CONFIG_DRM_PANEL_SITRONIX_ST7701) += panel-sitronix-st7701.o -+obj-$(CONFIG_DRM_PANEL_SITRONIX_ST7703) += panel-sitronix-st7703.o - obj-$(CONFIG_DRM_PANEL_SITRONIX_ST7789V) += panel-sitronix-st7789v.o - obj-$(CONFIG_DRM_PANEL_SONY_ACX424AKP) += panel-sony-acx424akp.o - obj-$(CONFIG_DRM_PANEL_SONY_ACX565AKM) += panel-sony-acx565akm.o -diff --git a/drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c b/drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c -deleted file mode 100644 -index 38ff742bc120..000000000000 ---- a/drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c -+++ /dev/null -@@ -1,424 +0,0 @@ --// SPDX-License-Identifier: GPL-2.0 --/* -- * Rockteck jh057n00900 5.5" MIPI-DSI panel driver -- * -- * Copyright (C) Purism SPC 2019 -- */ -- --#include --#include --#include --#include --#include --#include --#include -- --#include