Unverified Commit 8158597f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'qcom-dts-for-6.4-2' of... 

Merge tag 'qcom-dts-for-6.4-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/dt

A few more Qualcomm ARM32 DeviceTree updates for v6.4

This adds IPA definition to the sdx65 platform, and brings a few
stylistic changes to sdx55 and sdx65.

Compatibles for the two new Qualcomm Robotics Platform boards, RB1 and
RB2, are defined, as is Xiaomi Mi A3 and the MI01.6 development baord on
IPQ5332. These are all ARM64 boards, despite being introduced through
the ARM32 pull request...

* tag 'qcom-dts-for-6.4-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  dt-bindings: arm: qcom: Document the Qualcomm qrb4210-rb2 board
  ARM: dts: qcom: sdx55-fn980: Move "status" property to the end of node
  ARM: dts: qcom: sdx55: Move reset and wake gpios to board dts
  dt-bindings: arm: qcom: document MI01.6 board based on IPQ5332 family
  dt-bindings: arm: qcom: Document xiaomi,laurel-sprout board
  dt-bindings: arm: qcom: Add QRB2210/QCM2290 and RB1 board
  ARM: dts: qcom: sdx65: move status properties to end of nodes
  ARM: dts: qcom: sdx65: add IPA information

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 0a25e385 4e859ef0

Documentation/devicetree/bindings/arm/qcom.yaml

+20 −0
Original line number Diff line number Diff line
@@ -47,7 +47,10 @@ description: | 
        msm8996

        msm8998

        qcs404

        qcm2290

        qdu1000

        qrb2210

        qrb4210

        qru1000

        sa8155p

        sa8540p
@@ -84,6 +87,7 @@ description: | 
        adp

        ap-al02-c7

        ap-mi01.2

        ap-mi01.6

        cdp

        cp01-c1

        dragonboard
@@ -94,6 +98,7 @@ description: | 
        liquid

        mtp

        qrd

        rb2

        ride

        sbc

        x100
@@ -328,6 +333,7 @@ properties: 
      - items:

          - enum:

              - qcom,ipq5332-ap-mi01.2

              - qcom,ipq5332-ap-mi01.6

          - const: qcom,ipq5332



      - items:
@@ -354,6 +360,13 @@ properties: 
          - const: swir,wp8548

          - const: qcom,mdm9615



      - description: Qualcomm Technologies, Inc. Robotics RB1

        items:

          - enum:

              - qcom,qrb2210-rb1

          - const: qcom,qrb2210

          - const: qcom,qcm2290



      - description: Qualcomm Technologies, Inc. Distributed Unit 1000 platform

        items:

          - enum:
@@ -863,6 +876,12 @@ properties: 
              - oneplus,billie2

          - const: qcom,sm4250



      - items:

          - enum:

              - qcom,qrb4210-rb2

          - const: qcom,qrb4210

          - const: qcom,sm4250



      - items:

          - enum:

              - lenovo,j606f
@@ -872,6 +891,7 @@ properties: 
      - items:

          - enum:

              - sony,pdx201

              - xiaomi,laurel-sprout

          - const: qcom,sm6125



      - items:

arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts

+12 −7
Original line number Diff line number Diff line
@@ -243,18 +243,21 @@ 
};



&pcie_phy {

	status = "okay";



	vdda-phy-supply = <&vreg_l1e_bb_1p2>;

	vdda-pll-supply = <&vreg_l4e_bb_0p875>;

};



&pcie_ep {

	status = "okay";

};



&pcie_ep {

	pinctrl-names = "default";

	pinctrl-0 = <&pcie_ep_clkreq_default &pcie_ep_perst_default

		     &pcie_ep_wake_default>;



	reset-gpios = <&tlmm 57 GPIO_ACTIVE_LOW>;

	wake-gpios = <&tlmm 53 GPIO_ACTIVE_LOW>;



	status = "okay";

};



&qpic_bam {
@@ -277,8 +280,8 @@ 
};



&remoteproc_mpss {

	status = "okay";

	memory-region = <&mpss_adsp_mem>;

	status = "okay";

};



&tlmm {
@@ -305,16 +308,18 @@ 
};



&usb_hsphy {

	status = "okay";

	vdda-pll-supply = <&vreg_l4e_bb_0p875>;

	vdda33-supply = <&vreg_l10e_3p1>;

	vdda18-supply = <&vreg_l5e_bb_1p7>;



	status = "okay";

};



&usb_qmpphy {

	status = "okay";

	vdda-phy-supply = <&vreg_l4e_bb_0p875>;

	vdda-pll-supply = <&vreg_l1e_bb_1p2>;



	status = "okay";

};



