Skip to content

Commit 99cb440

Browse files
committed
Merge tag 'imx-bindings-6.17' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into soc/dt
i.MX dt-bindings changes for 6.17: - New board compatibles for i.MX28 Amarula, Engicam MicroGEA, GOcontroll and phyCORE-i.MX 95 Plus FPSC SoM - A couple of i.MX AIPSTZ bridge related bindings updates from Laurentiu Mihalcea * tag 'imx-bindings-6.17' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: dt-bindings: add imx95-libra-rdk-fpsc dt-bindings: arm: fsl: support Engicam MicroGEA GTW board dt-bindings: arm: fsl: support Engicam MicroGEA RMM board dt-bindings: arm: fsl: support Engicam MicroGEA BMM board dt-bindings: dsp: fsl,dsp: document 'access-controllers' property dt-bindings: bus: document the IMX AIPSTZ bridge dt-bindings: arm: fsl: add i.MX28 Amarula rmm board dt-bindings: arm: fsl: Add GOcontroll Moduline Display Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 1d9026c + f794181 commit 99cb440

File tree

3 files changed

+125
-0
lines changed

3 files changed

+125
-0
lines changed

Documentation/devicetree/bindings/arm/fsl.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ properties:
8989
- description: i.MX28 based Boards
9090
items:
9191
- enum:
92+
- amarula,imx28-rmm
9293
- armadeus,imx28-apf28 # APF28 SoM
9394
- bluegiga,apx4devkit # Bluegiga APx4 SoM on dev board
9495
- crystalfontz,cfa10036 # Crystalfontz CFA-10036 SoM
@@ -769,6 +770,15 @@ properties:
769770
- const: dh,imx6ull-dhcor-som
770771
- const: fsl,imx6ull
771772

773+
- description: i.MX6ULL Engicam MicroGEA SoM based boards
774+
items:
775+
- enum:
776+
- engicam,microgea-imx6ull-bmm # i.MX6ULL Engicam MicroGEA BMM Board
777+
- engicam,microgea-imx6ull-gtw # i.MX6ULL Engicam MicroGEA GTW Board
778+
- engicam,microgea-imx6ull-rmm # i.MX6ULL Engicam MicroGEA RMM Board
779+
- const: engicam,microgea-imx6ull # i.MX6ULL Engicam MicroGEA SoM
780+
- const: fsl,imx6ull
781+
772782
- description: i.MX6ULL PHYTEC phyBOARD-Segin
773783
items:
774784
- enum:
@@ -1095,6 +1105,7 @@ properties:
10951105
- gateworks,imx8mp-gw74xx # i.MX8MP Gateworks Board
10961106
- gateworks,imx8mp-gw75xx-2x # i.MX8MP Gateworks Board
10971107
- gateworks,imx8mp-gw82xx-2x # i.MX8MP Gateworks Board
1108+
- gocontroll,moduline-display # GOcontroll Moduline Display controller
10981109
- skov,imx8mp-skov-basic # SKOV i.MX8MP baseboard without frontplate
10991110
- skov,imx8mp-skov-revb-hdmi # SKOV i.MX8MP climate control without panel
11001111
- skov,imx8mp-skov-revb-lt6 # SKOV i.MX8MP climate control with 7” panel
@@ -1395,6 +1406,13 @@ properties:
13951406
- fsl,imx95-19x19-evk # i.MX95 19x19 EVK Board
13961407
- const: fsl,imx95
13971408

1409+
- description: PHYTEC i.MX 95 FPSC based Boards
1410+
items:
1411+
- enum:
1412+
- phytec,imx95-libra-rdk-fpsc # Libra-i.MX 95 FPSC
1413+
- const: phytec,imx95-phycore-fpsc # phyCORE-i.MX 95 FPSC
1414+
- const: fsl,imx95
1415+
13981416
- description: i.MXRT1050 based Boards
13991417
items:
14001418
- enum:
Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/bus/fsl,imx8mp-aipstz.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Secure AHB to IP Slave bus (AIPSTZ) bridge
8+
9+
description:
10+
The secure AIPS bridge (AIPSTZ) acts as a bridge for AHB masters issuing
11+
transactions to IP Slave peripherals. Additionally, this module offers access
12+
control configurations meant to restrict which peripherals a master can
13+
access.
14+
15+
maintainers:
16+
- Laurentiu Mihalcea <[email protected]>
17+
18+
properties:
19+
compatible:
20+
const: fsl,imx8mp-aipstz
21+
22+
reg:
23+
maxItems: 1
24+
25+
power-domains:
26+
maxItems: 1
27+
28+
"#address-cells":
29+
const: 1
30+
31+
"#size-cells":
32+
const: 1
33+
34+
"#access-controller-cells":
35+
const: 3
36+
description:
37+
First cell - consumer ID
38+
Second cell - consumer type (master or peripheral)
39+
Third cell - configuration value
40+
41+
ranges: true
42+
43+
# borrowed from simple-bus.yaml, no additional requirements for children
44+
patternProperties:
45+
"@(0|[1-9a-f][0-9a-f]*)$":
46+
type: object
47+
additionalProperties: true
48+
properties:
49+
reg:
50+
items:
51+
minItems: 2
52+
maxItems: 4
53+
minItems: 1
54+
maxItems: 1024
55+
ranges:
56+
oneOf:
57+
- items:
58+
minItems: 3
59+
maxItems: 7
60+
minItems: 1
61+
maxItems: 1024
62+
- $ref: /schemas/types.yaml#/definitions/flag
63+
anyOf:
64+
- required:
65+
- reg
66+
- required:
67+
- ranges
68+
69+
required:
70+
- compatible
71+
- reg
72+
- power-domains
73+
- "#address-cells"
74+
- "#size-cells"
75+
- "#access-controller-cells"
76+
- ranges
77+
78+
additionalProperties: false
79+
80+
examples:
81+
- |
82+
#include <dt-bindings/clock/imx8mp-clock.h>
83+
#include <dt-bindings/interrupt-controller/arm-gic.h>
84+
85+
bus@30df0000 {
86+
compatible = "fsl,imx8mp-aipstz";
87+
reg = <0x30df0000 0x10000>;
88+
ranges = <0x30c00000 0x30c00000 0x400000>;
89+
power-domains = <&pgc_audio>;
90+
#address-cells = <1>;
91+
#size-cells = <1>;
92+
#access-controller-cells = <3>;
93+
94+
dma-controller@30e00000 {
95+
compatible = "fsl,imx8mp-sdma", "fsl,imx8mq-sdma";
96+
reg = <0x30e00000 0x10000>;
97+
#dma-cells = <3>;
98+
clocks = <&audio_blk_ctrl IMX8MP_CLK_AUDIOMIX_SDMA3_ROOT>,
99+
<&clk IMX8MP_CLK_AUDIO_ROOT>;
100+
clock-names = "ipg", "ahb";
101+
interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
102+
fsl,sdma-ram-script-name = "imx/sdma/sdma-imx7d.bin";
103+
};
104+
};

Documentation/devicetree/bindings/dsp/fsl,dsp.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,9 @@ properties:
9191
- const: runstall
9292
- const: softreset
9393

94+
access-controllers:
95+
maxItems: 1
96+
9497
required:
9598
- compatible
9699
- reg

0 commit comments

Comments
 (0)