Skip to content

Commit b986e98

Browse files
arndbarndb
committed
Merge tag 'qcom-arm64-fixes-for-7.0-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes
More Qualcomm Arm64 DeviceTree fixes for v7.0 The shuffling of reset and wake GPIO properties across various Hamoa devices left things in an incomplete state, fix this. Add the missing "ranges" property to the QCM2290 MDSS DeviceTree binding example, to fix the validation warning that was introduced by the previous fix. * tag 'qcom-arm64-fixes-for-7.0-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: arm64: dts: qcom: hamoa: Fix incomplete Root Port property migration dt-bindings: display/msm: qcm2290-mdss: Fix missing ranges in example arm64: dts: qcom: agatti: Fix IOMMU DT properties dt-bindings: media: venus: Fix iommus property dt-bindings: display: msm: qcm2290-mdss: Fix iommus property arm64: dts: qcom: monaco: Reserve full Gunyah metadata region arm64: dts: qcom: monaco: Fix UART10 pinconf arm64: dts: qcom: qcm6490-idp: Fix WCD9370 reset GPIO polarity arm64: dts: qcom: hamoa/x1: fix idle exit latency Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 14edf33 + 11b72b1 commit b986e98

14 files changed

Lines changed: 81 additions & 66 deletions

‎Documentation/devicetree/bindings/display/msm/qcom,qcm2290-mdss.yaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ properties:
3333
- const: core
3434

3535
iommus:
36-
maxItems: 2
36+
maxItems: 1
3737

3838
interconnects:
3939
items:
@@ -107,8 +107,7 @@ examples:
107107
interconnect-names = "mdp0-mem",
108108
"cpu-cfg";
109109
110-
iommus = <&apps_smmu 0x420 0x2>,
111-
<&apps_smmu 0x421 0x0>;
110+
iommus = <&apps_smmu 0x420 0x2>;
112111
ranges;
113112
114113
display-controller@5e01000 {

‎Documentation/devicetree/bindings/media/qcom,qcm2290-venus.yaml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ properties:
4242
- const: vcodec0_bus
4343

4444
iommus:
45-
maxItems: 5
45+
maxItems: 2
4646

4747
interconnects:
4848
maxItems: 2
@@ -102,10 +102,7 @@ examples:
102102
memory-region = <&pil_video_mem>;
103103
104104
iommus = <&apps_smmu 0x860 0x0>,
105-
<&apps_smmu 0x880 0x0>,
106-
<&apps_smmu 0x861 0x04>,
107-
<&apps_smmu 0x863 0x0>,
108-
<&apps_smmu 0x804 0xe0>;
105+
<&apps_smmu 0x880 0x0>;
109106
110107
interconnects = <&mmnrt_virt MASTER_VIDEO_P0 RPM_ALWAYS_TAG
111108
&bimc SLAVE_EBI1 RPM_ALWAYS_TAG>,

‎arch/arm64/boot/dts/qcom/agatti.dtsi‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1669,8 +1669,7 @@
16691669
&bimc SLAVE_EBI1 RPM_ALWAYS_TAG>;
16701670
interconnect-names = "gfx-mem";
16711671

1672-
iommus = <&adreno_smmu 0 1>,
1673-
<&adreno_smmu 2 0>;
1672+
iommus = <&adreno_smmu 0 1>;
16741673
operating-points-v2 = <&gpu_opp_table>;
16751674
power-domains = <&rpmpd QCM2290_VDDCX>;
16761675
qcom,gmu = <&gmu_wrapper>;
@@ -1951,8 +1950,7 @@
19511950

19521951
power-domains = <&dispcc MDSS_GDSC>;
19531952

1954-
iommus = <&apps_smmu 0x420 0x2>,
1955-
<&apps_smmu 0x421 0x0>;
1953+
iommus = <&apps_smmu 0x420 0x2>;
19561954
interconnects = <&mmrt_virt MASTER_MDP0 RPM_ALWAYS_TAG
19571955
&bimc SLAVE_EBI1 RPM_ALWAYS_TAG>,
19581956
<&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG
@@ -2436,10 +2434,7 @@
24362434

24372435
memory-region = <&pil_video_mem>;
24382436
iommus = <&apps_smmu 0x860 0x0>,
2439-
<&apps_smmu 0x880 0x0>,
2440-
<&apps_smmu 0x861 0x04>,
2441-
<&apps_smmu 0x863 0x0>,
2442-
<&apps_smmu 0x804 0xe0>;
2437+
<&apps_smmu 0x880 0x0>;
24432438

24442439
interconnects = <&mmnrt_virt MASTER_VIDEO_P0 RPM_ALWAYS_TAG
24452440
&bimc SLAVE_EBI1 RPM_ALWAYS_TAG>,

‎arch/arm64/boot/dts/qcom/hamoa.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@
269269
idle-state-name = "ret";
270270
arm,psci-suspend-param = <0x00000004>;
271271
entry-latency-us = <180>;
272-
exit-latency-us = <500>;
272+
exit-latency-us = <320>;
273273
min-residency-us = <600>;
274274
};
275275
};

