Unverified Commit 14e9d449 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'qcom-arm64-fixes-for-6.9' of... 

Merge tag 'qcom-arm64-fixes-for-6.9' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into for-next

Qualcomm Arm64 DeviceTree fixes for v6.9

This corrects the watchdog IRQ flags for a number of remoteproc
instances, which otherwise prevents the driver from probe in the face of
a probe deferral.

Improvements in other areas, such as USB, have made it possible for CX
rail voltage on SC8280XP to be lowered, no longer meeting requirements
of active PCIe controllers. Necessary votes are added to these
controllers.

The MSI definitions for PCIe controllers in SM8450, SM8550, and SM8650
was incorrect, due to a bug in the driver. As this has now been fixed
the definition needs to be corrected.

Lastly, the SuperSpeed PHY irq of the second USB controller in SC8180x,
and the compatible string for X1 Elite domain idle states are corrected.

* tag 'qcom-arm64-fixes-for-6.9' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  arm64: dts: qcom: sc8180x: Fix ss_phy_irq for secondary USB controller
  arm64: dts: qcom: sm8650: Fix the msi-map entries
  arm64: dts: qcom: sm8550: Fix the msi-map entries
  arm64: dts: qcom: sm8450: Fix the msi-map entries
  arm64: dts: qcom: sc8280xp: add missing PCIe minimum OPP
  arm64: dts: qcom: x1e80100: Fix the compatible for cluster idle states
  arm64: dts: qcom: Fix type of "wdog" IRQs for remoteprocs

Link: https://lore.kernel.org/r/20240420161002.1132240-1-andersson@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 32a1eaa9 ecda8309

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

