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

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

Merge 5.3-rc5 into android-mainline 



Linux 5.3-rc5

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ibfaea1b9aca9f04a59def096f327c2afbd0cb296
parents 5368c08f d1abaeb3

Documentation/devicetree/bindings/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -19,7 +19,9 @@ quiet_cmd_mk_schema = SCHEMA $@ 


DT_DOCS = $(shell \

	cd $(srctree)/$(src) && \

	find * \( -name '*.yaml' ! -name $(DT_TMP_SCHEMA) \) \

	find * \( -name '*.yaml' ! \

		-name $(DT_TMP_SCHEMA) ! \

		-name '*.example.dt.yaml' \) \

	)



DT_SCHEMA_FILES ?= $(addprefix $(src)/,$(DT_DOCS))

Documentation/devicetree/bindings/net/fsl-fec.txt

+17 −13
Original line number Diff line number Diff line
@@ -7,18 +7,6 @@ Required properties: 
- phy-mode : See ethernet.txt file in the same directory



Optional properties:

- phy-reset-gpios : Should specify the gpio for phy reset

- phy-reset-duration : Reset duration in milliseconds.  Should present

  only if property "phy-reset-gpios" is available.  Missing the property

  will have the duration be 1 millisecond.  Numbers greater than 1000 are

  invalid and 1 millisecond will be used instead.

- phy-reset-active-high : If present then the reset sequence using the GPIO

  specified in the "phy-reset-gpios" property is reversed (H=reset state,

  L=operation state).

- phy-reset-post-delay : Post reset delay in milliseconds. If present then

  a delay of phy-reset-post-delay milliseconds will be observed after the

  phy-reset-gpios has been toggled. Can be omitted thus no delay is

  observed. Delay is in range of 1ms to 1000ms. Other delays are invalid.

- phy-supply : regulator that powers the Ethernet PHY.

- phy-handle : phandle to the PHY device connected to this device.

- fixed-link : Assume a fixed link. See fixed-link.txt in the same directory.
@@ -47,11 +35,27 @@ Optional properties: 
  For imx6sx, "int0" handles all 3 queues and ENET_MII. "pps" is for the pulse

  per second interrupt associated with 1588 precision time protocol(PTP).





Optional subnodes:

- mdio : specifies the mdio bus in the FEC, used as a container for phy nodes

  according to phy.txt in the same directory



Deprecated optional properties:

	To avoid these, create a phy node according to phy.txt in the same

	directory, and point the fec's "phy-handle" property to it. Then use

	the phy's reset binding, again described by phy.txt.

- phy-reset-gpios : Should specify the gpio for phy reset

- phy-reset-duration : Reset duration in milliseconds.  Should present

  only if property "phy-reset-gpios" is available.  Missing the property

  will have the duration be 1 millisecond.  Numbers greater than 1000 are

  invalid and 1 millisecond will be used instead.

- phy-reset-active-high : If present then the reset sequence using the GPIO

  specified in the "phy-reset-gpios" property is reversed (H=reset state,

  L=operation state).

- phy-reset-post-delay : Post reset delay in milliseconds. If present then

  a delay of phy-reset-post-delay milliseconds will be observed after the

  phy-reset-gpios has been toggled. Can be omitted thus no delay is

  observed. Delay is in range of 1ms to 1000ms. Other delays are invalid.



Example:



ethernet@83fec000 {

Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.yaml

+2 −1
Original line number Diff line number Diff line
@@ -37,7 +37,8 @@ properties: 
  hwlocks: true



  st,syscfg:

    $ref: "/schemas/types.yaml#/definitions/phandle-array"

    allOf:

      - $ref: "/schemas/types.yaml#/definitions/phandle-array"

    description: Should be phandle/offset/mask

    items:

      - description: Phandle to the syscon node which includes IRQ mux selection.

MAINTAINERS

+16 −2
Original line number Diff line number Diff line
@@ -6441,6 +6441,14 @@ S: Maintained 
F:	drivers/perf/fsl_imx8_ddr_perf.c

F:	Documentation/devicetree/bindings/perf/fsl-imx-ddr.txt



FREESCALE IMX I2C DRIVER

M:	Oleksij Rempel <o.rempel@pengutronix.de>

R:	Pengutronix Kernel Team <kernel@pengutronix.de>

L:	linux-i2c@vger.kernel.org

S:	Maintained

F:	drivers/i2c/busses/i2c-imx.c

F:	Documentation/devicetree/bindings/i2c/i2c-imx.txt



FREESCALE IMX LPI2C DRIVER

M:	Dong Aisheng <aisheng.dong@nxp.com>

L:	linux-i2c@vger.kernel.org
@@ -7452,7 +7460,7 @@ F: drivers/net/hyperv/ 
F:	drivers/scsi/storvsc_drv.c

F:	drivers/uio/uio_hv_generic.c

F:	drivers/video/fbdev/hyperv_fb.c

F:	drivers/iommu/hyperv_iommu.c

F:	drivers/iommu/hyperv-iommu.c

F:	net/vmw_vsock/hyperv_transport.c

F:	include/clocksource/hyperv_timer.h

F:	include/linux/hyperv.h
@@ -8064,6 +8072,13 @@ T: git git://git.code.sf.net/p/intel-sas/isci 
S:	Supported

F:	drivers/scsi/isci/



INTEL CPU family model numbers

M:	Tony Luck <tony.luck@intel.com>

M:	x86@kernel.org

L:	linux-kernel@vger.kernel.org

S:	Supported

F:	arch/x86/include/asm/intel-family.h



INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)

M:	Jani Nikula <jani.nikula@linux.intel.com>

M:	Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
@@ -8415,7 +8430,6 @@ L: linux-xfs@vger.kernel.org 
L:	linux-fsdevel@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git

S:	Supported

F:	fs/iomap.c

F:	fs/iomap/

F:	include/linux/iomap.h

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
VERSION = 5

PATCHLEVEL = 3

SUBLEVEL = 0

EXTRAVERSION = -rc4

EXTRAVERSION = -rc5

NAME = Bobtail Squid



# *DOCUMENTATION*