‎arch/arm64/boot/dts/qcom/monaco.dtsi‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -765,6 +765,11 @@
765765
hwlocks = <&tcsr_mutex 3>;
766766
};
767767

768+
gunyah_md_mem: gunyah-md-region@91a80000 {
769+
reg = <0x0 0x91a80000 0x0 0x80000>;
770+
no-map;
771+
};
772+
768773
lpass_machine_learning_mem: lpass-machine-learning-region@93b00000 {
769774
reg = <0x0 0x93b00000 0x0 0xf00000>;
770775
no-map;
@@ -6414,12 +6419,12 @@
64146419
};
64156420

64166421
qup_uart10_rts: qup-uart10-rts-state {
6417-
pins = "gpio84";
6422+
pins = "gpio85";
64186423
function = "qup1_se2";
64196424
};
64206425

64216426
qup_uart10_tx: qup-uart10-tx-state {
6422-
pins = "gpio85";
6427+
pins = "gpio86";
64236428
function = "qup1_se2";
64246429
};
64256430

‎arch/arm64/boot/dts/qcom/qcm6490-idp.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177
pinctrl-0 = <&wcd_default>;
178178
pinctrl-names = "default";
179179

180-
reset-gpios = <&tlmm 83 GPIO_ACTIVE_HIGH>;
180+
reset-gpios = <&tlmm 83 GPIO_ACTIVE_LOW>;
181181

182182
vdd-buck-supply = <&vreg_l17b_1p7>;
183183
vdd-rxtx-supply = <&vreg_l18b_1p8>;

‎arch/arm64/boot/dts/qcom/x1-asus-zenbook-a14.dtsi‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1032,9 +1032,6 @@
10321032
};
10331033

10341034
&pcie4 {
1035-
perst-gpios = <&tlmm 146 GPIO_ACTIVE_LOW>;
1036-
wake-gpios = <&tlmm 148 GPIO_ACTIVE_LOW>;
1037-
10381035
pinctrl-0 = <&pcie4_default>;
10391036
pinctrl-names = "default";
10401037

@@ -1048,10 +1045,12 @@
10481045
status = "okay";
10491046
};
10501047

