[Unstable/Q][PATCH] UBUNTU: [Config] Set TOUCHSCREEN_APPLE_Z2=m (arm64)

[Juerg Haefliger]

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

Make TOUCHSCREEN_APPLE_Z2 a module for both generic and generic-64k.
I don't believe it needs to be built-in. In fact it causes:

update-initramfs: Generating /boot/initrd.img-6.16.0-16-generic
W: Possible missing firmware /lib/firmware/apple/dfrmtfw-*.bin for built-in driver apple_z2

Signed-off-by: Juerg Haefliger <juerg.haefliger at canonical.com>
---
 debian.master/config/annotations | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 67ab6e6f5de4..3947e5ff8a41 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -723,6 +723,9 @@ CONFIG_TIMERLAT_TRACER                          note<'This enables the osnoise t
 CONFIG_TMPFS_POSIX_ACL                          policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}>
 CONFIG_TMPFS_POSIX_ACL                          note<'some /dev nodes require POSIX ACLs, like /dev/dsp'>
 
+CONFIG_TOUCHSCREEN_APPLE_Z2                     policy<{'arm64': 'm'}>
+CONFIG_TOUCHSCREEN_APPLE_Z2                     note<'LP: #2115758'>
+
 CONFIG_TOUCHSCREEN_ELAN                         policy<{'amd64': 'y', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': '-'}>
 CONFIG_TOUCHSCREEN_ELAN                         note<'LP: #1630238'>
 
@@ -14825,7 +14828,6 @@ CONFIG_TOUCHSCREEN_AD7879_I2C                   policy<{'amd64': 'm', 'arm64': '
 CONFIG_TOUCHSCREEN_AD7879_SPI                   policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}>
 CONFIG_TOUCHSCREEN_ADC                          policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}>
 CONFIG_TOUCHSCREEN_ADS7846                      policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': '-'}>
-CONFIG_TOUCHSCREEN_APPLE_Z2                     policy<{'arm64-generic': 'y', 'arm64-generic-64k': 'm'}>
 CONFIG_TOUCHSCREEN_AR1021_I2C                   policy<{'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}>
 CONFIG_TOUCHSCREEN_ATMEL_MXT                    policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': '-'}>
 CONFIG_TOUCHSCREEN_ATMEL_MXT_T37                policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y'}>
-- 
2.48.1