diff options
author | JohnnLee <johnnlee@google.com> | 2022-12-21 12:02:43 +0800 |
---|---|---|
committer | JohnnLee <johnnlee@google.com> | 2022-12-21 12:03:02 +0800 |
commit | c0ad545ffe7a988d2ce3adf2e3bc4a2f51863a9c (patch) | |
tree | 67ce540b6713eaeecdcf5ac23119471aa8e5d75f /qcom | |
parent | 924ee949a66fa021ea9a19c4e6ae16429e7bf865 (diff) | |
parent | 68e03a53c9662372c7e767883371220aed5c04c3 (diff) | |
download | devicetree-android-u-beta-2.1_r0.1.tar.gz |
Merge branch 'LA.UM.9.12.C10.11.00.00.840.478' via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19android-u-preview-2_r0.1android-u-beta-2_r0.1android-u-beta-2.1_r0.1android-u-beta-1_r0.2android-msm-redbull-4.19-u-preview-2android-msm-redbull-4.19-u-beta2android-msm-redbull-4.19-u-beta1
Bug: 261541074
Change-Id: I32a8e4d6fafd7dad52b35b59bae7217f672ef9a8
Signed-off-by: JohnnLee <johnnlee@google.com>
Diffstat (limited to 'qcom')
-rw-r--r-- | qcom/bengal-usb.dtsi | 3 | ||||
-rw-r--r-- | qcom/khaje-atp-overlay.dts | 2 | ||||
-rw-r--r-- | qcom/khaje-idp-nopmi-overlay.dts | 2 | ||||
-rw-r--r-- | qcom/khaje-idp-overlay.dts | 2 | ||||
-rw-r--r-- | qcom/khaje-idp-pm8010-overlay.dts | 2 | ||||
-rw-r--r-- | qcom/khaje-idp-usbc-overlay.dts | 2 | ||||
-rw-r--r-- | qcom/khaje-idp-usbc.dts | 2 | ||||
-rw-r--r-- | qcom/khaje-idps-display-90hz-overlay.dts | 2 | ||||
-rw-r--r-- | qcom/khaje-qrd-hvdcp3p5-overlay.dts | 2 | ||||
-rw-r--r-- | qcom/khaje-qrd-nopmi-overlay.dts | 2 | ||||
-rw-r--r-- | qcom/khaje-qrd-nowcd9375-overlay.dts | 2 | ||||
-rw-r--r-- | qcom/khaje-qrd-overlay.dts | 2 | ||||
-rw-r--r-- | qcom/khaje.dtsi | 4 | ||||
-rw-r--r-- | qcom/kona-7230-iot-rb5.dtsi | 21 |
14 files changed, 37 insertions, 13 deletions
diff --git a/qcom/bengal-usb.dtsi b/qcom/bengal-usb.dtsi index f3f2d38b..4828bafc 100644 --- a/qcom/bengal-usb.dtsi +++ b/qcom/bengal-usb.dtsi @@ -48,6 +48,7 @@ 0x1a4>; /* GSI_IF_STS */ qcom,dwc-usb3-msm-tx-fifo-size = <21288>; qcom,gsi-disable-io-coherency; + qcom,pm-qos-latency = <40>; qcom,msm-bus,name = "usb0"; qcom,msm-bus,num-cases = <4>; @@ -60,7 +61,7 @@ /* nominal vote */ <MSM_BUS_MASTER_USB3 - MSM_BUS_SLAVE_EBI_CH0 240000 700000>, + MSM_BUS_SLAVE_EBI_CH0 1000000 1550000>, <MSM_BUS_MASTER_USB3 MSM_BUS_SLAVE_IPA_CFG 0 2400>, <MSM_BUS_MASTER_AMPSS_M0 MSM_BUS_SLAVE_USB3 0 40000>, diff --git a/qcom/khaje-atp-overlay.dts b/qcom/khaje-atp-overlay.dts index bc5789fc..4ea2a6b2 100644 --- a/qcom/khaje-atp-overlay.dts +++ b/qcom/khaje-atp-overlay.dts @@ -7,7 +7,7 @@ / { model = "Qualcomm Technologies, Inc. Khaje ATP"; compatible = "qcom,khaje-atp", "qcom,khaje", "qcom,atp"; - qcom,msm-id = <518 0x10000>; + qcom,msm-id = <518 0x10000>, <586 0x10000>; qcom,board-id = <33 0>; qcom,pmic-id = <0x2D 0x2E 0x0 0x0>; }; diff --git a/qcom/khaje-idp-nopmi-overlay.dts b/qcom/khaje-idp-nopmi-overlay.dts index 566b24f0..5adb1890 100644 --- a/qcom/khaje-idp-nopmi-overlay.dts +++ b/qcom/khaje-idp-nopmi-overlay.dts @@ -7,7 +7,7 @@ / { model = "Qualcomm Technologies, Inc. KHAJE IDP nopmi"; compatible = "qcom,khaje-idp", "qcom,khaje", "qcom,idp"; - qcom,msm-id = <518 0x10000>; + qcom,msm-id = <518 0x10000>, <586 0x10000>; qcom,board-id = <0x10022 0>; qcom,pmic-id = <0x2D 0x0 0x0 0x0>; }; diff --git a/qcom/khaje-idp-overlay.dts b/qcom/khaje-idp-overlay.dts index dea903c5..cf0ca2ac 100644 --- a/qcom/khaje-idp-overlay.dts +++ b/qcom/khaje-idp-overlay.dts @@ -8,7 +8,7 @@ / { model = "Qualcomm Technologies, Inc. Khaje IDP"; compatible = "qcom,khaje-idp", "qcom,khaje", "qcom,idp"; - qcom,msm-id = <518 0x10000>; + qcom,msm-id = <518 0x10000>, <586 0x10000>; qcom,board-id = <0x10022 0>; qcom,pmic-id = <0x2D 0x2E 0x0 0x0>; }; diff --git a/qcom/khaje-idp-pm8010-overlay.dts b/qcom/khaje-idp-pm8010-overlay.dts index 6031d889..6679cb50 100644 --- a/qcom/khaje-idp-pm8010-overlay.dts +++ b/qcom/khaje-idp-pm8010-overlay.dts @@ -8,7 +8,7 @@ / { model = "Qualcomm Technologies, Inc. Khaje IDP with PM8010"; compatible = "qcom,khaje-idp", "qcom,khaje", "qcom,idp"; - qcom,msm-id = <518 0x10000>; + qcom,msm-id = <518 0x10000>, <586 0x10000>; qcom,board-id = <0x10222 0>; qcom,pmic-id = <0x2D 0x2E 0x0 0x0>; }; diff --git a/qcom/khaje-idp-usbc-overlay.dts b/qcom/khaje-idp-usbc-overlay.dts index 4993cdae..cc179681 100644 --- a/qcom/khaje-idp-usbc-overlay.dts +++ b/qcom/khaje-idp-usbc-overlay.dts @@ -9,7 +9,7 @@ / { model = "Qualcomm Technologies, Inc. KHAJE IDP USBC Audio"; compatible = "qcom,khaje-idp", "qcom,khaje", "qcom,idp"; - qcom,msm-id = <518 0x10000>; + qcom,msm-id = <518 0x10000>, <586 0x10000>; qcom,board-id = <0x1010022 0>; qcom,pmic-id = <0x2D 0x2E 0x0 0x0>; }; diff --git a/qcom/khaje-idp-usbc.dts b/qcom/khaje-idp-usbc.dts index 7a62a6d1..76acc9f6 100644 --- a/qcom/khaje-idp-usbc.dts +++ b/qcom/khaje-idp-usbc.dts @@ -8,7 +8,7 @@ / { model = "Qualcomm Technologies, Inc. KHAJE IDP USBC Audio"; compatible = "qcom,khaje-idp", "qcom,khaje", "qcom,idp"; - qcom,msm-id = <518 0x10000>; + qcom,msm-id = <518 0x10000>, <586 0x10000>; qcom,board-id = <0x1010022 0>; qcom,pmic-id = <0x2D 0x2E 0x0 0x0>; }; diff --git a/qcom/khaje-idps-display-90hz-overlay.dts b/qcom/khaje-idps-display-90hz-overlay.dts index 02711ed2..d1015486 100644 --- a/qcom/khaje-idps-display-90hz-overlay.dts +++ b/qcom/khaje-idps-display-90hz-overlay.dts @@ -9,7 +9,7 @@ / { model = "Qualcomm Technologies, Inc. KHAJE IDPS + 90Hz"; compatible = "qcom,khaje-idp", "qcom,khaje", "qcom,idp"; - qcom,msm-id = <518 0x10000>; + qcom,msm-id = <518 0x10000>, <586 0x10000>; qcom,board-id = <0x10122 0>; qcom,pmic-id = <0x2D 0x2E 0x0 0x0>; }; diff --git a/qcom/khaje-qrd-hvdcp3p5-overlay.dts b/qcom/khaje-qrd-hvdcp3p5-overlay.dts index a5fb87eb..04a8ea9b 100644 --- a/qcom/khaje-qrd-hvdcp3p5-overlay.dts +++ b/qcom/khaje-qrd-hvdcp3p5-overlay.dts @@ -9,7 +9,7 @@ / { model = "Qualcomm Technologies, Inc. Khaje QRD HVDCP3P5"; compatible = "qcom,khaje-qrd", "qcom,khaje", "qcom,qrd"; - qcom,msm-id = <518 0x10000>; + qcom,msm-id = <518 0x10000>, <586 0x10000>; qcom,board-id = <0x1010B 0>; qcom,pmic-id = <0x2D 0x2E 0x0 0x0>; }; diff --git a/qcom/khaje-qrd-nopmi-overlay.dts b/qcom/khaje-qrd-nopmi-overlay.dts index eab93663..865b1a68 100644 --- a/qcom/khaje-qrd-nopmi-overlay.dts +++ b/qcom/khaje-qrd-nopmi-overlay.dts @@ -7,7 +7,7 @@ / { model = "Qualcomm Technologies, Inc. KHAJE QRD nopmi overlay"; compatible = "qcom,khaje-qrd", "qcom,khaje", "qcom,qrd"; - qcom,msm-id = <518 0x10000>; + qcom,msm-id = <518 0x10000>, <586 0x10000>; qcom,board-id = <0x1000B 0>; qcom,pmic-id = <0x2D 0x0 0x0 0x0>; }; diff --git a/qcom/khaje-qrd-nowcd9375-overlay.dts b/qcom/khaje-qrd-nowcd9375-overlay.dts index 17dcc66b..57ca7d87 100644 --- a/qcom/khaje-qrd-nowcd9375-overlay.dts +++ b/qcom/khaje-qrd-nowcd9375-overlay.dts @@ -9,7 +9,7 @@ / { model = "Qualcomm Technologies, Inc. Khaje QRD NOWCD9375"; compatible = "qcom,khaje-qrd", "qcom,khaje", "qcom,qrd"; - qcom,msm-id = <518 0x10000>; + qcom,msm-id = <518 0x10000>, <586 0x10000>; qcom,board-id = <0x2010B 0>; qcom,pmic-id = <0x2D 0x2E 0x0 0x0>; }; diff --git a/qcom/khaje-qrd-overlay.dts b/qcom/khaje-qrd-overlay.dts index 7c8960f3..dcef4a89 100644 --- a/qcom/khaje-qrd-overlay.dts +++ b/qcom/khaje-qrd-overlay.dts @@ -8,7 +8,7 @@ / { model = "Qualcomm Technologies, Inc. Khaje QRD"; compatible = "qcom,khaje-qrd", "qcom,khaje", "qcom,qrd"; - qcom,msm-id = <518 0x10000>; + qcom,msm-id = <518 0x10000>, <586 0x10000>; qcom,board-id = <0x1000B 0>; qcom,pmic-id = <0x2D 0x2E 0x0 0x0>; }; diff --git a/qcom/khaje.dtsi b/qcom/khaje.dtsi index 04796e4e..1fb5577a 100644 --- a/qcom/khaje.dtsi +++ b/qcom/khaje.dtsi @@ -21,7 +21,7 @@ / { model = "Qualcomm Technologies, Inc. Khaje SoC"; compatible = "qcom,khaje"; - qcom,msm-id = <518 0x10000>; + qcom,msm-id = <518 0x10000>, <586 0x10000>; interrupt-parent = <&wakegic>; #address-cells = <2>; @@ -1957,6 +1957,7 @@ qcom,chd_silver { compatible = "qcom,core-hang-detect"; label = "silver"; + cluster-id = <0>; qcom,threshold-arr = <0x0f1880b0 0x0f1980b0 0x0f1a80b0 0x0f1b80b0>; qcom,config-arr = <0x0f1880b8 0x0f1980b8 @@ -1966,6 +1967,7 @@ qcom,chd_gold { compatible = "qcom,core-hang-detect"; label = "gold"; + cluster-id = <1>; qcom,threshold-arr = <0x0f0880b0 0x0f0980b0 0x0f0a80b0 0x0f0b80b0>; qcom,config-arr = <0x0f0880b8 0x0f0980b8 diff --git a/qcom/kona-7230-iot-rb5.dtsi b/qcom/kona-7230-iot-rb5.dtsi index 2244bea1..64b5c89a 100644 --- a/qcom/kona-7230-iot-rb5.dtsi +++ b/qcom/kona-7230-iot-rb5.dtsi @@ -17,14 +17,35 @@ status = "disabled"; }; +&cont_splash_memory { + status = "disabled"; +}; + +&disp_rdump_memory { + status = "disabled"; +}; + &sde_dp { label = "primary"; /delete-property/ qcom,max-hdisplay; /delete-property/ qcom,max-vdisplay; /delete-property/ qcom,max-pclk-frequency-khz; + qcom,no_tps4_support; }; &mdss_mdp { /delete-property/ connectors; connectors = <&sde_dp &sde_rscc>; }; + +&usb1 { + status = "disabled"; +}; + +&usb_qmp_phy { + status = "disabled"; +}; + +&usb2_phy1 { + status = "disabled"; +}; |