Skip to content

Commit d75eecc

Browse files
arndbarndb
committed
Merge tag 'qcom-arm64-fixes-for-6.3-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes
A few more Qualcomm ARM64 DeviceTree fixes for 6.3 The GPIO polarity of the WSA881x shutdown GPIO was inconsistent and had to be corrected in the driver, this fixes the polarity in the DeviceTree for QRB5165 RB5, SM8250 MTP, Samsung Galaxy Book 2 and Lenovo Yoga C630. The recent rearrangement of nodes among the IPQ8074 accidentally enabled the PCIe PHYs, rather than the PCIe controllers. This is being corrected, to restore PCIe functionality. PMK8280 PON node has the wrong compatible, which recently caused the driver to stop probing. This is corrected and the required "pbs" region is added. With support for HBR3 introduced, it's noted that SC7280 Herobrine devices are having trouble running at this rate. This drops the claim that it's supported, until further analysis can be done. * tag 'qcom-arm64-fixes-for-6.3-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: arm64: dts: qcom: sc7280: remove hbr3 support on herobrine boards arm64: dts: qcom: sc8280xp-pmics: fix pon compatible and registers arm64: dts: qcom: ipq8074-hk10: enable QMP device, not the PHY node arm64: dts: qcom: ipq8074-hk01: enable QMP device, not the PHY node arm64: dts: qcom: qrb5165-rb5: Use proper WSA881x shutdown GPIO polarity arm64: dts: qcom: sm8250-mtp: Use proper WSA881x shutdown GPIO polarity arm64: dts: qcom: sdm850-samsung-w737: Use proper WSA881x shutdown GPIO polarity arm64: dts: qcom: sdm850-lenovo-yoga-c630: Use proper WSA881x shutdown GPIO polarity Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 4395055 + 75eab74 commit d75eecc

File tree

8 files changed

+16
-15
lines changed

8 files changed

+16
-15
lines changed

‎arch/arm64/boot/dts/qcom/ipq8074-hk01.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@
6262
perst-gpios = <&tlmm 58 GPIO_ACTIVE_LOW>;
6363
};
6464

