Merge branch 'master' into tc358743-4-lane

raspberry-pi/4/default.nix

@@ -37,6 +37,9 @@
       "reset-raspberrypi" # required for vl805 firmware to load
     ];
 
+    # Allow building kernel
+    initrd.systemd.tpm2.enable = false;
+
     loader = {
       grub.enable = lib.mkDefault false;
       generic-extlinux-compatible.enable = lib.mkDefault true;

raspberry-pi/4/tc358743.nix

@@ -23,10 +23,16 @@ in
           Number of CSI lanes available
         '';
       };
+      media-controller = lib.mkEnableOption ''
+        Enable support for the Media Controller API.
+
+        See https://forums.raspberrypi.com/viewtopic.php?t=322076 for details
+      '';
     };
   };
 
   config = lib.mkIf cfg.enable {
+    hardware.deviceTree.filter = "bcm2711-rpi-4*.dtb";
     hardware.deviceTree.overlays = [
       {
         name = "tc358743-overlay";
@@ -71,6 +77,15 @@ in
               __overlay__ {
                 status = "okay";
 
+                ${
+                  if cfg.media-controller then
+                    ""
+                  else
+                    ''
+                      compatible = "brcm,bcm2835-unicam-legacy";
+                    ''
+                }
+
                 port {
 
                   endpoint {