+2 −2
Original line number Diff line number Diff line
@@ -3707,7 +3707,7 @@ remoteproc_adsp: remoteproc@3700000 { 
			compatible = "qcom,sc7280-adsp-pas";

			reg = <0 0x03700000 0 0x100>;



			interrupts-extended = <&pdc 6 IRQ_TYPE_LEVEL_HIGH>,

			interrupts-extended = <&pdc 6 IRQ_TYPE_EDGE_RISING>,

					      <&adsp_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,

					      <&adsp_smp2p_in 1 IRQ_TYPE_EDGE_RISING>,

					      <&adsp_smp2p_in 2 IRQ_TYPE_EDGE_RISING>,
@@ -3944,7 +3944,7 @@ remoteproc_cdsp: remoteproc@a300000 { 
			compatible = "qcom,sc7280-cdsp-pas";

			reg = <0 0x0a300000 0 0x10000>;



			interrupts-extended = <&intc GIC_SPI 578 IRQ_TYPE_LEVEL_HIGH>,

			interrupts-extended = <&intc GIC_SPI 578 IRQ_TYPE_EDGE_RISING>,

					      <&cdsp_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,

					      <&cdsp_smp2p_in 1 IRQ_TYPE_EDGE_RISING>,

					      <&cdsp_smp2p_in 2 IRQ_TYPE_EDGE_RISING>,

arch/arm64/boot/dts/qcom/sc8180x.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -2701,7 +2701,7 @@ usb_sec: usb@a8f8800 { 
			resets = <&gcc GCC_USB30_SEC_BCR>;

			power-domains = <&gcc USB30_SEC_GDSC>;

			interrupts-extended = <&intc GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>,

					      <&pdc 7 IRQ_TYPE_LEVEL_HIGH>,

					      <&pdc 40 IRQ_TYPE_LEVEL_HIGH>,

					      <&pdc 10 IRQ_TYPE_EDGE_BOTH>,

					      <&pdc 11 IRQ_TYPE_EDGE_BOTH>;

			interrupt-names = "hs_phy_irq", "ss_phy_irq",

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

+8 −3
Original line number Diff line number Diff line
@@ -1774,6 +1774,7 @@ pcie4: pcie@1c00000 { 
			reset-names = "pci";



			power-domains = <&gcc PCIE_4_GDSC>;

			required-opps = <&rpmhpd_opp_nom>;



			phys = <&pcie4_phy>;

			phy-names = "pciephy";
@@ -1872,6 +1873,7 @@ pcie3b: pcie@1c08000 { 
			reset-names = "pci";



			power-domains = <&gcc PCIE_3B_GDSC>;

			required-opps = <&rpmhpd_opp_nom>;



			phys = <&pcie3b_phy>;

			phy-names = "pciephy";
@@ -1970,6 +1972,7 @@ pcie3a: pcie@1c10000 { 
			reset-names = "pci";



			power-domains = <&gcc PCIE_3A_GDSC>;

			required-opps = <&rpmhpd_opp_nom>;



			phys = <&pcie3a_phy>;

			phy-names = "pciephy";
@@ -2071,6 +2074,7 @@ pcie2b: pcie@1c18000 { 
			reset-names = "pci";



			power-domains = <&gcc PCIE_2B_GDSC>;

			required-opps = <&rpmhpd_opp_nom>;



			phys = <&pcie2b_phy>;

			phy-names = "pciephy";
@@ -2169,6 +2173,7 @@ pcie2a: pcie@1c20000 { 
			reset-names = "pci";



			power-domains = <&gcc PCIE_2A_GDSC>;

			required-opps = <&rpmhpd_opp_nom>;



			phys = <&pcie2a_phy>;

			phy-names = "pciephy";
@@ -2641,7 +2646,7 @@ remoteproc_adsp: remoteproc@3000000 { 
			compatible = "qcom,sc8280xp-adsp-pas";

			reg = <0 0x03000000 0 0x100>;



			interrupts-extended = <&intc GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>,

			interrupts-extended = <&intc GIC_SPI 162 IRQ_TYPE_EDGE_RISING>,

					      <&smp2p_adsp_in 0 IRQ_TYPE_EDGE_RISING>,

					      <&smp2p_adsp_in 1 IRQ_TYPE_EDGE_RISING>,

					      <&smp2p_adsp_in 2 IRQ_TYPE_EDGE_RISING>,
@@ -4977,7 +4982,7 @@ remoteproc_nsp0: remoteproc@1b300000 { 
			compatible = "qcom,sc8280xp-nsp0-pas";

			reg = <0 0x1b300000 0 0x100>;



			interrupts-extended = <&intc GIC_SPI 578 IRQ_TYPE_LEVEL_HIGH>,

			interrupts-extended = <&intc GIC_SPI 578 IRQ_TYPE_EDGE_RISING>,

					      <&smp2p_nsp0_in 0 IRQ_TYPE_EDGE_RISING>,

					      <&smp2p_nsp0_in 1 IRQ_TYPE_EDGE_RISING>,

					      <&smp2p_nsp0_in 2 IRQ_TYPE_EDGE_RISING>,
@@ -5108,7 +5113,7 @@ remoteproc_nsp1: remoteproc@21300000 { 
			compatible = "qcom,sc8280xp-nsp1-pas";

			reg = <0 0x21300000 0 0x100>;



			interrupts-extended = <&intc GIC_SPI 887 IRQ_TYPE_LEVEL_HIGH>,

			interrupts-extended = <&intc GIC_SPI 887 IRQ_TYPE_EDGE_RISING>,

					      <&smp2p_nsp1_in 0 IRQ_TYPE_EDGE_RISING>,

					      <&smp2p_nsp1_in 1 IRQ_TYPE_EDGE_RISING>,

					      <&smp2p_nsp1_in 2 IRQ_TYPE_EDGE_RISING>,

arch/arm64/boot/dts/qcom/sm6350.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -1252,7 +1252,7 @@ adsp: remoteproc@3000000 { 
			compatible = "qcom,sm6350-adsp-pas";

			reg = <0 0x03000000 0 0x100>;



			interrupts-extended = <&pdc 6 IRQ_TYPE_LEVEL_HIGH>,

			interrupts-extended = <&pdc 6 IRQ_TYPE_EDGE_RISING>,

					      <&smp2p_adsp_in 0 IRQ_TYPE_EDGE_RISING>,

					      <&smp2p_adsp_in 1 IRQ_TYPE_EDGE_RISING>,

					      <&smp2p_adsp_in 2 IRQ_TYPE_EDGE_RISING>,
@@ -1511,7 +1511,7 @@ cdsp: remoteproc@8300000 { 
			compatible = "qcom,sm6350-cdsp-pas";

			reg = <0 0x08300000 0 0x10000>;



			interrupts-extended = <&intc GIC_SPI 578 IRQ_TYPE_LEVEL_HIGH>,

			interrupts-extended = <&intc GIC_SPI 578 IRQ_TYPE_EDGE_RISING>,

					      <&smp2p_cdsp_in 0 IRQ_TYPE_EDGE_RISING>,

					      <&smp2p_cdsp_in 1 IRQ_TYPE_EDGE_RISING>,

					      <&smp2p_cdsp_in 2 IRQ_TYPE_EDGE_RISING>,

arch/arm64/boot/dts/qcom/sm6375.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -1561,7 +1561,7 @@ remoteproc_adsp: remoteproc@a400000 { 
			compatible = "qcom,sm6375-adsp-pas";

			reg = <0 0x0a400000 0 0x100>;



			interrupts-extended = <&intc GIC_SPI 282 IRQ_TYPE_LEVEL_HIGH>,

			interrupts-extended = <&intc GIC_SPI 282 IRQ_TYPE_EDGE_RISING>,

					      <&smp2p_adsp_in 0 IRQ_TYPE_EDGE_RISING>,

					      <&smp2p_adsp_in 1 IRQ_TYPE_EDGE_RISING>,

					      <&smp2p_adsp_in 2 IRQ_TYPE_EDGE_RISING>,