diff options
| author | Mark Brown <broonie@kernel.org> | 2026-09-30 12:47:58 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-09-30 12:47:58 +0100 |
| commit | 3361951ed372fa82e2097006f4208f966015b502 (patch) | |
| tree | b8192e928dabc5fec89fc9f3f1323418faaf10ac /Documentation | |
| parent | a7c83235a984c4571a35749da67eafef6e515145 (diff) | |
| parent | ba727be7fe4a64ddc6aa2c178204cf6a36d44cc4 (diff) | |
| download | linux-next-3361951ed372fa82e2097006f4208f966015b502.tar.gz linux-next-3361951ed372fa82e2097006f4208f966015b502.zip | |
Merge branch 'ti-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git
Diffstat (limited to 'Documentation')
3 files changed, 17 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/arm/ti/k3.yaml b/Documentation/devicetree/bindings/arm/ti/k3.yaml index eebb3523303c..9a0d62234058 100644 --- a/Documentation/devicetree/bindings/arm/ti/k3.yaml +++ b/Documentation/devicetree/bindings/arm/ti/k3.yaml @@ -229,6 +229,13 @@ properties: - ti,j722s-evm - const: ti,j722s + - description: K3 AM67 SoC PHYTEC phyBOARD-Rigel + items: + - enum: + - phytec,am6754-phyboard-rigel + - const: phytec,am67-phycore-som + - const: ti,j722s + - description: K3 J742S2 SoC items: - enum: diff --git a/Documentation/devicetree/bindings/clock/ti,am62-audio-refclk.yaml b/Documentation/devicetree/bindings/clock/ti,am62-audio-refclk.yaml index b2e40bd39a3a..6c8fb0793070 100644 --- a/Documentation/devicetree/bindings/clock/ti,am62-audio-refclk.yaml +++ b/Documentation/devicetree/bindings/clock/ti,am62-audio-refclk.yaml @@ -11,8 +11,12 @@ maintainers: properties: compatible: - items: - - const: ti,am62-audio-refclk + oneOf: + - items: + - const: ti,am62-audio-refclk + - items: + - const: ti,j721s2-audio-refclk + - const: ti,am62-audio-refclk reg: maxItems: 1 diff --git a/Documentation/devicetree/bindings/soc/ti/ti,j721e-system-controller.yaml b/Documentation/devicetree/bindings/soc/ti/ti,j721e-system-controller.yaml index f3bd0be3b279..364be49f8c7c 100644 --- a/Documentation/devicetree/bindings/soc/ti/ti,j721e-system-controller.yaml +++ b/Documentation/devicetree/bindings/soc/ti/ti,j721e-system-controller.yaml @@ -53,9 +53,11 @@ patternProperties: "^clock-controller@[0-9a-f]+$": type: object - $ref: /schemas/clock/ti,am654-ehrpwm-tbclk.yaml# + oneOf: + - $ref: /schemas/clock/ti,am62-audio-refclk.yaml# + - $ref: /schemas/clock/ti,am654-ehrpwm-tbclk.yaml# description: - Clock provider for TI EHRPWM nodes. + Clock provider for TI EHRPWM or Audio Reference Clock nodes. "phy@[0-9a-f]+$": type: object |