diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-07-23 20:45:13 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-07-23 20:45:13 +0200 |
| commit | 13f37e7fe398411ef06f9bc489678bca23854e93 (patch) | |
| tree | dd5f02c1f33f1362f07c9e1b7f63d20f34c722de /kernel-aarch64-debug-fedora.config | |
| parent | 88cd7f3c81e0773ec035a3bd163b5f213173bc88 (diff) | |
| parent | e7f8b3f4a6dc6b1770afb143d65b17e86ca20d41 (diff) | |
| download | kernel-13f37e7fe398411ef06f9bc489678bca23854e93.tar.gz kernel-13f37e7fe398411ef06f9bc489678bca23854e93.tar.xz kernel-13f37e7fe398411ef06f9bc489678bca23854e93.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc6.20200723gitd15be546031c.1.vanilla.1.fc33kernel-5.8.0-0.rc6.20200723gitd15be546031c.1.vanilla.1.fc32kernel-5.8.0-0.rc6.20200723gitd15be546031c.1.vanilla.1.fc31
Diffstat (limited to 'kernel-aarch64-debug-fedora.config')
| -rw-r--r-- | kernel-aarch64-debug-fedora.config | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index dc26af4c3..e27f181d4 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -1061,6 +1061,8 @@ CONFIG_COMMON_CLK_HI6220=y CONFIG_COMMON_CLK_HI655X=m CONFIG_COMMON_CLK_MAX77686=y # CONFIG_COMMON_CLK_MAX9485 is not set +CONFIG_COMMON_CLK_MESON_PHASE=y +CONFIG_COMMON_CLK_MESON_SCLK_DIV=y # CONFIG_COMMON_CLK_MMP2_AUDIO is not set CONFIG_COMMON_CLK_PWM=m CONFIG_COMMON_CLK_QCOM=y @@ -3535,7 +3537,7 @@ CONFIG_MESON_IRQ_GPIO=y CONFIG_MESON_SARADC=m CONFIG_MESON_SECURE_PM_DOMAINS=y CONFIG_MESON_SM=y -# CONFIG_MESON_WATCHDOG is not set +CONFIG_MESON_WATCHDOG=m CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_88PM800 is not set # CONFIG_MFD_88PM805 is not set @@ -5230,6 +5232,7 @@ CONFIG_REALTEK_PHY=y # CONFIG_REED_SOLOMON_TEST is not set # CONFIG_REFCOUNT_FULL is not set CONFIG_REGMAP_I2C=y +CONFIG_REGMAP_MMIO=y CONFIG_REGMAP_SPMI=y CONFIG_REGMAP=y # CONFIG_REGULATOR_88PG86X is not set |