Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sm8250: bump current and edge to 6.12 #7532

Merged
merged 1 commit into from
Dec 4, 2024
+558 −302
Merged

sm8250: bump current and edge to 6.12 #7532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions config/sources/families/sm8250.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ enable_extension "image-output-abl"
case $BRANCH in

current)
declare -g KERNEL_MAJOR_MINOR="6.11" # Major and minor versions of this kernel.
declare -g KERNELBRANCH='branch:linux-6.11.y'
declare -g KERNEL_MAJOR_MINOR="6.12" # Major and minor versions of this kernel.
declare -g KERNELBRANCH='branch:linux-6.12.y'
declare -g -i KERNEL_GIT_CACHE_TTL=120 # 2 minutes; this is a high-traffic repo
;;

edge)
declare -g KERNEL_MAJOR_MINOR="6.10" # Major and minor versions of this kernel.
declare -g KERNEL_MAJOR_MINOR="6.12" # Major and minor versions of this kernel.
;;

esac
Expand Down
96 changes: 0 additions & 96 deletions ...ernel/archive/sm8250-6.11/0019-arm64-dts-qcom-sm8250-move-lpass-codec-macros-to-use.patch
View file
Open in desktop

This file was deleted.

43 changes: 0 additions & 43 deletions patch/kernel/archive/sm8250-6.11/0025-drm-mipi-dsi-add-set-column-page-multi-helpers.patch
View file
Open in desktop

This file was deleted.

0 ...1/0001-drm-Add-drm-notifier-support.patch → ...2/0001-drm-Add-drm-notifier-support.patch
View file
Open in desktop
File renamed without changes.
0 ...l-turn-on-off-signal-to-touchscreen.patch → ...l-turn-on-off-signal-to-touchscreen.patch
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...nput-Add-nt36523-touchscreen-driver.patch → ...nput-Add-nt36523-touchscreen-driver.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Make
index 111111111111..222222222222 100644
--- a/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile
@@ -121,3 +121,4 @@ obj-$(CONFIG_TOUCHSCREEN_IQS5XX) += iqs5xx.o
@@ -117,3 +117,4 @@ obj-$(CONFIG_TOUCHSCREEN_IQS5XX) += iqs5xx.o
obj-$(CONFIG_TOUCHSCREEN_IQS7211) += iqs7211.o
obj-$(CONFIG_TOUCHSCREEN_ZINITIX) += zinitix.o
obj-$(CONFIG_TOUCHSCREEN_HIMAX_HX83112B) += himax_hx83112b.o
Expand Down
10 changes: 6 additions & 4 deletions ...8250-xiaomi-elish-enable-wifi-and-b.patch → ...8250-xiaomi-elish-enable-wifi-and-b.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ Subject: arm64: dts: qcom: sm8250-xiaomi-elish: enable wifi and bluetooth

