Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c17a1ca1 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.20-rc2 into tty-next 



We want the tty/serial fixes in here as well.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 596f63da ccda4af0

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -159,6 +159,7 @@ Peter Oruba <peter@oruba.de> 
Peter Oruba <peter.oruba@amd.com>

Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>

Praveen BP <praveenbp@ti.com>

Punit Agrawal <punitagrawal@gmail.com> <punit.agrawal@arm.com>

Qais Yousef <qsyousef@gmail.com> <qais.yousef@imgtec.com>

Oleksij Rempel <linux@rempel-privat.de> <bug-track@fisher-privat.net>

Oleksij Rempel <linux@rempel-privat.de> <external.Oleksij.Rempel@de.bosch.com>

Documentation/ABI/testing/sysfs-class-led-trigger-pattern

+2 −2
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ Description: 
		  0-|   /             \/             \/

		    +---0----1----2----3----4----5----6------------> time (s)



		2. To make the LED go instantly from one brigntess value to another,

		we should use use zero-time lengths (the brightness must be same as

		2. To make the LED go instantly from one brightness value to another,

		we should use zero-time lengths (the brightness must be same as

		the previous tuple's). So the format should be:

		"brightness_1 duration_1 brightness_1 0 brightness_2 duration_2

		brightness_2 0 ...". For example:

Documentation/devicetree/bindings/arm/shmobile.txt

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ SoCs: 
    compatible = "renesas,r8a77470"

  - RZ/G2M (R8A774A1)

    compatible = "renesas,r8a774a1"

  - RZ/G2E (RA8774C0)

  - RZ/G2E (R8A774C0)

    compatible = "renesas,r8a774c0"

  - R-Car M1A (R8A77781)

    compatible = "renesas,r8a7778"

Documentation/devicetree/bindings/i2c/i2c-omap.txt

+6 −2
Original line number Diff line number Diff line 
I2C for OMAP platforms



Required properties :

- compatible : Must be "ti,omap2420-i2c", "ti,omap2430-i2c", "ti,omap3-i2c"

  or "ti,omap4-i2c"

- compatible : Must be

	"ti,omap2420-i2c" for OMAP2420 SoCs

	"ti,omap2430-i2c" for OMAP2430 SoCs

	"ti,omap3-i2c" for OMAP3 SoCs

	"ti,omap4-i2c" for OMAP4+ SoCs

	"ti,am654-i2c", "ti,omap4-i2c" for AM654 SoCs

- ti,hwmods : Must be "i2c<n>", n being the instance number (1-based)

- #address-cells = <1>;

- #size-cells = <0>;

Documentation/i2c/busses/i2c-nvidia-gpu

0 → 100644
+18 −0
Original line number Diff line number Diff line 
Kernel driver i2c-nvidia-gpu



Datasheet: not publicly available.



Authors:

	Ajay Gupta <ajayg@nvidia.com>



Description

-----------



i2c-nvidia-gpu is a driver for I2C controller included in NVIDIA Turing

and later GPUs and it is used to communicate with Type-C controller on GPUs.



If your 'lspci -v' listing shows something like the following,



01:00.3 Serial bus controller [0c80]: NVIDIA Corporation Device 1ad9 (rev a1)



then this driver should support the I2C controller of your GPU.