Unverified Commit b986e98c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 14edf33d 11b72b1c

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

+2 −3
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ properties: 
      - const: core



  iommus:

    maxItems: 2

    maxItems: 1



  interconnects:

    items:
@@ -107,8 +107,7 @@ examples: 
        interconnect-names = "mdp0-mem",

                             "cpu-cfg";



        iommus = <&apps_smmu 0x420 0x2>,

                 <&apps_smmu 0x421 0x0>;

        iommus = <&apps_smmu 0x420 0x2>;

        ranges;



        display-controller@5e01000 {

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

+2 −5
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ properties: 
      - const: vcodec0_bus



  iommus:

    maxItems: 5

    maxItems: 2



  interconnects:

    maxItems: 2
@@ -102,10 +102,7 @@ examples: 
        memory-region = <&pil_video_mem>;



        iommus = <&apps_smmu 0x860 0x0>,

                 <&apps_smmu 0x880 0x0>,

                 <&apps_smmu 0x861 0x04>,

                 <&apps_smmu 0x863 0x0>,

                 <&apps_smmu 0x804 0xe0>;

                 <&apps_smmu 0x880 0x0>;



        interconnects = <&mmnrt_virt MASTER_VIDEO_P0 RPM_ALWAYS_TAG

                         &bimc SLAVE_EBI1 RPM_ALWAYS_TAG>,

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

+3 −8
Original line number Diff line number Diff line
@@ -1669,8 +1669,7 @@ gpu: gpu@5900000 { 
					 &bimc SLAVE_EBI1 RPM_ALWAYS_TAG>;

			interconnect-names = "gfx-mem";



			iommus = <&adreno_smmu 0 1>,

				 <&adreno_smmu 2 0>;

			iommus = <&adreno_smmu 0 1>;

			operating-points-v2 = <&gpu_opp_table>;

			power-domains = <&rpmpd QCM2290_VDDCX>;

			qcom,gmu = <&gmu_wrapper>;
@@ -1951,8 +1950,7 @@ mdss: display-subsystem@5e00000 { 


			power-domains = <&dispcc MDSS_GDSC>;



			iommus = <&apps_smmu 0x420 0x2>,

				 <&apps_smmu 0x421 0x0>;

			iommus = <&apps_smmu 0x420 0x2>;

			interconnects = <&mmrt_virt MASTER_MDP0 RPM_ALWAYS_TAG

					 &bimc SLAVE_EBI1 RPM_ALWAYS_TAG>,

					<&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG
@@ -2436,10 +2434,7 @@ venus: video-codec@5a00000 { 


			memory-region = <&pil_video_mem>;

			iommus = <&apps_smmu 0x860 0x0>,

				 <&apps_smmu 0x880 0x0>,

				 <&apps_smmu 0x861 0x04>,

				 <&apps_smmu 0x863 0x0>,

				 <&apps_smmu 0x804 0xe0>;

				 <&apps_smmu 0x880 0x0>;



			interconnects = <&mmnrt_virt MASTER_VIDEO_P0 RPM_ALWAYS_TAG

					 &bimc SLAVE_EBI1 RPM_ALWAYS_TAG>,

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

+1 −1
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ cluster_c4: cpu-sleep-0 { 
				idle-state-name = "ret";

				arm,psci-suspend-param = <0x00000004>;

				entry-latency-us = <180>;

				exit-latency-us = <500>;

				exit-latency-us = <320>;

				min-residency-us = <600>;

			};

		};

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

+7 −2
Original line number Diff line number Diff line
@@ -765,6 +765,11 @@ smem_mem: smem@90900000 { 
			hwlocks = <&tcsr_mutex 3>;

		};



		gunyah_md_mem: gunyah-md-region@91a80000 {

			reg = <0x0 0x91a80000 0x0 0x80000>;

			no-map;

		};



		lpass_machine_learning_mem: lpass-machine-learning-region@93b00000 {

			reg = <0x0 0x93b00000 0x0 0xf00000>;

			no-map;
@@ -6414,12 +6419,12 @@ qup_uart10_cts: qup-uart10-cts-state { 
			};



			qup_uart10_rts: qup-uart10-rts-state {

				pins = "gpio84";

				pins = "gpio85";

				function = "qup1_se2";

			};



			qup_uart10_tx: qup-uart10-tx-state {

				pins = "gpio85";

				pins = "gpio86";

				function = "qup1_se2";

			};