Merge changes I781e670f,I70b37405,I983c4912,I7c3636f9 into kernel.lnx.6.6.r1-rel

* changes:
  ARM: dts: msm: Enable nb7vpq904m redriver on Kera QRD platfrom
  ARM: dts: msm: Include pmiv0102 for kera qrd platforms
  ARM: dts: msm: Disable sys-therm-11 node for kera
  ARM: dts: qcom: remove unused gpio
This commit is contained in:
Linux Build Service Account
2025-01-08 02:12:49 -08:00
committed by Gerrit - the friendly Code Review server
13 changed files with 118 additions and 42 deletions

View File

@@ -31,3 +31,15 @@
&pmic_glink_adc { &pmic_glink_adc {
status = "disabled"; status = "disabled";
}; };
&pmxr2230_sys_therm_11 {
status = "disabled";
};
&sys_therm_11 {
status = "disabled";
};
&pm8550ve_f_die_temp {
status = "disabled";
};

View File

@@ -64,3 +64,15 @@
&tlmm 3 0 &tlmm 16 0 &tlmm 13 0x2008>; &tlmm 3 0 &tlmm 16 0 &tlmm 13 0x2008>;
}; };
}; };
&pmxr2230_sys_therm_11 {
status = "disabled";
};
&sys_therm_11 {
status = "disabled";
};
&pm8550ve_f_die_temp {
status = "disabled";
};

View File

@@ -7,7 +7,6 @@
#include <dt-bindings/clock/qcom,gcc-kera.h> #include <dt-bindings/clock/qcom,gcc-kera.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/spmi/spmi.h> #include <dt-bindings/spmi/spmi.h>
#include "pmk8550.dtsi"
&sdhc_2 { &sdhc_2 {
vdd-supply = <&L13B>; vdd-supply = <&L13B>;
@@ -77,3 +76,15 @@
&tlmm 3 0 &tlmm 16 0 &tlmm 13 0x2008>; &tlmm 3 0 &tlmm 16 0 &tlmm 13 0x2008>;
}; };
}; };
&pmxr2230_sys_therm_11 {
status = "disabled";
};
&sys_therm_11 {
status = "disabled";
};
&pm8550ve_f_die_temp {
status = "disabled";
};

View File

@@ -94,37 +94,6 @@
}; };
}; };
i2s0_sd1 {
i2s0_sd1_sleep: i2s0_sd1_sleep {
mux {
pins = "gpio63";
function = "gpio";
};
config {
pins = "gpio63";
drive-strength = <2>; /* 2 mA */
bias-pull-down; /* PULL DOWN */
input-enable;
};
};
i2s0_sd1_active: i2s0_sd1_active {
mux {
pins = "gpio63";
function = "i2s0_data1";
};
config {
pins = "gpio63";
drive-strength = <8>; /* 8 mA */
bias-disable; /* NO PULL */
output-high;
};
};
};
/* WCD reset pin */ /* WCD reset pin */
wcd_reset_active: wcd_reset_active { wcd_reset_active: wcd_reset_active {
mux { mux {

View File

@@ -24,6 +24,3 @@
}; };
}; };
&thermal_zones {
/delete-node/ sys-therm-11;
};

View File