Signed-off-by: Jianhua Lu <[email protected]>
---
arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi | 113 ++++++++++
1 file changed, 113 insertions(+)
arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi | 115 ++++++++++
1 file changed, 115 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
index 111111111111..222222222222 100644
Expand Down Expand Up @@ -91,7 +91,7 @@ index 111111111111..222222222222 100644
reserved-memory {
xbl_aop_mem: xbl-aop@80600000 {
reg = <0x0 0x80600000 0x0 0x260000>;
@@ -619,6 +684,23 @@ &pcie0_phy {
@@ -619,6 +684,25 @@ &pcie0_phy {
status = "okay";
};

Expand All @@ -109,13 +109,15 @@ index 111111111111..222222222222 100644
+ vddrfa1p7-supply = <&vreg_pmu_rfa_1p7>;
+ vddpcie0p9-supply = <&vreg_pmu_pcie_0p9>;
+ vddpcie1p8-supply = <&vreg_pmu_pcie_1p8>;
+
+ qcom,ath11k-calibration-variant = "Xiaomi_Pad_5Pro";
+ };
+};
+
&pm8150_gpios {
vol_up_n: vol-up-n-state {
pins = "gpio6";
@@ -701,6 +783,37 @@ &slpi {
@@ -701,6 +785,37 @@ &slpi {

&tlmm {
gpio-reserved-ranges = <40 4>;
Expand Down
4 changes: 2 additions & 2 deletions ...8250-xiaomi-elish-enable-touchscree.patch → ...8250-xiaomi-elish-enable-touchscree.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ diff --git a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi b/arch/arm
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
@@ -764,6 +764,16 @@ &pon_resin {
@@ -766,6 +766,16 @@ &pon_resin {
status = "okay";
};

Expand All @@ -44,7 +44,7 @@ index 111111111111..222222222222 100644
&qupv3_id_0 {
status = "okay";
};
@@ -781,6 +791,28 @@ &slpi {
@@ -783,6 +793,28 @@ &slpi {
status = "okay";
};

Expand Down
6 changes: 3 additions & 3 deletions ...06-ASoC-qcom-sm8250-Add-tdm-support.patch → ...06-ASoC-qcom-sm8250-Add-tdm-support.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ index 111111111111..222222222222 100644
+ int ret,j;

switch (cpu_dai->id) {
case TERTIARY_MI2S_RX:
@@ -63,6 +118,21 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream)
case PRIMARY_MI2S_RX:
@@ -71,6 +126,21 @@ static int sm8250_snd_startup(struct snd_pcm_substream *substream)
snd_soc_dai_set_fmt(cpu_dai, fmt);
snd_soc_dai_set_fmt(codec_dai, codec_dai_fmt);
break;
Expand All @@ -109,7 +109,7 @@ index 111111111111..222222222222 100644
default:
break;
}
@@ -88,6 +158,11 @@ static int sm8250_snd_hw_params(struct snd_pcm_substream *substream,
@@ -96,6 +166,11 @@ static int sm8250_snd_hw_params(struct snd_pcm_substream *substream,
struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0);
struct sm8250_snd_data *pdata = snd_soc_card_get_drvdata(rtd->card);

Expand Down
4 changes: 2 additions & 2 deletions ...8250-xiaomi-elish-Add-sound-support.patch → ...8250-xiaomi-elish-Add-sound-support.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ index 111111111111..222222222222 100644
&i2c11 {
clock-frequency = <400000>;
status = "okay";
@@ -786,11 +934,63 @@ &qupv3_id_2 {
@@ -788,11 +936,63 @@ &qupv3_id_2 {
status = "okay";
};

Expand Down Expand Up @@ -237,7 +237,7 @@ index 111111111111..222222222222 100644
&spi4 {
status = "okay";
pinctrl-names = "default";
@@ -831,6 +1031,38 @@ wlan_en_state: wlan-default-state {
@@ -833,6 +1033,38 @@ wlan_en_state: wlan-default-state {
output-low;
bias-pull-up;
};
Expand Down
0 ...008-Asoc-wm_adsp-Add-prefix-support.patch → ...008-Asoc-wm_adsp-Add-prefix-support.patch
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...8250-oneplus-instantnoodlep-Add-dev.patch → ...8250-oneplus-instantnoodlep-Add-dev.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefi
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/qcom/Makefile
+++ b/arch/arm64/boot/dts/qcom/Makefile
@@ -235,6 +235,7 @@ dtb-$(CONFIG_ARCH_QCOM) += sm8150-sony-xperia-kumano-bahamut.dtb
@@ -242,6 +242,7 @@ dtb-$(CONFIG_ARCH_QCOM) += sm8150-sony-xperia-kumano-bahamut.dtb
dtb-$(CONFIG_ARCH_QCOM) += sm8150-sony-xperia-kumano-griffin.dtb
dtb-$(CONFIG_ARCH_QCOM) += sm8250-hdk.dtb
dtb-$(CONFIG_ARCH_QCOM) += sm8250-mtp.dtb
Expand Down
0 ...e-sync-mode-to-sync-on-DSI0-rather-.patch → ...e-sync-mode-to-sync-on-DSI0-rather-.patch
View file
Open in desktop
File renamed without changes.
0 ...pu1-improve-support-for-active-CTLs.patch → ...pu1-improve-support-for-active-CTLs.patch
View file
Open in desktop
File renamed without changes.
20 changes: 6 additions & 14 deletions ...ive-CTL-if-it-is-available.patch.disabled → ...e-one-active-CTL-if-it-is-available.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,37 +10,29 @@ available.

Signed-off-by: Dmitry Baryshkov <[email protected]>
---
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 8 ++++--
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 6 +++-
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 1 +
drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 14 +++++++---
drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 1 +
4 files changed, 18 insertions(+), 6 deletions(-)
4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
@@ -1180,14 +1180,18 @@ static void dpu_encoder_virt_atomic_mode_set(struct drm_encoder *drm_enc,
@@ -1198,7 +1198,11 @@ static void dpu_encoder_virt_atomic_mode_set(struct drm_encoder *drm_enc,
return;
}

- if (!hw_ctl[i]) {
- phys->hw_ctl = i < num_ctl ? to_dpu_hw_ctl(hw_ctl[i]) : NULL;
+ /* Use first (and only) CTL if active CTLs are supported */
+ if (dpu_kms->catalog->caps->has_active_ctls)
+ phys->hw_ctl = to_dpu_hw_ctl(hw_ctl[0]);
+ else
+ phys->hw_ctl = to_dpu_hw_ctl(hw_ctl[i]);
+ if (!phys->hw_ctl) {
+ phys->hw_ctl = i < num_ctl ? to_dpu_hw_ctl(hw_ctl[i]) : NULL;
if (!phys->hw_ctl) {
DPU_ERROR_ENC(dpu_enc,
"no ctl block assigned at idx: %d\n", i);
return;
}

phys->hw_pp = dpu_enc->hw_pp[i];
- phys->hw_ctl = to_dpu_hw_ctl(hw_ctl[i]);

phys->cached_mode = crtc_state->adjusted_mode;
if (phys->ops.atomic_mode_set)
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
Expand Down
0 ...active_ctls-in-the-catalog.patch.disabled → ...late-has_active_ctls-in-the-catalog.patch
View file
Open in desktop
File renamed without changes.
0 ...encoder_phys_-proper-support-for-ac.patch → ...encoder_phys_-proper-support-for-ac.patch
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...BIT-DPU_CTL_SPLIT_DISPLAY-from-acti.patch → ...BIT-DPU_CTL_SPLIT_DISPLAY-from-acti.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h b/drivers/gp
index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h
@@ -37,17 +37,16 @@ static const struct dpu_mdp_cfg sm8150_mdp = {
@@ -38,17 +38,16 @@ static const struct dpu_mdp_cfg sm8150_mdp = {
},
};

Expand All @@ -45,7 +45,7 @@ diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h b/drivers/g
index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h
@@ -41,12 +41,12 @@ static const struct dpu_ctl_cfg sc8180x_ctl[] = {
@@ -42,12 +42,12 @@ static const struct dpu_ctl_cfg sc8180x_ctl[] = {
{
.name = "ctl_0", .id = CTL_0,
.base = 0x1000, .len = 0x1e0,
Expand Down
4 changes: 2 additions & 2 deletions ...8250-xiaomi-elish-add-keyboard-supp.patch → ...8250-xiaomi-elish-add-keyboard-supp.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ index 111111111111..222222222222 100644
&mdss {
status = "okay";
};
@@ -1063,6 +1072,14 @@ dout-pins {
@@ -1065,6 +1074,14 @@ dout-pins {
bias-disable;
};
};
Expand All @@ -42,7 +42,7 @@ index 111111111111..222222222222 100644
};

&uart6 {
@@ -1106,6 +1123,29 @@ &usb_1_dwc3_hs_out {
@@ -1108,6 +1125,29 @@ &usb_1_dwc3_hs_out {
remote-endpoint = <&pm8150b_hs_in>;
};

Expand Down
0 ...8250-xiaomi-elish-remove-framebuffe.patch → ...8250-xiaomi-elish-remove-framebuffe.patch
View file
Open in desktop
File renamed without changes.
0 ...-use-devm_mipi_dsi_-function-to-reg.patch → ...-use-devm_mipi_dsi_-function-to-reg.patch
View file
Open in desktop
File renamed without changes.
Loading
Loading