Skip to content

Commit 86724b7

Browse files
arndbarndb
committed
Merge tag 'imx-bindings-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into soc/dt
i.MX dt-bindings update for 6.4: - Add vendor prefix for chargebyte. - A bunch of new board compatibles: Tolino Vision, Toradex Apalis, chargebyte Tarragon, i.MX8M Plus based boards from DH electronics and Data Modul, etc. - A series from Marek Vasut to improve blk-ctrl bindings. * tag 'imx-bindings-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: dt-bindings: arm: Add Data Modul i.MX8M Plus eDM SBC dt-bindings: arm: fsl: Add chargebyte Tarragon dt-bindings: vendor-prefixes: add chargebyte dt-bindings: soc: imx-blk-ctrl: Drop leading label in blk-ctrl in examples dt-bindings: soc: imx8m-blk-ctrl: Rename blk_ctrl to blk-ctrl in examples dt-bindings: arm: Add DH electronics i.MX8M Plus DHCOM on PDK3 dt-bindings: arm: fsl: add compatible string for Tolino Vision dt-bindings: arm: fsl: Add Y Soft IOTA Phoenix, Lynx, Pegasus and Pegasus+ dt-bindings: arm: fsl: Add colibri-imx8x carrier boards dt-bindings: soc: imx8mp-media-blk-ctrl: Add LDB subnode into schema and example dt-bindings: soc: imx8mp-media-blk-ctrl: Align block controller example name dt-bindings: arm: fsl: Fix copy-paste error in comment dt-bindings: arm: fsl: add toradex,apalis-imx8 et al.
2 parents 83f91bb + e7a985d commit 86724b7

9 files changed

Lines changed: 102 additions & 10 deletions

‎Documentation/devicetree/bindings/arm/fsl.yaml‎

Lines changed: 42 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,7 @@ properties:
300300
- variscite,dt6customboard
301301
- wand,imx6q-wandboard # Wandboard i.MX6 Quad Board
302302
- ysoft,imx6q-yapp4-crux # i.MX6 Quad Y Soft IOTA Crux board
303+
- ysoft,imx6q-yapp4-pegasus # i.MX6 Quad Y Soft IOTA Pegasus board
303304
- zealz,imx6q-gk802 # Zealz GK802
304305
- zii,imx6q-zii-rdu2 # ZII RDU2 Board
305306
- const: fsl,imx6q
@@ -410,6 +411,7 @@ properties:
410411
- prt,prtwd3 # Protonic WD3 board
411412
- wand,imx6qp-wandboard # Wandboard i.MX6 QuadPlus Board
412413
- ysoft,imx6qp-yapp4-crux-plus # i.MX6 Quad Plus Y Soft IOTA Crux+ board
414+
- ysoft,imx6qp-yapp4-pegasus-plus # i.MX6 Quad Plus Y Soft IOTA Pegasus+ board
413415
- zii,imx6qp-zii-rdu2 # ZII RDU2+ Board
414416
- const: fsl,imx6qp
415417

@@ -474,9 +476,11 @@ properties:
474476
- udoo,imx6dl-udoo # Udoo i.MX6 Dual-lite Board
475477
- vdl,lanmcu # Van der Laan LANMCU board
476478
- wand,imx6dl-wandboard # Wandboard i.MX6 Dual Lite Board
477-
- ysoft,imx6dl-yapp4-draco # i.MX6 DualLite Y Soft IOTA Draco board
479+
- ysoft,imx6dl-yapp4-draco # i.MX6 Solo Y Soft IOTA Draco board
478480
- ysoft,imx6dl-yapp4-hydra # i.MX6 DualLite Y Soft IOTA Hydra board
481+
- ysoft,imx6dl-yapp4-lynx # i.MX6 DualLite Y Soft IOTA Lynx board
479482
- ysoft,imx6dl-yapp4-orion # i.MX6 DualLite Y Soft IOTA Orion board
483+
- ysoft,imx6dl-yapp4-phoenix # i.MX6 DualLite Y Soft IOTA Phoenix board
480484
- ysoft,imx6dl-yapp4-ursa # i.MX6 Solo Y Soft IOTA Ursa board
481485
- const: fsl,imx6dl
482486

