Merge branch 'linus' into perf/urgent, to resolve conflict (9d020d33) · Commits · e / devices / android_kernel_oneplus_sm8150

Documentation/devicetree/bindings/pwm/imx-pwm.txt

+3 −3

Original line number	Diff line number	Diff line
		@@ -6,8 +6,8 @@ Required properties:
		- "fsl,imx1-pwm" for PWM compatible with the one integrated on i.MX1
		- "fsl,imx27-pwm" for PWM compatible with the one integrated on i.MX27
		- reg: physical base address and length of the controller's registers
		- #pwm-cells: should be 2. See pwm.txt in this directory for a description of
		the cells format.
		- #pwm-cells: 2 for i.MX1 and 3 for i.MX27 and newer SoCs. See pwm.txt
		in this directory for a description of the cells format.
		- clocks : Clock specifiers for both ipg and per clocks.
		- clock-names : Clock names should include both "ipg" and "per"
		See the clock consumer binding,
		@@ -17,7 +17,7 @@ See the clock consumer binding,
		Example:

		pwm1: pwm@53fb4000 {
		#pwm-cells = <2>;
		#pwm-cells = <3>;
		compatible = "fsl,imx53-pwm", "fsl,imx27-pwm";
		reg = <0x53fb4000 0x4000>;
		clocks = <&clks IMX5_CLK_PWM1_IPG_GATE>,

Documentation/devicetree/bindings/thermal/qoriq-thermal.txt

+7 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,12 @@ Required properties:
		calibration data, as specified by the SoC reference manual.
		The first cell of each pair is the value to be written to TTCFGR,
		and the second is the value to be written to TSCFGR.
		- #thermal-sensor-cells : Must be 1. The sensor specifier is the monitoring
		site ID, and represents the "n" in TRITSRn and TRATSRn.

		Optional property:
		- little-endian : If present, the TMU registers are little endian. If absent,
		the default is big endian.

		Example:

		@@ -60,4 +66,5 @@ tmu@f0000 {

		0x00030000 0x00000012
		0x00030001 0x0000001d>;
		#thermal-sensor-cells = <1>;
		};

Documentation/devicetree/bindings/thermal/rcar-gen3-thermal.txt

0 → 100644

+56 −0

Original line number	Diff line number	Diff line
		* DT bindings for Renesas R-Car Gen3 Thermal Sensor driver

		On R-Car Gen3 SoCs, the thermal sensor controllers (TSC) control the thermal
		sensors (THS) which are the analog circuits for measuring temperature (Tj)
		inside the LSI.

		Required properties:
		- compatible : "renesas,<soctype>-thermal",
		Examples with soctypes are:
		- "renesas,r8a7795-thermal" (R-Car H3)
		- "renesas,r8a7796-thermal" (R-Car M3-W)
		- reg : Address ranges of the thermal registers. Each sensor
		needs one address range. Sorting must be done in
		increasing order according to datasheet, i.e.
		TSC1, TSC2, ...
		- clocks : Must contain a reference to the functional clock.
		- #thermal-sensor-cells : must be <1>.

		Optional properties:

		- interrupts : interrupts routed to the TSC (3 for H3 and M3-W)
		- power-domain : Must contain a reference to the power domain. This
		property is mandatory if the thermal sensor instance
		is part of a controllable power domain.

		Example:

		tsc: thermal@e6198000 {
		compatible = "renesas,r8a7795-thermal";
		reg = <0 0xe6198000 0 0x68>,
		<0 0xe61a0000 0 0x5c>,
		<0 0xe61a8000 0 0x5c>;
		interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>,
		<GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>,
		<GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
		clocks = <&cpg CPG_MOD 522>;
		power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
		#thermal-sensor-cells = <1>;
		status = "okay";
		};

		thermal-zones {
		sensor_thermal1: sensor-thermal1 {
		polling-delay-passive = <250>;
		polling-delay = <1000>;
		thermal-sensors = <&tsc 0>;

		trips {
		sensor1_crit: sensor1-crit {
		temperature = <90000>;
		hysteresis = <2000>;
		type = "critical";
		};
		};
		};
		};

Documentation/devicetree/bindings/thermal/zx2967-thermal.txt

0 → 100644

+116 −0

Original line number	Diff line number	Diff line
		* ZTE zx2967 family Thermal

		Required Properties:
		- compatible: should be one of the following.
		* zte,zx296718-thermal
		- reg: physical base address of the controller and length of memory mapped
		region.
		- clocks : Pairs of phandle and specifier referencing the controller's clocks.
		- clock-names: "topcrm" for the topcrm clock.
		"apb" for the apb clock.
		- #thermal-sensor-cells: must be 0.

		Please note: slope coefficient defined in thermal-zones section need to be
		multiplied by 1000.

		Example for tempsensor:

		tempsensor: tempsensor@148a000 {
		compatible = "zte,zx296718-thermal";
		reg = <0x0148a000 0x20>;
		clocks = <&topcrm TEMPSENSOR_GATE>, <&audiocrm AUDIO_TS_PCLK>;
		clock-names = "topcrm", "apb";
		#thermal-sensor-cells = <0>;
		};

		Example for cooling device:

		cooling_dev: cooling_dev {
		cluster0_cooling_dev: cluster0-cooling-dev {
		#cooling-cells = <2>;
		cpumask = <0xf>;
		capacitance = <1500>;
		};

		cluster1_cooling_dev: cluster1-cooling-dev {
		#cooling-cells = <2>;
		cpumask = <0x30>;
		capacitance = <2000>;
		};
		};

		Example for thermal zones:

		thermal-zones {
		zx296718_thermal: zx296718_thermal {
		polling-delay-passive = <500>;
		polling-delay = <1000>;
		sustainable-power = <6500>;

		thermal-sensors = <&tempsensor 0>;
		/*
		* slope need to be multiplied by 1000.
		*/
		coefficients = <1951 (-922)>;

		trips {
		trip0: switch_on_temperature {
		temperature = <90000>;
		hysteresis = <2000>;
		type = "passive";
		};

		trip1: desired_temperature {
		temperature = <100000>;
		hysteresis = <2000>;
		type = "passive";
		};

		crit: critical_temperature {
		temperature = <110000>;
		hysteresis = <2000>;
		type = "critical";
		};
		};

		cooling-maps {
		map0 {
		trip = <&trip0>;
		cooling-device = <&gpu 2 5>;
		};

		map1 {
		trip = <&trip0>;
		cooling-device = <&cluster0_cooling_dev 1 2>;
		};

		map2 {
		trip = <&trip1>;
		cooling-device = <&cluster0_cooling_dev 1 2>;
		};

		map3 {
		trip = <&crit>;
		cooling-device = <&cluster0_cooling_dev 1 2>;
		};

		map4 {
		trip = <&trip0>;
		cooling-device = <&cluster1_cooling_dev 1 2>;
		contribution = <9000>;
		};

		map5 {
		trip = <&trip1>;
		cooling-device = <&cluster1_cooling_dev 1 2>;
		contribution = <4096>;
		};

		map6 {
		trip = <&crit>;
		cooling-device = <&cluster1_cooling_dev 1 2>;
		contribution = <4096>;
		};
		};
		};
		};

Documentation/filesystems/f2fs.txt

+5 −2

Original line number	Diff line number	Diff line
		@@ -125,13 +125,14 @@ active_logs=%u Support configuring the number of active logs. In the
		disable_ext_identify Disable the extension list configured by mkfs, so f2fs
		does not aware of cold files such as media files.
		inline_xattr Enable the inline xattrs feature.
		noinline_xattr Disable the inline xattrs feature.
		inline_data Enable the inline data feature: New created small(<~3.4k)
		files can be written into inode block.
		inline_dentry Enable the inline dir feature: data in new created
		directory entries can be written into inode block. The
		space of inode block which is used to store inline
		dentries is limited to ~3.4k.
		noinline_dentry Diable the inline dentry feature.
		noinline_dentry Disable the inline dentry feature.
		flush_merge Merge concurrent cache_flush commands as much as possible
		to eliminate redundant command issues. If the underlying
		device handles the cache_flush command relatively slowly,
		@@ -157,6 +158,8 @@ data_flush Enable data flushing before checkpoint in order to
		mode=%s Control block allocation mode which supports "adaptive"
		and "lfs". In "lfs" mode, there should be no random
		writes towards main area.
		io_bits=%u Set the bit size of write IO requests. It should be set
		with "mode=lfs".

		================================================================================
		DEBUGFS ENTRIES
		@@ -174,7 +177,7 @@ f2fs. Each file shows the whole f2fs information.
		SYSFS ENTRIES
		================================================================================

		Information about mounted f2f2 file systems can be found in
		Information about mounted f2fs file systems can be found in
		/sys/fs/f2fs. Each mounted filesystem will have a directory in
		/sys/fs/f2fs based on its device name (i.e., /sys/fs/f2fs/sda).
		The files in each per-device directory are shown in table below.