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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJdwP8bAAoJEFKiBbHx2RXV5j0QALhHwTtoqJ3VDi44kRjiPapX
 A+QIG4/HEmgerFuj8AIk1ln1//yH/RTcBpWJ1Djxlplbo9s1M7mpJQvw+xE5D8NT
 vger00jvX5sK+/TwBDVcDbDbUdel/kD38YtZ8ZwJ4yd2+nyZJp0fIno8/PElkeuj
 IH5lf1HWWMHZ5EvOUoQzw2tED3SofQdPTnPpXjv1FUx3v7a+tUigdQ0XzxO/l91v
 uKyAKKh+mjmo5WszSjG2cgYn4TkJMWrfug2TjhSLuDe2l6T7dJmvF1Q1DjMw762d
 29xXJ+ZqD6Ee13guhL8ILjWCiQulGjpb1yAMCjXXdEe4WzGA0FLvBy2wZELFnEr3
 jGJKaFtlwf9avyEIqkS8mPaMSkRmVJP98Xm/MKs5QDneDqA0wjX5dwjUf6ewCIh1
 NwyHJ8c9/ixgEsQl3PPrOEfgwwmQWpNd9FuwRYKQ896JtPVF7VW09zckIblEYlG0
 xS5hkG9T+vGEroNGyVojlVSWuwp09n6AFuwFezR7zypSBTuaRFW4VwZc1+CDO0my
 3OAzzOUAidT7O0IXY0NNkjlycIa4NSGY4aYe1eUG1IOLFIiKF4tnEvuAcbOGHuPF
 b7GxR1uE83woi4gv1+6/rHDJ9Tipy1LUnQUlevlgBQy+L6h+RmT1Z28fupNfg3Vn
 voJntYyZ4yJwjyAUH/Px
 =VDFS
 -----END PGP SIGNATURE-----

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: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2019-11-06 14:06:34 -08:00
commit 86a56b2c61
4 changed files with 138 additions and 9 deletions

View file

@ -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>;

View file

@ -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 {

View file

@ -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 {

View file

@ -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>;
};
};
};
};