&usb {

arch/arm/boot/dts/qcom-sdx55.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -421,8 +421,6 @@ 
				     <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "global",

					  "doorbell";

			reset-gpios = <&tlmm 57 GPIO_ACTIVE_LOW>;

			wake-gpios = <&tlmm 53 GPIO_ACTIVE_LOW>;

			resets = <&gcc GCC_PCIE_BCR>;

			reset-names = "core";

			power-domains = <&gcc PCIE_GDSC>;

arch/arm/boot/dts/qcom-sdx65-mtp.dts

+8 −3
Original line number Diff line number Diff line
@@ -245,6 +245,11 @@ 
	status = "okay";

};



&ipa {

	qcom,gsi-loader = "skip";

	status = "okay";

};



&qpic_bam {

	status = "okay";

};
@@ -265,8 +270,8 @@ 
};



&remoteproc_mpss {

	status = "okay";

	memory-region = <&mpss_adsp_mem>;

	status = "okay";

};



&usb {
@@ -278,14 +283,14 @@ 
};



&usb_hsphy {

	status = "okay";

	vdda-pll-supply = <&vreg_l4b_0p88>;

	vdda33-supply = <&vreg_l10b_3p08>;

	vdda18-supply = <&vreg_l5b_1p8>;

	status = "okay";

};



&usb_qmpphy {

	status = "okay";

	vdda-phy-supply = <&vreg_l4b_0p88>;

	vdda-pll-supply = <&vreg_l1b_1p2>;

	status = "okay";

};

arch/arm/boot/dts/qcom-sdx65.dtsi

+44 −3
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <dt-bindings/interrupt-controller/arm-gic.h>

#include <dt-bindings/power/qcom-rpmpd.h>

#include <dt-bindings/soc/qcom,rpmh-rsc.h>

#include <dt-bindings/interconnect/qcom,sdx65.h>



/ {

	#address-cells = <1>;
@@ -223,16 +224,15 @@ 
				     "qcom,usb-snps-hs-7nm-phy";

			reg = <0xff4000 0x120>;

			#phy-cells = <0>;

			status = "disabled";

			clocks = <&rpmhcc RPMH_CXO_CLK>;

			clock-names = "ref";

			resets = <&gcc GCC_QUSB2PHY_BCR>;

			status = "disabled";

		};



		usb_qmpphy: phy@ff6000 {

			compatible = "qcom,sdx65-qmp-usb3-uni-phy";

			reg = <0x00ff6000 0x1c8>;

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges;
@@ -246,6 +246,8 @@ 
				 <&gcc GCC_USB3_PHY_BCR>;

			reset-names = "phy", "common";



			status = "disabled";



			usb_ssphy: phy@ff6200 {

				reg = <0x00ff6e00 0x160>,

				      <0x00ff7000 0x1ec>,
@@ -299,6 +301,44 @@ 
			#hwlock-cells = <1>;

		};



		ipa: ipa@3f40000 {

			compatible = "qcom,sdx65-ipa";



			reg = <0x03f40000 0x10000>,

			      <0x03f50000 0x5000>,

			      <0x03e04000 0xfc000>;

			reg-names = "ipa-reg",

				    "ipa-shared",

				    "gsi";



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

					      <&intc GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>,

					      <&ipa_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,

					      <&ipa_smp2p_in 1 IRQ_TYPE_EDGE_RISING>;

			interrupt-names = "ipa",

					  "gsi",

					  "ipa-clock-query",

					  "ipa-setup-ready";



			iommus = <&apps_smmu 0x5e0 0x0>,

				 <&apps_smmu 0x5e2 0x0>;



			clocks = <&rpmhcc RPMH_IPA_CLK>;

			clock-names = "core";



			interconnects = <&system_noc MASTER_IPA &mc_virt SLAVE_EBI1>,

					<&mem_noc MASTER_APPSS_PROC &system_noc SLAVE_IPA_CFG>;

			interconnect-names = "memory",

					     "config";



			qcom,smem-states = <&ipa_smp2p_out 0>,

					   <&ipa_smp2p_out 1>;

			qcom,smem-state-names = "ipa-clock-enabled-valid",

						"ipa-clock-enabled";



			status = "disabled";

		};



		remoteproc_mpss: remoteproc@4080000 {

			compatible = "qcom,sdx55-mpss-pas";

			reg = <0x04080000 0x4040>;
@@ -355,7 +395,6 @@ 
		usb: usb@a6f8800 {

			compatible = "qcom,sdx65-dwc3", "qcom,dwc3";

			reg = <0x0a6f8800 0x400>;

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges;
@@ -385,6 +424,8 @@ 


			resets = <&gcc GCC_USB30_BCR>;



			status = "disabled";



			usb_dwc3: usb@a600000 {

				compatible = "snps,dwc3";

				reg = <0x0a600000 0xcd00>;