@@ -581,6 +585,7 @@ properties:
581585
- kobo,aura2
582586
- kobo,tolino-shine2hd
583587
- kobo,tolino-shine3
588+
- kobo,tolino-vision
584589
- kobo,tolino-vision5
585590
- revotics,imx6sl-warp # Revotics WaRP Board
586591
- const: fsl,imx6sl
@@ -702,6 +707,15 @@ properties:
702707
- const: armadeus,imx6ull-opos6ul # OPOS6UL (i.MX6ULL) SoM
703708
- const: fsl,imx6ull
704709

710+
- description: i.MX6ULL chargebyte Tarragon Boards
711+
items:
712+
- enum:
713+
- chargebyte,imx6ull-tarragon-master
714+
- chargebyte,imx6ull-tarragon-micro
715+
- chargebyte,imx6ull-tarragon-slave
716+
- chargebyte,imx6ull-tarragon-slavext
717+
- const: fsl,imx6ull
718+
705719
- description: i.MX6ULL DHCOM SoM based Boards
706720
items:
707721
- enum:
@@ -1002,6 +1016,7 @@ properties:
10021016
items:
10031017
- enum:
10041018
- beacon,imx8mp-beacon-kit # i.MX8MP Beacon Development Kit
1019+
- dmo,imx8mp-data-modul-edm-sbc # i.MX8MP eDM SBC
10051020
- fsl,imx8mp-evk # i.MX8MP EVK Board
10061021
- gateworks,imx8mp-gw74xx # i.MX8MP Gateworks Board
10071022
- polyhex,imx8mp-debix # Polyhex Debix boards
@@ -1020,7 +1035,9 @@ properties:
10201035

10211036
- description: i.MX8MP DHCOM based Boards
10221037
items:
1023-
- const: dh,imx8mp-dhcom-pdk2 # i.MX8MP DHCOM SoM on PDK2 board
1038+
- enum:
1039+
- dh,imx8mp-dhcom-pdk2 # i.MX8MP DHCOM SoM on PDK2 board
1040+
- dh,imx8mp-dhcom-pdk3 # i.MX8MP DHCOM SoM on PDK3 board
10241041
- const: dh,imx8mp-dhcom-som # i.MX8MP DHCOM SoM
10251042
- const: fsl,imx8mp
10261043

@@ -1119,6 +1136,25 @@ properties:
11191136
items:
11201137
- enum:
11211138
- fsl,imx8qm-mek # i.MX8QM MEK Board
1139+
- toradex,apalis-imx8 # Apalis iMX8 Modules
1140+
- toradex,apalis-imx8-v1.1 # Apalis iMX8 V1.1 Modules
1141+
- const: fsl,imx8qm
1142+
1143+
- description: i.MX8QM Boards with Toradex Apalis iMX8 Modules
1144+
items:
1145+
- enum:
1146+
- toradex,apalis-imx8-eval # Apalis iMX8 Module on Apalis Evaluation Board
1147+
- toradex,apalis-imx8-ixora-v1.1 # Apalis iMX8 Module on Ixora V1.1 Carrier Board
1148+
- const: toradex,apalis-imx8
1149+
- const: fsl,imx8qm
1150+
1151+
- description: i.MX8QM Boards with Toradex Apalis iMX8 V1.1 Modules
1152+
items:
1153+
- enum:
1154+
- toradex,apalis-imx8-v1.1-eval # Apalis iMX8 V1.1 Module on Apalis Eval. Board
1155+
- toradex,apalis-imx8-v1.1-ixora-v1.1 # Apalis iMX8 V1.1 Module on Ixora V1.1 C. Board
1156+
- toradex,apalis-imx8-v1.1-ixora-v1.2 # Apalis iMX8 V1.1 Module on Ixora V1.2 C. Board
1157+
- const: toradex,apalis-imx8-v1.1
11221158
- const: fsl,imx8qm
11231159

