Merge remote-tracking branch 'spi/for-6.3' into spi-next (de82c25d) · Commits · EulixOS / Software / Kernel

Documentation/devicetree/bindings/spi/allwinner,sun4i-a10-spi.yaml

+1 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
		title: Allwinner A10 SPI Controller

		allOf:
		- $ref: "spi-controller.yaml"
		- $ref: spi-controller.yaml

		maintainers:
		- Chen-Yu Tsai <wens@csie.org>

+1 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
		title: Allwinner A31 SPI Controller

		allOf:
		- $ref: "spi-controller.yaml"
		- $ref: spi-controller.yaml

		maintainers:
		- Chen-Yu Tsai <wens@csie.org>

+16 −16

Original line number	Diff line number	Diff line
		@@ -2,8 +2,8 @@
		# Copyright 2019 BayLibre, SAS
		%YAML 1.2
		---
		$id: "http://devicetree.org/schemas/spi/amlogic,meson-gx-spicc.yaml#"
		$schema: "http://devicetree.org/meta-schemas/core.yaml#"
		$id: http://devicetree.org/schemas/spi/amlogic,meson-gx-spicc.yaml#
		$schema: http://devicetree.org/meta-schemas/core.yaml#

		title: Amlogic Meson SPI Communication Controller

		@@ -41,7 +41,7 @@ properties:
		maxItems: 2

		allOf:
		- $ref: "spi-controller.yaml#"
		- $ref: spi-controller.yaml#
		- if:
		properties:
		compatible:

+14 −14

Original line number	Diff line number	Diff line
		@@ -2,8 +2,8 @@
		# Copyright 2019 BayLibre, SAS
		%YAML 1.2
		---
		$id: "http://devicetree.org/schemas/spi/amlogic,meson6-spifc.yaml#"
		$schema: "http://devicetree.org/meta-schemas/core.yaml#"
		$id: http://devicetree.org/schemas/spi/amlogic,meson6-spifc.yaml#
		$schema: http://devicetree.org/meta-schemas/core.yaml#

		title: Amlogic Meson SPI Flash Controller

		@@ -11,7 +11,7 @@ maintainers:
		- Neil Armstrong <neil.armstrong@linaro.org>

		allOf:
		- $ref: "spi-controller.yaml#"
		- $ref: spi-controller.yaml#

		description: \|
		The Meson SPIFC is a controller optimized for communication with SPI

+13 −13