Skip to content

Commit 3e5d625

Browse files
committed
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 <[email protected]>
1 parent b2b29b4 commit 3e5d625

11 files changed

+108
-2
lines changed

arch/arm/boot/dts/overlays/README

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,8 @@ Info: Analog Devices ADV7282M analogue video to CSI2 bridge.
416416
variants.
417417
Load: dtoverlay=adv7282m,<param>=<val>
418418
Params: addr Overrides the I2C address (default 0x21)
419+
media-controller Configure use of Media Controller API for
420+
configuring the sensor (default off)
419421

420422

421423
Name: adv728x-m
@@ -426,6 +428,8 @@ Params: addr Overrides the I2C address (default 0x21)
426428
adv7280m Select ADV7280-M.
427429
adv7281m Select ADV7281-M.
428430
adv7281ma Select ADV7281-MA.
431+
media-controller Configure use of Media Controller API for
432+
configuring the sensor (default off)
429433

430434

431435
Name: akkordion-iqdacplus
@@ -1708,6 +1712,8 @@ Params: rotation Mounting rotation of the camera sensor (0 or
17081712
180, default 180)
17091713
orientation Sensor orientation (0 = front, 1 = rear,
17101714
2 = external, default external)
1715+
media-controller Configure use of Media Controller API for
1716+
configuring the sensor (default on)
17111717

17121718

17131719
Name: imx290
@@ -1728,6 +1734,8 @@ Params: 4lane Enable 4 CSI2 lanes. This requires a Compute
17281734
2 = external, default external)
17291735
rotation Mounting rotation of the camera sensor (0 or
17301736
180, default 0)
1737+
media-controller Configure use of Media Controller API for
1738+
configuring the sensor (default on)
17311739

17321740

17331741
Name: imx378
@@ -1739,6 +1747,8 @@ Params: rotation Mounting rotation of the camera sensor (0 or
17391747
180, default 180)
17401748
orientation Sensor orientation (0 = front, 1 = rear,
17411749
2 = external, default external)
1750+
media-controller Configure use of Media Controller API for
1751+
configuring the sensor (default on)
17421752

17431753

17441754
Name: imx477
@@ -1750,6 +1760,8 @@ Params: rotation Mounting rotation of the camera sensor (0 or
17501760
180, default 180)
17511761
orientation Sensor orientation (0 = front, 1 = rear,
17521762
2 = external, default external)
1763+
media-controller Configure use of Media Controller API for
1764+
configuring the sensor (default on)
17531765

17541766

17551767
Name: imx519
@@ -1761,6 +1773,8 @@ Params: rotation Mounting rotation of the camera sensor (0 or
17611773
180, default 0)
17621774
orientation Sensor orientation (0 = front, 1 = rear,
17631775
2 = external, default external)
1776+
media-controller Configure use of Media Controller API for
1777+
configuring the sensor (default on)
17641778

17651779

17661780
Name: iqaudio-codec
@@ -1824,8 +1838,9 @@ Name: irs1125
18241838
Info: Infineon irs1125 TOF camera module.
18251839
Uses Unicam 1, which is the standard camera connector on most Pi
18261840
variants.
1827-
Load: dtoverlay=irs1125
1828-
Params: <None>
1841+
Load: dtoverlay=irs1125,<param>=<val>
1842+
Params: media-controller Configure use of Media Controller API for
1843+
configuring the sensor (default off)
18291844

18301845

18311846
Name: jedec-spi-nor
@@ -2237,6 +2252,8 @@ Params: rotation Mounting rotation of the camera sensor (0 or
22372252
180, default 0)
22382253
orientation Sensor orientation (0 = front, 1 = rear,
22392254
2 = external, default external)
2255+
media-controller Configure use of Media Controller API for
2256+
configuring the sensor (default on)
22402257

22412258

22422259
Name: ov7251
@@ -2248,6 +2265,8 @@ Params: rotation Mounting rotation of the camera sensor (0 or
22482265
180, default 0)
22492266
orientation Sensor orientation (0 = front, 1 = rear,
22502267
2 = external, default external)
2268+
media-controller Configure use of Media Controller API for
2269+
configuring the sensor (default off)
22512270

22522271

22532272
Name: ov9281
@@ -2259,6 +2278,8 @@ Params: rotation Mounting rotation of the camera sensor (0 or
22592278
180, default 0)
22602279
orientation Sensor orientation (0 = front, 1 = rear,
22612280
2 = external, default external)
2281+
media-controller Configure use of Media Controller API for
2282+
configuring the sensor (default on)
22622283

22632284

22642285
Name: papirus
@@ -3239,6 +3260,8 @@ Params: 4lane Use 4 lanes (only applicable to Compute Modules
32393260
link-frequency Set the link frequency. Only values of 297000000
32403261
(574Mbit/s) and 486000000 (972Mbit/s - default)
32413262
are supported by the driver.
3263+
media-controller Configure use of Media Controller API for
3264+
configuring the sensor (default off)
32423265

32433266

32443267
Name: tc358743-audio

arch/arm/boot/dts/overlays/adv7282m-overlay.dts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,15 @@
5959
};
6060
};
6161

62+
fragment@4 {
63+
target = <&csi1>;
64+
__dormant__ {
65+
brcm,media-controller;
66+
};
67+
};
68+
6269
__overrides__ {
6370
addr = <&adv728x>,"reg:0";
71+
media-controller = "=4";
6472
};
6573
};

arch/arm/boot/dts/overlays/imx219-overlay.dts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,16 @@
108108
};
109109
};
110110

111+
fragment@6 {
112+
target = <&csi1>;
113+
__overlay__ {
114+
brcm,media-controller;
115+
};
116+
};
117+
111118
__overrides__ {
112119
rotation = <&imx219>,"rotation:0";
113120
orientation = <&imx219>,"orientation:0";
121+
media-controller = "=6";
114122
};
115123
};

arch/arm/boot/dts/overlays/imx290_327-overlay.dtsi

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,19 @@
134134
};
135135
};
136136

137+
fragment@10 {
138+
target = <&csi1>;
139+
__overlay__ {
140+
brcm,media-controller;
141+
};
142+
};
143+
137144
__overrides__ {
138145
4lane = <0>, "-6+7-8+9";
139146
clock-frequency = <&imx290_clk>,"clock-frequency:0",
140147
<&imx290>,"clock-frequency:0";
141148
rotation = <&imx290>,"rotation:0";
142149
orientation = <&imx290>,"orientation:0";
150+
media-controller = "=10";
143151
};
144152
};

arch/arm/boot/dts/overlays/imx477_378-overlay.dtsi

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,16 @@
103103
};
104104
};
105105

106+
fragment@6 {
107+
target = <&csi1>;
108+
__overlay__ {
109+
brcm,media-controller;
110+
};
111+
};
112+
106113
__overrides__ {
107114
rotation = <&imx477>,"rotation:0";
108115
orientation = <&imx477>,"orientation:0";
116+
media-controller = "=6";
109117
};
110118
};

arch/arm/boot/dts/overlays/imx519-overlay.dts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,16 @@
108108
};
109109
};
110110

111+
fragment@6 {
112+
target = <&csi1>;
113+
__overlay__ {
114+
brcm,media-controller;
115+
};
116+
};
117+
111118
__overrides__ {
112119
rotation = <&imx519>,"rotation:0";
113120
orientation = <&imx519>,"orientation:0";
121+
media-controller = "=6";
114122
};
115123
};

arch/arm/boot/dts/overlays/irs1125-overlay.dts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,4 +82,15 @@
8282
};
8383
};
8484
};
85+
86+
fragment@6 {
87+
target = <&csi1>;
88+
__dormant__ {
89+
brcm,media-controller;
90+
};
91+
};
92+
93+
__overrides__ {
94+
media-controller = "=6";
95+
};
8596
};

arch/arm/boot/dts/overlays/ov5647-overlay.dts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,16 @@
8787
};
8888
};
8989

90+
fragment@6 {
91+
target = <&csi1>;
92+
__overlay__ {
93+
brcm,media-controller;
94+
};
95+
};
96+
9097
__overrides__ {
9198
rotation = <&ov5647>,"rotation:0";
9299
orientation = <&ov5647>,"orientation:0";
100+
media-controller = "=6";
93101
};
94102
};

arch/arm/boot/dts/overlays/ov7251-overlay.dts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,16 @@
106106
};
107107
};
108108

109+
fragment@6 {
110+
target = <&csi1>;
111+
__dormant__ {
112+
brcm,media-controller;
113+
};
114+
};
115+
109116
__overrides__ {
110117
rotation = <&ov7251>,"rotation:0";
111118
orientation = <&ov7251>,"orientation:0";
119+
media-controller = "=6";
112120
};
113121
};

arch/arm/boot/dts/overlays/ov9281-overlay.dts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,16 @@
106106
};
107107
};
108108

109+
fragment@6 {
110+
target = <&csi1>;
111+
__overlay__ {
112+
brcm,media-controller;
113+
};
114+
};
115+
109116
__overrides__ {
110117
rotation = <&ov9281>,"rotation:0";
111118
orientation = <&ov9281>,"orientation:0";
119+
media-controller = "=6";
112120
};
113121
};

arch/arm/boot/dts/overlays/tc358743-overlay.dts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,16 @@
100100
};
101101
};
102102

103+
fragment@9 {
104+
target = <&csi1>;
105+
__dormant__ {
106+
brcm,media-controller;
107+
};
108+
};
109+
103110
__overrides__ {
104111
4lane = <0>, "-2+3-7+8";
105112
link-frequency = <&tc358743>,"link-frequencies#0";
113+
media-controller = "=9";
106114
};
107115
};

0 commit comments

Comments
 (0)