cam-configs: remove dev, add TODOs

When there's a 'media' field in the config, dev is automatically found via Media Device's MEDIA_IOC_DEVICE_INFO. When 'media' is missing, each item in 'devices' must have a 'device' field to look up the dev via VIDIOC_QUERYCAP.
tomba · Nov 1, 2024 · fb1cdae · fb1cdae
1 parent d0c66b4
commit fb1cdae
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 15 deletions.
diff --git a/utils/cam-configs/am62a-fpd.py b/utils/cam-configs/am62a-fpd.py
@@ -96,7 +96,6 @@ def gen_imx219_pixel(port):
                 "entity": f"{dma_ent} {port}",
                 "fmt": fmt_pix_imx219,
                 "embedded": False,
-                "dev": f"/dev/video{port}",
             },
         ],
 
@@ -166,7 +165,6 @@ def gen_imx219_meta(port):
                 "entity": f"CAL output {port + 4}",
                 "fmt": fmt_pix_imx219_meta,
                 "embedded": True,
-                "dev": f"/dev/video{port + 4}",
                 "display": False,
             },
         ],
@@ -241,7 +239,6 @@ def gen_ub953_tpg(port):
                 "entity": f"{dma_ent} {port}",
                 "fmt": fmt_tpg,
                 "embedded": False,
-                "dev": f"/dev/video{port}",
                 "dra-plane-hack": False,
             },
         ],

diff --git a/utils/cam-configs/debix-tpg.py b/utils/cam-configs/debix-tpg.py
@@ -15,6 +15,7 @@
 
 #2592✕1940
 configurations["cam0"] = {
+    # TODO: add 'media' entry
     "subdevs": [
         {
             "entity": "rkisp1_tpg",

diff --git a/utils/cam-configs/debix.py b/utils/cam-configs/debix.py
@@ -13,6 +13,7 @@
 configurations = {}
 
 configurations["cam0"] = {
+    # TODO: add 'media' entry
     "subdevs": [
         # Camera
         {

diff --git a/utils/cam-configs/desky.py b/utils/cam-configs/desky.py
@@ -21,7 +21,6 @@
         {
             "entity": "UVC Camera*",
             "fmt": fmt_pix_1,
-            "dev": "/dev/video0",
         },
     ],
 

diff --git a/utils/cam-configs/dra76-fpd.py b/utils/cam-configs/dra76-fpd.py
@@ -112,7 +112,6 @@ def gen_imx390_pixel(port):
                 "entity": f"CAL output {port}",
                 "fmt": fmt_pix_imx390,
                 "embedded": False,
-                "dev": f"/dev/video{port}",
                 "dra-plane-hack": False,
             },
         ],
@@ -182,7 +181,6 @@ def gen_imx390_meta(port):
                 "entity": f"CAL output {port + 4}",
                 "fmt": fmt_pix_imx390_meta,
                 "embedded": True,
-                "dev": f"/dev/video{port + 4}",
                 "display": False,
             },
         ],
@@ -255,7 +253,6 @@ def gen_imx219_pixel(port):
                 "entity": f"CAL output {port}",
                 "fmt": fmt_pix_imx219,
                 "embedded": False,
-                "dev": f"/dev/video{port}",
                 "dra-plane-hack": False,
             },
         ],
@@ -325,7 +322,6 @@ def gen_imx219_meta(port):
                 "entity": f"CAL output {port + 4}",
                 "fmt": fmt_pix_imx219_meta,
                 "embedded": True,
-                "dev": f"/dev/video{port + 4}",
                 "display": False,
             },
         ],
@@ -398,7 +394,6 @@ def gen_ov10635_pixel(port):
                 "entity": f"CAL output {port}",
                 "fmt": fmt_pix_ov10635,
                 "embedded": False,
-                "dev": f"/dev/video{port}",
             },
         ],
 
@@ -464,7 +459,6 @@ def gen_ov10635_meta(port):
                 "entity": f"CAL output {port + 4}",
                 "fmt": fmt_pix_ov10635_meta,
                 "embedded": True,
-                "dev": f"/dev/video{port + 4}",
                 "display": False,
             },
         ],
@@ -524,7 +518,6 @@ def gen_ub953_tpg(port):
                 "entity": f"CAL output {port}",
                 "fmt": fmt_tpg,
                 "embedded": False,
-                "dev": f"/dev/video{port}",
                 "dra-plane-hack": False,
             },
         ],

diff --git a/utils/cam-configs/dra76-ov5640.py b/utils/cam-configs/dra76-ov5640.py
@@ -19,8 +19,8 @@
 configurations["legacy-ov5640"] = {
     "devices": [
         {
+            # TODO: add 'device' entry
             "fmt": fmt_pix_1,
-            "dev": "/dev/video0",
         },
     ],
 }
@@ -29,6 +29,7 @@
 # DRA76 EVM: OV5640
 #
 configurations["ov5640"] = {
+    # TODO: add 'media' entry
     "subdevs": [
         {
             "entity": "ov5640 4-003c",
@@ -49,7 +50,6 @@
         {
             "entity": "CAL output 0",
             "fmt": fmt_pix_1,
-            "dev": "/dev/video0",
         },
     ],
 

diff --git a/utils/cam-configs/j7-ov5640.py b/utils/cam-configs/j7-ov5640.py
@@ -14,6 +14,7 @@
 configurations = {}
 
 configurations["ov5640"] = {
+    # TODO: add 'media' entry
     "subdevs": [
         {
             "entity": "ov5640 4-003c",
@@ -34,7 +35,6 @@
         {
             "entity": "j721e-csi2rx",
             "fmt": fmt_pix_1,
-            "dev": "/dev/video0",
         },
     ],
 

diff --git a/utils/cam-configs/lappy.py b/utils/cam-configs/lappy.py
@@ -12,14 +12,14 @@
 configurations = {}
 
 configurations["lappy"] = {
+    # TODO: add 'media' entry
     "subdevs": [
     ],
 
     "devices": [
         {
             "entity": "Integrated Camera: Integrated C",
             "fmt": fmt_pix_1,
-            "dev": "/dev/video0",
         },
     ],
 

diff --git a/utils/cam-configs/rpi4.py b/utils/cam-configs/rpi4.py
@@ -27,6 +27,7 @@
 sensor_ent = "imx219 5-0010"
 
 configurations["cam0"] = {
+    # TODO: add 'media' entry
     "subdevs": [
         # Camera
         {
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,6 @@ @@
             {
                 "entity": "UVC Camera*",
                 "fmt": fmt_pix_1,
-                "dev": "/dev/video0",
             },
         ],
@@ Expand Down @@