Commit 86a56b2c authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'qcom-dts-for-5.5' of... 

Merge tag 'qcom-dts-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/dt

Qualcomm Device Tree Changes for v5.5

* Add thermal zones and IRQ support for MSM8974
* Add 5vs2 regulator node for PM8941
* Add reboot-mode node, fix sdhci and card detect on MSM8974-FP2
* Add IPQ4019 SDHCI node

* tag 'qcom-dts-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  ARM: dts: msm8974: thermal: Add thermal zones for each sensor
  ARM: dts: msm8974: thermal: Add interrupt support
  ARM: dts: qcom: pm8941: add 5vs2 regulator node
  ARM: dts: msm8974-FP2: add reboot-mode node
  ARM: dts: msm8974-FP2: Increase load on l20 for sdhci
  ARM: dts: msm8974-FP2: Drop unused card-detect pin
  ARM: dts: qcom: ipq4019: Add SDHCI controller node

Link: https://lore.kernel.org/r/1573068840-13098-5-git-send-email-agross@kernel.org


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 1d16a917 140647f8

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

+12 −0
Original line number Diff line number Diff line
@@ -206,6 +206,18 @@ 
			interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>;

		};



		sdhci: sdhci@7824900 {

			compatible = "qcom,sdhci-msm-v4";

			reg = <0x7824900 0x11c>, <0x7824000 0x800>;

			interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "hc_irq", "pwr_irq";

			bus-width = <8>;

			clocks = <&gcc GCC_SDCC1_APPS_CLK>, <&gcc GCC_SDCC1_AHB_CLK>,

				 <&gcc GCC_DCD_XO_CLK>;

			clock-names = "core", "iface", "xo";

			status = "disabled";

		};



		blsp_dma: dma@7884000 {

			compatible = "qcom,bam-v1.7.0";

			reg = <0x07884000 0x23000>;

arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts

+13 −9
Original line number Diff line number Diff line
@@ -221,6 +221,8 @@ 
						regulator-max-microvolt = <2950000>;



						regulator-boot-on;

						regulator-system-load = <200000>;

						regulator-allow-set-load;

					};



					l21 {
@@ -272,14 +274,6 @@ 
			};

		};



		sdhc2_cd_pin_a: sdhc2-cd-pin-active {

			pins = "gpio62";

			function = "gpio";



			drive-strength = <2>;

			bias-disable;

		};



		sdhc2_pin_a: sdhc2-pin-active {

			clk {

				pins = "sdc2_clk";
@@ -317,7 +311,7 @@ 
		bus-width = <4>;



		pinctrl-names = "default";

		pinctrl-0 = <&sdhc2_pin_a>, <&sdhc2_cd_pin_a>;

		pinctrl-0 = <&sdhc2_pin_a>;

	};



	usb@f9a55000 {
@@ -344,6 +338,16 @@ 
			};

		};

	};



	imem@fe805000 {

		status = "okay";



		reboot-mode {

			mode-normal	= <0x77665501>;

			mode-bootloader	= <0x77665500>;

			mode-recovery	= <0x77665502>;

		};

	};

};



&spmi_bus {

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

+103 −0
Original line number Diff line number Diff line
@@ -217,6 +217,96 @@ 
				};

			};

		};



		q6-dsp-thermal {

			polling-delay-passive = <250>;

			polling-delay = <1000>;



			thermal-sensors = <&tsens 1>;



			trips {

				q6_dsp_alert0: trip-point0 {

					temperature = <90000>;

					hysteresis = <2000>;

					type = "hot";

				};

			};

		};



		modemtx-thermal {

			polling-delay-passive = <250>;

			polling-delay = <1000>;



			thermal-sensors = <&tsens 2>;



			trips {

				modemtx_alert0: trip-point0 {

					temperature = <90000>;

					hysteresis = <2000>;

					type = "hot";

				};

			};

		};



		video-thermal {

			polling-delay-passive = <250>;

			polling-delay = <1000>;



			thermal-sensors = <&tsens 3>;



			trips {

				video_alert0: trip-point0 {

					temperature = <95000>;

					hysteresis = <2000>;

					type = "hot";

				};

			};

		};



		wlan-thermal {

			polling-delay-passive = <250>;

			polling-delay = <1000>;



			thermal-sensors = <&tsens 4>;



			trips {

				wlan_alert0: trip-point0 {

					temperature = <105000>;

					hysteresis = <2000>;

					type = "hot";

				};

			};

		};



		gpu-thermal-top {

			polling-delay-passive = <250>;

			polling-delay = <1000>;



			thermal-sensors = <&tsens 9>;



			trips {

				gpu1_alert0: trip-point0 {

					temperature = <90000>;

					hysteresis = <2000>;

					type = "hot";

				};

			};

		};



		gpu-thermal-bottom {

			polling-delay-passive = <250>;

			polling-delay = <1000>;



			thermal-sensors = <&tsens 10>;



			trips {

				gpu2_alert0: trip-point0 {

					temperature = <90000>;

					hysteresis = <2000>;

					type = "hot";

				};

			};

		};

	};



	cpu-pmu {
@@ -441,6 +531,8 @@ 
			nvmem-cells = <&tsens_calib>, <&tsens_backup>;

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

			#qcom,sensors = <11>;

			interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "uplow";

			#thermal-sensor-cells = <1>;

		};
@@ -1217,6 +1309,17 @@ 
				clock-names = "iface";

			};

		};



		imem@fe805000 {

			status = "disabled";

			compatible = "syscon", "simple-mfd";

			reg = <0xfe805000 0x1000>;



			reboot-mode {

				compatible = "syscon-reboot-mode";

				offset = <0x65c>;

			};

		};

	};



	smd {

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

+10 −0
Original line number Diff line number Diff line
@@ -178,6 +178,16 @@ 
				qcom,vs-soft-start-strength = <0>;

				regulator-initial-mode = <1>;

			};



			pm8941_5vs2: 5vs2 {

				regulator-enable-ramp-delay = <1000>;

				regulator-pull-down;

				regulator-over-current-protection;

				qcom,ocp-max-retries = <10>;

				qcom,ocp-retry-delay = <30>;

				qcom,vs-soft-start-strength = <0>;

				regulator-initial-mode = <1>;

			};

		};

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE