[SRU][J/allwinner-5.17][PATCH v3 4/4] UBUNTU: [Config] Enable additional Allwinner D1 options

[Emil Renner Berthing]

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

CONFIG_SUN6I_RTC_CCU=y is needed to export the iosc clock for the
random number generator in the crypto peripheral or the driver won't
probe.

CONFIG_CRYPTO_DEV_SUN8I_CE_TRNG=y enables support for the "true random
number generator" now that the crypto driver works.

CONFIG_ARM_SUN50I_R329_MBUS_DEVFREQ=y enables the newly added dummy
driver that the display engine depends on.

Add annotations for the clock drivers, crypto driver and the new dummy
devfreq driver while we're here.

Signed-off-by: Emil Renner Berthing <emil.renner.berthing at canonical.com>
---
 debian.allwinner/config/annotations          | 16 ++++++++++++++++
 debian.allwinner/config/config.common.ubuntu |  5 +++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/debian.allwinner/config/annotations b/debian.allwinner/config/annotations
index 06efec7fbf99..dc779e4bb1d2 100644
--- a/debian.allwinner/config/annotations
+++ b/debian.allwinner/config/annotations
@@ -155,6 +155,11 @@ CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG             policy<{'riscv64': 'n'}>
 # Menu: Cryptographic API >> Hardware crypto devices >> Freescale CAAM Job Ring driver backend
 
 # Menu: Cryptographic API >> Hardware crypto devices >> Support for Allwinner cryptographic offloader
+CONFIG_CRYPTO_DEV_SUN8I_CE                      policy<{'riscv64': 'y'}>
+CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG                policy<{'riscv64': 'y'}>
+CONFIG_CRYPTO_DEV_SUN8I_CE_HASH                 policy<{'riscv64': 'y'}>
+CONFIG_CRYPTO_DEV_SUN8I_CE_PRNG                 policy<{'riscv64': 'y'}>
+CONFIG_CRYPTO_DEV_SUN8I_CE_TRNG                 policy<{'riscv64': 'y'}>
 
 # Menu: Cryptographic API >> Hardware crypto devices >> Support for OMAP crypto HW accelerators
 
@@ -462,6 +467,14 @@ CONFIG_COMMON_CLK_FIXED_MMIO                    policy<{'riscv64': 'y'}>
 # Menu: Device Drivers >> Common Clock Framework >> Clock driver for MediaTek SoC >> Clock driver for MediaTek MT8183
 
 # Menu: Device Drivers >> Common Clock Framework >> Clock support for Allwinner SoCs
+CONFIG_SUNXI_CCU                                policy<{'riscv64': 'y'}>
+CONFIG_SUN20I_D1_CCU                            policy<{'riscv64': 'y'}>
+CONFIG_SUN20I_D1_R_CCU                          policy<{'riscv64': 'y'}>
+CONFIG_SUN6I_RTC_CCU                            policy<{'riscv64': 'y'}>
+CONFIG_SUN8I_DE2_CCU                            policy<{'riscv64': 'y'}>
+CONFIG_SUN8I_R_CCU                              policy<{'riscv64': 'y'}>
+
+CONFIG_SUN6I_RTC_CCU                            note<LP#1981074>
 
 # Menu: Device Drivers >> Common Clock Framework >> Ingenic SoCs drivers
 
@@ -772,6 +785,9 @@ CONFIG_DEVFREQ_GOV_PERFORMANCE                  policy<{'riscv64': 'y'}>
 CONFIG_DEVFREQ_GOV_POWERSAVE                    policy<{'riscv64': 'y'}>
 CONFIG_DEVFREQ_GOV_USERSPACE                    policy<{'riscv64': 'y'}>
 CONFIG_DEVFREQ_GOV_PASSIVE                      policy<{'riscv64': 'y'}>
+CONFIG_ARM_SUN50I_R329_MBUS_DEVFREQ             policy<{'riscv64': 'y'}>
+
+CONFIG_ARM_SUN50I_R329_MBUS_DEVFREQ             note<LP#1981074>
 
 # Menu: Device Drivers >> Generic Dynamic Voltage and Frequency Scaling (DVFS) support >> DEVFREQ-Event device Support
 CONFIG_PM_DEVFREQ_EVENT                         policy<{'riscv64': 'y'}>
diff --git a/debian.allwinner/config/config.common.ubuntu b/debian.allwinner/config/config.common.ubuntu
index d74825fa6340..722cec25cc7b 100644
--- a/debian.allwinner/config/config.common.ubuntu
+++ b/debian.allwinner/config/config.common.ubuntu
@@ -270,6 +270,7 @@ CONFIG_ARCNET_COM90xxIO=m
 CONFIG_ARCNET_RAW=m
 CONFIG_ARCNET_RIM_I=m
 CONFIG_ARCX_ANYBUS_CONTROLLER=m
+CONFIG_ARM_SUN50I_R329_MBUS_DEVFREQ=y
 CONFIG_ARM_SUN8I_A33_MBUS_DEVFREQ=m
 CONFIG_AS3935=m
 CONFIG_AS73211=m
@@ -1277,7 +1278,7 @@ CONFIG_CRYPTO_DEV_SUN8I_CE=y
 CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG=y
 CONFIG_CRYPTO_DEV_SUN8I_CE_HASH=y
 CONFIG_CRYPTO_DEV_SUN8I_CE_PRNG=y
-# CONFIG_CRYPTO_DEV_SUN8I_CE_TRNG is not set
+CONFIG_CRYPTO_DEV_SUN8I_CE_TRNG=y
 CONFIG_CRYPTO_DEV_SUN8I_SS=y
 CONFIG_CRYPTO_DEV_SUN8I_SS_DEBUG=y
 CONFIG_CRYPTO_DEV_SUN8I_SS_HASH=y
@@ -7254,7 +7255,7 @@ CONFIG_SUN50I_DE2_BUS=y
 CONFIG_SUN50I_IOMMU=y
 CONFIG_SUN5I_HSTIMER=y
 CONFIG_SUN6I_MSGBOX=y
-CONFIG_SUN6I_RTC_CCU=m
+CONFIG_SUN6I_RTC_CCU=y
 CONFIG_SUN8I_DE2_CCU=y
 # CONFIG_SUN8I_DSP_REMOTEPROC is not set
 CONFIG_SUN8I_MSGBOX=y
-- 
2.36.1