aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2024-03-01 19:03:18 +0100
committerArnd Bergmann <arnd@arndb.de>2024-03-01 19:03:19 +0100
commit4bf6c3b48f2c7f35bc00e457f7ee9161f4f93f10 (patch)
tree25d3e014d2bb9ea27e7ad753ec5eecedc581aef5 /Documentation
parentd80ec24ed8acf0075d6f0a0c71bac8dc33113e0d (diff)
parenta3b7554ade36436bbbd52b058207a31dc4224e36 (diff)
downloadlinux-4bf6c3b48f2c7f35bc00e457f7ee9161f4f93f10.tar.gz
Merge tag 'amlogic-arm64-dt-for-v6.9' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into soc/dt
Amlogic ARM64 DT changes for v6.9: - New Board: - Freebox Pop Player (IPTV Set-To-Box from Free FRench internet provider) - Add reset controller for Amlogic C3 - Set initial rate for the NPU on Amlogic G12 SoCs - Set initial clocks for USB on Amlogic A1 - Initialize Amlogic AXG SoC capacitance - Drop unstable remark on Amlogic Bindings - Add all Amlogic maintainers/reviewers on Amlogic SoCs bindings - Cleanups: - T7 whitespaces - Underscore in names * tag 'amlogic-arm64-dt-for-v6.9' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux: dt-bindings: arm: amlogic: add Neil, Martin and Jerome as maintainers dt-bindings: arm: amlogic: remove unstable remark arm64: dts: amlogic: add fbx8am DT overlays arm64: dts: amlogic: add fbx8am board dt-bindings: arm: amlogic: add fbx8am binding dt-bindings: vendor-prefixes: add freebox arm64: dts: amlogic: replace underscores in node names arm64: dts: amlogic: t7: minor whitespace cleanup arm64: dts: amlogic: axg: initialize default SoC capacitance arm64: dts: amlogic: axg: move cpu cooling-cells to common dtsi arch: arm64: dts: meson: a1: add assigned-clocks for usb node arm64: dts: amlogic: meson-g12-common: Set the rates of the clocks for the NPU arm64: dts: amlogic: add reset controller for Amlogic C3 SoC Link: https://lore.kernel.org/r/1937f5ef-5d76-4259-931d-523c0e2f0a91@linaro.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/arm/amlogic.yaml15
-rw-r--r--Documentation/devicetree/bindings/vendor-prefixes.yaml2
2 files changed, 6 insertions, 11 deletions
diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
index caab7ceeda45a..949537cea6be2 100644
--- a/Documentation/devicetree/bindings/arm/amlogic.yaml
+++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
@@ -7,19 +7,11 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Amlogic SoC based Platforms
maintainers:
+ - Neil Armstrong <neil.armstrong@linaro.org>
+ - Martin Blumenstingl <martin.blumenstingl@googlemail.com>
+ - Jerome Brunet <jbrunet@baylibre.com>
- Kevin Hilman <khilman@baylibre.com>
-description: |+
- Work in progress statement:
-
- Device tree files and bindings applying to Amlogic SoCs and boards are
- considered "unstable". Any Amlogic device tree binding may change at
- any time. Be sure to use a device tree binary and a kernel image
- generated from the same source tree.
-
- Please refer to Documentation/devicetree/bindings/ABI.rst for a definition of a
- stable binding/ABI.
-
properties:
$nodename:
const: '/'
@@ -146,6 +138,7 @@ properties:
- enum:
- amediatech,x96-max
- amlogic,u200
+ - freebox,fbx8am
- radxa,zero
- seirobotics,sei510
- const: amlogic,g12a
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml
index bf5ea655be8b1..d371eb5721645 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@ -502,6 +502,8 @@ patternProperties:
description: FocalTech Systems Co.,Ltd
"^forlinx,.*":
description: Baoding Forlinx Embedded Technology Co., Ltd.
+ "^freebox,.*":
+ description: Freebox SAS
"^freecom,.*":
description: Freecom Gmbh
"^frida,.*":