Merge tag 'actions-bindings-for-v5.10' of... (a6d862f2) · Commits · 戴 / test

Merge tag 'actions-bindings-for-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions into arm/dt Actions Semi bindings for v5.10 - Add vendor prefix for Roseapple Pi: http://roseapplepi.org/ - Document RoseapplePi SBC manufactured by Roseapple Pi team in Taiwan. This board is based on Actions Semi S500 SoC. More information about this board can be found in their website: http://roseapplepi.org/index.php/spec/ - Add vendor prefix for Caninos Loucos Program: https://caninosloucos.org/en/program-en/ - Document Caninos Loucos Labrador SBC manufactured by Laboratory of Integrated Technological Systems (LSI-TEC), Brazil. This board is based on Actions Semi S500 SoC. More information about this board can be found in their website: https://caninosloucos.org/en/labrador-32-en/ * tag 'actions-bindings-for-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions: dt-bindings: arm: actions: Document RoseapplePi dt-bindings: Add vendor prefix for RoseapplePi.org dt-bindings: arm: actions: Document Caninos Loucos Labrador dt-bindings: Add vendor prefix for Caninos Loucos Link: https://lore.kernel.org/r/20200922113408.GA11251@Mani-XPS-13-9360 Signed-off-by:

Documentation/devicetree/bindings/arm/actions.yaml

+11 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,12 @@ properties:
		- enum:
		- allo,sparky # Allo.com Sparky
		- cubietech,cubieboard6 # Cubietech CubieBoard6
		- roseapplepi,roseapplepi # RoseapplePi.org RoseapplePi
		- const: actions,s500
		- items:
		- enum:
		- caninos,labrador-base-m # Labrador Base Board M v1
		- const: caninos,labrador-v2 # Labrador Core v2
		- const: actions,s500
		- items:
		- enum:
		@@ -26,6 +32,11 @@ properties:
		- const: actions,s500

		# The Actions Semi S700 is a quad-core ARM Cortex-A53 SoC.
		- items:
		- enum:
		- caninos,labrador-base-m2 # Labrador Base Board M v2
		- const: caninos,labrador-v3 # Labrador Core v3
		- const: actions,s700
		- items:
		- enum:
		- cubietech,cubieboard7 # Cubietech CubieBoard7

+4 −0

Original line number	Diff line number	Diff line
		@@ -179,6 +179,8 @@ patternProperties:
		description: CALAO Systems SAS
		"^calxeda,.*":
		description: Calxeda
		"^caninos,.*":
		description: Caninos Loucos Program
		"^capella,.*":
		description: Capella Microsystems, Inc
		"^cascoda,.*":
		@@ -894,6 +896,8 @@ patternProperties:
		description: Ronbo Electronics
		"^roofull,.*":
		description: Shenzhen Roofull Technology Co, Ltd
		"^roseapplepi,.*":
		description: RoseapplePi.org
		"^samsung,.*":
		description: Samsung Semiconductor
		"^samtec,.*":