From 79a7654076e2e9d45965fd70ceb99c8108c573ee Mon Sep 17 00:00:00 2001
From: Emil Renner Berthing <emil.renner.berthing@canonical.com>
Date: Wed, 20 Jul 2022 12:40:00 +0200
Subject: [PATCH] UBUNTU: [Config] Enable CONFIG_GPIO_CDEV_V1

BugLink: https://bugs.launchpad.net/bugs/1953613

Enable v1 of the character device interface for manipulating GPIOs from
userspace. The libgpiod2 library and gpiod tools in Jammy are still
using this interface.

Signed-off-by: Emil Renner Berthing <emil.renner.berthing@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
---
 debian.master/config/annotations          | 4 +++-
 debian.master/config/config.common.ubuntu | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 8ce1396221a8..1997923ffe51 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -1845,7 +1845,9 @@ CONFIG_GPIOLIB_FASTPATH_LIMIT                   policy<{'amd64': '512', 'arm64':
 CONFIG_DEBUG_GPIO                               policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}>
 CONFIG_GPIO_SYSFS                               policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_GPIO_CDEV                                policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}>
-CONFIG_GPIO_CDEV_V1                             policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}>
+CONFIG_GPIO_CDEV_V1                             policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}>
+
+CONFIG_GPIO_CDEV_V1                             note<LP: #1953613>
 
 # Menu: Device Drivers >> GPIO Support >> I2C GPIO expanders
 CONFIG_GPIO_ADP5588                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'n'}>
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index dd7a3403e37e..d5d1b085185c 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3963,7 +3963,7 @@ CONFIG_GPIO_BRCMSTB=m
 CONFIG_GPIO_BT8XX=m
 CONFIG_GPIO_CADENCE=m
 CONFIG_GPIO_CDEV=y
-# CONFIG_GPIO_CDEV_V1 is not set
+CONFIG_GPIO_CDEV_V1=y
 CONFIG_GPIO_CRYSTAL_COVE=y
 CONFIG_GPIO_DA9052=m
 CONFIG_GPIO_DA9055=m
-- 
2.39.2