Commit 604a98f1 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'timers/urgent' into timers/core 

Pick up urgent fixes to apply dependent cleanup patch
parents 1cfd904f 7dba33c6

Documentation/core-api/kernel-api.rst

+13 −0
Original line number Diff line number Diff line
@@ -136,6 +136,19 @@ Sorting 
.. kernel-doc:: lib/list_sort.c

   :export:



Text Searching

--------------



.. kernel-doc:: lib/textsearch.c

   :doc: ts_intro



.. kernel-doc:: lib/textsearch.c

   :export:



.. kernel-doc:: include/linux/textsearch.h

   :functions: textsearch_find textsearch_next \

               textsearch_get_pattern textsearch_get_pattern_len



UUID/GUID

---------

Documentation/devicetree/bindings/serial/amlogic,meson-uart.txt

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ Required properties: 
- interrupts : identifier to the device interrupt

- clocks : a list of phandle + clock-specifier pairs, one for each

	   entry in clock names.

- clocks-names :

- clock-names :

   * "xtal" for external xtal clock identifier

   * "pclk" for the bus core clock, either the clk81 clock or the gate clock

   * "baud" for the source of the baudrate generator, can be either the xtal

Documentation/devicetree/bindings/serial/mvebu-uart.txt

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ Required properties: 
    - Must contain two elements for the extended variant of the IP

      (marvell,armada-3700-uart-ext): "uart-tx" and "uart-rx",

      respectively the UART TX interrupt and the UART RX interrupt. A

      corresponding interrupts-names property must be defined.

      corresponding interrupt-names property must be defined.

    - For backward compatibility reasons, a single element interrupts

      property is also supported for the standard variant of the IP,

      containing only the UART sum interrupt. This form is deprecated

Documentation/devicetree/bindings/serial/renesas,sci-serial.txt

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ Required properties: 
    - "renesas,scifa-r8a7745" for R8A7745 (RZ/G1E) SCIFA compatible UART.

    - "renesas,scifb-r8a7745" for R8A7745 (RZ/G1E) SCIFB compatible UART.

    - "renesas,hscif-r8a7745" for R8A7745 (RZ/G1E) HSCIF compatible UART.

    - "renesas,scif-r8a77470" for R8A77470 (RZ/G1C) SCIF compatible UART.

    - "renesas,hscif-r8a77470" for R8A77470 (RZ/G1C) HSCIF compatible UART.

    - "renesas,scif-r8a7778" for R8A7778 (R-Car M1) SCIF compatible UART.

    - "renesas,scif-r8a7779" for R8A7779 (R-Car H1) SCIF compatible UART.

    - "renesas,scif-r8a7790" for R8A7790 (R-Car H2) SCIF compatible UART.

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

+5 −18
Original line number Diff line number Diff line
@@ -49,19 +49,6 @@ on the SoC (only first trip points defined in DT will be configured): 
 - samsung,exynos5433-tmu: 8

 - samsung,exynos7-tmu: 8



Following properties are mandatory (depending on SoC):

- samsung,tmu_gain: Gain value for internal TMU operation.

- samsung,tmu_reference_voltage: Value of TMU IP block's reference voltage

- samsung,tmu_noise_cancel_mode: Mode for noise cancellation

- samsung,tmu_efuse_value: Default level of temperature - it is needed when

			   in factory fusing produced wrong value

- samsung,tmu_min_efuse_value: Minimum temperature fused value

- samsung,tmu_max_efuse_value: Maximum temperature fused value

- samsung,tmu_first_point_trim: First point trimming value

- samsung,tmu_second_point_trim: Second point trimming value

- samsung,tmu_default_temp_offset: Default temperature offset

- samsung,tmu_cal_type: Callibration type



** Optional properties:



- vtmu-supply: This entry is optional and provides the regulator node supplying
@@ -78,7 +65,7 @@ Example 1): 
		clocks = <&clock 383>;

		clock-names = "tmu_apbif";

		vtmu-supply = <&tmu_regulator_node>;

		#include "exynos4412-tmu-sensor-conf.dtsi"

		#thermal-sensor-cells = <0>;

	};



Example 2):
@@ -89,7 +76,7 @@ Example 2): 
		interrupts = <0 58 0>;

		clocks = <&clock 21>;

		clock-names = "tmu_apbif";

		#include "exynos5440-tmu-sensor-conf.dtsi"

		#thermal-sensor-cells = <0>;

	};



Example 3): (In case of Exynos5420 "with misplaced TRIMINFO register")
@@ -99,7 +86,7 @@ Example 3): (In case of Exynos5420 "with misplaced TRIMINFO register") 
		interrupts = <0 184 0>;

		clocks = <&clock 318>, <&clock 318>;

		clock-names = "tmu_apbif", "tmu_triminfo_apbif";

		#include "exynos4412-tmu-sensor-conf.dtsi"

		#thermal-sensor-cells = <0>;

	};



	tmu_cpu3: tmu@1006c000 {
@@ -108,7 +95,7 @@ Example 3): (In case of Exynos5420 "with misplaced TRIMINFO register") 
		interrupts = <0 185 0>;

		clocks = <&clock 318>, <&clock 319>;

		clock-names = "tmu_apbif", "tmu_triminfo_apbif";

		#include "exynos4412-tmu-sensor-conf.dtsi"

		#thermal-sensor-cells = <0>;

	};



	tmu_gpu: tmu@100a0000 {
@@ -117,7 +104,7 @@ Example 3): (In case of Exynos5420 "with misplaced TRIMINFO register") 
		interrupts = <0 215 0>;

		clocks = <&clock 319>, <&clock 318>;

		clock-names = "tmu_apbif", "tmu_triminfo_apbif";

		#include "exynos4412-tmu-sensor-conf.dtsi"

		#thermal-sensor-cells = <0>;

	};



Note: For multi-instance tmu each instance should have an alias correctly