@@ -9,10 +9,6 @@
status= "ok"; status= "ok";
}; };
&pmiv010x_amoled_ecm {
status = "ok";
};
&pmiv010x_eusb2_repeater { &pmiv010x_eusb2_repeater {
vdd18-supply = <&L7B>; vdd18-supply = <&L7B>;
vdd3-supply = <&L17B>; vdd3-supply = <&L17B>;

View File

@@ -7,6 +7,7 @@
/plugin/; /plugin/;
#include "kera-qrd-qca6750-ufs2.dtsi" #include "kera-qrd-qca6750-ufs2.dtsi"
#include "kera-pmiv0102.dtsi"
/ { / {
model = "Qualcomm Technologies, Inc. Kera QRD + QCA6750 + UFS2"; model = "Qualcomm Technologies, Inc. Kera QRD + QCA6750 + UFS2";

View File

@@ -7,6 +7,7 @@
/plugin/; /plugin/;
#include "kera-qrd-wcn7750-ufs2.dtsi" #include "kera-qrd-wcn7750-ufs2.dtsi"
#include "kera-pmiv0102.dtsi"
/ { / {
model = "Qualcomm Technologies, Inc. Kera QRD + WCN7750 + UFS2"; model = "Qualcomm Technologies, Inc. Kera QRD + WCN7750 + UFS2";

View File

@@ -7,6 +7,7 @@
/plugin/; /plugin/;
#include "kera-qrd-wcn7750-ufs3.dtsi" #include "kera-qrd-wcn7750-ufs3.dtsi"
#include "kera-pmiv0102.dtsi"
/ { / {
model = "Qualcomm Technologies, Inc. Kera QRD + WCN7750 + UFS3"; model = "Qualcomm Technologies, Inc. Kera QRD + WCN7750 + UFS3";

View File

@@ -106,3 +106,66 @@
label = "smb1393_1_die_temp"; label = "smb1393_1_die_temp";
}; };
}; };
&pmxr2230_sys_therm_11 {
status = "disabled";
};
&sys_therm_11 {
status = "disabled";
};
&pm8550ve_f_die_temp {
status = "disabled";
};
&qupv3_se4_i2c {
status = "ok";
#address-cells = <1>;
#size-cells = <0>;
redriver: redriver@1c {
compatible = "onnn,redriver";
reg = <0x1c>;
vdd-supply = <&L7B>;
lane-channel-swap;
eq = /bits/ 8 <
/* Parameters for USB */
0x4 0x4 0x4 0x4
/* Parameters for DP */
0x5 0x7 0x7 0x5>;
flat-gain = /bits/ 8 <
/* Parameters for USB */
0x3 0x1 0x1 0x3
/* Parameters for DP */
0x0 0x3 0x3 0x0>;
output-comp = /bits/ 8 <
/* Parameters for USB */
0x3 0x3 0x3 0x3
/* Parameters for DP */
0x3 0x3 0x3 0x3>;
loss-match = /bits/ 8 <
/* Parameters for USB */
0x1 0x3 0x3 0x1
/* Parameters for DP */
0x3 0x3 0x3 0x3>;
};
};
&usb_qmp_dp_phy {
pinctrl-names = "unused";
};
&usb0 {
pinctrl-names = "default";
pinctrl-0 = <&usb3phy_portselect_gpio>;
gpios = <&tlmm 122 0>;
ssusb_redriver = <&redriver>;
qcom,wcd_usbss = <&wcd_usbss>;
};

View File

@@ -7,6 +7,7 @@
/plugin/; /plugin/;
#include "kera-rcm-wcn7750-ufs4.dtsi" #include "kera-rcm-wcn7750-ufs4.dtsi"
#include "kera-pmiv0102.dtsi"
/ { / {
model = "Qualcomm Technologies, Inc. Kera RCM + WCN7750 + UFS4"; model = "Qualcomm Technologies, Inc. Kera RCM + WCN7750 + UFS4";

View File

@@ -64,3 +64,15 @@
&tlmm 3 0 &tlmm 16 0 &tlmm 13 0x2008>; &tlmm 3 0 &tlmm 16 0 &tlmm 13 0x2008>;
}; };
}; };
&pmxr2230_sys_therm_11 {
status = "disabled";
};
&sys_therm_11 {
status = "disabled";
};
&pm8550ve_f_die_temp {
status = "disabled";
};

View File

@@ -279,7 +279,7 @@
}; };
}; };
sys-therm-11 { sys_therm_11: sys-therm-11 {
polling-delay-passive = <0>; polling-delay-passive = <0>;
polling-delay = <0>; polling-delay = <0>;
thermal-sensors = <&pmk8550_vadc PMXR2230_ADC5_GEN3_AMUX_THM5_100K_PU>; thermal-sensors = <&pmk8550_vadc PMXR2230_ADC5_GEN3_AMUX_THM5_100K_PU>;
@@ -387,7 +387,7 @@
qcom,adc-tm-type = <1>; qcom,adc-tm-type = <1>;
}; };
pmxr2230_sys_therm_11 { pmxr2230_sys_therm_11: pmxr2230_sys_therm_11 {
reg = <PMXR2230_ADC5_GEN3_AMUX_THM5_100K_PU>; reg = <PMXR2230_ADC5_GEN3_AMUX_THM5_100K_PU>;
label = "pmxr2230_sys_therm_11"; label = "pmxr2230_sys_therm_11";
qcom,ratiometric; qcom,ratiometric;
@@ -408,7 +408,7 @@
qcom,pre-scaling = <1 1>; qcom,pre-scaling = <1 1>;
}; };
pm8550ve_f_die_temp { pm8550ve_f_die_temp: pm8550ve_f_die_temp {
reg = <PM8550VX_ADC5_GEN3_DIE_TEMP(5)>; reg = <PM8550VX_ADC5_GEN3_DIE_TEMP(5)>;
label = "pm8550ve_f_die_temp"; label = "pm8550ve_f_die_temp";
qcom,pre-scaling = <1 1>; qcom,pre-scaling = <1 1>;