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

Merge tag 'qcom-arm64-for-6.20-2' of... 

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

More Qualcomm Arm64 DeviceTree updates for v6.20

Enable ADSP FastRPC and add missing GPU memory regions on Agatti.
Also add the missing GPU regions on SM6115.

Describe the application subsystem watchdog on Hamoa and enable this in
the EL2 configurations.

Add the camera control interface (CCI) I2C controller on MSM8953, and
describe the camera regulators and the camera EEPROM on Fairphone FP3.

Specify clock frequency for the i2c4 bus on OnePlus 6, to silence the
warnings about missing frequency definition.

Add FastRPC and associated heap memory, as well as Coresight, on SM8750

Switch a variety of platforms to use the generic RPMPD_ constants,
instead of target-specific duplicated, to allow us to drop these from
the header files.

Drop the invalid opp-shared on the QUP OPP table for Talos.

* tag 'qcom-arm64-for-6.20-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux

:
  arm64: dts: qcom: sm6115: Add CX_MEM/DBGC GPU regions
  arm64: dts: qcom: agatti: Add CX_MEM/DBGC GPU regions
  arm64: dts: qcom: sm8750: add ADSP fastrpc-compute-cb nodes
  arm64: dts: qcom: sm8750: add memory node for adsp fastrpc
  arm64: dts: qcom: switch to RPMPD_* indices
  arm64: dts: qcom: oneplus-enchilada: Specify i2c4 clock frequency
  arm64: dts: qcom: sm6350: Add clocks for aggre1 & aggre2 NoC
  arm64: dts: qcom: agatti: enable FastRPC on the ADSP
  arm64: qcom: dts: sm8750: add coresight nodes
  arm64: dts: qcom: talos: Drop opp-shared from QUP OPP table
  arm64: dts: qcom: x1-el2: Enable the APSS watchdog
  arm64: dts: qcom: hamoa: Add the APSS watchdog
  dt-bindings: watchdog: Document X1E80100 compatible
  arm64: dts: qcom: sdm632-fairphone-fp3: Enable CCI and add EEPROM
  arm64: dts: qcom: sdm632-fairphone-fp3: Add camera fixed regulators
  arm64: dts: qcom: msm8953: Add CCI nodes
  arm64: dts: qcom: msm8953: Re-sort tlmm pinctrl states

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 67fea39d 78c13dac

Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ properties: 
              - qcom,apss-wdt-sm6350

              - qcom,apss-wdt-sm8150

              - qcom,apss-wdt-sm8250

              - qcom,apss-wdt-x1e80100

          - const: qcom,kpss-wdt

      - const: qcom,kpss-wdt

        deprecated: true

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

+47 −2
Original line number Diff line number Diff line
@@ -1643,8 +1643,12 @@ usb_dwc3_ss: endpoint { 


		gpu: gpu@5900000 {

			compatible = "qcom,adreno-07000200", "qcom,adreno";

			reg = <0x0 0x05900000 0x0 0x40000>;

			reg-names = "kgsl_3d0_reg_memory";

			reg = <0x0 0x05900000 0x0 0x40000>,

			      <0x0 0x0599e000 0x0 0x1000>,

			      <0x0 0x05961000 0x0 0x800>;

			reg-names = "kgsl_3d0_reg_memory",

				    "cx_mem",

				    "cx_dbgc";



			interrupts = <GIC_SPI 177 IRQ_TYPE_LEVEL_HIGH>;
@@ -2287,6 +2291,47 @@ q6routing: routing { 
						};

					};

				};



				fastrpc {

					compatible = "qcom,fastrpc";

					qcom,glink-channels = "fastrpcglink-apps-dsp";

					label = "adsp";



					qcom,non-secure-domain;



					#address-cells = <1>;

					#size-cells = <0>;



					compute-cb@3 {

						compatible = "qcom,fastrpc-compute-cb";

						reg = <3>;

						iommus = <&apps_smmu 0x1c3 0x0>;

					};



					compute-cb@4 {

						compatible = "qcom,fastrpc-compute-cb";

						reg = <4>;

						iommus = <&apps_smmu 0x1c4 0x0>;

					};



					compute-cb@5 {

						compatible = "qcom,fastrpc-compute-cb";

						reg = <5>;

						iommus = <&apps_smmu 0x1c5 0x0>;

					};



					compute-cb@6 {

						compatible = "qcom,fastrpc-compute-cb";

						reg = <6>;

						iommus = <&apps_smmu 0x1c6 0x0>;

					};



					compute-cb@7 {

						compatible = "qcom,fastrpc-compute-cb";

						reg = <7>;

						iommus = <&apps_smmu 0x1c7 0x0>;

					};

				};

			};

		};

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

