Commit acfbaa5d authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'qcom-arm64-for-4.21' of... 

Merge tag 'qcom-arm64-for-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/dt

Qualcomm ARM64 Updates for v4.21

* Add QCS404 base platform and nodes
* Add QCS404 EVB boards
* Add external SD and dependencies for MSM8998-mtp
* Add default scm compatible for MSM8998
* Fix XO clk name on MSM8998
* Add prng-ee nodes for SDM845 and MSM8996
* Add ADC die temp node for pm8998
* Fix documentation on QCOM ADC sample

* tag 'qcom-arm64-for-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux

: (34 commits)
  arm64: dts: qcom: msm8998: Fix compatible of scm node
  arm64: dts: qcom: msm8998: Add SDC2 control pins
  arm64: dts: qcom: msm8998-mtp: Add external SD
  arm64: dts: qcom: msm8998: Add SDCC2
  arm64: dts: qcom: msm8998: correct xo clock name
  arm64: dts: qcom: pms405: Add pon and pwrkey nodes
  arm64: dts: qcom: qcs404: Use BAM DMA for serial uart2
  arm64: dts: qcom: qcs404: Add BAM DMA node
  arm64: dts: qcom: qcs404: add prng-ee node
  arm64: dts: qcom: qcs404: Add remoteproc nodes
  arm64: dts: qcom: qcs404: Add scm firmware node
  arm64: dts: qcom: pms405: add gpios
  arm64: dts: qcom: pms405: add rtc node
  arm64: dts: qcom: qcs404: add spmi node
  arm64: dts: qcom: pms405: add spmi node
  arm64: dts: qcom: qcs404: Add sdcc1 node
  arm64: dts: qcom: qcs404: Add TLMM pinctrl node
  arm64: dts: qcom: qcs404: add smp2p nodes
  arm64: dts: qcom: qcs404: Add PMS405 RPM regulators
  arm64: dts: qcom: qcs404: Add RPM GLINK related nodes
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents f491ac32 70827d9f

Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.txt

+5 −1
Original line number Diff line number Diff line
@@ -140,6 +140,10 @@ VADC_GND_REF and VADC_VDD_VADC. 


Example:



#include <dt-bindings/iio/qcom,spmi-vadc.h>

#include <linux/irq.h>

/* ... */



	/* VADC node */

	pmic_vadc: vadc@3100 {

		compatible = "qcom,spmi-vadc";
@@ -151,7 +155,7 @@ Example: 
		io-channel-ranges;



		/* Channel node */

		usb_id_nopull {

		adc-chan@VADC_LR_MUX10_USB_ID {

			reg = <VADC_LR_MUX10_USB_ID>;

			qcom,decimation = <512>;

			qcom,ratiometric;

arch/arm64/boot/dts/qcom/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -8,3 +8,5 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8994-angler-rev-101.dtb 
dtb-$(CONFIG_ARCH_QCOM)	+= msm8996-mtp.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8998-mtp.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-mtp.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= qcs404-evb-1000.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= qcs404-evb-4000.dtb

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

+45 −2
Original line number Diff line number Diff line
@@ -234,6 +234,47 @@ 
			};

		};



		gpu-thermal {

			polling-delay-passive = <250>;

			polling-delay = <1000>;



			thermal-sensors = <&tsens 2>;



			trips {

				gpu_alert: trip0 {

					temperature = <75000>;

					hysteresis = <2000>;

					type = "passive";

				};

				gpu_crit: trip1 {

					temperature = <95000>;

					hysteresis = <2000>;

					type = "critical";

				};

			};

		};



		camera-thermal {

			polling-delay-passive = <250>;

			polling-delay = <1000>;



			thermal-sensors = <&tsens 1>;



			trips {

				cam_alert: trip0 {

					temperature = <75000>;

					hysteresis = <2000>;

					type = "passive";

				};

				cam_crit: trip1 {

					temperature = <95000>;

					hysteresis = <2000>;

					type = "critical";

				};

			};



		};



	};



	cpu_opp_table: cpu_opp_table {
@@ -758,11 +799,13 @@ 
			};

		};



		tsens: thermal-sensor@4a8000 {

		tsens: thermal-sensor@4a9000 {

			compatible = "qcom,msm8916-tsens";

			reg = <0x4a8000 0x2000>;

			reg = <0x4a9000 0x1000>, /* TM */

			      <0x4a8000 0x1000>; /* SROT */

			nvmem-cells = <&tsens_caldata>, <&tsens_calsel>;

			nvmem-cell-names = "calib", "calib_sel";

			#qcom,sensors = <5>;

			#thermal-sensor-cells = <1>;

		};

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

+7 −0
Original line number Diff line number Diff line
@@ -370,6 +370,13 @@ 
			reg = <0x68000 0x6000>;

		};



		rng: rng@83000 {

			compatible = "qcom,prng-ee";

			reg = <0x00083000 0x1000>;

			clocks = <&gcc GCC_PRNG_AHB_CLK>;

			clock-names = "core";

		};



		tcsr_mutex_regs: syscon@740000 {

			compatible = "syscon";

			reg = <0x740000 0x20000>;

arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi

+16 −0
Original line number Diff line number Diff line
@@ -241,3 +241,19 @@ 
		};

	};

};



&tlmm {

	gpio-reserved-ranges = <0 4>, <81 4>;

};



&sdhc2 {

	status = "okay";

	cd-gpios = <&tlmm 95 GPIO_ACTIVE_LOW>;



	vmmc-supply = <&vreg_l21a_2p95>;

	vqmmc-supply = <&vreg_l13a_2p95>;



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

	pinctrl-0 = <&sdc2_clk_on  &sdc2_cmd_on  &sdc2_data_on  &sdc2_cd_on>;

	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE