Merge branch 'arm64-for-5.1' into arm64-for-5.1-2 (40d8e6da) · Commits · 戴 / test

arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi

+2 −0

Original line number	Diff line number	Diff line
		@@ -644,6 +644,8 @@
		l11 {
		regulator-min-microvolt = <1750000>;
		regulator-max-microvolt = <3337000>;
		regulator-allow-set-load;
		regulator-system-load = <200000>;
		};

		l12 {

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -139,7 +139,7 @@
		};

		pinconf {
		pins = "gpio4", "gpiio5", "gpio6", "gpio7";
		pins = "gpio4", "gpio5", "gpio6", "gpio7";
		drive-strength = <2>;
		bias-disable;
		};

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,12 @@
		bias-pull-up;
		linux,code = <KEY_POWER>;
		};

		watchdog {
		compatible = "qcom,pm8916-wdt";
		interrupts = <0x0 0x8 6 IRQ_TYPE_EDGE_RISING>;
		timeout-sec = <60>;
		};
		};

		pm8916_gpios: gpios@c000 {

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

+79 −0

Original line number	Diff line number	Diff line
		@@ -3,6 +3,32 @@

		#include <dt-bindings/spmi/spmi.h>
		#include <dt-bindings/input/linux-event-codes.h>
		#include <dt-bindings/iio/qcom,spmi-vadc.h>
		#include <dt-bindings/thermal/thermal.h>

		/ {
		thermal-zones {
		pms405 {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&pms405_temp>;

		trips {
		pms405_alert0: pms405-alert0 {
		temperature = <105000>;
		hysteresis = <2000>;
		type = "passive";
		};
		pms405_crit: pms405-crit {
		temperature = <125000>;
		hysteresis = <2000>;
		type = "critical";
		};
		};
		};
		};
		};

		&spmi_bus {
		pms405_0: pms405@0 {
		@@ -45,6 +71,59 @@
		};
		};

		pms405_temp: temp-alarm@2400 {
		compatible = "qcom,spmi-temp-alarm";
		reg = <0x2400>;
		interrupts = <0 0x24 0 IRQ_TYPE_EDGE_RISING>;
		io-channels = <&pms405_adc ADC5_DIE_TEMP>;
		io-channel-names = "thermal";
		#thermal-sensor-cells = <0>;
		};

		pms405_adc: adc@3100 {
		compatible = "qcom,pms405-adc", "qcom,spmi-adc-rev2";
		reg = <0x3100>;
		interrupts = <0x0 0x31 0x0 IRQ_TYPE_EDGE_RISING>;
		#address-cells = <1>;
		#size-cells = <0>;
		#io-channel-cells = <1>;

		ref_gnd {
		reg = <ADC5_REF_GND>;
		qcom,pre-scaling = <1 1>;
		};

		vref_1p25 {
		reg = <ADC5_1P25VREF>;
		qcom,pre-scaling = <1 1>;
		};

		vph_pwr {
		reg = <ADC5_VPH_PWR>;
		qcom,pre-scaling = <1 3>;
		};

		die_temp {
		reg = <ADC5_DIE_TEMP>;
		qcom,pre-scaling = <1 1>;
		};

		xo_therm_100k_pu {
		reg = <ADC5_XO_THERM_100K_PU>;
		qcom,pre-scaling = <1 1>;
		};

		amux_thm1_100k_pu {
		reg = <ADC5_AMUX_THM1_100K_PU>;
		qcom,pre-scaling = <1 1>;
		};

		amux_thm3_100k_pu {
		reg = <ADC5_AMUX_THM3_100K_PU>;
		qcom,pre-scaling = <1 1>;
		};
		};

		rtc@6000 {
		compatible = "qcom,pm8941-rtc";
		reg = <0x6000>;

arch/arm64/boot/dts/qcom/qcs404-evb.dtsi

+5 −0

Original line number	Diff line number	Diff line
		@@ -127,6 +127,7 @@
		status = "ok";

		mmc-ddr-1_8v;
		mmc-hs400-1_8v;
		bus-width = <8>;
		non-removable;

		@@ -186,3 +187,7 @@
		};
		};
		};

		&wifi {
		status = "okay";
		};

Admin message