+8 −0
Original line number Diff line number Diff line
@@ -8360,6 +8360,14 @@ gic_its: msi-controller@17040000 { 
			};

		};



		apss_watchdog: watchdog@17410000 {

			compatible = "qcom,apss-wdt-x1e80100", "qcom,kpss-wdt";

			reg = <0x0 0x17410000 0x0 0x1000>;

			clocks = <&sleep_clk>;

			interrupts = <GIC_SPI 0 IRQ_TYPE_EDGE_RISING>;

			status = "reserved"; /* Reserved by Gunyah */

		};



		cpucp_mbox: mailbox@17430000 {

			compatible = "qcom,x1e80100-cpucp-mbox";

			reg = <0 0x17430000 0 0x10000>, <0 0x18830000 0 0x10000>;

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

+4 −4
Original line number Diff line number Diff line
@@ -1945,8 +1945,8 @@ mpss: remoteproc@4080000 { 
			interrupt-names = "wdog", "fatal", "ready",

					  "handover", "stop-ack";



			power-domains = <&rpmpd MSM8916_VDDCX>,

					<&rpmpd MSM8916_VDDMX>;

			power-domains = <&rpmpd RPMPD_VDDCX>,

					<&rpmpd RPMPD_VDDMX>;

			power-domain-names = "cx", "mx";



			clocks = <&gcc GCC_MSS_CFG_AHB_CLK>,
@@ -2449,8 +2449,8 @@ wcnss: remoteproc@a204000 { 
					      <&wcnss_smp2p_in 3 IRQ_TYPE_EDGE_RISING>;

			interrupt-names = "wdog", "fatal", "ready", "handover", "stop-ack";



			power-domains = <&rpmpd MSM8916_VDDCX>,

					<&rpmpd MSM8916_VDDMX>;

			power-domains = <&rpmpd RPMPD_VDDCX>,

					<&rpmpd RPMPD_VDDMX>;

			power-domain-names = "cx", "mx";



			qcom,smem-states = <&wcnss_smp2p_out 0>;

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

+5 −5
Original line number Diff line number Diff line
@@ -1070,7 +1070,7 @@ mdss_dsi0: dsi@1a94000 { 
				phys = <&mdss_dsi0_phy>;



				operating-points-v2 = <&mdss_dsi0_opp_table>;

				power-domains = <&rpmpd MSM8917_VDDCX>;

				power-domains = <&rpmpd RPMPD_VDDCX>;



				#address-cells = <1>;

				#size-cells = <0>;
@@ -1288,7 +1288,7 @@ sdhc_1: mmc@7824900 { 
			pinctrl-0 = <&sdc1_default>;

			pinctrl-1 = <&sdc1_sleep>;

			pinctrl-names = "default", "sleep";

			power-domains = <&rpmpd MSM8917_VDDCX>;

			power-domains = <&rpmpd RPMPD_VDDCX>;

			mmc-hs200-1_8v;

			mmc-hs400-1_8v;

			mmc-ddr-1_8v;
@@ -1313,7 +1313,7 @@ sdhc_2: mmc@7864900 { 
			pinctrl-0 = <&sdc2_default>;

			pinctrl-1 = <&sdc2_sleep>;

			pinctrl-names = "default", "sleep";

			power-domains = <&rpmpd MSM8917_VDDCX>;

			power-domains = <&rpmpd RPMPD_VDDCX>;

			bus-width = <4>;

			status = "disabled";

		};
@@ -1517,8 +1517,8 @@ wcnss: remoteproc@a204000 { 
					      <&wcnss_smp2p_in 3 IRQ_TYPE_EDGE_RISING>;

			interrupt-names = "wdog", "fatal", "ready", "handover", "stop-ack";



			power-domains = <&rpmpd MSM8917_VDDCX>,

					<&rpmpd MSM8917_VDDMX>;

			power-domains = <&rpmpd RPMPD_VDDCX>,

					<&rpmpd RPMPD_VDDMX>;

			power-domain-names = "cx", "mx";



			qcom,smem-states = <&wcnss_smp2p_out 0>;