linuxmsm/meta-qcom-extras
0
0
Fork 0
mirror of https://github.com/linux-msm/meta-qcom-extras.git synced 2026-02-25 13:14:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

linux-yocto: drop patches applied upstream

Browse Source 
Drop two patches that have been merged to the 6.6-stable kernel tree.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
This commit is contained in:
Dmitry Baryshkov
2024-02-08 15:46:38 +02:00
parent cddb160080
commit af2ef00b14
3 changed files with 0 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
recipes-kernel/linux/linux-yocto/qcm6490-dtsi/0001-PENDING-arm64-dts-qcom-qcm6490-disable-qcom-watchdog.patch
View File

@@ -1,47 +0,0 @@
From f7de6f81ae7a37628a15dd3166ae869e7ca85ab0 Mon Sep 17 00:00:00 2001
From: Atul Dhudase <quic_adhudase@quicinc.com>
Date: Thu, 18 Jan 2024 14:56:11 +0530
Subject: [PATCH] PENDING: arm64: dts: qcom: qcm6490: disable qcom watchdog
Disable qcom watchdog for qcm6490 boards. With hypervisor enabled on
qcm6490, accessing watchdog registers results into an external abort
because hypervisor will trap that address and won't allow the access.
Signed-off-by: Atul Dhudase <quic_adhudase@quicinc.com>
Upstream-Status: Pending
---
arch/arm64/boot/dts/qcom/qcm6490.dtsi | 4 ++++
arch/arm64/boot/dts/qcom/sc7280.dtsi | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/qcom/qcm6490.dtsi b/arch/arm64/boot/dts/qcom/qcm6490.dtsi
index e05e0f3b4b12..838402affa1c 100644
--- a/arch/arm64/boot/dts/qcom/qcm6490.dtsi
+++ b/arch/arm64/boot/dts/qcom/qcm6490.dtsi
@@ -137,6 +137,10 @@ &video_mem {
reg = <0x0 0x8a700000 0x0 0x500000>;
};
+&watchdog {
+ status = "disabled";
+};
+
&wifi {
memory-region = <&wlan_fw_mem>;
};
diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi
index 9e849983c60b..1885b7df2527 100644
--- a/arch/arm64/boot/dts/qcom/sc7280.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi
@@ -5268,7 +5268,7 @@ msi-controller@17a40000 {
};
};
- watchdog@17c10000 {
+ watchdog: watchdog@17c10000 {
compatible = "qcom,apss-wdt-sc7280", "qcom,kpss-wdt";
reg = <0 0x17c10000 0 0x1000>;
clocks = <&sleep_clk>;
--
2.25.1

32
recipes-kernel/linux/linux-yocto/qrb4210-dts/usb/0001-arm64-dts-qcom-qrb4210-rb2-don-t-force-usb-periphera.patch
View File

@@ -1,32 +0,0 @@
From 7f7575d07b7f495daa7d4728b72ff4dc26a5ea5f Mon Sep 17 00:00:00 2001
From: Caleb Connolly <caleb.connolly@linaro.org>
Date: Tue, 10 Oct 2023 11:34:42 +0100
Subject: [PATCH 1/3] arm64: dts: qcom: qrb4210-rb2: don't force usb peripheral
mode
The rb2 only has a single USB controller, it can be switched between a
type-c port and an internal USB hub via a DIP switch. Until dynamic
role switching is available it's preferable to put the USB controller
in host mode so that the type-A ports and ethernet are available.
Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
Upstream-Status: Backport [https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git 27c2ca90e2f34cd3c4849af996e1a96a69e700d3]
---
arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts b/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts
index 803ca056f9b6..7c19f874fa71 100644
--- a/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts
+++ b/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts
@@ -609,7 +609,6 @@ &usb {
&usb_dwc3 {
maximum-speed = "super-speed";
- dr_mode = "peripheral";
};
&usb_hsphy {
--
2.39.2

2
recipes-kernel/linux/linux-yocto_6.6.bbappend
View File

@@ -48,7 +48,6 @@ SRC_URI:append:qcom = " \
file://qrb4210-dts/0002-arm64-dts-qcom-qrb4210-rb2-Enable-bluetooth.patch \
file://qrb4210-dts/0001-arm64-dts-qcom-sm6115-Hook-up-interconnects.patch \
file://qrb4210-dts/0001-arm64-dts-qcom-qrb4210-rb2-Enable-MPSS-and-Wi-Fi.patch \
file://qrb4210-dts/usb/0001-arm64-dts-qcom-qrb4210-rb2-don-t-force-usb-periphera.patch \
file://qrb4210-dts/usb/0002-arm64-dts-qcom-qrb4210-rb2-Select-USB3-host-mode-by-.patch \
file://qrb4210-dts/usb/0003-arm64-dts-qcom-sm6115-Enable-USB3-SS-phy.patch \
file://generic-drivers/0001-FROMLIST-dma-heap-Add-proper-kref-handling-on-dma-bu.patch \
@@ -65,7 +64,6 @@ SRC_URI:append:qcom = " \
file://qcm6490-dtsi/0001-PENDING-arm64-dts-qcm6490-Update-the-protected-clock.patch \
file://qcm6490-dtsi/0001-PENDING-dt-bindings-pinctrl-qcom-sc7280-pinctrl-add-.patch \
file://qcm6490-dtsi/0002-PENDING-arm64-dts-qcom-qcm6490-Add-gpio-reserved-ran.patch \
file://qcm6490-dtsi/0001-PENDING-arm64-dts-qcom-qcm6490-disable-qcom-watchdog.patch \
file://qcm6490-board-dts/0001-FROMLIST-dt-bindings-arm-qcom-Add-QCM6490-IDP-board.patch \
file://qcm6490-board-dts/0001-PENDING-dt-bindings-arm-qcom-Add-QCM6490-RB3-board.patch \
file://qcm6490-board-dts/0002-PENDING-arm64-dts-qcom-Add-qcm6490-rb3-support.patch \