diff options
| author | Olof Johansson <olof@lixom.net> | 2020-10-03 12:35:14 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2020-10-03 12:35:16 -0700 |
| commit | a6d862f21ad9c7d2b3d0b5355741b358c8316091 (patch) | |
| tree | 6de285d29ed066afe689a3ac1567cdd56f7fb234 /Documentation | |
| parent | 2494ad156d2a8018f576db8ac519c91b06bebbaf (diff) | |
| parent | 494eebdc7e9089021192d1642d7c6d542dbc8ec8 (diff) | |
| download | linux-a6d862f21ad9c7d2b3d0b5355741b358c8316091.tar.gz linux-a6d862f21ad9c7d2b3d0b5355741b358c8316091.tar.bz2 linux-a6d862f21ad9c7d2b3d0b5355741b358c8316091.zip | |
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: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/actions.yaml | 11 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/vendor-prefixes.yaml | 4 |
2 files changed, 15 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/actions.yaml b/Documentation/devicetree/bindings/arm/actions.yaml index ace3fdaa8396..9dd6bd067f4a 100644 --- a/Documentation/devicetree/bindings/arm/actions.yaml +++ b/Documentation/devicetree/bindings/arm/actions.yaml @@ -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: @@ -28,6 +34,11 @@ properties: # 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 - const: actions,s700 diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml index d8fef6a4f118..639137945c3c 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml @@ -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,.*": |