1051-
&pcie6a {
1052-
perst-gpios = <&tlmm 152 GPIO_ACTIVE_LOW>;
1053-
wake-gpios = <&tlmm 154 GPIO_ACTIVE_LOW>;
1048+
&pcie4_port0 {
1049+
reset-gpios = <&tlmm 146 GPIO_ACTIVE_LOW>;
1050+
wake-gpios = <&tlmm 148 GPIO_ACTIVE_LOW>;
1051+
};
10541052

1053+
&pcie6a {
10551054
vddpe-3v3-supply = <&vreg_nvme>;
10561055

10571056
pinctrl-0 = <&pcie6a_default>;
@@ -1067,6 +1066,11 @@
10671066
status = "okay";
10681067
};
10691068

1069+
&pcie6a_port0 {
1070+
reset-gpios = <&tlmm 152 GPIO_ACTIVE_LOW>;
1071+
wake-gpios = <&tlmm 154 GPIO_ACTIVE_LOW>;
1072+
};
1073+
10701074
&pm8550_gpios {
10711075
rtmr0_default: rtmr0-reset-n-active-state {
10721076
pins = "gpio10";

‎arch/arm64/boot/dts/qcom/x1-crd.dtsi‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1216,15 +1216,17 @@
12161216
};
12171217

12181218
&pcie4 {
1219-
perst-gpios = <&tlmm 146 GPIO_ACTIVE_LOW>;
1220-
wake-gpios = <&tlmm 148 GPIO_ACTIVE_LOW>;
1221-
12221219
pinctrl-0 = <&pcie4_default>;
12231220
pinctrl-names = "default";
12241221

12251222
status = "okay";
12261223
};
12271224

1225+
&pcie4_port0 {
1226+
reset-gpios = <&tlmm 146 GPIO_ACTIVE_LOW>;
1227+
wake-gpios = <&tlmm 148 GPIO_ACTIVE_LOW>;
1228+
};
1229+
12281230
&pcie4_phy {
12291231
vdda-phy-supply = <&vreg_l3i_0p8>;
12301232
vdda-pll-supply = <&vreg_l3e_1p2>;
@@ -1233,9 +1235,6 @@
12331235
};
12341236

12351237
&pcie5 {
1236-
perst-gpios = <&tlmm 149 GPIO_ACTIVE_LOW>;
1237-
wake-gpios = <&tlmm 151 GPIO_ACTIVE_LOW>;
1238-
12391238
vddpe-3v3-supply = <&vreg_wwan>;
12401239

12411240
pinctrl-0 = <&pcie5_default>;
@@ -1251,10 +1250,12 @@
12511250
status = "okay";
12521251
};
12531252

1254-
&pcie6a {
1255-
perst-gpios = <&tlmm 152 GPIO_ACTIVE_LOW>;
1256-
wake-gpios = <&tlmm 154 GPIO_ACTIVE_LOW>;
1253+
&pcie5_port0 {
1254+
reset-gpios = <&tlmm 149 GPIO_ACTIVE_LOW>;
1255+
wake-gpios = <&tlmm 151 GPIO_ACTIVE_LOW>;
1256+
};
12571257

1258+
&pcie6a {
12581259
vddpe-3v3-supply = <&vreg_nvme>;
12591260

12601261
pinctrl-names = "default";
@@ -1270,6 +1271,11 @@
12701271
status = "okay";
12711272
};
12721273

1274+
&pcie6a_port0 {
1275+
reset-gpios = <&tlmm 152 GPIO_ACTIVE_LOW>;
1276+
wake-gpios = <&tlmm 154 GPIO_ACTIVE_LOW>;
1277+
};
1278+
12731279
&pm8550_gpios {
12741280
kypd_vol_up_n: kypd-vol-up-n-state {
12751281
pins = "gpio6";

‎arch/arm64/boot/dts/qcom/x1-dell-thena.dtsi‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1081,9 +1081,6 @@
10811081
};
10821082

10831083
&pcie4 {
1084-
perst-gpios = <&tlmm 146 GPIO_ACTIVE_LOW>;
1085-
wake-gpios = <&tlmm 148 GPIO_ACTIVE_LOW>;
1086-
10871084
pinctrl-0 = <&pcie4_default>;
10881085
pinctrl-names = "default";
10891086

@@ -1098,6 +1095,9 @@
10981095
};
10991096

11001097
&pcie4_port0 {
1098+
reset-gpios = <&tlmm 146 GPIO_ACTIVE_LOW>;
1099+
wake-gpios = <&tlmm 148 GPIO_ACTIVE_LOW>;
1100+
11011101
wifi@0 {
11021102
compatible = "pci17cb,1107";
11031103
reg = <0x10000 0x0 0x0 0x0 0x0>;
@@ -1115,9 +1115,6 @@
11151115
};
11161116

11171117
&pcie6a {
1118-
perst-gpios = <&tlmm 152 GPIO_ACTIVE_LOW>;
1119-
wake-gpios = <&tlmm 154 GPIO_ACTIVE_LOW>;
1120-
11211118
vddpe-3v3-supply = <&vreg_nvme>;
11221119

11231120
pinctrl-0 = <&pcie6a_default>;
@@ -1126,6 +1123,11 @@
11261123
status = "okay";
11271124
};
11281125

1126+
&pcie6a_port0 {
1127+
reset-gpios = <&tlmm 152 GPIO_ACTIVE_LOW>;
1128+
wake-gpios = <&tlmm 154 GPIO_ACTIVE_LOW>;
1129+
};
1130+
11291131
&pcie6a_phy {
11301132
vdda-phy-supply = <&vreg_l1d_0p8>;
11311133
vdda-pll-supply = <&vreg_l2j_1p2>;

‎arch/arm64/boot/dts/qcom/x1-hp-omnibook-x14.dtsi‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,9 +1065,6 @@
10651065
};
10661066

10671067
&pcie4 {
1068-
perst-gpios = <&tlmm 146 GPIO_ACTIVE_LOW>;
1069-
wake-gpios = <&tlmm 148 GPIO_ACTIVE_LOW>;
1070-
10711068
pinctrl-0 = <&pcie4_default>;
10721069
pinctrl-names = "default";
10731070

@@ -1082,6 +1079,9 @@
10821079
};
10831080

10841081
&pcie4_port0 {
1082+
reset-gpios = <&tlmm 146 GPIO_ACTIVE_LOW>;
1083+
wake-gpios = <&tlmm 148 GPIO_ACTIVE_LOW>;
1084+
10851085
wifi@0 {
10861086
compatible = "pci17cb,1107";
10871087
reg = <0x10000 0x0 0x0 0x0 0x0>;
@@ -1099,9 +1099,6 @@
10991099
};
11001100

11011101
&pcie6a {
1102-
perst-gpios = <&tlmm 152 GPIO_ACTIVE_LOW>;
1103-
wake-gpios = <&tlmm 154 GPIO_ACTIVE_LOW>;
1104-
11051102
vddpe-3v3-supply = <&vreg_nvme>;
11061103

11071104
pinctrl-0 = <&pcie6a_default>;
@@ -1110,6 +1107,11 @@
11101107
status = "okay";
11111108
};
11121109

1110+
&pcie6a_port0 {
1111+
reset-gpios = <&tlmm 152 GPIO_ACTIVE_LOW>;
1112+
wake-gpios = <&tlmm 154 GPIO_ACTIVE_LOW>;
1113+
};
1114+
11131115
&pcie6a_phy {
11141116
vdda-phy-supply = <&vreg_l1d_0p8>;
11151117
vdda-pll-supply = <&vreg_l2j_1p2>;

0 commit comments

Comments
 (0)