Unverified Commit d75eecc3 authored Apr 14, 2023 by Arnd Bergmann

Merge tag 'qcom-arm64-fixes-for-6.3-2' of...

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/20230410153850.4752-1-andersson@kernel.org

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents 43950556 75eab749

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -62,11 +62,11 @@
		perst-gpios = <&tlmm 58 GPIO_ACTIVE_LOW>;
		};

		&pcie_phy0 {
		&pcie_qmp0 {
		status = "okay";
		};

		&pcie_phy1 {
		&pcie_qmp1 {
		status = "okay";
		};

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -48,11 +48,11 @@
		perst-gpios = <&tlmm 61 GPIO_ACTIVE_LOW>;
		};

		&pcie_phy0 {
		&pcie_qmp0 {
		status = "okay";
		};

		&pcie_phy1 {
		&pcie_qmp1 {
		status = "okay";
		};

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -1012,7 +1012,7 @@
		left_spkr: speaker@0,3 {
		compatible = "sdw10217211000";
		reg = <0 3>;
		powerdown-gpios = <&tlmm 130 GPIO_ACTIVE_HIGH>;
		powerdown-gpios = <&tlmm 130 GPIO_ACTIVE_LOW>;
		#thermal-sensor-cells = <0>;
		sound-name-prefix = "SpkrLeft";
		#sound-dai-cells = <0>;
		@@ -1021,7 +1021,7 @@
		right_spkr: speaker@0,4 {
		compatible = "sdw10217211000";
		reg = <0 4>;
		powerdown-gpios = <&tlmm 130 GPIO_ACTIVE_HIGH>;
		powerdown-gpios = <&tlmm 130 GPIO_ACTIVE_LOW>;
		#thermal-sensor-cells = <0>;
		sound-name-prefix = "SpkrRight";
		#sound-dai-cells = <0>;

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -464,7 +464,7 @@ ap_i2c_tpm: &i2c14 {

		&mdss_dp_out {
		data-lanes = <0 1>;
		link-frequencies = /bits/ 64 <1620000000 2700000000 5400000000 8100000000>;
		link-frequencies = /bits/ 64 <1620000000 2700000000 5400000000>;
		};

		&mdss_mdp {

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -59,8 +59,9 @@
		#size-cells = <0>;

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

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