From: Greg Kroah-Hartman Date: Thu, 11 Apr 2024 07:35:25 +0000 (+0200) Subject: dropped arm64-dts-qcom-add-support-for-xiaomi-redmi-note-9s.patch from 6.8 X-Git-Tag: v4.19.312~39 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=85a87589bc41675ce6e3e2bc5ebb4dbb247a50a8;p=thirdparty%2Fkernel%2Fstable-queue.git dropped arm64-dts-qcom-add-support-for-xiaomi-redmi-note-9s.patch from 6.8 --- diff --git a/queue-6.8/arm64-dts-qcom-add-support-for-xiaomi-redmi-note-9s.patch b/queue-6.8/arm64-dts-qcom-add-support-for-xiaomi-redmi-note-9s.patch deleted file mode 100644 index a2ded3f5910..00000000000 --- a/queue-6.8/arm64-dts-qcom-add-support-for-xiaomi-redmi-note-9s.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 52fba89bd13ca076baf3518faa452ec04f3017fa Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 21 Jan 2024 17:57:48 +0100 -Subject: arm64: dts: qcom: Add support for Xiaomi Redmi Note 9S - -From: Joe Mason - -[ Upstream commit 6016fb7c91f72f4afbb4017e13cd91954d0f1a9b ] - -Add a device tree for the Xiaomi Redmi Note 9S (curtana) phone, based on -sm7125-xiaomi-common.dtsi. - -Reviewed-by: Konrad Dybcio -Signed-off-by: Joe Mason -Signed-off-by: David Wronek -Link: https://lore.kernel.org/r/20240121-sm7125-upstream-v4-8-f7d1212c8ebb@gmail.com -Signed-off-by: Bjorn Andersson -Signed-off-by: Sasha Levin ---- - arch/arm64/boot/dts/qcom/Makefile | 1 + - .../boot/dts/qcom/sm7125-xiaomi-curtana.dts | 16 ++++++++++++++++ - 2 files changed, 17 insertions(+) - create mode 100644 arch/arm64/boot/dts/qcom/sm7125-xiaomi-curtana.dts - -diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile -index 39889d5f8e123..2e6984bbbb836 100644 ---- a/arch/arm64/boot/dts/qcom/Makefile -+++ b/arch/arm64/boot/dts/qcom/Makefile -@@ -210,6 +210,7 @@ dtb-$(CONFIG_ARCH_QCOM) += sm6125-sony-xperia-seine-pdx201.dtb - dtb-$(CONFIG_ARCH_QCOM) += sm6125-xiaomi-laurel-sprout.dtb - dtb-$(CONFIG_ARCH_QCOM) += sm6350-sony-xperia-lena-pdx213.dtb - dtb-$(CONFIG_ARCH_QCOM) += sm6375-sony-xperia-murray-pdx225.dtb -+dtb-$(CONFIG_ARCH_QCOM) += sm7125-xiaomi-curtana.dtb - dtb-$(CONFIG_ARCH_QCOM) += sm7125-xiaomi-joyeuse.dtb - dtb-$(CONFIG_ARCH_QCOM) += sm7225-fairphone-fp4.dtb - dtb-$(CONFIG_ARCH_QCOM) += sm8150-hdk.dtb -diff --git a/arch/arm64/boot/dts/qcom/sm7125-xiaomi-curtana.dts b/arch/arm64/boot/dts/qcom/sm7125-xiaomi-curtana.dts -new file mode 100644 -index 0000000000000..12f517a8492c3 ---- /dev/null -+++ b/arch/arm64/boot/dts/qcom/sm7125-xiaomi-curtana.dts -@@ -0,0 +1,16 @@ -+// SPDX-License-Identifier: GPL-2.0 -+/* -+ * Copyright (c) 2023, Joe Mason -+ */ -+ -+/dts-v1/; -+ -+#include "sm7125-xiaomi-common.dtsi" -+ -+/ { -+ model = "Xiaomi Redmi Note 9S"; -+ compatible = "xiaomi,curtana", "qcom,sm7125"; -+ -+ /* required for bootloader to select correct board */ -+ qcom,board-id = <0x20022 1>; -+}; --- -2.43.0 - diff --git a/queue-6.8/series b/queue-6.8/series index 909b94b70d7..789fedfb018 100644 --- a/queue-6.8/series +++ b/queue-6.8/series @@ -3,7 +3,6 @@ wifi-rtw89-fix-null-pointer-access-when-abort-scan.patch bnx2x-fix-firmware-version-string-character-counts.patch batman-adv-return-directly-after-a-failed-batadv_dat.patch batman-adv-improve-exception-handling-in-batadv_thro.patch -arm64-dts-qcom-add-support-for-xiaomi-redmi-note-9s.patch net-stmmac-dwmac-starfive-add-support-for-jh7100-soc.patch net-phy-phy_device-prevent-nullptr-exceptions-on-isr.patch wifi-rtw89-pci-validate-rx-tag-for-rxq-and-rpq.patch