11241160
- description: i.MX8QXP based Boards
@@ -1135,10 +1171,13 @@ properties:
11351171
- fsl,imx8dxl-evk # i.MX8DXL EVK Board
11361172
- const: fsl,imx8dxl
11371173

1138-
- description: i.MX8QXP Boards with Toradex Coilbri iMX8X Modules
1174+
- description: i.MX8QXP Boards with Toradex Colibri iMX8X Modules
11391175
items:
11401176
- enum:
1177+
- toradex,colibri-imx8x-aster # Colibri iMX8X Module on Aster Board
11411178
- toradex,colibri-imx8x-eval-v3 # Colibri iMX8X Module on Colibri Evaluation Board V3
1179+
- toradex,colibri-imx8x-iris # Colibri iMX8X Module on Iris Board
1180+
- toradex,colibri-imx8x-iris-v2 # Colibri iMX8X Module on Iris Board V2
11421181
- const: toradex,colibri-imx8x
11431182
- const: fsl,imx8qxp
11441183

‎Documentation/devicetree/bindings/soc/imx/fsl,imx8mm-disp-blk-ctrl.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ examples:
7070
#include <dt-bindings/clock/imx8mm-clock.h>
7171
#include <dt-bindings/power/imx8mm-power.h>
7272
73-
disp_blk_ctl: blk_ctrl@32e28000 {
73+
blk-ctrl@32e28000 {
7474
compatible = "fsl,imx8mm-disp-blk-ctrl", "syscon";
7575
reg = <0x32e28000 0x100>;
7676
power-domains = <&pgc_dispmix>, <&pgc_dispmix>, <&pgc_dispmix>,

‎Documentation/devicetree/bindings/soc/imx/fsl,imx8mm-vpu-blk-ctrl.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ examples:
150150
#include <dt-bindings/clock/imx8mm-clock.h>
151151
#include <dt-bindings/power/imx8mm-power.h>
152152
153-
vpu_blk_ctrl: blk-ctrl@38330000 {
153+
blk-ctrl@38330000 {
154154
compatible = "fsl,imx8mm-vpu-blk-ctrl", "syscon";
155155
reg = <0x38330000 0x100>;
156156
power-domains = <&pgc_vpumix>, <&pgc_vpu_g1>,

‎Documentation/devicetree/bindings/soc/imx/fsl,imx8mn-disp-blk-ctrl.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ examples:
7171
#include <dt-bindings/clock/imx8mn-clock.h>
7272
#include <dt-bindings/power/imx8mn-power.h>
7373
74-
disp_blk_ctl: blk_ctrl@32e28000 {
74+
blk-ctrl@32e28000 {
7575
compatible = "fsl,imx8mn-disp-blk-ctrl", "syscon";
7676
reg = <0x32e28000 0x100>;
7777
power-domains = <&pgc_dispmix>, <&pgc_dispmix>,

‎Documentation/devicetree/bindings/soc/imx/fsl,imx8mp-hsio-blk-ctrl.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ examples:
7676
#include <dt-bindings/clock/imx8mp-clock.h>
7777
#include <dt-bindings/power/imx8mp-power.h>
7878
79-
hsio_blk_ctrl: blk-ctrl@32f10000 {
79+
blk-ctrl@32f10000 {
8080
compatible = "fsl,imx8mp-hsio-blk-ctrl", "syscon";
8181
reg = <0x32f10000 0x24>;
8282
clocks = <&clk IMX8MP_CLK_USB_ROOT>,

‎Documentation/devicetree/bindings/soc/imx/fsl,imx8mp-media-blk-ctrl.yaml‎

Lines changed: 52 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@ properties:
2323
reg:
2424
maxItems: 1
2525

26+
'#address-cells':
27+
const: 1
28+
29+
'#size-cells':
30+
const: 1
31+
2632
'#power-domain-cells':
2733
const: 1
2834

@@ -78,9 +84,16 @@ properties:
7884
- const: isp1
7985
- const: dwe
8086

87+
bridge@5c:
88+
type: object
89+
$ref: /schemas/display/bridge/fsl,ldb.yaml#
90+
unevaluatedProperties: false
91+
8192
required:
8293
- compatible
8394
- reg
95+
- '#address-cells'
96+
- '#size-cells'
8497
- '#power-domain-cells'
8598
- power-domains
8699
- power-domain-names
@@ -94,7 +107,7 @@ examples:
94107
#include <dt-bindings/clock/imx8mp-clock.h>
95108
#include <dt-bindings/power/imx8mp-power.h>
96109
97-
media_blk_ctl: blk-ctl@32ec0000 {
110+
blk-ctrl@32ec0000 {
98111
compatible = "fsl,imx8mp-media-blk-ctrl", "syscon";
99112
reg = <0x32ec0000 0x138>;
100113
power-domains = <&mediamix_pd>, <&mipi_phy1_pd>, <&mipi_phy1_pd>,
@@ -114,5 +127,43 @@ examples:
114127
clock-names = "apb", "axi", "cam1", "cam2", "disp1", "disp2",
115128
"isp", "phy";
116129
#power-domain-cells = <1>;
130+
#address-cells = <1>;
131+
#size-cells = <1>;
132+
133+
bridge@5c {
134+
compatible = "fsl,imx8mp-ldb";
135+
reg = <0x5c 0x4>, <0x128 0x4>;
136+
reg-names = "ldb", "lvds";
137+
clocks = <&clk IMX8MP_CLK_MEDIA_LDB>;
138+
clock-names = "ldb";
139+
140+
ports {
141+
#address-cells = <1>;
142+
#size-cells = <0>;
143+
144+
port@0 {
145+
reg = <0>;
146+
147+
ldb_from_lcdif2: endpoint {
148+
remote-endpoint = <&lcdif2_to_ldb>;
149+
};
150+
};
151+
152+
port@1 {
153+
reg = <1>;
154+
155+
ldb_lvds_ch0: endpoint {
156+
remote-endpoint = <&ldb_to_lvdsx4panel>;
157+
};
158+
};
159+
160+
port@2 {
161+
reg = <2>;
162+
163+
ldb_lvds_ch1: endpoint {
164+
};
165+
};
166+
};
167+
};
117168
};
118169
...

‎Documentation/devicetree/bindings/soc/imx/fsl,imx8mq-vpu-blk-ctrl.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ examples:
5959
#include <dt-bindings/clock/imx8mq-clock.h>
6060
#include <dt-bindings/power/imx8mq-power.h>
6161
62-
vpu_blk_ctrl: blk-ctrl@38320000 {
62+
blk-ctrl@38320000 {
6363
compatible = "fsl,imx8mq-vpu-blk-ctrl";
6464
reg = <0x38320000 0x100>;
6565
power-domains = <&pgc_vpu>, <&pgc_vpu>, <&pgc_vpu>;

‎Documentation/devicetree/bindings/soc/imx/fsl,imx93-media-blk-ctrl.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ examples:
6060
#include <dt-bindings/clock/imx93-clock.h>
6161
#include <dt-bindings/power/fsl,imx93-power.h>
6262
63-
media_blk_ctrl: system-controller@4ac10000 {
63+
system-controller@4ac10000 {
6464
compatible = "fsl,imx93-media-blk-ctrl", "syscon";
6565
reg = <0x4ac10000 0x10000>;
6666
power-domains = <&mediamix>;

‎Documentation/devicetree/bindings/vendor-prefixes.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,8 @@ patternProperties:
240240
description: CellWise Microelectronics Co., Ltd
241241
"^ceva,.*":
242242
description: Ceva, Inc.
243+
"^chargebyte,.*":
244+
description: chargebyte GmbH
243245
"^checkpoint,.*":
244246
description: Check Point Software Technologies Ltd.
245247
"^chefree,.*":

0 commit comments

Comments
 (0)