Merge branch 'devel' into for-next (6b240aeb) · Commits · 戴 / test

.mailmap

+3 −1

Original line number	Diff line number	Diff line
		@@ -196,7 +196,8 @@ Oleksij Rempel <linux@rempel-privat.de> <o.rempel@pengutronix.de>
		Oleksij Rempel <linux@rempel-privat.de> <ore@pengutronix.de>
		Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
		Patrick Mochel <mochel@digitalimplant.org>
		Paul Burton <paul.burton@mips.com> <paul.burton@imgtec.com>
		Paul Burton <paulburton@kernel.org> <paul.burton@imgtec.com>
		Paul Burton <paulburton@kernel.org> <paul.burton@mips.com>
		Peter A Jonsson <pj@ludd.ltu.se>
		Peter Oruba <peter@oruba.de>
		Peter Oruba <peter.oruba@amd.com>
		@@ -229,6 +230,7 @@ Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com>
		Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com>
		Shuah Khan <shuah@kernel.org> <shuahkh@osg.samsung.com>
		Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com>
		Simon Arlott <simon@octiron.net> <simon@fire.lp0.eu>
		Simon Kelley <simon@thekelleys.org.uk>
		Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
		Stephen Hemminger <shemminger@osdl.org>

+6 −1

Original line number	Diff line number	Diff line
		@@ -91,6 +91,11 @@ stable kernels.
		\| ARM \| MMU-500 \| #841119,826419 \| N/A \|
		+----------------+-----------------+-----------------+-----------------------------+
		+----------------+-----------------+-----------------+-----------------------------+
		\| Broadcom \| Brahma-B53 \| N/A \| ARM64_ERRATUM_845719 \|
		+----------------+-----------------+-----------------+-----------------------------+
		\| Broadcom \| Brahma-B53 \| N/A \| ARM64_ERRATUM_843419 \|
		+----------------+-----------------+-----------------+-----------------------------+
		+----------------+-----------------+-----------------+-----------------------------+
		\| Cavium \| ThunderX ITS \| #22375,24313 \| CAVIUM_ERRATUM_22375 \|
		+----------------+-----------------+-----------------+-----------------------------+
		\| Cavium \| ThunderX ITS \| #23144 \| CAVIUM_ERRATUM_23144 \|
		@@ -126,7 +131,7 @@ stable kernels.
		+----------------+-----------------+-----------------+-----------------------------+
		\| Qualcomm Tech. \| Kryo/Falkor v1 \| E1003 \| QCOM_FALKOR_ERRATUM_1003 \|
		+----------------+-----------------+-----------------+-----------------------------+
		\| Qualcomm Tech. \| Falkor v1 \| E1009 \| QCOM_FALKOR_ERRATUM_1009 \|
		\| Qualcomm Tech. \| Kryo/Falkor v1 \| E1009 \| QCOM_FALKOR_ERRATUM_1009 \|
		+----------------+-----------------+-----------------+-----------------------------+
		\| Qualcomm Tech. \| QDF2400 ITS \| E0065 \| QCOM_QDF2400_ERRATUM_0065 \|
		+----------------+-----------------+-----------------+-----------------------------+

+2 −2

Original line number	Diff line number	Diff line
		@@ -496,12 +496,12 @@ properties:

		- description: Theobroma Systems RK3368-uQ7 with Haikou baseboard
		items:
		- const: tsd,rk3368-uq7-haikou
		- const: tsd,rk3368-lion-haikou
		- const: rockchip,rk3368

		- description: Theobroma Systems RK3399-Q7 with Haikou baseboard
		items:
		- const: tsd,rk3399-q7-haikou
		- const: tsd,rk3399-puma-haikou
		- const: rockchip,rk3399

		- description: Tronsmart Orion R68 Meta

0 → 100644

+70 −0

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
		%YAML 1.2
		---
		$id: http://devicetree.org/schemas/gpio/brcm,xgs-iproc-gpio.yaml#
		$schema: http://devicetree.org/meta-schemas/core.yaml#

		title: Broadcom XGS iProc GPIO controller

		maintainers:
		- Chris Packham <chris.packham@alliedtelesis.co.nz>

		description: \|
		This controller is the Chip Common A GPIO present on a number of Broadcom
		switch ASICs with integrated SoCs.

		properties:
		compatible:
		const: brcm,iproc-gpio-cca

		reg:
		items:
		- description: the I/O address containing the GPIO controller
		registers.
		- description: the I/O address containing the Chip Common A interrupt
		registers.

		gpio-controller: true

		'#gpio-cells':
		const: 2

		ngpios:
		minimum: 0
		maximum: 32

		interrupt-controller: true

		'#interrupt-cells':
		const: 2

		interrupts:
		maxItems: 1

		required:
		- compatible
		- reg
		- "#gpio-cells"
		- gpio-controller

		dependencies:
		interrupt-controller: [ interrupts ]

		examples:
		- \|
		#include <dt-bindings/interrupt-controller/irq.h>
		#include <dt-bindings/interrupt-controller/arm-gic.h>
		gpio@18000060 {
		compatible = "brcm,iproc-gpio-cca";
		#gpio-cells = <2>;
		reg = <0x18000060 0x50>,
		<0x18000000 0x50>;
		ngpios = <12>;
		gpio-controller;
		interrupt-controller;
		#interrupt-cells = <2>;
		interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;
		};


		...

0 → 100644

+50 −0

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
		%YAML 1.2
		---
		$id: http://devicetree.org/schemas/gpio/gpio-rda.yaml#
		$schema: http://devicetree.org/meta-schemas/core.yaml#

		title: RDA Micro GPIO controller

		maintainers:
		- Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>

		properties:
		compatible:
		const: rda,8810pl-gpio

		reg:
		maxItems: 1

		gpio-controller: true

		"#gpio-cells":
		const: 2

		ngpios:
		description:
		Number of available gpios in a bank.
		minimum: 1
		maximum: 32

		interrupt-controller: true

		"#interrupt-cells":
		const: 2

		interrupts:
		maxItems: 1

		required:
		- compatible
		- reg
		- gpio-controller
		- "#gpio-cells"
		- ngpios
		- interrupt-controller
		- "#interrupt-cells"
		- interrupts

		additionalProperties: false

		...