1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
|
From 74b6a90ba073ae853640432f824b6308c5a003b5 Mon Sep 17 00:00:00 2001
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
Date: Thu, 21 Oct 2021 15:06:02 +0100
Subject: [PATCH] dtoverlays: Update all image sensor overlays for
Media Controller option
Add an option to enable configuration via the Media Controller API
(rather than the video-node-centric /dev/videoN) as about to
be used by libcamera as it enables more complex pipelines to be
handled.
Any source that has a libcamera tuning merged has MC enabled by
default.
Sources with no libcamera tuning merged have it disabled by
default.
In either case it can be overridden with the overlay parameter
"media-controller".
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
---
arch/arm/boot/dts/overlays/README | 27 +++++++++++++++++--
.../boot/dts/overlays/adv7282m-overlay.dts | 8 ++++++
arch/arm/boot/dts/overlays/imx219-overlay.dts | 8 ++++++
.../boot/dts/overlays/imx290_327-overlay.dtsi | 8 ++++++
.../boot/dts/overlays/imx477_378-overlay.dtsi | 8 ++++++
arch/arm/boot/dts/overlays/imx519-overlay.dts | 8 ++++++
.../arm/boot/dts/overlays/irs1125-overlay.dts | 11 ++++++++
arch/arm/boot/dts/overlays/ov5647-overlay.dts | 8 ++++++
arch/arm/boot/dts/overlays/ov7251-overlay.dts | 8 ++++++
arch/arm/boot/dts/overlays/ov9281-overlay.dts | 8 ++++++
.../boot/dts/overlays/tc358743-overlay.dts | 8 ++++++
11 files changed, 108 insertions(+), 2 deletions(-)
--- a/arch/arm/boot/dts/overlays/README
+++ b/arch/arm/boot/dts/overlays/README
@@ -416,6 +416,8 @@ Info: Analog Devices ADV7282M analogue
variants.
Load: dtoverlay=adv7282m,<param>=<val>
Params: addr Overrides the I2C address (default 0x21)
+ media-controller Configure use of Media Controller API for
+ configuring the sensor (default off)
Name: adv728x-m
@@ -426,6 +428,8 @@ Params: addr Override
adv7280m Select ADV7280-M.
adv7281m Select ADV7281-M.
adv7281ma Select ADV7281-MA.
+ media-controller Configure use of Media Controller API for
+ configuring the sensor (default off)
Name: akkordion-iqdacplus
@@ -1708,6 +1712,8 @@ Params: rotation Mounting
180, default 180)
orientation Sensor orientation (0 = front, 1 = rear,
2 = external, default external)
+ media-controller Configure use of Media Controller API for
+ configuring the sensor (default on)
Name: imx290
@@ -1728,6 +1734,8 @@ Params: 4lane Enable 4
2 = external, default external)
rotation Mounting rotation of the camera sensor (0 or
180, default 0)
+ media-controller Configure use of Media Controller API for
+ configuring the sensor (default on)
Name: imx378
@@ -1739,6 +1747,8 @@ Params: rotation Mounting
180, default 180)
orientation Sensor orientation (0 = front, 1 = rear,
2 = external, default external)
+ media-controller Configure use of Media Controller API for
+ configuring the sensor (default on)
Name: imx477
@@ -1750,6 +1760,8 @@ Params: rotation Mounting
180, default 180)
orientation Sensor orientation (0 = front, 1 = rear,
2 = external, default external)
+ media-controller Configure use of Media Controller API for
+ configuring the sensor (default on)
Name: imx519
@@ -1761,6 +1773,8 @@ Params: rotation Mounting
180, default 0)
orientation Sensor orientation (0 = front, 1 = rear,
2 = external, default external)
+ media-controller Configure use of Media Controller API for
+ configuring the sensor (default on)
Name: iqaudio-codec
@@ -1824,8 +1838,9 @@ Name: irs1125
Info: Infineon irs1125 TOF camera module.
Uses Unicam 1, which is the standard camera connector on most Pi
variants.
-Load: dtoverlay=irs1125
-Params: <None>
+Load: dtoverlay=irs1125,<param>=<val>
+Params: media-controller Configure use of Media Controller API for
+ configuring the sensor (default off)
Name: jedec-spi-nor
@@ -2237,6 +2252,8 @@ Params: rotation Mounting
180, default 0)
orientation Sensor orientation (0 = front, 1 = rear,
2 = external, default external)
+ media-controller Configure use of Media Controller API for
+ configuring the sensor (default on)
Name: ov7251
@@ -2248,6 +2265,8 @@ Params: rotation Mounting
180, default 0)
orientation Sensor orientation (0 = front, 1 = rear,
2 = external, default external)
+ media-controller Configure use of Media Controller API for
+ configuring the sensor (default off)
Name: ov9281
@@ -2259,6 +2278,8 @@ Params: rotation Mounting
180, default 0)
orientation Sensor orientation (0 = front, 1 = rear,
2 = external, default external)
+ media-controller Configure use of Media Controller API for
+ configuring the sensor (default on)
Name: papirus
@@ -3239,6 +3260,8 @@ Params: 4lane Use 4 la
link-frequency Set the link frequency. Only values of 297000000
(574Mbit/s) and 486000000 (972Mbit/s - default)
are supported by the driver.
+ media-controller Configure use of Media Controller API for
+ configuring the sensor (default off)
Name: tc358743-audio
--- a/arch/arm/boot/dts/overlays/adv7282m-overlay.dts
+++ b/arch/arm/boot/dts/overlays/adv7282m-overlay.dts
@@ -59,7 +59,15 @@
};
};
+ fragment@4 {
+ target = <&csi1>;
+ __dormant__ {
+ brcm,media-controller;
+ };
+ };
+
__overrides__ {
addr = <&adv728x>,"reg:0";
+ media-controller = <0>,"=4";
};
};
--- a/arch/arm/boot/dts/overlays/imx219-overlay.dts
+++ b/arch/arm/boot/dts/overlays/imx219-overlay.dts
@@ -108,8 +108,16 @@
};
};
+ fragment@6 {
+ target = <&csi1>;
+ __overlay__ {
+ brcm,media-controller;
+ };
+ };
+
__overrides__ {
rotation = <&imx219>,"rotation:0";
orientation = <&imx219>,"orientation:0";
+ media-controller = <0>,"=6";
};
};
--- a/arch/arm/boot/dts/overlays/imx290_327-overlay.dtsi
+++ b/arch/arm/boot/dts/overlays/imx290_327-overlay.dtsi
@@ -134,11 +134,19 @@
};
};
+ fragment@10 {
+ target = <&csi1>;
+ __overlay__ {
+ brcm,media-controller;
+ };
+ };
+
__overrides__ {
4lane = <0>, "-6+7-8+9";
clock-frequency = <&imx290_clk>,"clock-frequency:0",
<&imx290>,"clock-frequency:0";
rotation = <&imx290>,"rotation:0";
orientation = <&imx290>,"orientation:0";
+ media-controller = <0>,"=10";
};
};
--- a/arch/arm/boot/dts/overlays/imx477_378-overlay.dtsi
+++ b/arch/arm/boot/dts/overlays/imx477_378-overlay.dtsi
@@ -103,8 +103,16 @@
};
};
+ fragment@6 {
+ target = <&csi1>;
+ __overlay__ {
+ brcm,media-controller;
+ };
+ };
+
__overrides__ {
rotation = <&imx477>,"rotation:0";
orientation = <&imx477>,"orientation:0";
+ media-controller = <0>,"=6";
};
};
--- a/arch/arm/boot/dts/overlays/imx519-overlay.dts
+++ b/arch/arm/boot/dts/overlays/imx519-overlay.dts
@@ -108,8 +108,16 @@
};
};
+ fragment@6 {
+ target = <&csi1>;
+ __overlay__ {
+ brcm,media-controller;
+ };
+ };
+
__overrides__ {
rotation = <&imx519>,"rotation:0";
orientation = <&imx519>,"orientation:0";
+ media-controller = <0>,"=6";
};
};
--- a/arch/arm/boot/dts/overlays/irs1125-overlay.dts
+++ b/arch/arm/boot/dts/overlays/irs1125-overlay.dts
@@ -82,4 +82,15 @@
};
};
};
+
+ fragment@6 {
+ target = <&csi1>;
+ __dormant__ {
+ brcm,media-controller;
+ };
+ };
+
+ __overrides__ {
+ media-controller = <0>,"=6";
+ };
};
--- a/arch/arm/boot/dts/overlays/ov5647-overlay.dts
+++ b/arch/arm/boot/dts/overlays/ov5647-overlay.dts
@@ -87,8 +87,16 @@
};
};
+ fragment@6 {
+ target = <&csi1>;
+ __overlay__ {
+ brcm,media-controller;
+ };
+ };
+
__overrides__ {
rotation = <&ov5647>,"rotation:0";
orientation = <&ov5647>,"orientation:0";
+ media-controller = <0>,"=6";
};
};
--- a/arch/arm/boot/dts/overlays/ov7251-overlay.dts
+++ b/arch/arm/boot/dts/overlays/ov7251-overlay.dts
@@ -106,8 +106,16 @@
};
};
+ fragment@6 {
+ target = <&csi1>;
+ __dormant__ {
+ brcm,media-controller;
+ };
+ };
+
__overrides__ {
rotation = <&ov7251>,"rotation:0";
orientation = <&ov7251>,"orientation:0";
+ media-controller = <0>,"=6";
};
};
--- a/arch/arm/boot/dts/overlays/ov9281-overlay.dts
+++ b/arch/arm/boot/dts/overlays/ov9281-overlay.dts
@@ -106,8 +106,16 @@
};
};
+ fragment@6 {
+ target = <&csi1>;
+ __overlay__ {
+ brcm,media-controller;
+ };
+ };
+
__overrides__ {
rotation = <&ov9281>,"rotation:0";
orientation = <&ov9281>,"orientation:0";
+ media-controller = <0>,"=6";
};
};
--- a/arch/arm/boot/dts/overlays/tc358743-overlay.dts
+++ b/arch/arm/boot/dts/overlays/tc358743-overlay.dts
@@ -100,8 +100,16 @@
};
};
+ fragment@9 {
+ target = <&csi1>;
+ __dormant__ {
+ brcm,media-controller;
+ };
+ };
+
__overrides__ {
4lane = <0>, "-2+3-7+8";
link-frequency = <&tc358743>,"link-frequencies#0";
+ media-controller = <0>,"=9";
};
};
|
