summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bindings/interrupt-controller/qcom,mpm.txt1
-rw-r--r--qcom/Makefile3
-rw-r--r--qcom/bengal-thermal.dtsi56
-rw-r--r--qcom/khaje-atp.dtsi22
-rw-r--r--qcom/khaje-sde-display.dtsi5
-rw-r--r--qcom/khaje-usb.dtsi7
-rw-r--r--qcom/khaje.dtsi34
-rw-r--r--qcom/kona-sde-display.dtsi4
8 files changed, 97 insertions, 35 deletions
diff --git a/bindings/interrupt-controller/qcom,mpm.txt b/bindings/interrupt-controller/qcom,mpm.txt
index f67d2c3f..dce7af96 100644
--- a/bindings/interrupt-controller/qcom,mpm.txt
+++ b/bindings/interrupt-controller/qcom,mpm.txt
@@ -30,6 +30,7 @@ Properties:
"qcom,mpm-gic-bengal"
"qcom,mpm-gic-scuba"
"qcom,mpm-gic-sdm660"
+ "qcom,mpm-gic-khaje"
- interrupts:
Usage: required
diff --git a/qcom/Makefile b/qcom/Makefile
index 3e5b2294..40a9d061 100644
--- a/qcom/Makefile
+++ b/qcom/Makefile
@@ -190,7 +190,8 @@ dtb-$(CONFIG_ARCH_BENGAL) += bengal-rumi.dtb \
bengal-iot-idp-usbc.dtb \
bengalp-iot-idp-2gb.dtb \
bengalp-iot-idp-usbc-2gb.dtb \
- bengalp-iot-idp-usbc.dtb
+ bengalp-iot-idp-usbc.dtb \
+ bengalp-iot-idp-2gb.dtb
endif
ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
diff --git a/qcom/bengal-thermal.dtsi b/qcom/bengal-thermal.dtsi
index 8f0ba2c0..0cc49b16 100644
--- a/qcom/bengal-thermal.dtsi
+++ b/qcom/bengal-thermal.dtsi
@@ -957,6 +957,30 @@
};
};
+ mapss-lowc {
+ polling-delay-passive = <0>;
+ polling-delay = <0>;
+ thermal-governor = "low_limits_cap";
+ thermal-sensors = <&tsens0 0>;
+ wake-capable-sensor;
+ tracks-low;
+
+ trips {
+ mapss_cap_trip: mapss-cap-trip {
+ temperature = <5000>;
+ hysteresis = <5000>;
+ type = "passive";
+ };
+ };
+
+ cooling-maps {
+ lmh_cpu_cdev {
+ trip = <&mapss_cap_trip>;
+ cooling-device = <&lmh_cpu_vdd 1 1>;
+ };
+ };
+ };
+
mapss-lowf {
polling-delay-passive = <0>;
polling-delay = <0>;
@@ -996,16 +1020,16 @@
};
};
- mapss-lowc {
+ camera-lowc {
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-governor = "low_limits_cap";
- thermal-sensors = <&tsens0 0>;
+ thermal-sensors = <&tsens0 3>;
wake-capable-sensor;
tracks-low;
trips {
- mapss_cap_trip: mapss-cap-trip {
+ camera_cap_trip: camera-cap-trip {
temperature = <5000>;
hysteresis = <5000>;
type = "passive";
@@ -1014,7 +1038,7 @@
cooling-maps {
lmh_cpu_cdev {
- trip = <&mapss_cap_trip>;
+ trip = <&camera_cap_trip>;
cooling-device = <&lmh_cpu_vdd 1 1>;
};
};
@@ -1059,30 +1083,6 @@
};
};
- camera-lowc {
- polling-delay-passive = <0>;
- polling-delay = <0>;
- thermal-governor = "low_limits_cap";
- thermal-sensors = <&tsens0 3>;
- wake-capable-sensor;
- tracks-low;
-
- trips {
- camera_cap_trip: camera-cap-trip {
- temperature = <5000>;
- hysteresis = <5000>;
- type = "passive";
- };
- };
-
- cooling-maps {
- lmh_cpu_cdev {
- trip = <&camera_cap_trip>;
- cooling-device = <&lmh_cpu_vdd 1 1>;
- };
- };
- };
-
quiet-therm-step {
polling-delay-passive = <2000>;
polling-delay = <0>;
diff --git a/qcom/khaje-atp.dtsi b/qcom/khaje-atp.dtsi
index 70542aae..29855637 100644
--- a/qcom/khaje-atp.dtsi
+++ b/qcom/khaje-atp.dtsi
@@ -284,3 +284,25 @@
panel = <&dsi_nt36672e_fhd_plus_90hz_video>;
};
};
+
+&pm7250b_charger {
+ dpdm-supply = <&usb2_phy0>;
+
+ smb5_vbus: qcom,smb5-vbus {
+ regulator-name = "smb5-vbus";
+ };
+
+ smb5_vconn: qcom,smb5-vconn {
+ regulator-name = "smb5-vconn";
+ };
+};
+
+&pm7250b_pdphy {
+ vdd-pdphy-supply = <&L15A>;
+ vbus-supply = <&smb5_vbus>;
+ vconn-supply = <&smb5_vconn>;
+};
+
+&usb0 {
+ extcon = <&pm7250b_pdphy>, <&pm7250b_charger>, <&eud>;
+};
diff --git a/qcom/khaje-sde-display.dtsi b/qcom/khaje-sde-display.dtsi
index 69291d75..6f229d6a 100644
--- a/qcom/khaje-sde-display.dtsi
+++ b/qcom/khaje-sde-display.dtsi
@@ -55,6 +55,11 @@
cell-index = <0>;
label = "wb_display";
};
+
+ msm_notifier: qcom,msm_notifier@0 {
+ compatible = "qcom,msm-notifier";
+ panel = <&dsi_nt36672e_fhd_plus_90hz_video>;
+ };
};
&mdss_mdp {
diff --git a/qcom/khaje-usb.dtsi b/qcom/khaje-usb.dtsi
index 0a14f827..890029f6 100644
--- a/qcom/khaje-usb.dtsi
+++ b/qcom/khaje-usb.dtsi
@@ -145,9 +145,10 @@
resets = <&gcc GCC_QUSB2PHY_PRIM_BCR>;
reset-names = "phy_reset";
- qcom,param-override-seq = <0x61 0x6c>, //override_x0
- <0x43 0x70>, //override_x1
- <0x2E 0x74>; //override_x2
+ qcom,param-override-seq =
+ <0xa6 0x6c>, /* override_x0 */
+ <0x85 0x70>, /* override_x1 */
+ <0x16 0x74>; /* override_x2 */
};
/* Primary USB port related QMP USB PHY */
diff --git a/qcom/khaje.dtsi b/qcom/khaje.dtsi
index 8b3e145f..d5e31f80 100644
--- a/qcom/khaje.dtsi
+++ b/qcom/khaje.dtsi
@@ -612,7 +612,7 @@
};
wakegic: wake-gic {
- compatible = "qcom,mpm-gic-bengal", "qcom,mpm-gic";
+ compatible = "qcom,mpm-gic-khaje", "qcom,mpm-gic";
interrupts-extended = <&wakegic GIC_SPI 197
IRQ_TYPE_EDGE_RISING>;
reg = <0x45f01b8 0x1000>,
@@ -3150,6 +3150,11 @@
reg = <0x602d 0x1>;
bits = <5 1>;
};
+
+ feat_conf11: feat_conf11@6030 {
+ reg = <0x6030 0x1>;
+ bits = <0 8>;
+ };
};
spmi_bus: qcom,spmi@1c40000 {
@@ -4360,3 +4365,30 @@ tpdm_turing_llm: tpdm@8861000 {
&cxip_cdev {
status = "disabled";
};
+
+&rpm_bus {
+ rpm_smd_cdev: rpm-smd-cdev {
+ compatible = "qcom,rpm-smd-cooling-device";
+ #cooling-cells = <2>;
+ };
+};
+
+&thermal_zones {
+ mapss-lowc {
+ cooling-maps {
+ rpm_smd_vdd_cdev {
+ trip = <&mapss_cap_trip>;
+ cooling-device = <&rpm_smd_cdev 2 2>;
+ };
+ };
+ };
+
+ camera-lowc {
+ cooling-maps {
+ rpm_smd_vdd_cdev {
+ trip = <&camera_cap_trip>;
+ cooling-device = <&rpm_smd_cdev 2 2>;
+ };
+ };
+ };
+};
diff --git a/qcom/kona-sde-display.dtsi b/qcom/kona-sde-display.dtsi
index f77a9d13..5a6bf555 100644
--- a/qcom/kona-sde-display.dtsi
+++ b/qcom/kona-sde-display.dtsi
@@ -111,7 +111,7 @@
qcom,panel-supply-entry@1 {
reg = <1>;
qcom,supply-name = "lab";
- qcom,supply-min-voltage = <4600000>;
+ qcom,supply-min-voltage = <5600000>;
qcom,supply-max-voltage = <6000000>;
qcom,supply-enable-load = <100000>;
qcom,supply-disable-load = <100>;
@@ -120,7 +120,7 @@
qcom,panel-supply-entry@2 {
reg = <2>;
qcom,supply-name = "ibb";
- qcom,supply-min-voltage = <4600000>;
+ qcom,supply-min-voltage = <5600000>;
qcom,supply-max-voltage = <6000000>;
qcom,supply-enable-load = <100000>;
qcom,supply-disable-load = <100>;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 20:05:32 +0000