commit 7ef92ca83a525b132ddc35ec51d86187fc7b91b3
Author: robert jakub <rj@project2.pl>
Date:   Thu Oct 17 15:00:31 2024 +0200

    first commit (import)

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..e69de29
diff --git a/default.nix b/default.nix
new file mode 100644
index 0000000..fbb5b77
--- /dev/null
+++ b/default.nix
@@ -0,0 +1,3 @@
+# This file is necessary so nix-env -qa does not break,
+# when nixos-hardware is used as a channel
+{}
diff --git a/flake.nix b/flake.nix
new file mode 100644
index 0000000..3f8c667
--- /dev/null
+++ b/flake.nix
@@ -0,0 +1,20 @@
+{
+  description = "oom-hardware";
+
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+  inputs.nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+
+  outputs = {
+    self,
+    nixpkgs,
+    nixos-hardware,
+    ...
+  }: let
+    system = "aarch64-linux";
+    pkgs = import nixpkgs {inherit system;};
+  in {
+    nixosModules = {
+      uconsole = import ./uconsole {inherit pkgs nixos-hardware;};
+    };
+  };
+}
diff --git a/uconsole/audio-patch.nix b/uconsole/audio-patch.nix
new file mode 100644
index 0000000..769849e
--- /dev/null
+++ b/uconsole/audio-patch.nix
@@ -0,0 +1,44 @@
+{pkgs, ...}: let
+  rpi-utils = pkgs.callPackage ./packages/rpi-utils {};
+  audio-patch = pkgs.writeText "audio_3.5_patch.py" ''
+    import os
+    import time
+
+    def init_gpio():
+        os.popen("${rpi-utils}/bin/pinctrl set 11 op")
+        os.popen("${rpi-utils}/bin/pinctrl set 10 ip pn")
+
+    def check_3_5():
+        tmp = os.popen("${rpi-utils}/bin/pinctrl 10").readline().strip("\n")
+        return tmp
+
+    def enable_speaker_gpio():
+        os.popen("${rpi-utils}/bin/pinctrl set 11 op dh")
+
+    def disable_speaker_gpio():
+        os.popen("${rpi-utils}/bin/pinctrl set 11 op dl")
+
+    init_gpio()
+
+    while True:
+        tmp =  check_3_5()
+        if tmp == "10: ip    pn | lo // GPIO10 = input":
+            enable_speaker_gpio()
+        elif tmp == "10: ip    pn | hi // GPIO10 = input":
+            disable_speaker_gpio()
+        time.sleep(1)
+  '';
+in {
+  config = {
+    systemd.services."audio_3.5_patch" = {
+      description = "cpi audio patch";
+      after = ["multi-user.target"];
+      wantedBy = ["multi-user.target"];
+      serviceConfig = {
+        Type = "simple";
+        ExecStart = "${pkgs.python3Minimal}/bin/python ${audio-patch}";
+        RemainAfterExit = "no";
+      };
+    };
+  };
+}
diff --git a/uconsole/default.nix b/uconsole/default.nix
new file mode 100644
index 0000000..77290b4
--- /dev/null
+++ b/uconsole/default.nix
@@ -0,0 +1,72 @@
+{
+  pkgs,
+  nixos-hardware,
+  ...
+}: let
+  rpi-utils = pkgs.callPackage ./packages/rpi-utils {};
+in {
+  imports =
+    [nixos-hardware.nixosModules.raspberry-pi-4]
+    ++ [./kernel]
+    ++ [./overlays]
+    ++ [./packages/overlays]
+    ++ [./audio-patch.nix];
+
+  config = {
+    environment.systemPackages = [rpi-utils];
+
+    hardware.raspberry-pi."4" = {
+      xhci.enable = false;
+      dwc2.enable = true;
+      dwc2.dr_mode = "host";
+      overlays = {
+        cpu-revision.enable = true;
+        audremap.enable = true;
+        vc4-kms-v3d.enable = true;
+        disable-pcie.enable = true;
+        disable-genet.enable = true;
+        panel-uc.enable = true;
+        cpi-pmu.enable = true;
+        cpi-i2c1.enable = false;
+        cpi-spi4.enable = false;
+        cpi-bluetooth.enable = true;
+      };
+    };
+
+    hardware.deviceTree = {
+      enable = true;
+      filter = "bcm2711-rpi-cm4.dtb";
+      overlaysParams = [
+        {
+          name = "bcm2711-rpi-cm4";
+          params = {
+            # ant2 = "on";
+            audio = "on";
+            spi = "off";
+            i2c_arm = "on";
+          };
+        }
+        {
+          name = "cpu-revision";
+          params = {cm4-8 = "on";};
+        }
+        {
+          name = "audremap";
+          params = {pins_12_13 = "on";};
+        }
+        {
+          name = "vc4-kms-v3d";
+          params = {
+            cma-384 = "on";
+            nohdmi1 = "on";
+          };
+        }
+      ];
+    };
+
+    users.groups.spi = {};
+    services.udev.extraRules = ''
+      SUBSYSTEM=="spidev", KERNEL=="spidev0.0", GROUP="spi", MODE="0660"
+    '';
+  };
+}
diff --git a/uconsole/kernel/default.nix b/uconsole/kernel/default.nix
new file mode 100644
index 0000000..b0156c3
--- /dev/null
+++ b/uconsole/kernel/default.nix
@@ -0,0 +1,77 @@
+{
+  nixpkgs,
+  pkgs,
+  config,
+  ...
+}: let
+  kernelPackagesCfg = {
+    linuxPackagesFor,
+    linux_rpi4,
+    fetchFromGitHub,
+  }: let
+    # Version picked from the current (as of 8th Oct 2024) nixpkgs-unstable branch
+    modDirVersion = "6.6.31";
+    tag = "stable_20240529";
+  in
+    linuxPackagesFor (linux_rpi4.override {
+      argsOverride = {
+        version = "${modDirVersion}-${tag}-cpi";
+        inherit modDirVersion;
+
+        src = fetchFromGitHub {
+          owner = "raspberrypi";
+          repo = "linux";
+          rev = tag;
+          hash = "sha256-UWUTeCpEN7dlFSQjog6S3HyEWCCnaqiUqV5KxCjYink=";
+        };
+      };
+    });
+  patches = [
+    ./patches/001-OCP8178-backlight-driver.patch
+    ./patches/002-clockwork-cwu50.patch
+    ./patches/003-axp20x-power.patch
+    ./patches/004-vc4_dsi-update.patch
+    ./patches/005-bcm2835-audio-staging.patch
+  ];
+in {
+  boot.kernelPackages = pkgs.callPackages kernelPackagesCfg {};
+
+  #  boot.initrd.kernelModules = [
+  #    "ocp8178_bl"
+  #    "panel-cwu50"
+  #  ];
+
+  boot.kernelPatches =
+    (
+      builtins.map (patch: {
+        name = patch + "";
+        patch = patch;
+      })
+      patches
+    )
+    ++ [
+      {
+        name = "uconsole-config";
+        patch = null;
+        extraStructuredConfig = {
+          DRM_PANEL_CWU50 = pkgs.lib.kernel.module;
+          DRM_PANEL_CWD686 = pkgs.lib.kernel.module;
+          # SIMPLE_AMPLIFIER_SWITCH = pkgs.lib.kernel.module;
+          BACKLIGHT_OCP8178 = pkgs.lib.kernel.module;
+
+          REGMAP_I2C = pkgs.lib.kernel.yes;
+          INPUT_AXP20X_PEK = pkgs.lib.kernel.yes;
+          CHARGER_AXP20X = pkgs.lib.kernel.module;
+          BATTERY_AXP20X = pkgs.lib.kernel.module;
+          AXP20X_POWER = pkgs.lib.kernel.module;
+          MFD_AXP20X = pkgs.lib.kernel.yes;
+          MFD_AXP20X_I2C = pkgs.lib.kernel.yes;
+          REGULATOR_AXP20X = pkgs.lib.kernel.yes;
+          AXP20X_ADC = pkgs.lib.kernel.module;
+          TI_ADC081C = pkgs.lib.kernel.module;
+          CRYPTO_LIB_ARC4 = pkgs.lib.kernel.yes;
+          CRC_CCITT = pkgs.lib.kernel.yes;
+        };
+      }
+    ];
+}
diff --git a/uconsole/kernel/patches/001-OCP8178-backlight-driver.patch b/uconsole/kernel/patches/001-OCP8178-backlight-driver.patch
new file mode 100644
index 0000000..84c52e7
--- /dev/null
+++ b/uconsole/kernel/patches/001-OCP8178-backlight-driver.patch
@@ -0,0 +1,302 @@
+--- a/drivers/video/backlight/Kconfig
++++ b/drivers/video/backlight/Kconfig
+@@ -479,6 +479,12 @@ config BACKLIGHT_LED
+ 	  If you have a LCD backlight adjustable by LED class driver, say Y
+ 	  to enable this driver.
+ 
++config BACKLIGHT_OCP8178
++	tristate "OCP8178 Backlight Driver"
++	depends on GPIOLIB
++	help
++	  If you have an OCP8178, say Y to enable the backlight driver.
++
+ endif # BACKLIGHT_CLASS_DEVICE
+ 
+ endmenu
+--- a/drivers/video/backlight/Makefile
++++ b/drivers/video/backlight/Makefile
+@@ -59,3 +59,4 @@ obj-$(CONFIG_BACKLIGHT_WM831X)		+= wm831x_bl.o
+ obj-$(CONFIG_BACKLIGHT_ARCXCNN) 	+= arcxcnn_bl.o
+ obj-$(CONFIG_BACKLIGHT_RAVE_SP)		+= rave-sp-backlight.o
+ obj-$(CONFIG_BACKLIGHT_LED)		+= led_bl.o
++obj-$(CONFIG_BACKLIGHT_OCP8178)		+= ocp8178_bl.o
+--- /dev/null
++++ b/drivers/video/backlight/ocp8178_bl.c
+@@ -0,0 +1,277 @@
++/*
++ * ocp8178_bl.c - ocp8178 backlight driver
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#include <linux/backlight.h>
++#include <linux/err.h>
++#include <linux/fb.h>
++#include <linux/gpio.h> /* Only for legacy support */
++#include <linux/gpio/consumer.h>
++#include <linux/init.h>
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/of.h>
++#include <linux/of_gpio.h>
++#include <linux/platform_data/gpio_backlight.h>
++#include <linux/platform_device.h>
++#include <linux/slab.h>
++#include <linux/delay.h>
++#include <linux/timer.h>
++#include <linux/poll.h>
++#include <linux/proc_fs.h>
++#include <linux/seq_file.h>
++#include <linux/sched.h>
++#include <linux/interrupt.h>
++#include <linux/irq.h>
++#include <linux/io.h>
++#include <linux/clk.h>
++
++struct ocp8178_backlight {
++	struct device *dev;
++	struct device *fbdev;
++
++	struct gpio_desc *gpiod;
++	int def_value;
++	int current_value;
++};
++
++#define DETECT_DELAY 200
++#define DETECT_TIME 500
++#define DETECT_WINDOW_TIME 1000
++#define START_TIME 10
++#define END_TIME 10
++#define SHUTDOWN_TIME 3000
++#define LOW_BIT_HIGH_TIME 10
++#define LOW_BIT_LOW_TIME 50
++#define HIGH_BIT_HIGH_TIME 50
++#define HIGH_BIT_LOW_TIME 10
++#define MAX_BRIGHTNESS_VALUE 9
++
++static void entry_1wire_mode(struct ocp8178_backlight *gbl)
++{
++	unsigned long flags = 0;
++	local_irq_save(flags);
++	gpiod_set_value(gbl->gpiod, 0);
++	mdelay(SHUTDOWN_TIME/1000);
++	gpiod_set_value(gbl->gpiod, 1);
++	udelay(DETECT_DELAY);
++	gpiod_set_value(gbl->gpiod, 0);
++	udelay(DETECT_TIME);
++	gpiod_set_value(gbl->gpiod, 1);
++	udelay(DETECT_WINDOW_TIME);
++	local_irq_restore(flags);
++}
++
++static inline void write_bit(struct ocp8178_backlight *gbl, int bit)
++{
++	if (bit) {
++		gpiod_set_value(gbl->gpiod, 0);
++		udelay(HIGH_BIT_LOW_TIME);
++		gpiod_set_value(gbl->gpiod, 1);
++		udelay(HIGH_BIT_HIGH_TIME);
++	} else {
++		gpiod_set_value(gbl->gpiod, 0);
++		udelay(LOW_BIT_LOW_TIME);
++		gpiod_set_value(gbl->gpiod, 1);
++		udelay(LOW_BIT_HIGH_TIME);
++	}
++}
++
++static void write_byte(struct ocp8178_backlight *gbl, int byte)
++{
++	unsigned long flags = 0;
++	unsigned char data = 0x72;
++	int i;
++
++	local_irq_save(flags);
++
++	gpiod_set_value(gbl->gpiod, 1);
++	udelay(START_TIME);
++	for(i = 0; i < 8; i++) {
++		if(data & 0x80) {
++			write_bit(gbl, 1);
++		} else {
++			write_bit(gbl, 0);
++		}
++		data <<= 1;
++	}
++	gpiod_set_value(gbl->gpiod, 0);
++	udelay(END_TIME);
++
++	data = byte & 0x1f;
++
++	gpiod_set_value(gbl->gpiod, 1);
++	udelay(START_TIME);
++	for(i = 0; i < 8; i++) {
++		if(data & 0x80) {
++			write_bit(gbl, 1);
++		} else {
++			write_bit(gbl, 0);
++		}
++		data <<= 1;
++	}
++	gpiod_set_value(gbl->gpiod, 0);
++	udelay(END_TIME);
++	gpiod_set_value(gbl->gpiod, 1);
++
++	local_irq_restore(flags);
++}
++
++unsigned char ocp8178_bl_table[MAX_BRIGHTNESS_VALUE+1] = {0, 1, 4, 8, 12, 16, 20, 24, 28, 31};
++
++static int ocp8178_update_status(struct backlight_device *bl)
++{
++	struct ocp8178_backlight *gbl = bl_get_data(bl);
++	int brightness = bl->props.brightness, i;
++
++	if (bl->props.power != FB_BLANK_UNBLANK ||
++	    bl->props.fb_blank != FB_BLANK_UNBLANK ||
++	    bl->props.state & (BL_CORE_SUSPENDED | BL_CORE_FBBLANK))
++		brightness = 0;
++
++	if(brightness > MAX_BRIGHTNESS_VALUE)
++		brightness = MAX_BRIGHTNESS_VALUE;
++
++	for(i = 0; i < 2; i++) {
++		entry_1wire_mode(gbl);
++		write_byte(gbl, ocp8178_bl_table[brightness]);
++	}
++	gbl->current_value = brightness;
++
++	return 0;
++}
++
++static int ocp8178_get_brightness(struct backlight_device *bl)
++{
++	struct ocp8178_backlight *gbl = bl_get_data(bl);
++	return gbl->current_value;
++}
++
++static int ocp8178_check_fb(struct backlight_device *bl,
++				   struct fb_info *info)
++{
++	struct ocp8178_backlight *gbl = bl_get_data(bl);
++	return gbl->fbdev == NULL || gbl->fbdev == info->dev;
++}
++
++static const struct backlight_ops ocp8178_backlight_ops = {
++	.options	= BL_CORE_SUSPENDRESUME,
++	.update_status	= ocp8178_update_status,
++	.get_brightness = ocp8178_get_brightness,
++	.check_fb	= ocp8178_check_fb,
++};
++
++static int ocp8178_probe_dt(struct platform_device *pdev,
++				   struct ocp8178_backlight *gbl)
++{
++	struct device *dev = &pdev->dev;
++	struct device_node *np = dev->of_node;
++	enum gpiod_flags flags;
++	int ret = 0;
++	u32 value32;
++
++	of_property_read_u32(np, "default-brightness", &value32);
++	if(value32 > MAX_BRIGHTNESS_VALUE)
++		gbl->def_value = MAX_BRIGHTNESS_VALUE;
++	else
++		gbl->def_value = value32;
++	flags = gbl->def_value ? GPIOD_OUT_HIGH : GPIOD_OUT_LOW;
++
++	gbl->gpiod = devm_gpiod_get(dev, "backlight-control", flags);
++	if (IS_ERR(gbl->gpiod)) {
++		ret = PTR_ERR(gbl->gpiod);
++
++		if (ret != -EPROBE_DEFER) {
++			dev_err(dev,
++				"Error: The gpios parameter is missing or invalid.\n");
++		}
++	}
++
++	return ret;
++}
++
++static struct backlight_device *backlight;
++
++static int ocp8178_probe(struct platform_device *pdev)
++{
++	struct backlight_properties props;
++	struct backlight_device *bl;
++	struct ocp8178_backlight *gbl;
++	struct device_node *np = pdev->dev.of_node;
++	int ret;
++
++	if ( !np) {
++		dev_err(&pdev->dev,
++			"failed to find platform data or device tree node.\n");
++		return -ENODEV;
++	}
++
++	gbl = devm_kzalloc(&pdev->dev, sizeof(*gbl), GFP_KERNEL);
++	if (gbl == NULL)
++		return -ENOMEM;
++
++	gbl->dev = &pdev->dev;
++
++	ret = ocp8178_probe_dt(pdev, gbl);
++	if (ret)
++		return ret;
++
++	gbl->current_value = gbl->def_value;
++
++	memset(&props, 0, sizeof(props));
++	props.type = BACKLIGHT_RAW;
++	props.max_brightness = MAX_BRIGHTNESS_VALUE;
++	bl = devm_backlight_device_register(&pdev->dev, dev_name(&pdev->dev),
++					&pdev->dev, gbl, &ocp8178_backlight_ops,
++					&props);
++	if (IS_ERR(bl)) {
++		dev_err(&pdev->dev, "failed to register backlight\n");
++		return PTR_ERR(bl);
++	}
++
++//	entry_1wire_mode(gbl);
++
++	bl->props.brightness = gbl->def_value;
++	backlight_update_status(bl);
++
++	platform_set_drvdata(pdev, bl);
++
++	backlight = bl;
++	return 0;
++}
++
++static int ocp8178_suspend(struct platform_device *pdev, pm_message_t state)
++{
++	return 0;
++}
++
++static int ocp8178_resume(struct platform_device *pdev)
++{
++	return 0;
++}
++
++static struct of_device_id ocp8178_of_match[] = {
++	{ .compatible = "ocp8178-backlight" },
++	{ /* sentinel */ }
++};
++
++MODULE_DEVICE_TABLE(of, ocp8178_of_match);
++
++static struct platform_driver ocp8178_driver = {
++	.driver		= {
++		.name		= "ocp8178-backlight",
++		.of_match_table = of_match_ptr(ocp8178_of_match),
++	},
++	.probe		= ocp8178_probe,
++	.suspend		= ocp8178_suspend,
++	.resume		= ocp8178_resume,
++};
++
++module_platform_driver(ocp8178_driver);
++
++MODULE_DESCRIPTION("OCP8178 Driver");
++MODULE_LICENSE("GPL");
diff --git a/uconsole/kernel/patches/002-clockwork-cwu50.patch b/uconsole/kernel/patches/002-clockwork-cwu50.patch
new file mode 100644
index 0000000..ca11a63
--- /dev/null
+++ b/uconsole/kernel/patches/002-clockwork-cwu50.patch
@@ -0,0 +1,835 @@
+--- a/drivers/gpu/drm/panel/Kconfig
++++ b/drivers/gpu/drm/panel/Kconfig
+@@ -76,6 +76,32 @@ config DRM_PANEL_BOE_TV101WUM_NL6
+ 	  Say Y here if you want to support for BOE TV101WUM and AUO KD101N80
+ 	  45NA WUXGA PANEL DSI Video Mode panel
+ 
++
++config DRM_PANEL_CWD686
++	tristate "CWD686 panel"
++	depends on OF
++	depends on DRM_MIPI_DSI
++	depends on BACKLIGHT_CLASS_DEVICE
++	help
++	  Say Y here if you want to enable support for CWD686 panel.
++	  The panel has a 480x1280 resolution and uses 24 bit RGB per pixel.
++
++	  To compile this driver as a module, choose M here: the module
++	  will be called panel-cwd686.
++
++config DRM_PANEL_CWU50
++	tristate "CWU50 panel"
++	depends on OF
++	depends on DRM_MIPI_DSI
++	depends on BACKLIGHT_CLASS_DEVICE
++	help
++	  Say Y here if you want to enable support for CWU50 panel.
++	  The panel has a 720x1280 resolution and uses 24 bit RGB per pixel.
++
++	  To compile this driver as a module, choose M here: the module
++	  will be called panel-cwu50.
++
++
+ config DRM_PANEL_DSI_CM
+ 	tristate "Generic DSI command mode panels"
+ 	depends on OF
+--- a/drivers/gpu/drm/panel/Makefile
++++ b/drivers/gpu/drm/panel/Makefile
+@@ -88,3 +88,5 @@ obj-$(CONFIG_DRM_PANEL_VISIONOX_R66451) += panel-visionox-r66451.o
+ obj-$(CONFIG_DRM_PANEL_WAVESHARE_TOUCHSCREEN) += panel-waveshare-dsi.o
+ obj-$(CONFIG_DRM_PANEL_WIDECHIPS_WS2401) += panel-widechips-ws2401.o
+ obj-$(CONFIG_DRM_PANEL_XINPENG_XPP055C272) += panel-xinpeng-xpp055c272.o
++obj-$(CONFIG_DRM_PANEL_CWD686) += panel-cwd686.o
++obj-$(CONFIG_DRM_PANEL_CWU50) += panel-cwu50.o
+--- /dev/null
++++ b/drivers/gpu/drm/panel/panel-cwd686.c
+@@ -0,0 +1,300 @@
++// SPDX-License-Identifier: GPL-2.0+
++
++#include <drm/drm_modes.h>
++#include <drm/drm_mipi_dsi.h>
++#include <drm/drm_panel.h>
++#include <linux/backlight.h>
++#include <linux/gpio/consumer.h>
++#include <linux/regulator/consumer.h>
++#include <linux/delay.h>
++#include <linux/of_device.h>
++#include <linux/module.h>
++
++struct cwd686 {
++	struct device *dev;
++	struct drm_panel panel;
++	struct regulator *supply;
++	struct gpio_desc *reset_gpio;
++	struct backlight_device *backlight;
++	bool prepared;
++	bool enabled;
++	enum drm_panel_orientation orientation;
++};
++
++static const struct drm_display_mode default_mode = {
++	.clock = 54465,
++	.hdisplay = 480,
++	.hsync_start = 480 + 150,
++	.hsync_end = 480 + 150 + 24,
++	.htotal = 480 + 150 + 24 + 40,
++	.vdisplay = 1280,
++	.vsync_start = 1280 + 12,
++	.vsync_end = 1280 + 12+ 6,
++	.vtotal = 1280 + 12 + 6 + 10,
++};
++
++static inline struct cwd686 *panel_to_cwd686(struct drm_panel *panel)
++{
++	return container_of(panel, struct cwd686, panel);
++}
++
++#define dcs_write_seq(seq...)                              \
++({                                                              \
++	static const u8 d[] = { seq };                          \
++	mipi_dsi_dcs_write_buffer(dsi, d, ARRAY_SIZE(d));	 \
++})
++
++static void cwd686_init_sequence(struct cwd686 *ctx) 
++{
++	struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev);
++
++	dcs_write_seq(0xF0,0x5A,0x59);
++	dcs_write_seq(0xF1,0xA5,0xA6);
++	dcs_write_seq(0xB0,0x54,0x32,0x23,0x45,0x44,0x44,0x44,0x44,0x9F,0x00,0x01,0x9F,0x00,0x01);
++	dcs_write_seq(0xB1,0x32,0x84,0x02,0x83,0x29,0x06,0x06,0x72,0x06,0x06);
++	dcs_write_seq(0xB2,0x73);
++	dcs_write_seq(0xB3,0x0B,0x09,0x13,0x11,0x0F,0x0D,0x00,0x00,0x00,0x03,0x00,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x05,0x07);
++	dcs_write_seq(0xB4,0x0A,0x08,0x12,0x10,0x0E,0x0C,0x00,0x00,0x00,0x03,0x00,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x04,0x06);
++	dcs_write_seq(0xB6,0x13,0x13);
++	dcs_write_seq(0xB8,0xB4,0x43,0x02,0xCC);
++	dcs_write_seq(0xB9,0xA5,0x20,0xFF,0xC8);
++	dcs_write_seq(0xBA,0x88,0x23);
++	dcs_write_seq(0xBD,0x43,0x0E,0x0E,0x50,0x50,0x29,0x10,0x03,0x44,0x03);
++	dcs_write_seq(0xC1,0x00,0x0C,0x16,0x04,0x00,0x30,0x10,0x04);
++	dcs_write_seq(0xC2,0x21,0x81);
++	dcs_write_seq(0xC3,0x02,0x30);
++	dcs_write_seq(0xC7,0x25,0x6A);
++	dcs_write_seq(0xC8,0x7C,0x68,0x59,0x4E,0x4B,0x3C,0x41,0x2B,0x44,0x43,0x43,0x60,0x4E,0x55,0x47,0x44,0x38,0x27,0x06,0x7C,0x68,0x59,0x4E,0x4B,0x3C,0x41,0x2B,0x44,0x43,0x43,0x60,0x4E,0x55,0x47,0x44,0x38,0x27,0x06);//GAMMA2.2
++	//dcs_write_seq(0xC8,0x7C,0x66,0x56,0x4A,0x46,0x37,0x3B,0x24,0x3D,0x3C,0x3A,0x56,0x42,0x48,0x39,0x38,0x2C,0x17,0x06,0x7C,0x66,0x56,0x4A,0x46,0x37,0x3B,0x24,0x3D,0x3C,0x3A,0x56,0x42,0x48,0x39,0x38,0x2C,0x17,0x06);//GAMMA2.5
++	//dcs_write_seq(0xC8,0x7C,0x69,0x5B,0x50,0x4E,0x40,0x46,0x31,0x4A,0x49,0x49,0x67,0x56,0x5E,0x51,0x4E,0x41,0x2F,0x06,0x7C,0x69,0x5B,0x50,0x4E,0x40,0x46,0x31,0x4A,0x49,0x49,0x67,0x56,0x5E,0x51,0x4E,0x41,0x2F,0x06);//GAMMA2.0
++	//dcs_write_seq(0xC8,0x7C,0x6D,0x60,0x56,0x54,0x47,0x4c,0x37,0x50,0x4e,0x4e,0x6d,0x5c,0x66,0x59,0x56,0x4A,0x36,0x06,0x7C,0x6D,0x60,0x56,0x54,0x47,0x4c,0x37,0x50,0x4e,0x4e,0x6d,0x5c,0x66,0x59,0x56,0x4A,0x36,0x06);//GAMMA1.8
++	//dcs_write_seq(0xC8,0x7C,0x6e,0x62,0x59,0x58,0x4b,0x52,0x3d,0x57,0x56,0x56,0x75,0x66,0x71,0x66,0x64,0x55,0x44,0x06,0x7C,0x6e,0x62,0x59,0x58,0x4b,0x52,0x3d,0x57,0x56,0x56,0x75,0x66,0x71,0x66,0x64,0x55,0x44,0x06);//GAMMA1.6
++	dcs_write_seq(0xD4,0x00,0x00,0x00,0x32,0x04,0x51);
++	dcs_write_seq(0xF1,0x5A,0x59);
++	dcs_write_seq(0xF0,0xA5,0xA6);
++	dcs_write_seq(0x36,0x14);
++	dcs_write_seq(0x35,0x00);
++	dcs_write_seq(0x11);
++	msleep(120);
++	dcs_write_seq(0x29);
++	msleep(20);
++}
++
++static int cwd686_disable(struct drm_panel *panel)
++{
++	struct cwd686 *ctx = panel_to_cwd686(panel);
++	struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev);
++	int ret;
++
++	if (!ctx->enabled)
++		return 0;
++
++	backlight_disable(ctx->backlight);
++
++	ctx->enabled = false;
++
++	return 0;
++}
++
++static int cwd686_unprepare(struct drm_panel *panel)
++{
++	struct cwd686 *ctx = panel_to_cwd686(panel);
++	struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev);
++	int ret;
++
++#if 0
++	if (!ctx->prepared)
++		return 0;
++
++	ret = mipi_dsi_dcs_set_display_off(dsi);
++	if (ret) {
++		dev_err(ctx->dev, "failed to turn display off (%d)\n", ret);
++		return ret;
++	}
++
++	ret = mipi_dsi_dcs_enter_sleep_mode(dsi);
++	if (ret) {
++		dev_err(ctx->dev, "failed to enter sleep mode (%d)\n", ret);
++		return ret;
++	}
++	msleep(120);
++
++	gpiod_set_value_cansleep(ctx->reset_gpio, 0);
++	msleep(5);
++
++	ctx->prepared = false;
++#endif
++
++	return 0;
++}
++
++static int cwd686_prepare(struct drm_panel *panel)
++{
++	struct cwd686 *ctx = panel_to_cwd686(panel);
++	struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev);
++	int ret;
++
++	if (ctx->prepared)
++		return 0;
++
++	gpiod_set_value_cansleep(ctx->reset_gpio, 0);
++	msleep(10);
++	gpiod_set_value_cansleep(ctx->reset_gpio, 1);
++	msleep(120);
++
++	/* Enabe tearing mode: send TE (tearing effect) at VBLANK */
++	ret = mipi_dsi_dcs_set_tear_on(dsi, MIPI_DSI_DCS_TEAR_MODE_VBLANK);
++	if (ret) {
++		dev_err(ctx->dev, "failed to enable vblank TE (%d)\n", ret);
++		return ret;
++	}
++	/* Exit sleep mode and power on */
++
++	cwd686_init_sequence(ctx);
++
++	ret = mipi_dsi_dcs_exit_sleep_mode(dsi);
++	if (ret) {
++		dev_err(ctx->dev, "failed to exit sleep mode (%d)\n", ret);
++		return ret;
++	}
++	msleep(120);
++
++	ret = mipi_dsi_dcs_set_display_on(dsi);
++	if (ret) {
++		dev_err(ctx->dev, "failed to turn display on (%d)\n", ret);
++		return ret;
++	}
++	msleep(20);
++
++	ctx->prepared = true;
++
++	return 0;
++}
++
++static int cwd686_enable(struct drm_panel *panel)
++{
++	struct cwd686 *ctx = panel_to_cwd686(panel);
++	struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev);
++	int ret;
++
++	if (ctx->enabled)
++		return 0;
++
++	backlight_enable(ctx->backlight);
++
++	ctx->enabled = true;
++
++	return 0;
++}
++
++static int cwd686_get_modes(struct drm_panel *panel, struct drm_connector *connector)
++{
++	struct cwd686 *ctx = panel_to_cwd686(panel);
++	struct drm_display_mode *mode;
++
++	mode = drm_mode_duplicate(connector->dev, &default_mode);
++	if (!mode) {
++		dev_err(panel->dev, "bad mode or failed to add mode\n");
++		return -EINVAL;
++	}
++	drm_mode_set_name(mode);
++	mode->type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED;
++
++	connector->display_info.width_mm = mode->width_mm;
++	connector->display_info.height_mm = mode->height_mm;
++
++	/* set up connector's "panel orientation" property */
++	drm_connector_set_panel_orientation(connector, ctx->orientation);
++
++	drm_mode_probed_add(connector, mode);
++
++	return 1; /* Number of modes */
++}
++
++static const struct drm_panel_funcs cwd686_drm_funcs = {
++	.disable = cwd686_disable,
++	.unprepare = cwd686_unprepare,
++	.prepare = cwd686_prepare,
++	.enable = cwd686_enable,
++	.get_modes = cwd686_get_modes,
++};
++
++static int cwd686_probe(struct mipi_dsi_device *dsi)
++{
++	struct device *dev = &dsi->dev;
++	struct cwd686 *ctx;
++	int ret;
++
++	ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL);
++	if (!ctx)
++		return -ENOMEM;
++
++	mipi_dsi_set_drvdata(dsi, ctx);
++	ctx->dev = dev;
++
++	dsi->lanes = 4;
++	dsi->format = MIPI_DSI_FMT_RGB888;
++	dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_SYNC_PULSE | MIPI_DSI_MODE_LPM;
++
++	ctx->reset_gpio = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH);
++	if (IS_ERR(ctx->reset_gpio)) {
++		ret = PTR_ERR(ctx->reset_gpio);
++		if (ret != -EPROBE_DEFER)
++			dev_err(dev, "failed to request GPIO (%d)\n", ret);
++		return ret;
++	}
++
++	ctx->backlight = devm_of_find_backlight(dev);
++	if (IS_ERR(ctx->backlight)) {
++		dev_err(ctx->dev, "devm_of_find_backlight");
++		return PTR_ERR(ctx->backlight);
++	}
++
++	ret = of_drm_get_panel_orientation(dev->of_node, &ctx->orientation);
++	if (ret) {
++		dev_err(dev, "%pOF: failed to get orientation %d\n", dev->of_node, ret);
++		return ret;
++	}
++
++	ctx->panel.prepare_prev_first = true;
++
++	drm_panel_init(&ctx->panel, dev, &cwd686_drm_funcs, DRM_MODE_CONNECTOR_DSI);
++
++	drm_panel_add(&ctx->panel);
++
++	ret = mipi_dsi_attach(dsi);
++	if (ret < 0) {
++		dev_err(dev, "mipi_dsi_attach() failed: %d\n", ret);
++		drm_panel_remove(&ctx->panel);
++		return ret;
++	}
++
++	return 0;
++}
++
++static void cwd686_remove(struct mipi_dsi_device *dsi)
++{
++	struct cwd686 *ctx = mipi_dsi_get_drvdata(dsi);
++
++	mipi_dsi_detach(dsi);
++	drm_panel_remove(&ctx->panel);
++}
++
++static const struct of_device_id cwd686_of_match[] = {
++	{ .compatible = "cw,cwd686" },
++	{ }
++};
++MODULE_DEVICE_TABLE(of, cwd686_of_match);
++
++static struct mipi_dsi_driver cwd686_driver = {
++	.probe = cwd686_probe,
++	.remove = cwd686_remove,
++	.driver = {
++		.name = "panel-cwd686",
++		.of_match_table = cwd686_of_match,
++	},
++};
++module_mipi_dsi_driver(cwd686_driver);
++
++MODULE_DESCRIPTION("DRM Driver for cwd686 MIPI DSI panel");
++MODULE_LICENSE("GPL v2");
+--- /dev/null
++++ b/drivers/gpu/drm/panel/panel-cwu50.c
+@@ -0,0 +1,486 @@
++// SPDX-License-Identifier: GPL-2.0+
++
++#include <drm/drm_modes.h>
++#include <drm/drm_mipi_dsi.h>
++#include <drm/drm_panel.h>
++#include <linux/backlight.h>
++#include <linux/gpio/consumer.h>
++#include <linux/regulator/consumer.h>
++#include <linux/delay.h>
++#include <linux/of_device.h>
++#include <linux/module.h>
++
++struct cwu50 {
++	struct device *dev;
++	struct drm_panel panel;
++	struct regulator *supply;
++	struct gpio_desc *reset_gpio;
++	struct backlight_device *backlight;
++	bool prepared;
++	bool enabled;
++	enum drm_panel_orientation orientation;
++};
++
++static const struct drm_display_mode default_mode = {
++	.clock = 62500,
++	.hdisplay = 720,
++	.hsync_start = 720 + 43,
++	.hsync_end = 720+ 43 + 20,
++	.htotal = 720 + 43 + 20 + 20,
++	.vdisplay = 1280,
++	.vsync_start = 1280 + 8,
++	.vsync_end = 1280 + 8+ 2,
++	.vtotal = 1280 + 8 + 2 + 16,
++};
++
++static inline struct cwu50 *panel_to_cwu50(struct drm_panel *panel)
++{
++	return container_of(panel, struct cwu50, panel);
++}
++
++#define dcs_write_seq(seq...)                              \
++({                                                              \
++	static const u8 d[] = { seq };                          \
++	mipi_dsi_dcs_write_buffer(dsi, d, ARRAY_SIZE(d));	 \
++})
++
++static void cwu50_init_sequence(struct cwu50 *ctx)
++{
++	struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev);
++
++	dcs_write_seq(0xE1,0x93);
++	dcs_write_seq(0xE2,0x65);
++	dcs_write_seq(0xE3,0xF8);
++	dcs_write_seq(0x70,0x20);
++	dcs_write_seq(0x71,0x13);
++	dcs_write_seq(0x72,0x06);
++	dcs_write_seq(0x75,0x03);
++	dcs_write_seq(0xE0,0x01);
++	dcs_write_seq(0x00,0x00);
++	dcs_write_seq(0x01,0x47);//VCOM0x47
++	dcs_write_seq(0x03,0x00);
++	dcs_write_seq(0x04,0x4D);
++	dcs_write_seq(0x0C,0x64);
++	dcs_write_seq(0x17,0x00);
++	dcs_write_seq(0x18,0xBF);
++	dcs_write_seq(0x19,0x00);
++	dcs_write_seq(0x1A,0x00);
++	dcs_write_seq(0x1B,0xBF);
++	dcs_write_seq(0x1C,0x00);
++	dcs_write_seq(0x1F,0x7E);
++	dcs_write_seq(0x20,0x24);
++	dcs_write_seq(0x21,0x24);
++	dcs_write_seq(0x22,0x4E);
++	dcs_write_seq(0x24,0xFE);
++	dcs_write_seq(0x37,0x09);
++	dcs_write_seq(0x38,0x04);
++	dcs_write_seq(0x3C,0x76);
++	dcs_write_seq(0x3D,0xFF);
++	dcs_write_seq(0x3E,0xFF);
++	dcs_write_seq(0x3F,0x7F);
++	dcs_write_seq(0x40,0x04);//Dot inversion type
++	dcs_write_seq(0x41,0xA0);
++	dcs_write_seq(0x44,0x11);
++	dcs_write_seq(0x55,0x02);
++	dcs_write_seq(0x56,0x01);
++	dcs_write_seq(0x57,0x49);
++	dcs_write_seq(0x58,0x09);
++	dcs_write_seq(0x59,0x2A);
++	dcs_write_seq(0x5A,0x1A);
++	dcs_write_seq(0x5B,0x1A);
++	dcs_write_seq(0x5D,0x78);
++	dcs_write_seq(0x5E,0x6E);
++	dcs_write_seq(0x5F,0x66);
++	dcs_write_seq(0x60,0x5E);
++	dcs_write_seq(0x61,0x60);
++	dcs_write_seq(0x62,0x54);
++	dcs_write_seq(0x63,0x5C);
++	dcs_write_seq(0x64,0x47);
++	dcs_write_seq(0x65,0x5F);
++	dcs_write_seq(0x66,0x5D);
++	dcs_write_seq(0x67,0x5B);
++	dcs_write_seq(0x68,0x76);
++	dcs_write_seq(0x69,0x61);
++	dcs_write_seq(0x6A,0x63);
++	dcs_write_seq(0x6B,0x50);
++	dcs_write_seq(0x6C,0x45);
++	dcs_write_seq(0x6D,0x34);
++	dcs_write_seq(0x6E,0x1C);
++	dcs_write_seq(0x6F,0x07);
++	dcs_write_seq(0x70,0x78);
++	dcs_write_seq(0x71,0x6E);
++	dcs_write_seq(0x72,0x66);
++	dcs_write_seq(0x73,0x5E);
++	dcs_write_seq(0x74,0x60);
++	dcs_write_seq(0x75,0x54);
++	dcs_write_seq(0x76,0x5C);
++	dcs_write_seq(0x77,0x47);
++	dcs_write_seq(0x78,0x5F);
++	dcs_write_seq(0x79,0x5D);
++	dcs_write_seq(0x7A,0x5B);
++	dcs_write_seq(0x7B,0x76);
++	dcs_write_seq(0x7C,0x61);
++	dcs_write_seq(0x7D,0x63);
++	dcs_write_seq(0x7E,0x50);
++	dcs_write_seq(0x7F,0x45);
++	dcs_write_seq(0x80,0x34);
++	dcs_write_seq(0x81,0x1C);
++	dcs_write_seq(0x82,0x07);
++	dcs_write_seq(0xE0,0x02);
++	dcs_write_seq(0x00,0x44);
++	dcs_write_seq(0x01,0x46);
++	dcs_write_seq(0x02,0x48);
++	dcs_write_seq(0x03,0x4A);
++	dcs_write_seq(0x04,0x40);
++	dcs_write_seq(0x05,0x42);
++	dcs_write_seq(0x06,0x1F);
++	dcs_write_seq(0x07,0x1F);
++	dcs_write_seq(0x08,0x1F);
++	dcs_write_seq(0x09,0x1F);
++	dcs_write_seq(0x0A,0x1F);
++	dcs_write_seq(0x0B,0x1F);
++	dcs_write_seq(0x0C,0x1F);
++	dcs_write_seq(0x0D,0x1F);
++	dcs_write_seq(0x0E,0x1F);
++	dcs_write_seq(0x0F,0x1F);
++	dcs_write_seq(0x10,0x1F);
++	dcs_write_seq(0x11,0x1F);
++	dcs_write_seq(0x12,0x1F);
++	dcs_write_seq(0x13,0x1F);
++	dcs_write_seq(0x14,0x1E);
++	dcs_write_seq(0x15,0x1F);
++	dcs_write_seq(0x16,0x45);
++	dcs_write_seq(0x17,0x47);
++	dcs_write_seq(0x18,0x49);
++	dcs_write_seq(0x19,0x4B);
++	dcs_write_seq(0x1A,0x41);
++	dcs_write_seq(0x1B,0x43);
++	dcs_write_seq(0x1C,0x1F);
++	dcs_write_seq(0x1D,0x1F);
++	dcs_write_seq(0x1E,0x1F);
++	dcs_write_seq(0x1F,0x1F);
++	dcs_write_seq(0x20,0x1F);
++	dcs_write_seq(0x21,0x1F);
++	dcs_write_seq(0x22,0x1F);
++	dcs_write_seq(0x23,0x1F);
++	dcs_write_seq(0x24,0x1F);
++	dcs_write_seq(0x25,0x1F);
++	dcs_write_seq(0x26,0x1F);
++	dcs_write_seq(0x27,0x1F);
++	dcs_write_seq(0x28,0x1F);
++	dcs_write_seq(0x29,0x1F);
++	dcs_write_seq(0x2A,0x1E);
++	dcs_write_seq(0x2B,0x1F);
++	dcs_write_seq(0x2C,0x0B);
++	dcs_write_seq(0x2D,0x09);
++	dcs_write_seq(0x2E,0x07);
++	dcs_write_seq(0x2F,0x05);
++	dcs_write_seq(0x30,0x03);
++	dcs_write_seq(0x31,0x01);
++	dcs_write_seq(0x32,0x1F);
++	dcs_write_seq(0x33,0x1F);
++	dcs_write_seq(0x34,0x1F);
++	dcs_write_seq(0x35,0x1F);
++	dcs_write_seq(0x36,0x1F);
++	dcs_write_seq(0x37,0x1F);
++	dcs_write_seq(0x38,0x1F);
++	dcs_write_seq(0x39,0x1F);
++	dcs_write_seq(0x3A,0x1F);
++	dcs_write_seq(0x3B,0x1F);
++	dcs_write_seq(0x3C,0x1F);
++	dcs_write_seq(0x3D,0x1F);
++	dcs_write_seq(0x3E,0x1F);
++	dcs_write_seq(0x3F,0x1F);
++	dcs_write_seq(0x40,0x1F);
++	dcs_write_seq(0x41,0x1E);
++	dcs_write_seq(0x42,0x0A);
++	dcs_write_seq(0x43,0x08);
++	dcs_write_seq(0x44,0x06);
++	dcs_write_seq(0x45,0x04);
++	dcs_write_seq(0x46,0x02);
++	dcs_write_seq(0x47,0x00);
++	dcs_write_seq(0x48,0x1F);
++	dcs_write_seq(0x49,0x1F);
++	dcs_write_seq(0x4A,0x1F);
++	dcs_write_seq(0x4B,0x1F);
++	dcs_write_seq(0x4C,0x1F);
++	dcs_write_seq(0x4D,0x1F);
++	dcs_write_seq(0x4E,0x1F);
++	dcs_write_seq(0x4F,0x1F);
++	dcs_write_seq(0x50,0x1F);
++	dcs_write_seq(0x51,0x1F);
++	dcs_write_seq(0x52,0x1F);
++	dcs_write_seq(0x53,0x1F);
++	dcs_write_seq(0x54,0x1F);
++	dcs_write_seq(0x55,0x1F);
++	dcs_write_seq(0x56,0x1F);
++	dcs_write_seq(0x57,0x1E);
++	dcs_write_seq(0x58,0x40);
++	dcs_write_seq(0x59,0x00);
++	dcs_write_seq(0x5A,0x00);
++	dcs_write_seq(0x5B,0x30);
++	dcs_write_seq(0x5C,0x02);
++	dcs_write_seq(0x5D,0x40);
++	dcs_write_seq(0x5E,0x01);
++	dcs_write_seq(0x5F,0x02);
++	dcs_write_seq(0x60,0x00);
++	dcs_write_seq(0x61,0x01);
++	dcs_write_seq(0x62,0x02);
++	dcs_write_seq(0x63,0x65);
++	dcs_write_seq(0x64,0x66);
++	dcs_write_seq(0x65,0x00);
++	dcs_write_seq(0x66,0x00);
++	dcs_write_seq(0x67,0x74);
++	dcs_write_seq(0x68,0x06);
++	dcs_write_seq(0x69,0x65);
++	dcs_write_seq(0x6A,0x66);
++	dcs_write_seq(0x6B,0x10);
++	dcs_write_seq(0x6C,0x00);
++	dcs_write_seq(0x6D,0x04);
++	dcs_write_seq(0x6E,0x04);
++	dcs_write_seq(0x6F,0x88);
++	dcs_write_seq(0x70,0x00);
++	dcs_write_seq(0x71,0x00);
++	dcs_write_seq(0x72,0x06);
++	dcs_write_seq(0x73,0x7B);
++	dcs_write_seq(0x74,0x00);
++	dcs_write_seq(0x75,0x87);
++	dcs_write_seq(0x76,0x00);
++	dcs_write_seq(0x77,0x5D);
++	dcs_write_seq(0x78,0x17);
++	dcs_write_seq(0x79,0x1F);
++	dcs_write_seq(0x7A,0x00);
++	dcs_write_seq(0x7B,0x00);
++	dcs_write_seq(0x7C,0x00);
++	dcs_write_seq(0x7D,0x03);
++	dcs_write_seq(0x7E,0x7B);
++	dcs_write_seq(0xE0,0x04);
++	dcs_write_seq(0x09,0x10);
++	dcs_write_seq(0xE0,0x00);
++	dcs_write_seq(0xE6,0x02);
++	dcs_write_seq(0xE7,0x02);
++	dcs_write_seq(0x11);// SLPOUT
++	msleep (120);
++	dcs_write_seq(0x29);// DSPON
++	msleep (20);
++	dcs_write_seq(0x35,0x00);
++}
++
++static int cwu50_disable(struct drm_panel *panel)
++{
++	struct cwu50 *ctx = panel_to_cwu50(panel);
++	struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev);
++	int ret;
++
++	if (!ctx->enabled)
++		return 0;
++
++	backlight_disable(ctx->backlight);
++
++	ctx->enabled = false;
++
++	return 0;
++}
++
++static int cwu50_unprepare(struct drm_panel *panel)
++{
++	struct cwu50 *ctx = panel_to_cwu50(panel);
++	struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev);
++	int ret;
++
++#if 0
++	if (!ctx->prepared)
++		return 0;
++
++	ret = mipi_dsi_dcs_set_display_off(dsi);
++	if (ret) {
++		dev_err(ctx->dev, "failed to turn display off (%d)\n", ret);
++		return ret;
++	}
++
++	ret = mipi_dsi_dcs_enter_sleep_mode(dsi);
++	if (ret) {
++		dev_err(ctx->dev, "failed to enter sleep mode (%d)\n", ret);
++		return ret;
++	}
++	msleep(120);
++
++	gpiod_set_value_cansleep(ctx->reset_gpio, 0);
++	msleep(5);
++
++	ctx->prepared = false;
++#endif
++
++	return 0;
++}
++
++static int cwu50_prepare(struct drm_panel *panel)
++{
++	struct cwu50 *ctx = panel_to_cwu50(panel);
++	struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev);
++	int ret;
++
++	if (ctx->prepared)
++		return 0;
++
++	gpiod_set_value_cansleep(ctx->reset_gpio, 0);
++	msleep(10);
++	gpiod_set_value_cansleep(ctx->reset_gpio, 1);
++	msleep(120);
++
++	/* Enabe tearing mode: send TE (tearing effect) at VBLANK */
++	ret = mipi_dsi_dcs_set_tear_on(dsi, MIPI_DSI_DCS_TEAR_MODE_VBLANK);
++	if (ret) {
++		dev_err(ctx->dev, "failed to enable vblank TE (%d)\n", ret);
++		return ret;
++	}
++	/* Exit sleep mode and power on */
++
++	cwu50_init_sequence(ctx);
++
++	ret = mipi_dsi_dcs_exit_sleep_mode(dsi);
++	if (ret) {
++		dev_err(ctx->dev, "failed to exit sleep mode (%d)\n", ret);
++		return ret;
++	}
++	msleep(120);
++
++	ret = mipi_dsi_dcs_set_display_on(dsi);
++	if (ret) {
++		dev_err(ctx->dev, "failed to turn display on (%d)\n", ret);
++		return ret;
++	}
++	msleep(20);
++
++	ctx->prepared = true;
++
++	return 0;
++}
++
++static int cwu50_enable(struct drm_panel *panel)
++{
++	struct cwu50 *ctx = panel_to_cwu50(panel);
++	struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev);
++	int ret;
++
++	if (ctx->enabled)
++		return 0;
++
++	backlight_enable(ctx->backlight);
++
++	ctx->enabled = true;
++
++	return 0;
++}
++
++static int cwu50_get_modes(struct drm_panel *panel, struct drm_connector *connector)
++{
++	struct cwu50 *ctx = panel_to_cwu50(panel);
++	struct drm_display_mode *mode;
++
++	mode = drm_mode_duplicate(connector->dev, &default_mode);
++	if (!mode) {
++		dev_err(panel->dev, "bad mode or failed to add mode\n");
++		return -EINVAL;
++	}
++	drm_mode_set_name(mode);
++	mode->type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED;
++
++	connector->display_info.width_mm = mode->width_mm;
++	connector->display_info.height_mm = mode->height_mm;
++
++	/* set up connector's "panel orientation" property */
++	drm_connector_set_panel_orientation(connector, ctx->orientation);
++
++	drm_mode_probed_add(connector, mode);
++
++	return 1; /* Number of modes */
++}
++
++static const struct drm_panel_funcs cwu50_drm_funcs = {
++	.disable = cwu50_disable,
++	.unprepare = cwu50_unprepare,
++	.prepare = cwu50_prepare,
++	.enable = cwu50_enable,
++	.get_modes = cwu50_get_modes,
++};
++
++static int cwu50_probe(struct mipi_dsi_device *dsi)
++{
++	struct device *dev = &dsi->dev;
++	struct cwu50 *ctx;
++	int ret;
++
++	ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL);
++	if (!ctx)
++		return -ENOMEM;
++
++	mipi_dsi_set_drvdata(dsi, ctx);
++	ctx->dev = dev;
++
++	dsi->lanes = 4;
++	dsi->format = MIPI_DSI_FMT_RGB888;
++	dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST | MIPI_DSI_MODE_VIDEO_SYNC_PULSE;
++
++	ctx->reset_gpio = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH);
++	if (IS_ERR(ctx->reset_gpio)) {
++		ret = PTR_ERR(ctx->reset_gpio);
++		if (ret != -EPROBE_DEFER)
++			dev_err(dev, "failed to request GPIO (%d)\n", ret);
++		return ret;
++	}
++
++	ctx->backlight = devm_of_find_backlight(dev);
++	if (IS_ERR(ctx->backlight)) {
++		dev_err(ctx->dev, "devm_of_find_backlight");
++		return PTR_ERR(ctx->backlight);
++	}
++
++	ret = of_drm_get_panel_orientation(dev->of_node, &ctx->orientation);
++	if (ret) {
++		dev_err(dev, "%pOF: failed to get orientation %d\n", dev->of_node, ret);
++		return ret;
++	}
++
++	ctx->panel.prepare_prev_first = true;
++
++	drm_panel_init(&ctx->panel, dev, &cwu50_drm_funcs, DRM_MODE_CONNECTOR_DSI);
++
++	drm_panel_add(&ctx->panel);
++
++	ret = mipi_dsi_attach(dsi);
++	if (ret < 0) {
++		dev_err(dev, "mipi_dsi_attach() failed: %d\n", ret);
++		drm_panel_remove(&ctx->panel);
++		return ret;
++	}
++
++	return 0;
++}
++
++static void cwu50_remove(struct mipi_dsi_device *dsi)
++{
++	struct cwu50 *ctx = mipi_dsi_get_drvdata(dsi);
++
++	mipi_dsi_detach(dsi);
++	drm_panel_remove(&ctx->panel);
++}
++
++static const struct of_device_id cwu50_of_match[] = {
++	{ .compatible = "cw,cwu50" },
++	{ }
++};
++MODULE_DEVICE_TABLE(of, cwu50_of_match);
++
++static struct mipi_dsi_driver cwu50_driver = {
++	.probe = cwu50_probe,
++	.remove = cwu50_remove,
++	.driver = {
++		.name = "panel-cwu50",
++		.of_match_table = cwu50_of_match,
++	},
++};
++module_mipi_dsi_driver(cwu50_driver);
++
++MODULE_DESCRIPTION("DRM Driver for cwu50 MIPI DSI panel");
++MODULE_LICENSE("GPL v2");
diff --git a/uconsole/kernel/patches/003-axp20x-power.patch b/uconsole/kernel/patches/003-axp20x-power.patch
new file mode 100644
index 0000000..08da306
--- /dev/null
+++ b/uconsole/kernel/patches/003-axp20x-power.patch
@@ -0,0 +1,196 @@
+--- a/drivers/power/supply/axp20x_ac_power.c
++++ b/drivers/power/supply/axp20x_ac_power.c
+@@ -52,6 +52,9 @@ static irqreturn_t axp20x_ac_power_irq(int irq, void *devid)
+ {
+ 	struct axp20x_ac_power *power = devid;
+ 
++	regmap_update_bits(power->regmap, AXP20X_VBUS_IPSOUT_MGMT, 0x03, 0x00);
++	regmap_update_bits(power->regmap, AXP20X_VBUS_IPSOUT_MGMT, 0x03, 0x03);
++
+ 	power_supply_changed(power->supply);
+ 
+ 	return IRQ_HANDLED;
+--- a/drivers/power/supply/axp20x_battery.c
++++ b/drivers/power/supply/axp20x_battery.c
+@@ -55,6 +55,10 @@
+ 
+ #define AXP20X_V_OFF_MASK		GENMASK(2, 0)
+ 
++#define AXP228_FULL_CAPACITY_CALIBRATE_EN BIT(5)
++#define AXP228_CAPACITY_CALIBRATE BIT(4)
++#define AXP228_CALIBRATE_MASK (BIT(4) | BIT(5))
++
+ struct axp20x_batt_ps;
+ 
+ struct axp_data {
+@@ -74,6 +78,9 @@ struct axp20x_batt_ps {
+ 	struct iio_channel *batt_v;
+ 	/* Maximum constant charge current */
+ 	unsigned int max_ccc;
++  int energy_full_design;
++  int current_now;
++  int voltage_now;
+ 	const struct axp_data	*data;
+ };
+ 
+@@ -275,6 +282,7 @@ static int axp20x_battery_get_prop(struct power_supply *psy,
+ 
+ 		/* IIO framework gives mA but Power Supply framework gives uA */
+ 		val->intval *= 1000;
++    axp20x_batt->current_now = val->intval;
+ 		break;
+ 
+ 	case POWER_SUPPLY_PROP_CAPACITY:
+@@ -323,8 +331,60 @@ static int axp20x_battery_get_prop(struct power_supply *psy,
+ 
+ 		/* IIO framework gives mV but Power Supply framework gives uV */
+ 		val->intval *= 1000;
++    axp20x_batt->current_now = val->intval;
++		break;
++
++	case POWER_SUPPLY_PROP_ENERGY_FULL:
++	case POWER_SUPPLY_PROP_ENERGY_NOW:
++  case POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN:
++		/* When no battery is present, return 0 */
++		ret = regmap_read(axp20x_batt->regmap, AXP20X_PWR_OP_MODE,
++				  &reg);
++		if (ret)
++			return ret;
++
++		if (!(reg & AXP20X_PWR_OP_BATT_PRESENT)) {
++			val->intval = 0;
++			return 0;
++		}
++
++		if(psp == POWER_SUPPLY_PROP_ENERGY_FULL) {
++      // TODO
++			val->intval = axp20x_batt->energy_full_design;
++			return 0;
++		}
++
++    if(psp == POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN) {
++      val->intval = axp20x_batt->energy_full_design;
++      return 0;
++    }
++
++		ret = regmap_read(axp20x_batt->regmap, AXP20X_FG_RES, &reg);
++		if (ret)
++			return ret;
++
++		if (axp20x_batt->data->has_fg_valid && !(reg & AXP22X_FG_VALID))
++			return -EINVAL;
++
++		val1 = reg & AXP209_FG_PERCENT;
++    val1 = max(min(val1, 100), 0);
++		val->intval = (val1 * ((long long int)axp20x_batt->energy_full_design)) / 100;
+ 		break;
+ 
++  case POWER_SUPPLY_PROP_CALIBRATE:
++    // report both calibrate enable flag and calibration status
++		ret = regmap_read(axp20x_batt->regmap, AXP20X_CC_CTRL, &reg);
++    if (ret)
++      return ret;
++    val1 = reg & AXP228_CALIBRATE_MASK;
++    val->intval = val1;
++    break;
++
++  case POWER_SUPPLY_PROP_POWER_NOW:
++    val->intval = (axp20x_batt->voltage_now / 10000) * axp20x_batt->current_now;
++    val->intval = val->intval / 100; // uW
++    break;
++
+ 	default:
+ 		return -EINVAL;
+ 	}
+@@ -453,6 +513,7 @@ static int axp20x_battery_set_prop(struct power_supply *psy,
+ 				   const union power_supply_propval *val)
+ {
+ 	struct axp20x_batt_ps *axp20x_batt = power_supply_get_drvdata(psy);
++  int val1;
+ 
+ 	switch (psp) {
+ 	case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN:
+@@ -467,6 +528,16 @@ static int axp20x_battery_set_prop(struct power_supply *psy,
+ 	case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX:
+ 		return axp20x_set_max_constant_charge_current(axp20x_batt,
+ 							      val->intval);
++
++  case POWER_SUPPLY_PROP_CALIBRATE:
++    if (val->intval) {
++      // enable calibrate
++      val1 = AXP228_FULL_CAPACITY_CALIBRATE_EN | AXP228_CAPACITY_CALIBRATE;
++    } else {
++      // disable calibrate
++      val1 = 0;
++    }
++    return regmap_update_bits(axp20x_batt->regmap, AXP20X_CC_CTRL, AXP228_CALIBRATE_MASK, val1);
+ 	case POWER_SUPPLY_PROP_STATUS:
+ 		switch (val->intval) {
+ 		case POWER_SUPPLY_STATUS_CHARGING:
+@@ -496,6 +567,11 @@ static enum power_supply_property axp20x_battery_props[] = {
+ 	POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN,
+ 	POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN,
+ 	POWER_SUPPLY_PROP_CAPACITY,
++	POWER_SUPPLY_PROP_ENERGY_FULL,
++	POWER_SUPPLY_PROP_ENERGY_NOW,
++  POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN,
++	POWER_SUPPLY_PROP_CALIBRATE,
++  POWER_SUPPLY_PROP_POWER_NOW,
+ };
+ 
+ static int axp20x_battery_prop_writeable(struct power_supply *psy,
+@@ -505,7 +581,8 @@ static int axp20x_battery_prop_writeable(struct power_supply *psy,
+ 	       psp == POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN ||
+ 	       psp == POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN ||
+ 	       psp == POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT ||
+-	       psp == POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX;
++	       psp == POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX ||
++         psp == POWER_SUPPLY_PROP_CALIBRATE;
+ }
+ 
+ static const struct power_supply_desc axp20x_batt_ps_desc = {
+@@ -615,6 +692,7 @@ static int axp20x_power_probe(struct platform_device *pdev)
+ 	if (!power_supply_get_battery_info(axp20x_batt->batt, &info)) {
+ 		int vmin = info->voltage_min_design_uv;
+ 		int ccc = info->constant_charge_current_max_ua;
++    int cfd = info->charge_full_design_uah;
+ 
+ 		if (vmin > 0 && axp20x_set_voltage_min_design(axp20x_batt,
+ 							      vmin))
+@@ -632,7 +710,22 @@ static int axp20x_power_probe(struct platform_device *pdev)
+ 			axp20x_batt->max_ccc = ccc;
+ 			axp20x_set_constant_charge_current(axp20x_batt, ccc);
+ 		}
+-	}
++
++
++    axp20x_batt->energy_full_design = info->energy_full_design_uwh;
++    // tell pmic about our battery
++    if (cfd) {
++      // [14:8], [7:0], cfd = Value * 1.456mAh
++      cfd = cfd / 1456;
++      regmap_update_bits(axp20x_batt->regmap, AXP288_FG_DES_CAP0_REG, 0xff, cfd & 0xff);
++      regmap_update_bits(axp20x_batt->regmap, AXP288_FG_DES_CAP1_REG, 0xff, BIT(7) | ((cfd >> 8) & 0xff));
++    } else {
++      dev_warn(axp20x_batt->dev, "charge full design is not set");
++    }
++	} else {
++    axp20x_batt->energy_full_design = 8000000;
++    dev_warn(axp20x_batt->dev, "energy full design is not set, default to %d\n", axp20x_batt->energy_full_design);
++  }
+ 
+ 	/*
+ 	 * Update max CCC to a valid value if battery info is present or set it
+@@ -641,6 +734,12 @@ static int axp20x_power_probe(struct platform_device *pdev)
+ 	axp20x_get_constant_charge_current(axp20x_batt,
+ 					   &axp20x_batt->max_ccc);
+ 
++	regmap_update_bits(axp20x_batt->regmap, AXP20X_VBUS_IPSOUT_MGMT, 0x03, 0x03);
++	regmap_update_bits(axp20x_batt->regmap, AXP20X_OFF_CTRL, 0x08, 0x08);
++	regmap_update_bits(axp20x_batt->regmap, AXP20X_CHRG_CTRL2, 0x30, 0x20);
++	regmap_update_bits(axp20x_batt->regmap, AXP20X_PEK_KEY, 0x0f, 0x0b);
++	regmap_update_bits(axp20x_batt->regmap, AXP20X_GPIO0_CTRL, 0x07, 0x00);
++
+ 	return 0;
+ }
+ 
diff --git a/uconsole/kernel/patches/004-vc4_dsi-update.patch b/uconsole/kernel/patches/004-vc4_dsi-update.patch
new file mode 100644
index 0000000..bae0ad1
--- /dev/null
+++ b/uconsole/kernel/patches/004-vc4_dsi-update.patch
@@ -0,0 +1,34 @@
+--- a/drivers/gpu/drm/vc4/vc4_dsi.c
++++ b/drivers/gpu/drm/vc4/vc4_dsi.c
+@@ -753,7 +753,7 @@ static void vc4_dsi_ulps(struct vc4_dsi *dsi, bool ulps)
+ 			 (dsi->lanes > 1 ? DSI1_STAT_PHY_D1_STOP : 0) |
+ 			 (dsi->lanes > 2 ? DSI1_STAT_PHY_D2_STOP : 0) |
+ 			 (dsi->lanes > 3 ? DSI1_STAT_PHY_D3_STOP : 0));
+-	int ret;
++	int ret, i = 0;
+ 	bool ulps_currently_enabled = (DSI_PORT_READ(PHY_AFEC0) &
+ 				       DSI_PORT_BIT(PHY_AFEC0_LATCH_ULPS));
+ 
+@@ -781,14 +781,15 @@ static void vc4_dsi_ulps(struct vc4_dsi *dsi, bool ulps)
+ 
+ 	DSI_PORT_WRITE(STAT, stat_stop);
+ 	DSI_PORT_WRITE(PHYC, DSI_PORT_READ(PHYC) & ~phyc_ulps);
+-	ret = wait_for((DSI_PORT_READ(STAT) & stat_stop) == stat_stop, 200);
+-	if (ret) {
+-		dev_warn(&dsi->pdev->dev,
+-			 "Timeout waiting for DSI STOP entry: STAT 0x%08x",
+-			 DSI_PORT_READ(STAT));
+-		DSI_PORT_WRITE(PHYC, DSI_PORT_READ(PHYC) & ~phyc_ulps);
+-		return;
++	while(wait_for((DSI_PORT_READ(STAT) & stat_stop) == stat_stop, 200)){
++		if(i++ == 10) {
++			DSI_PORT_WRITE(PHYC, DSI_PORT_READ(PHYC) & ~phyc_ulps);
++			break;
++		}
+ 	}
++	if(i > 0)
++		dev_warn(&dsi->pdev->dev, "Timeout waiting for DSI STOP entry: STAT 0x%08x %d", DSI_PORT_READ(STAT), i);
++	return;
+ }
+ 
+ static u32
diff --git a/uconsole/kernel/patches/005-bcm2835-audio-staging.patch b/uconsole/kernel/patches/005-bcm2835-audio-staging.patch
new file mode 100644
index 0000000..9325eb3
--- /dev/null
+++ b/uconsole/kernel/patches/005-bcm2835-audio-staging.patch
@@ -0,0 +1,11 @@
+--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
++++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
+@@ -10,7 +10,7 @@
+ #include "bcm2835.h"
+ #include <soc/bcm2835/raspberrypi-firmware.h>
+ 
+-static bool enable_hdmi, enable_hdmi0, enable_hdmi1;
++static bool enable_hdmi = true, enable_hdmi0, enable_hdmi1;
+ static bool enable_headphones = true;
+ static int num_channels = MAX_SUBSTREAMS;
+ 
diff --git a/uconsole/overlays/default.nix b/uconsole/overlays/default.nix
new file mode 100644
index 0000000..60c01d5
--- /dev/null
+++ b/uconsole/overlays/default.nix
@@ -0,0 +1,14 @@
+{...}: {
+  imports = [
+    ./dtb-audremap.nix
+    ./dtb-cpu-revision.nix
+    ./dtb-disable-pcie.nix
+    ./dtb-disable-genet.nix
+    ./dtb-panel-uc.nix
+    ./dtb-cpi-pmu.nix
+    ./dtb-cpi-i2c1.nix
+    ./dtb-cpi-bluetooth.nix
+    ./dtb-vc4-kms-v3d.nix
+    ./dtb-cpi-spi4.nix
+  ];
+}
diff --git a/uconsole/overlays/dtb-audremap.nix b/uconsole/overlays/dtb-audremap.nix
new file mode 100644
index 0000000..ba2dba2
--- /dev/null
+++ b/uconsole/overlays/dtb-audremap.nix
@@ -0,0 +1,28 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib) mkEnableOption mkIf mkMerge mkOption types;
+  cfg = config.hardware.raspberry-pi."4".overlays.audremap;
+in {
+  options.hardware.raspberry-pi."4".overlays.audremap = {
+    enable = mkEnableOption ''overlay enable'';
+    name = mkOption {
+      type = types.str;
+      default = "audremap";
+    };
+  };
+
+  config = mkMerge [
+    (mkIf cfg.enable {
+      hardware.deviceTree.overlays = [
+        {
+          name = "${cfg.name}";
+          filter = "bcm2711-rpi-cm4.dtb";
+          dtsFile = ./source/audremap.dts;
+        }
+      ];
+    })
+  ];
+}
diff --git a/uconsole/overlays/dtb-cpi-bluetooth.nix b/uconsole/overlays/dtb-cpi-bluetooth.nix
new file mode 100644
index 0000000..cb364a2
--- /dev/null
+++ b/uconsole/overlays/dtb-cpi-bluetooth.nix
@@ -0,0 +1,30 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib) mkEnableOption mkIf mkMerge mkOption types;
+  cfg = config.hardware.raspberry-pi."4".overlays.cpi-bluetooth;
+in {
+  options.hardware.raspberry-pi."4".overlays.cpi-bluetooth = {
+    enable = mkEnableOption ''overlay enable'';
+    name = mkOption {
+      type = types.str;
+      default = "cpi-bluetooth";
+    };
+  };
+
+  config = mkMerge [
+    (mkIf cfg.enable {
+      hardware.deviceTree = {
+        overlays = [
+          {
+            name = "${cfg.name}";
+            filter = "bcm2711-rpi-cm4.dtb";
+            dtsFile = ./source/cpi-bluetooth.dts;
+          }
+        ];
+      };
+    })
+  ];
+}
diff --git a/uconsole/overlays/dtb-cpi-i2c1.nix b/uconsole/overlays/dtb-cpi-i2c1.nix
new file mode 100644
index 0000000..e88f61a
--- /dev/null
+++ b/uconsole/overlays/dtb-cpi-i2c1.nix
@@ -0,0 +1,30 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib) mkEnableOption mkIf mkMerge mkOption types;
+  cfg = config.hardware.raspberry-pi."4".overlays.cpi-i2c1;
+in {
+  options.hardware.raspberry-pi."4".overlays.cpi-i2c1 = {
+    enable = mkEnableOption ''overlay enable'';
+    name = mkOption {
+      type = types.str;
+      default = "cpi-i2c1";
+    };
+  };
+
+  config = mkMerge [
+    (mkIf cfg.enable {
+      hardware.deviceTree = {
+        overlays = [
+          {
+            name = "${cfg.name}";
+            filter = "bcm2711-rpi-cm4.dtb";
+            dtsFile = ./source/cpi-i2c1.dts;
+          }
+        ];
+      };
+    })
+  ];
+}
diff --git a/uconsole/overlays/dtb-cpi-pmu.nix b/uconsole/overlays/dtb-cpi-pmu.nix
new file mode 100644
index 0000000..5483580
--- /dev/null
+++ b/uconsole/overlays/dtb-cpi-pmu.nix
@@ -0,0 +1,30 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib) mkEnableOption mkIf mkMerge mkOption types;
+  cfg = config.hardware.raspberry-pi."4".overlays.cpi-pmu;
+in {
+  options.hardware.raspberry-pi."4".overlays.cpi-pmu = {
+    enable = mkEnableOption ''overlay enable'';
+    name = mkOption {
+      type = types.str;
+      default = "cpi-pmu";
+    };
+  };
+
+  config = mkMerge [
+    (mkIf cfg.enable {
+      hardware.deviceTree = {
+        overlays = [
+          {
+            name = "${cfg.name}";
+            filter = "bcm2711-rpi-cm4.dtb";
+            dtsFile = ./source/cpi-pmu.dts;
+          }
+        ];
+      };
+    })
+  ];
+}
diff --git a/uconsole/overlays/dtb-cpi-spi4.nix b/uconsole/overlays/dtb-cpi-spi4.nix
new file mode 100644
index 0000000..7c00bde
--- /dev/null
+++ b/uconsole/overlays/dtb-cpi-spi4.nix
@@ -0,0 +1,30 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib) mkEnableOption mkIf mkMerge mkOption types;
+  cfg = config.hardware.raspberry-pi."4".overlays.cpi-spi4;
+in {
+  options.hardware.raspberry-pi."4".overlays.cpi-spi4 = {
+    enable = mkEnableOption ''overlay enable'';
+    name = mkOption {
+      type = types.str;
+      default = "cpi-spi4";
+    };
+  };
+
+  config = mkMerge [
+    (mkIf cfg.enable {
+      hardware.deviceTree = {
+        overlays = [
+          {
+            name = "${cfg.name}";
+            filter = "bcm2711-rpi-cm4.dtb";
+            dtsFile = ./source/cpi-spi4.dts;
+          }
+        ];
+      };
+    })
+  ];
+}
diff --git a/uconsole/overlays/dtb-cpu-revision.nix b/uconsole/overlays/dtb-cpu-revision.nix
new file mode 100644
index 0000000..497ef13
--- /dev/null
+++ b/uconsole/overlays/dtb-cpu-revision.nix
@@ -0,0 +1,30 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib) mkEnableOption mkIf mkMerge mkOption types;
+  cfg = config.hardware.raspberry-pi."4".overlays.cpu-revision;
+in {
+  options.hardware.raspberry-pi."4".overlays.cpu-revision = {
+    enable = mkEnableOption ''overlay enable'';
+    name = mkOption {
+      type = types.str;
+      default = "cpu-revision";
+    };
+  };
+
+  config = mkMerge [
+    (mkIf cfg.enable {
+      hardware.deviceTree = {
+        overlays = [
+          {
+            name = "${cfg.name}";
+            filter = "bcm2711-rpi-cm4.dtb";
+            dtsFile = ./source/cpu-revision.dts;
+          }
+        ];
+      };
+    })
+  ];
+}
diff --git a/uconsole/overlays/dtb-disable-genet.nix b/uconsole/overlays/dtb-disable-genet.nix
new file mode 100644
index 0000000..221153e
--- /dev/null
+++ b/uconsole/overlays/dtb-disable-genet.nix
@@ -0,0 +1,30 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib) mkEnableOption mkIf mkMerge mkOption types;
+  cfg = config.hardware.raspberry-pi."4".overlays.disable-genet;
+in {
+  options.hardware.raspberry-pi."4".overlays.disable-genet = {
+    enable = mkEnableOption ''overlay enable'';
+    name = mkOption {
+      type = types.str;
+      default = "disable-genet";
+    };
+  };
+
+  config = mkMerge [
+    (mkIf cfg.enable {
+      hardware.deviceTree = {
+        overlays = [
+          {
+            name = "${cfg.name}";
+            filter = "bcm2711-rpi-cm4.dtb";
+            dtsFile = ./source/disable-genet.dts;
+          }
+        ];
+      };
+    })
+  ];
+}
diff --git a/uconsole/overlays/dtb-disable-pcie.nix b/uconsole/overlays/dtb-disable-pcie.nix
new file mode 100644
index 0000000..02d8fe0
--- /dev/null
+++ b/uconsole/overlays/dtb-disable-pcie.nix
@@ -0,0 +1,30 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib) mkEnableOption mkIf mkMerge mkOption types;
+  cfg = config.hardware.raspberry-pi."4".overlays.disable-pcie;
+in {
+  options.hardware.raspberry-pi."4".overlays.disable-pcie = {
+    enable = mkEnableOption ''overlay enable'';
+    name = mkOption {
+      type = types.str;
+      default = "disable-pcie";
+    };
+  };
+
+  config = mkMerge [
+    (mkIf cfg.enable {
+      hardware.deviceTree = {
+        overlays = [
+          {
+            name = "${cfg.name}";
+            filter = "bcm2711-rpi-cm4.dtb";
+            dtsFile = ./source/disable-pcie.dts;
+          }
+        ];
+      };
+    })
+  ];
+}
diff --git a/uconsole/overlays/dtb-panel-uc.nix b/uconsole/overlays/dtb-panel-uc.nix
new file mode 100644
index 0000000..5c5187e
--- /dev/null
+++ b/uconsole/overlays/dtb-panel-uc.nix
@@ -0,0 +1,30 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib) mkEnableOption mkIf mkMerge mkOption types;
+  cfg = config.hardware.raspberry-pi."4".overlays.panel-uc;
+in {
+  options.hardware.raspberry-pi."4".overlays.panel-uc = {
+    enable = mkEnableOption ''overlay enable'';
+    name = mkOption {
+      type = types.str;
+      default = "panel-uc";
+    };
+  };
+
+  config = mkMerge [
+    (mkIf cfg.enable {
+      hardware.deviceTree = {
+        overlays = [
+          {
+            name = "${cfg.name}";
+            filter = "bcm2711-rpi-cm4.dtb";
+            dtsFile = ./source/panel-uc.dts;
+          }
+        ];
+      };
+    })
+  ];
+}
diff --git a/uconsole/overlays/dtb-vc4-kms-v3d.nix b/uconsole/overlays/dtb-vc4-kms-v3d.nix
new file mode 100644
index 0000000..fc6221b
--- /dev/null
+++ b/uconsole/overlays/dtb-vc4-kms-v3d.nix
@@ -0,0 +1,30 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib) mkEnableOption mkIf mkMerge mkOption types;
+  cfg = config.hardware.raspberry-pi."4".overlays.vc4-kms-v3d;
+in {
+  options.hardware.raspberry-pi."4".overlays.vc4-kms-v3d = {
+    enable = mkEnableOption ''overlay enable'';
+    name = mkOption {
+      type = types.str;
+      default = "vc4-kms-v3d";
+    };
+  };
+
+  config = mkMerge [
+    (mkIf cfg.enable {
+      hardware.deviceTree = {
+        overlays = [
+          {
+            name = "${cfg.name}";
+            filter = "bcm2711-rpi-cm4.dtb";
+            dtsFile = ./source/vc4-kms-v3d.dts;
+          }
+        ];
+      };
+    })
+  ];
+}
diff --git a/uconsole/overlays/source/audremap.dts b/uconsole/overlays/source/audremap.dts
new file mode 100644
index 0000000..16bf187
--- /dev/null
+++ b/uconsole/overlays/source/audremap.dts
@@ -0,0 +1,26 @@
+/dts-v1/;
+/plugin/;
+/ {
+  compatible = "brcm,bcm2711";
+  fragment@0 {
+    target = <&audio_pins>;
+    frag0: __overlay__ {
+      brcm,pins = <12 13>;
+      brcm,function = <4>; /* alt0 alt0 */
+    };
+  };
+  fragment@1 {
+    target = <&chosen>;
+    __overlay__  {
+      bootargs = "snd_bcm2835.enable_headphones=1";
+    };
+  };
+  __overrides__ {
+    swap_lr = <&frag0>, "swap_lr?";
+    enable_jack = <&frag0>, "enable_jack?";
+    pins_12_13 = <&frag0>,"brcm,pins:0=12", <&frag0>,"brcm,pins:4=13", <&frag0>,"brcm,function:0=4";
+    pins_18_19 = <&frag0>,"brcm,pins:0=18", <&frag0>,"brcm,pins:4=19", <&frag0>,"brcm,function:0=2";
+    pins_40_41 = <&frag0>,"brcm,pins:0=40", <&frag0>,"brcm,pins:4=41", <&frag0>,"brcm,function:0=4";
+    pins_40_45 = <&frag0>,"brcm,pins:0=40", <&frag0>,"brcm,pins:4=45", <&frag0>,"brcm,function:0=4";
+  };
+};
\ No newline at end of file
diff --git a/uconsole/overlays/source/cpi-bluetooth.dts b/uconsole/overlays/source/cpi-bluetooth.dts
new file mode 100644
index 0000000..9f0b382
--- /dev/null
+++ b/uconsole/overlays/source/cpi-bluetooth.dts
@@ -0,0 +1,14 @@
+/dts-v1/;
+/plugin/;
+
+/{
+  compatible = "brcm,bcm2711";
+
+  fragment@0 {
+    target = <&uart0_pins>;
+    __overlay__ {
+      brcm,pins = <30 31 32 33>;
+      brcm,pull = <2 0 0 2>;
+    };
+  };
+};
diff --git a/uconsole/overlays/source/cpi-i2c1.dts b/uconsole/overlays/source/cpi-i2c1.dts
new file mode 100644
index 0000000..3240754
--- /dev/null
+++ b/uconsole/overlays/source/cpi-i2c1.dts
@@ -0,0 +1,34 @@
+/dts-v1/;
+/plugin/;
+
+/{
+  compatible = "brcm,bcm2711";
+
+  fragment@0 {
+    target = <&i2c1>;
+    __overlay__ {
+      #address-cells = <1>;
+      #size-cells = <0>;
+      pinctrl-names = "default";
+      pinctrl-0 = <&i2c1_pins>;
+      status = "okay";
+
+      adc101c: adc@54 {
+        reg = <0x54>;
+        compatible = "ti,adc101c";
+        status = "okay";
+      };
+    };
+  };
+
+  fragment@1 {
+    target = <&gpio>;
+    __overlay__ {
+
+      i2c1_pins: i2c1 {
+        brcm,pins = <44 45>;
+        brcm,function = <6>;
+      };
+    };
+  };
+};
diff --git a/uconsole/overlays/source/cpi-pmu.dts b/uconsole/overlays/source/cpi-pmu.dts
new file mode 100644
index 0000000..ed0273c
--- /dev/null
+++ b/uconsole/overlays/source/cpi-pmu.dts
@@ -0,0 +1,110 @@
+/dts-v1/;
+/plugin/;
+
+/{
+  compatible = "brcm,bcm2711";
+
+  fragment@0 {
+    target = <&i2c0if>;
+    __overlay__ {
+      #address-cells = <1>;
+      #size-cells = <0>;
+      pinctrl-0 = <&i2c0_pins>;
+      pinctrl-names = "default";
+      status = "okay";
+
+      axp22x: pmic@34 {
+        interrupt-controller;
+        #interrupt-cells = <1>;
+        compatible = "x-powers,axp221";
+        reg = <0x34>; /* i2c address */
+        interrupt-parent = <&gpio>;
+        interrupts = <2 8>;  /* IRQ_TYPE_EDGE_FALLING */
+        irq-gpios = <&gpio 2 0>;
+
+        regulators {
+
+          x-powers,dcdc-freq = <3000>;
+
+          reg_aldo1: aldo1 {
+            regulator-always-on;
+            regulator-min-microvolt = <3300000>;
+            regulator-max-microvolt = <3300000>;
+            regulator-name = "audio-vdd";
+          };
+
+          reg_aldo2: aldo2 {
+            regulator-always-on;
+            regulator-min-microvolt = <3300000>;
+            regulator-max-microvolt = <3300000>;
+            regulator-name = "display-vcc";
+          };
+
+          reg_dldo2: dldo2 {
+            regulator-always-on;
+            regulator-min-microvolt = <3300000>;
+            regulator-max-microvolt = <3300000>;
+            regulator-name = "dldo2";
+          };
+
+          reg_dldo3: dldo3 {
+            regulator-always-on;
+            regulator-min-microvolt = <3300000>;
+            regulator-max-microvolt = <3300000>;
+            regulator-name = "dldo3";
+          };
+
+          reg_dldo4: dldo4 {
+            regulator-always-on;
+            regulator-min-microvolt = <3300000>;
+            regulator-max-microvolt = <3300000>;
+            regulator-name = "dldo4";
+          };
+
+        };
+
+        battery_power_supply: battery-power-supply {
+          compatible = "x-powers,axp221-battery-power-supply";
+          monitored-battery = <&battery>;
+        };
+
+        ac_power_supply: ac_power_supply {
+          compatible = "x-powers,axp221-ac-power-supply";
+        };
+
+      };
+    };
+  };
+
+  fragment@1 {
+    target = <&i2c0if>;
+    __overlay__ {
+      compatible = "brcm,bcm2708-i2c";
+    };
+  };
+
+  fragment@2 {
+    target-path = "/aliases";
+    __overlay__ {
+      i2c0 = "/soc/i2c@7e205000";
+    };
+  };
+
+  fragment@3 {
+    target-path = "/";
+    __overlay__  {
+      battery: battery@0 {
+        compatible = "simple-battery";
+        device-chemistry = "lithium-ion";
+        constant-charge-current-max-microamp = <2100000>;
+        voltage-max-design-microvolt = <4200000>;
+        re-charge-voltage-microvolt = <4000000>;
+        // adjust the following params according to your battery specs
+        voltage-min-design-microvolt = <3300000>;
+        energy-full-design-microwatt-hours = <24790000>; // 2x3350mAh * 3.7v
+        charge-full-design-microamp-hours = <6700000>; // 2x3350mAh
+      };
+    };
+  };
+
+};
diff --git a/uconsole/overlays/source/cpi-spi4.dts b/uconsole/overlays/source/cpi-spi4.dts
new file mode 100644
index 0000000..48e6bcd
--- /dev/null
+++ b/uconsole/overlays/source/cpi-spi4.dts
@@ -0,0 +1,41 @@
+/dts-v1/;
+/plugin/;
+
+/{
+	compatible = "brcm,bcm2711";
+
+	fragment@1 {
+		target = <&spi4>;
+		__overlay__ {
+			pinctrl-names = "default";
+			pinctrl-0 = <&spi4_pins &spi4_cs_pins>;
+			cs-gpios = <&gpio 4 1>;
+			status = "okay";
+
+			spidev4_0: spidev@0 {
+				compatible = "spidev";
+				reg = <0>;      /* CE0 */
+				#address-cells = <1>;
+				#size-cells = <0>;
+				spi-max-frequency = <125000000>;
+				status = "okay";
+			};
+		};
+	};
+
+	fragment@2 {
+		target = <&gpio>;
+		__overlay__ {
+
+			spi4_pins: spi4_pins {
+				brcm,pins = <6 7>;
+				brcm,function = <7>;
+			};
+
+			spi4_cs_pins: spi0_cs_pins {
+				brcm,pins = <4>;
+				brcm,function = <1>;
+			};
+		};
+	};	
+};
diff --git a/uconsole/overlays/source/cpu-revision.dts b/uconsole/overlays/source/cpu-revision.dts
new file mode 100644
index 0000000..f6e81ed
--- /dev/null
+++ b/uconsole/overlays/source/cpu-revision.dts
@@ -0,0 +1,20 @@
+/dts-v1/;
+/plugin/;
+
+/{
+  compatible = "brcm,bcm2711";
+
+  fragment@0 {
+    target-path = "/";
+    __overlay__ {
+      frag0: system {
+        linux,revision = <0x00d03114>;
+      };
+    };
+  };
+
+  __overrides__ {
+    pi4 = <&frag0>,"linux,revision:0=",<0x00d03114>;
+    cm4-8 = <&frag0>,"linux,revision:0=",<0x00d03140>;
+  };
+};
diff --git a/uconsole/overlays/source/disable-genet.dts b/uconsole/overlays/source/disable-genet.dts
new file mode 100644
index 0000000..3c3596d
--- /dev/null
+++ b/uconsole/overlays/source/disable-genet.dts
@@ -0,0 +1,13 @@
+/dts-v1/;
+/plugin/;
+
+/{
+  compatible = "brcm,bcm2711";
+
+  fragment@0 {
+    target = <&genet>;
+    __overlay__ {
+      status = "disabled";
+    };
+  };
+};
diff --git a/uconsole/overlays/source/disable-pcie.dts b/uconsole/overlays/source/disable-pcie.dts
new file mode 100644
index 0000000..d6134f0
--- /dev/null
+++ b/uconsole/overlays/source/disable-pcie.dts
@@ -0,0 +1,13 @@
+/dts-v1/;
+/plugin/;
+
+/{
+  compatible = "brcm,bcm2711";
+
+  fragment@0 {
+    target = <&pcie0>;
+    __overlay__ {
+      status = "disabled";
+    };
+  };
+};
diff --git a/uconsole/overlays/source/panel-uc.dts b/uconsole/overlays/source/panel-uc.dts
new file mode 100644
index 0000000..2a656d9
--- /dev/null
+++ b/uconsole/overlays/source/panel-uc.dts
@@ -0,0 +1,47 @@
+/dts-v1/;
+/plugin/;
+
+/{
+  compatible = "brcm,bcm2711";
+
+  fragment@0 {
+    target=<&dsi1>;
+    __overlay__ {
+      #address-cells = <1>;
+      #size-cells = <0>;
+      status = "okay";
+
+      port {
+        dsi_out_port: endpoint {
+          remote-endpoint = <&panel_dsi_port>;
+        };
+      };
+
+      panel_cwu50: panel@0 {
+        compatible = "cw,cwu50";
+        reg = <0>;
+        reset-gpio = <&gpio 8 1>;
+        backlight = <&ocp8178_backlight>;
+        rotation = <90>;
+
+        port {
+          panel_dsi_port: endpoint {
+            remote-endpoint = <&dsi_out_port>;
+          };
+        };
+      };
+    };
+  };
+
+  fragment@1 {
+    target-path = "/";
+    __overlay__  {
+      ocp8178_backlight: backlight@0 {
+        compatible = "ocp8178-backlight";
+        backlight-control-gpios = <&gpio 9 0>;
+        default-brightness = <5>;
+      };
+    };
+  };
+
+};
diff --git a/uconsole/overlays/source/vc4-kms-v3d.dts b/uconsole/overlays/source/vc4-kms-v3d.dts
new file mode 100644
index 0000000..3ff516c
--- /dev/null
+++ b/uconsole/overlays/source/vc4-kms-v3d.dts
@@ -0,0 +1,217 @@
+/dts-v1/;
+/plugin/;
+
+#include <dt-bindings/clock/bcm2835.h>
+
+&frag0 {
+  size = <((512-4)*1024*1024)>;
+};
+
+/{
+  compatible = "brcm,bcm2711";
+
+  fragment@0 {
+    target = <&cma>;
+    frag0: __overlay__ {
+      /*
+      * The default size when using this overlay is 256 MB
+      * and should be kept as is for backwards
+      * compatibility.
+      */
+      size = <0x10000000>;
+    };
+  };
+
+  fragment@1 {
+    target = <&ddc0>;
+    __overlay__  {
+      status = "okay";
+    };
+  };
+
+  fragment@2 {
+    target = <&ddc1>;
+    __overlay__  {
+      status = "okay";
+    };
+  };
+
+  fragment@3 {
+    target = <&hdmi0>;
+    __overlay__  {
+      status = "okay";
+    };
+  };
+
+  fragment@4 {
+    target = <&hdmi1>;
+    __overlay__  {
+      status = "okay";
+    };
+  };
+
+  fragment@5 {
+    target = <&hvs>;
+    __overlay__  {
+      status = "okay";
+    };
+  };
+
+  fragment@6 {
+    target = <&pixelvalve0>;
+    __overlay__  {
+      status = "okay";
+    };
+  };
+
+  fragment@7 {
+    target = <&pixelvalve1>;
+    __overlay__  {
+      status = "okay";
+    };
+  };
+
+  fragment@8 {
+    target = <&pixelvalve2>;
+    __overlay__  {
+      status = "okay";
+    };
+  };
+
+  fragment@9 {
+    target = <&pixelvalve3>;
+    __overlay__  {
+      status = "okay";
+    };
+  };
+
+  fragment@10 {
+    target = <&pixelvalve4>;
+    __overlay__  {
+      status = "okay";
+    };
+  };
+
+  fragment@11 {
+    target = <&v3d>;
+    __overlay__  {
+      status = "okay";
+    };
+  };
+
+  fragment@12 {
+    target = <&vc4>;
+    __overlay__  {
+      status = "okay";
+    };
+  };
+
+  fragment@13 {
+    target = <&txp>;
+    __overlay__  {
+      status = "okay";
+    };
+  };
+
+  fragment@14 {
+    target = <&fb>;
+    __overlay__  {
+      status = "disabled";
+    };
+  };
+
+  fragment@15 {
+    target = <&firmwarekms>;
+    __overlay__  {
+      status = "disabled";
+    };
+  };
+
+  fragment@16 {
+    target = <&vec>;
+    __overlay__  {
+      status = "disabled";
+    };
+  };
+
+  fragment@17 {
+    target = <&hdmi0>;
+    __dormant__  {
+      dmas;
+    };
+  };
+
+  fragment@18 {
+    target = <&hdmi1>;
+    __dormant__  {
+      dmas;
+    };
+  };
+
+  fragment@19 {
+    target-path = "/chosen";
+    __overlay__  {
+      bootargs = "snd_bcm2835.enable_hdmi=0";
+    };
+  };
+
+  fragment@20 {
+    target = <&dvp>;
+    __overlay__  {
+      status = "okay";
+    };
+  };
+
+  fragment@21 {
+    target = <&pixelvalve3>;
+    __dormant__  {
+      status = "okay";
+    };
+  };
+
+  fragment@22 {
+    target = <&vec>;
+    __dormant__  {
+      status = "okay";
+    };
+  };
+
+  fragment@23 {
+    target = <&aon_intr>;
+    __overlay__  {
+      status = "okay";
+    };
+  };
+
+  __overrides__ {
+    audio   = <0>,"!17";
+    audio1   = <0>,"!18";
+    noaudio = <0>,"=17", <0>,"=18";
+    composite = <0>, "!1",
+          <0>, "!2",
+          <0>, "!3",
+          <0>, "!4",
+          <0>, "!6",
+          <0>, "!7",
+          <0>, "!8",
+          <0>, "!9",
+          <0>, "!10",
+          <0>, "!16",
+          <0>, "=21",
+          <0>, "=22";
+    nohdmi0 =   <0>, "-1-3-8";
+    nohdmi1 =   <0>, "-2-4-10";
+    nohdmi =    <0>, "-1-2-3-4-8-10";
+    cma-512 = <&frag0>,"size:0=",<0x20000000>;
+    cma-448 = <&frag0>,"size:0=",<0x1c000000>;
+    cma-384 = <&frag0>,"size:0=",<0x18000000>;
+    cma-320 = <&frag0>,"size:0=",<0x14000000>;
+    cma-256 = <&frag0>,"size:0=",<0x10000000>;
+    cma-192 = <&frag0>,"size:0=",<0xC000000>;
+    cma-128 = <&frag0>,"size:0=",<0x8000000>;
+    cma-96  = <&frag0>,"size:0=",<0x6000000>;
+    cma-64  = <&frag0>,"size:0=",<0x4000000>;
+    cma-size = <&frag0>,"size:0"; /* in bytes, 4MB aligned */
+    cma-default = <0>,"-0";
+  };
+};
\ No newline at end of file
diff --git a/uconsole/packages/overlays/apply-overlays-dtmerge.nix b/uconsole/packages/overlays/apply-overlays-dtmerge.nix
new file mode 100644
index 0000000..0355819
--- /dev/null
+++ b/uconsole/packages/overlays/apply-overlays-dtmerge.nix
@@ -0,0 +1,64 @@
+paramsPerOverlayMap: {
+  lib,
+  stdenvNoCC,
+  dtc,
+  libraspberrypi,
+}:
+with lib; (base: overlays':
+    stdenvNoCC.mkDerivation {
+      name = "device-tree-overlays";
+      nativeBuildInputs = [dtc libraspberrypi];
+      buildCommand = let
+        overlays = toList overlays';
+      in ''
+        mkdir -p $out
+        cd "${base}"
+        find . -type f -name '*.dtb' -print0 \
+          | xargs -0 cp -v --no-preserve=mode --target-directory "$out" --parents
+
+        for dtb in $(find "$out" -type f -name '*.dtb'); do
+
+          echo -n "Applying params to $(basename "$dtb")... "
+          echo ${concatStringsSep " " (mapAttrsToList (name: value: "${name}=${value}") (paramsPerOverlayMap.bcm2711-rpi-cm4 or {}))}
+
+          mv "$dtb"{,.in}
+          dtmerge "$dtb.in" "$dtb" - ${concatStringsSep " " (mapAttrsToList (name: value: "${name}=${value}") (paramsPerOverlayMap.bcm2711-rpi-cm4 or {}))}
+          rm "$dtb.in"
+
+          dtbCompat=$(fdtget -t s "$dtb" / compatible 2>/dev/null || true)
+          # skip files without `compatible` string
+          test -z "$dtbCompat" && continue
+
+          ${flip (concatMapStringsSep "\n") overlays (o: ''
+          overlayCompat="$(fdtget -t s "${o.dtboFile}" / compatible)"
+
+          # skip incompatible and non-matching overlays
+          if [[ ! "$dtbCompat" =~ "$overlayCompat" ]]; then
+            echo "Skipping overlay ${o.name}: incompatible with $(basename "$dtb")"
+          elif ${
+            if ((o.filter or null) == null)
+            then "false"
+            else ''
+              [[ "''${dtb//${o.filter}/}" ==  "$dtb" ]]
+            ''
+          }
+          then
+            echo "Skipping overlay ${o.name}: filter does not match $(basename "$dtb")"
+          else
+            echo -n "Applying overlay ${o.name} to $(basename "$dtb")... "
+            mv "$dtb"{,.in}
+
+            # dtmerge requires a .dtbo ext for dtbo files, otherwise it adds it to the given file implicitly
+            dtboWithExt="$TMPDIR/$(basename "${o.dtboFile}").dtbo"
+            cp -r ${o.dtboFile} "$dtboWithExt"
+
+            echo -n ${concatStringsSep " " (mapAttrsToList (name: value: "${name}=${value}") (paramsPerOverlayMap.${o.name} or {}))} " "
+            dtmerge "$dtb.in" "$dtb" "$dtboWithExt" ${concatStringsSep " " (mapAttrsToList (name: value: "${name}=${value}") (paramsPerOverlayMap.${o.name} or {}))}
+
+            echo "ok"
+            rm "$dtb.in" "$dtboWithExt"
+          fi
+        '')}
+
+        done'';
+    })
diff --git a/uconsole/packages/overlays/default.nix b/uconsole/packages/overlays/default.nix
new file mode 100644
index 0000000..45ddc48
--- /dev/null
+++ b/uconsole/packages/overlays/default.nix
@@ -0,0 +1,51 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; let
+  overlayParamsType = types.submodule {
+    options = {
+      name = mkOption {
+        type = types.str;
+        description = lib.mdDoc ''
+          Name of an overlay for which params are going to be passed to dtmerge.
+        '';
+      };
+
+      params = mkOption {
+        type = types.attrsOf types.str;
+        description = lib.mdDoc ''
+          Params to pass to dtmerge.
+        '';
+      };
+    };
+  };
+
+  paramsPerOverlayMap =
+    builtins.mapAttrs
+    (_: value: builtins.foldl' (a: b: a // b) {} (builtins.catAttrs "params" value))
+    (builtins.groupBy (x: x.name) config.hardware.deviceTree.overlaysParams);
+
+  dtmergeOverlay = _final: prev: {
+    deviceTree =
+      prev.deviceTree
+      // {
+        applyOverlays = _final.callPackage ((import ./apply-overlays-dtmerge.nix) paramsPerOverlayMap) {};
+      };
+  };
+in {
+  options = {
+    hardware.deviceTree.overlaysParams = mkOption {
+      default = [];
+      type = types.listOf overlayParamsType;
+    };
+  };
+
+  config = {
+    nixpkgs.overlays = [
+      dtmergeOverlay
+    ];
+  };
+}
diff --git a/uconsole/packages/rpi-utils/default.nix b/uconsole/packages/rpi-utils/default.nix
new file mode 100644
index 0000000..db61d55
--- /dev/null
+++ b/uconsole/packages/rpi-utils/default.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  stdenv,
+  gcc,
+  fetchFromGitHub,
+  cmake,
+  dtc,
+  ...
+}: let
+  pname = "rpi-utils";
+  version = "current-20241010";
+  src = fetchFromGitHub {
+    owner = "raspberrypi";
+    repo = "utils";
+    rev = "371ae96ff6d8b869d4125137fdc73b86fe154245";
+    hash = "sha256-qYpfy3PtPXzzunKsKSgsQXRUALQz6FSCsHQLe7djSt0=";
+  };
+in
+  stdenv.mkDerivation rec {
+    inherit pname version src;
+    nativeBuildInputs = [gcc cmake];
+    buildInputs = [dtc];
+
+    makeFlags = [
+      "prefix=${placeholder "out"}"
+    ];
+
+    installPhase = ''
+      runHook preInstall
+      mkdir -p $out/bin
+      install -m755 ./pinctrl/pinctrl $out/bin/pinctrl
+      runHook postInstall
+    '';
+
+    meta = with lib; {
+      homepage = "https://github.com/raspberrypi/utils";
+      description = "A collection of scripts and simple applications for Raspberry PI";
+      license = licenses.bsd3;
+      platforms = ["aarch64-linux"];
+    };
+  }