65-
&pcie_phy0 {
65+
&pcie_qmp0 {
6666
status = "okay";
6767
};
6868

69-
&pcie_phy1 {
69+
&pcie_qmp1 {
7070
status = "okay";
7171
};
7272

‎arch/arm64/boot/dts/qcom/ipq8074-hk10.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@
4848
perst-gpios = <&tlmm 61 GPIO_ACTIVE_LOW>;
4949
};
5050

51-
&pcie_phy0 {
51+
&pcie_qmp0 {
5252
status = "okay";
5353
};
5454

55-
&pcie_phy1 {
55+
&pcie_qmp1 {
5656
status = "okay";
5757
};
5858

‎arch/arm64/boot/dts/qcom/qrb5165-rb5.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1012,7 +1012,7 @@
10121012
left_spkr: speaker@0,3 {
10131013
compatible = "sdw10217211000";
10141014
reg = <0 3>;
1015-
powerdown-gpios = <&tlmm 130 GPIO_ACTIVE_HIGH>;
1015+
powerdown-gpios = <&tlmm 130 GPIO_ACTIVE_LOW>;
10161016
#thermal-sensor-cells = <0>;
10171017
sound-name-prefix = "SpkrLeft";
10181018
#sound-dai-cells = <0>;
@@ -1021,7 +1021,7 @@
10211021
right_spkr: speaker@0,4 {
10221022
compatible = "sdw10217211000";
10231023
reg = <0 4>;
1024-
powerdown-gpios = <&tlmm 130 GPIO_ACTIVE_HIGH>;
1024+
powerdown-gpios = <&tlmm 130 GPIO_ACTIVE_LOW>;
10251025
#thermal-sensor-cells = <0>;
10261026
sound-name-prefix = "SpkrRight";
10271027
#sound-dai-cells = <0>;

‎arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ ap_i2c_tpm: &i2c14 {
464464

465465
&mdss_dp_out {
466466
data-lanes = <0 1>;
467-
link-frequencies = /bits/ 64 <1620000000 2700000000 5400000000 8100000000>;
467+
link-frequencies = /bits/ 64 <1620000000 2700000000 5400000000>;
468468
};
469469

470470
&mdss_mdp {

‎arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,9 @@
5959
#size-cells = <0>;
6060

6161
pmk8280_pon: pon@1300 {
62-
compatible = "qcom,pm8998-pon";
63-
reg = <0x1300>;
62+
compatible = "qcom,pmk8350-pon";
63+
reg = <0x1300>, <0x800>;
64+
reg-names = "hlos", "pbs";
6465

6566
pmk8280_pon_pwrkey: pwrkey {
6667
compatible = "qcom,pmk8350-pwrkey";

‎arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -753,15 +753,15 @@
753753
left_spkr: speaker@0,3 {
754754
compatible = "sdw10217211000";
755755
reg = <0 3>;
756-
powerdown-gpios = <&wcdgpio 1 GPIO_ACTIVE_HIGH>;
756+
powerdown-gpios = <&wcdgpio 1 GPIO_ACTIVE_LOW>;
757757
#thermal-sensor-cells = <0>;
758758
sound-name-prefix = "SpkrLeft";
759759
#sound-dai-cells = <0>;
760760
};
761761

762762
right_spkr: speaker@0,4 {
763763
compatible = "sdw10217211000";
764-
powerdown-gpios = <&wcdgpio 2 GPIO_ACTIVE_HIGH>;
764+
powerdown-gpios = <&wcdgpio 2 GPIO_ACTIVE_LOW>;
765765
reg = <0 4>;
766766
#thermal-sensor-cells = <0>;
767767
sound-name-prefix = "SpkrRight";

‎arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -662,15 +662,15 @@
662662
left_spkr: speaker@0,3 {
663663
compatible = "sdw10217211000";
664664
reg = <0 3>;
665-
powerdown-gpios = <&wcdgpio 1 GPIO_ACTIVE_HIGH>;
665+
powerdown-gpios = <&wcdgpio 1 GPIO_ACTIVE_LOW>;
666666
#thermal-sensor-cells = <0>;
667667
sound-name-prefix = "SpkrLeft";
668668
#sound-dai-cells = <0>;
669669
};
670670

671671
right_spkr: speaker@0,4 {
672672
compatible = "sdw10217211000";
673-
powerdown-gpios = <&wcdgpio 2 GPIO_ACTIVE_HIGH>;
673+
powerdown-gpios = <&wcdgpio 2 GPIO_ACTIVE_LOW>;
674674
reg = <0 4>;
675675
#thermal-sensor-cells = <0>;
676676
sound-name-prefix = "SpkrRight";

‎arch/arm64/boot/dts/qcom/sm8250-mtp.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -764,7 +764,7 @@
764764
left_spkr: speaker@0,3 {
765765
compatible = "sdw10217211000";
766766
reg = <0 3>;
767-
powerdown-gpios = <&tlmm 26 GPIO_ACTIVE_HIGH>;
767+
powerdown-gpios = <&tlmm 26 GPIO_ACTIVE_LOW>;
768768
#thermal-sensor-cells = <0>;
769769
sound-name-prefix = "SpkrLeft";
770770
#sound-dai-cells = <0>;
@@ -773,7 +773,7 @@
773773
right_spkr: speaker@0,4 {
774774
compatible = "sdw10217211000";
775775
reg = <0 4>;
776-
powerdown-gpios = <&tlmm 127 GPIO_ACTIVE_HIGH>;
776+
powerdown-gpios = <&tlmm 127 GPIO_ACTIVE_LOW>;
777777
#thermal-sensor-cells = <0>;
778778
sound-name-prefix = "SpkrRight";
779779
#sound-dai-cells = <0>;

0 commit comments

Comments
 (0)