summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--asus-fx503-keyb.patch73
-rw-r--r--configs/fedora/generic/CONFIG_DRM_SUN6I_DSI1
-rw-r--r--configs/fedora/generic/CONFIG_MEDIA_CONTROLLER_REQUEST_API1
-rw-r--r--configs/fedora/generic/arm/CONFIG_AHCI_SUNXI (renamed from configs/fedora/generic/arm/aarch64/CONFIG_AHCI_SUNXI)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_ARCH_SUNXI (renamed from configs/fedora/generic/arm/aarch64/CONFIG_ARCH_SUNXI)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_AXP20X_ADC (renamed from configs/fedora/generic/arm/aarch64/CONFIG_AXP20X_ADC)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_AXP20X_POWER (renamed from configs/fedora/generic/arm/aarch64/CONFIG_AXP20X_POWER)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_BATTERY_AXP20X (renamed from configs/fedora/generic/arm/aarch64/CONFIG_BATTERY_AXP20X)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_CAN_SUN4I (renamed from configs/fedora/generic/arm/aarch64/CONFIG_CAN_SUN4I)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_CHARGER_AXP20X (renamed from configs/fedora/generic/arm/aarch64/CONFIG_CHARGER_AXP20X)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_SUN4I_SS (renamed from configs/fedora/generic/arm/armv7/CONFIG_CRYPTO_DEV_SUN4I_SS)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_DMA_SUN4I1
-rw-r--r--configs/fedora/generic/arm/CONFIG_DMA_SUN6I2
-rw-r--r--configs/fedora/generic/arm/CONFIG_DWMAC_SUN8I (renamed from configs/fedora/generic/arm/aarch64/CONFIG_DWMAC_SUN8I)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_DWMAC_SUNXI (renamed from configs/fedora/generic/arm/aarch64/CONFIG_DWMAC_SUNXI)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_INPUT_AXP20X_PEK (renamed from configs/fedora/generic/arm/aarch64/CONFIG_INPUT_AXP20X_PEK)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_IR_SUNXI (renamed from configs/fedora/generic/arm/aarch64/CONFIG_IR_SUNXI)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_KEYBOARD_SUN4I_LRADC (renamed from configs/fedora/generic/arm/aarch64/CONFIG_KEYBOARD_SUN4I_LRADC)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_MDIO_SUN4I (renamed from configs/fedora/generic/arm/aarch64/CONFIG_MDIO_SUN4I)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_MFD_AXP20X (renamed from configs/fedora/generic/arm/aarch64/CONFIG_MFD_AXP20X)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_MFD_AXP20X_I2C (renamed from configs/fedora/generic/arm/aarch64/CONFIG_MFD_AXP20X_I2C)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_MFD_AXP20X_RSB (renamed from configs/fedora/generic/arm/aarch64/CONFIG_MFD_AXP20X_RSB)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_MFD_SUN4I_GPADC1
-rw-r--r--configs/fedora/generic/arm/CONFIG_MFD_SUN6I_PRCM1
-rw-r--r--configs/fedora/generic/arm/CONFIG_MMC_SUNXI (renamed from configs/fedora/generic/arm/aarch64/CONFIG_MMC_SUNXI)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_PHY_SUN4I_USB (renamed from configs/fedora/generic/arm/aarch64/CONFIG_PHY_SUN4I_USB)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_PHY_SUN9I_USB (renamed from configs/fedora/generic/arm/aarch64/CONFIG_PHY_SUN9I_USB)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_PWM_SUN4I (renamed from configs/fedora/generic/arm/aarch64/CONFIG_PWM_SUN4I)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_REGULATOR_AXP20X (renamed from configs/fedora/generic/arm/aarch64/CONFIG_REGULATOR_AXP20X)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_REGULATOR_MAX89521
-rw-r--r--configs/fedora/generic/arm/CONFIG_RTC_DRV_SUN6I (renamed from configs/fedora/generic/arm/aarch64/CONFIG_RTC_DRV_SUN6I)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_SERIO_SUN4I_PS2 (renamed from configs/fedora/generic/arm/aarch64/CONFIG_SERIO_SUN4I_PS2)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_SND_SUN4I_CODEC (renamed from configs/fedora/generic/arm/aarch64/CONFIG_SND_SUN4I_CODEC)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_SND_SUN4I_I2S (renamed from configs/fedora/generic/arm/aarch64/CONFIG_SND_SUN4I_I2S)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_SND_SUN4I_SPDIF (renamed from configs/fedora/generic/arm/aarch64/CONFIG_SND_SUN4I_SPDIF)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_SPI_SUN6I2
-rw-r--r--configs/fedora/generic/arm/CONFIG_SUNXI_WATCHDOG (renamed from configs/fedora/generic/arm/aarch64/CONFIG_SUNXI_WATCHDOG)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_TOUCHSCREEN_SUN4I (renamed from configs/fedora/generic/arm/aarch64/CONFIG_TOUCHSCREEN_SUN4I)0
-rw-r--r--configs/fedora/generic/arm/aarch64/CONFIG_MFD_SUN4I_GPADC1
-rw-r--r--configs/fedora/generic/arm/aarch64/CONFIG_SPI_SUN6I1
-rw-r--r--configs/fedora/generic/arm/aarch64/CONFIG_SUN4I_GPADC1
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_AHCI_SUNXI1
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_ARCH_SUNXI1
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_AXP20X_ADC1
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_AXP20X_POWER1
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_BATTERY_AXP20X1
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_CAN_SUN4I1
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_CHARGER_AXP20X1
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_DMA_SUN6I1
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_DWMAC_SUN8I1
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_DWMAC_SUNXI1
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_INPUT_AXP20X_PEK1
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_IR_SUNXI1
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_MFD_AXP20X1
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_MFD_AXP20X_I2C1
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_MFD_AXP20X_RSB1
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_MFD_SUN6I_PRCM (renamed from configs/fedora/generic/arm/aarch64/CONFIG_MFD_SUN6I_PRCM)0
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_MMC_SUNXI1
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_PHY_SUN4I_USB1
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_PWM_SUN4I1
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_REGULATOR_AXP20X1
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_RTC_DRV_SUN6I1
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_SND_SUN4I_CODEC1
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_SND_SUN4I_I2S1
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_SND_SUN4I_SPDIF1
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_SPI_SUN6I1
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_SUNXI_WATCHDOG1
-rw-r--r--configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_MXS_DCP2
-rw-r--r--configs/fedora/generic/arm/armv7/armv7/CONFIG_DA9063_WATCHDOG1
-rw-r--r--configs/fedora/generic/arm/armv7/armv7/CONFIG_INPUT_DA9063_ONKEY1
-rw-r--r--configs/fedora/generic/arm/armv7/armv7/CONFIG_MFD_DA90631
-rw-r--r--configs/fedora/generic/arm/armv7/armv7/CONFIG_REGULATOR_DA90631
-rw-r--r--configs/fedora/generic/arm/armv7/armv7/CONFIG_REGULATOR_MAX89521
-rw-r--r--configs/fedora/generic/arm/armv7/armv7/CONFIG_RTC_DRV_DA90631
-rw-r--r--configs/fedora/generic/arm/armv7/armv7/CONFIG_VIDEO_IMX_PXP (renamed from configs/fedora/generic/arm/CONFIG_VIDEO_IMX_PXP)0
-rw-r--r--configs/fedora/generic/x86/x86_64/CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT2
-rw-r--r--configs/fedora/generic/x86/x86_64/CONFIG_REGULATOR_MAX89521
-rw-r--r--gitrev2
-rw-r--r--kernel-aarch64-debug.config11
-rw-r--r--kernel-aarch64.config11
-rw-r--r--kernel-armv7hl-debug.config10
-rw-r--r--kernel-armv7hl-lpae-debug.config3
-rw-r--r--kernel-armv7hl-lpae.config3
-rw-r--r--kernel-armv7hl.config10
-rw-r--r--kernel-i686-debug.config2
-rw-r--r--kernel-i686.config2
-rw-r--r--kernel-ppc64le-debug.config2
-rw-r--r--kernel-ppc64le.config2
-rw-r--r--kernel-s390x-debug.config2
-rw-r--r--kernel-s390x.config2
-rw-r--r--kernel-x86_64-debug.config4
-rw-r--r--kernel-x86_64.config4
-rw-r--r--kernel.spec16
-rw-r--r--sources1
94 files changed, 120 insertions, 89 deletions
diff --git a/asus-fx503-keyb.patch b/asus-fx503-keyb.patch
index ae1b4076f..c0a8fab4f 100644
--- a/asus-fx503-keyb.patch
+++ b/asus-fx503-keyb.patch
@@ -1,4 +1,4 @@
-From 330c27ee59fb76db02c671ac4cb32914565aa609 Mon Sep 17 00:00:00 2001
+From c1dfbd7a588e43be466d12c3636f5670aef04847 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Fri, 23 Nov 2018 13:31:00 +0100
Subject: [PATCH 1/2] HID: asus: Add event handler to catch unmapped Asus
@@ -16,21 +16,22 @@ and add them to the asus_input_mapping() function.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
- drivers/hid/hid-asus.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
+ drivers/hid/hid-asus.c | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c
-index a1fa2fc8c9b5..043120cc4b97 100644
+index a1fa2fc8c9b5..61fb5a43c1cb 100644
--- a/drivers/hid/hid-asus.c
+++ b/drivers/hid/hid-asus.c
-@@ -241,6 +241,17 @@ static int asus_report_input(struct asus_drvdata *drvdat, u8 *data, int size)
+@@ -241,6 +241,18 @@ static int asus_report_input(struct asus_drvdata *drvdat, u8 *data, int size)
return 1;
}
+static int asus_event(struct hid_device *hdev, struct hid_field *field,
+ struct hid_usage *usage, __s32 value)
+{
-+ if ((usage->hid & HID_USAGE_PAGE) == 0xff310000 && !usage->type) {
++ if ((usage->hid & HID_USAGE_PAGE) == 0xff310000 &&
++ (usage->hid & HID_USAGE) != 0x00 && !usage->type) {
+ hid_warn(hdev, "Unmapped Asus vendor usagepage code 0x%02x\n",
+ usage->hid & HID_USAGE);
+ }
@@ -41,7 +42,7 @@ index a1fa2fc8c9b5..043120cc4b97 100644
static int asus_raw_event(struct hid_device *hdev,
struct hid_report *report, u8 *data, int size)
{
-@@ -832,6 +843,7 @@ static struct hid_driver asus_driver = {
+@@ -832,6 +844,7 @@ static struct hid_driver asus_driver = {
#ifdef CONFIG_PM
.reset_resume = asus_reset_resume,
#endif
@@ -50,40 +51,64 @@ index a1fa2fc8c9b5..043120cc4b97 100644
};
module_hid_driver(asus_driver);
--
-2.19.1
+2.19.2
-From 71256aaf9979072c9bd99fb08db586731e3ccf55 Mon Sep 17 00:00:00 2001
+From 53cb4c986eaedd2cfa161932b36d80c70d947e9e Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Fri, 23 Nov 2018 13:44:27 +0100
-Subject: [PATCH 2/2] HID: asus: Add USB-id for the ASUS FX503VD laptop
+Subject: [PATCH 2/2] HID: asus: Add support for the ASUS FX503VD laptop
The ASUS FX503VD laptop uses an USB keyboard with several hotkeys
which use the Asus Vendor specific UsagePage.
-At the USB-id for this keyboard to the hid-asus driver so that these
-custom usages get properly mapped.
+This uses two usage-codes within the page which have not been seen
+before, 0x7c for its mic-mute hotkey and 0x99 for Fn+F5 which has
+a "fan" symbol as hotkey symbol on the keyb. we map this to KEY_PROG4
+(PROG1-PROG3 are already used).
+
+This commit adds the mappings for the 2 new usage codes and the USB-ids
+for this keyboard to the hid-asus driver.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
- drivers/hid/hid-asus.c | 2 ++
+ drivers/hid/hid-asus.c | 7 +++++++
drivers/hid/hid-ids.h | 1 +
- 2 files changed, 3 insertions(+)
+ 2 files changed, 8 insertions(+)
diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c
-index 043120cc4b97..6e9470e00c69 100644
+index 61fb5a43c1cb..ab8bd40a77ed 100644
--- a/drivers/hid/hid-asus.c
+++ b/drivers/hid/hid-asus.c
-@@ -806,6 +806,8 @@ static __u8 *asus_report_fixup(struct hid_device *hdev, __u8 *rdesc,
- }
+@@ -522,6 +522,7 @@ static int asus_input_mapping(struct hid_device *hdev,
+ case 0x20: asus_map_key_clear(KEY_BRIGHTNESSUP); break;
+ case 0x35: asus_map_key_clear(KEY_DISPLAY_OFF); break;
+ case 0x6c: asus_map_key_clear(KEY_SLEEP); break;
++ case 0x7c: asus_map_key_clear(KEY_MICMUTE); break;
+ case 0x82: asus_map_key_clear(KEY_CAMERA); break;
+ case 0x88: asus_map_key_clear(KEY_RFKILL); break;
+ case 0xb5: asus_map_key_clear(KEY_CALC); break;
+@@ -540,6 +541,9 @@ static int asus_input_mapping(struct hid_device *hdev,
+ /* Fn+Space Power4Gear Hybrid */
+ case 0x5c: asus_map_key_clear(KEY_PROG3); break;
- static const struct hid_device_id asus_devices[] = {
++ /* Fn+F5 "fan" symbol on FX503VD */
++ case 0x99: asus_map_key_clear(KEY_PROG4); break;
++
+ default:
+ /* ASUS lazily declares 256 usages, ignore the rest,
+ * as some make the keyboard appear as a pointer device. */
+@@ -817,6 +821,9 @@ static const struct hid_device_id asus_devices[] = {
+ USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD2), QUIRK_USE_KBD_BACKLIGHT },
+ { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
+ USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD3), QUIRK_G752_KEYBOARD },
+ { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
-+ USB_DEVICE_ID_ASUSTEK_FX503VD_KEYBOARD) },
- { HID_I2C_DEVICE(USB_VENDOR_ID_ASUSTEK,
- USB_DEVICE_ID_ASUSTEK_I2C_KEYBOARD), I2C_KEYBOARD_QUIRKS},
- { HID_I2C_DEVICE(USB_VENDOR_ID_ASUSTEK,
++ USB_DEVICE_ID_ASUSTEK_FX503VD_KEYBOARD),
++ QUIRK_USE_KBD_BACKLIGHT },
+ { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
+ USB_DEVICE_ID_ASUSTEK_T100TA_KEYBOARD),
+ QUIRK_T100_KEYBOARD | QUIRK_NO_CONSUMER_USAGES },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
-index c0d668944dbe..5ae1db6fa5c8 100644
+index ed35c9a9a110..4206428c0ba2 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -190,6 +190,7 @@
@@ -95,5 +120,5 @@ index c0d668944dbe..5ae1db6fa5c8 100644
#define USB_VENDOR_ID_ATEN 0x0557
#define USB_DEVICE_ID_ATEN_UC100KM 0x2004
--
-2.19.1
+2.19.2
diff --git a/configs/fedora/generic/CONFIG_DRM_SUN6I_DSI b/configs/fedora/generic/CONFIG_DRM_SUN6I_DSI
deleted file mode 100644
index f3a5cf0ad..000000000
--- a/configs/fedora/generic/CONFIG_DRM_SUN6I_DSI
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DRM_SUN6I_DSI is not set
diff --git a/configs/fedora/generic/CONFIG_MEDIA_CONTROLLER_REQUEST_API b/configs/fedora/generic/CONFIG_MEDIA_CONTROLLER_REQUEST_API
new file mode 100644
index 000000000..f83f31b8b
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_MEDIA_CONTROLLER_REQUEST_API
@@ -0,0 +1 @@
+# CONFIG_MEDIA_CONTROLLER_REQUEST_API is not set
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_AHCI_SUNXI b/configs/fedora/generic/arm/CONFIG_AHCI_SUNXI
index 91560d628..91560d628 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_AHCI_SUNXI
+++ b/configs/fedora/generic/arm/CONFIG_AHCI_SUNXI
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_ARCH_SUNXI b/configs/fedora/generic/arm/CONFIG_ARCH_SUNXI
index 6cf4026fd..6cf4026fd 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_ARCH_SUNXI
+++ b/configs/fedora/generic/arm/CONFIG_ARCH_SUNXI
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_AXP20X_ADC b/configs/fedora/generic/arm/CONFIG_AXP20X_ADC
index 025239f25..025239f25 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_AXP20X_ADC
+++ b/configs/fedora/generic/arm/CONFIG_AXP20X_ADC
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_AXP20X_POWER b/configs/fedora/generic/arm/CONFIG_AXP20X_POWER
index ddf89f551..ddf89f551 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_AXP20X_POWER
+++ b/configs/fedora/generic/arm/CONFIG_AXP20X_POWER
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_BATTERY_AXP20X b/configs/fedora/generic/arm/CONFIG_BATTERY_AXP20X
index 75591a277..75591a277 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_BATTERY_AXP20X
+++ b/configs/fedora/generic/arm/CONFIG_BATTERY_AXP20X
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_CAN_SUN4I b/configs/fedora/generic/arm/CONFIG_CAN_SUN4I
index 925f02a15..925f02a15 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_CAN_SUN4I
+++ b/configs/fedora/generic/arm/CONFIG_CAN_SUN4I
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_CHARGER_AXP20X b/configs/fedora/generic/arm/CONFIG_CHARGER_AXP20X
index 2e64e7733..2e64e7733 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_CHARGER_AXP20X
+++ b/configs/fedora/generic/arm/CONFIG_CHARGER_AXP20X
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_CRYPTO_DEV_SUN4I_SS b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_SUN4I_SS
index 957fb4e1d..957fb4e1d 100644
--- a/configs/fedora/generic/arm/armv7/CONFIG_CRYPTO_DEV_SUN4I_SS
+++ b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_SUN4I_SS
diff --git a/configs/fedora/generic/arm/CONFIG_DMA_SUN4I b/configs/fedora/generic/arm/CONFIG_DMA_SUN4I
new file mode 100644
index 000000000..95a4adfeb
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_DMA_SUN4I
@@ -0,0 +1 @@
+# CONFIG_DMA_SUN4I is not set
diff --git a/configs/fedora/generic/arm/CONFIG_DMA_SUN6I b/configs/fedora/generic/arm/CONFIG_DMA_SUN6I
index 9c50f4fed..83eeb271f 100644
--- a/configs/fedora/generic/arm/CONFIG_DMA_SUN6I
+++ b/configs/fedora/generic/arm/CONFIG_DMA_SUN6I
@@ -1 +1 @@
-# CONFIG_DMA_SUN6I is not set
+CONFIG_DMA_SUN6I=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_DWMAC_SUN8I b/configs/fedora/generic/arm/CONFIG_DWMAC_SUN8I
index ce05f93b3..ce05f93b3 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_DWMAC_SUN8I
+++ b/configs/fedora/generic/arm/CONFIG_DWMAC_SUN8I
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_DWMAC_SUNXI b/configs/fedora/generic/arm/CONFIG_DWMAC_SUNXI
index 254fc7d8a..254fc7d8a 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_DWMAC_SUNXI
+++ b/configs/fedora/generic/arm/CONFIG_DWMAC_SUNXI
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_INPUT_AXP20X_PEK b/configs/fedora/generic/arm/CONFIG_INPUT_AXP20X_PEK
index e2fbdf907..e2fbdf907 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_INPUT_AXP20X_PEK
+++ b/configs/fedora/generic/arm/CONFIG_INPUT_AXP20X_PEK
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_IR_SUNXI b/configs/fedora/generic/arm/CONFIG_IR_SUNXI
index fe2dc68a6..fe2dc68a6 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_IR_SUNXI
+++ b/configs/fedora/generic/arm/CONFIG_IR_SUNXI
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_KEYBOARD_SUN4I_LRADC b/configs/fedora/generic/arm/CONFIG_KEYBOARD_SUN4I_LRADC
index 8fcbd86b6..8fcbd86b6 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_KEYBOARD_SUN4I_LRADC
+++ b/configs/fedora/generic/arm/CONFIG_KEYBOARD_SUN4I_LRADC
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_MDIO_SUN4I b/configs/fedora/generic/arm/CONFIG_MDIO_SUN4I
index 5bf147832..5bf147832 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_MDIO_SUN4I
+++ b/configs/fedora/generic/arm/CONFIG_MDIO_SUN4I
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_MFD_AXP20X b/configs/fedora/generic/arm/CONFIG_MFD_AXP20X
index ada79c0d1..ada79c0d1 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_MFD_AXP20X
+++ b/configs/fedora/generic/arm/CONFIG_MFD_AXP20X
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_MFD_AXP20X_I2C b/configs/fedora/generic/arm/CONFIG_MFD_AXP20X_I2C
index 22c60295b..22c60295b 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_MFD_AXP20X_I2C
+++ b/configs/fedora/generic/arm/CONFIG_MFD_AXP20X_I2C
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_MFD_AXP20X_RSB b/configs/fedora/generic/arm/CONFIG_MFD_AXP20X_RSB
index 29150d51b..29150d51b 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_MFD_AXP20X_RSB
+++ b/configs/fedora/generic/arm/CONFIG_MFD_AXP20X_RSB
diff --git a/configs/fedora/generic/arm/CONFIG_MFD_SUN4I_GPADC b/configs/fedora/generic/arm/CONFIG_MFD_SUN4I_GPADC
new file mode 100644
index 000000000..1c0bb306a
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_MFD_SUN4I_GPADC
@@ -0,0 +1 @@
+# CONFIG_MFD_SUN4I_GPADC is not set
diff --git a/configs/fedora/generic/arm/CONFIG_MFD_SUN6I_PRCM b/configs/fedora/generic/arm/CONFIG_MFD_SUN6I_PRCM
new file mode 100644
index 000000000..f4c258168
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_MFD_SUN6I_PRCM
@@ -0,0 +1 @@
+# CONFIG_MFD_SUN6I_PRCM is not set
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_MMC_SUNXI b/configs/fedora/generic/arm/CONFIG_MMC_SUNXI
index 0f6eda36b..0f6eda36b 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_MMC_SUNXI
+++ b/configs/fedora/generic/arm/CONFIG_MMC_SUNXI
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_PHY_SUN4I_USB b/configs/fedora/generic/arm/CONFIG_PHY_SUN4I_USB
index f619228c3..f619228c3 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_PHY_SUN4I_USB
+++ b/configs/fedora/generic/arm/CONFIG_PHY_SUN4I_USB
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_PHY_SUN9I_USB b/configs/fedora/generic/arm/CONFIG_PHY_SUN9I_USB
index 98d002535..98d002535 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_PHY_SUN9I_USB
+++ b/configs/fedora/generic/arm/CONFIG_PHY_SUN9I_USB
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_PWM_SUN4I b/configs/fedora/generic/arm/CONFIG_PWM_SUN4I
index d4f562f3f..d4f562f3f 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_PWM_SUN4I
+++ b/configs/fedora/generic/arm/CONFIG_PWM_SUN4I
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_REGULATOR_AXP20X b/configs/fedora/generic/arm/CONFIG_REGULATOR_AXP20X
index 6694810a6..6694810a6 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_REGULATOR_AXP20X
+++ b/configs/fedora/generic/arm/CONFIG_REGULATOR_AXP20X
diff --git a/configs/fedora/generic/arm/CONFIG_REGULATOR_MAX8952 b/configs/fedora/generic/arm/CONFIG_REGULATOR_MAX8952
deleted file mode 100644
index f8346c0fc..000000000
--- a/configs/fedora/generic/arm/CONFIG_REGULATOR_MAX8952
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_REGULATOR_MAX8952 is not set
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_RTC_DRV_SUN6I b/configs/fedora/generic/arm/CONFIG_RTC_DRV_SUN6I
index 54410db09..54410db09 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_RTC_DRV_SUN6I
+++ b/configs/fedora/generic/arm/CONFIG_RTC_DRV_SUN6I
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SERIO_SUN4I_PS2 b/configs/fedora/generic/arm/CONFIG_SERIO_SUN4I_PS2
index aa105b326..aa105b326 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_SERIO_SUN4I_PS2
+++ b/configs/fedora/generic/arm/CONFIG_SERIO_SUN4I_PS2
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SND_SUN4I_CODEC b/configs/fedora/generic/arm/CONFIG_SND_SUN4I_CODEC
index 6cce5a1f7..6cce5a1f7 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_SND_SUN4I_CODEC
+++ b/configs/fedora/generic/arm/CONFIG_SND_SUN4I_CODEC
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SND_SUN4I_I2S b/configs/fedora/generic/arm/CONFIG_SND_SUN4I_I2S
index d9270e25b..d9270e25b 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_SND_SUN4I_I2S
+++ b/configs/fedora/generic/arm/CONFIG_SND_SUN4I_I2S
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SND_SUN4I_SPDIF b/configs/fedora/generic/arm/CONFIG_SND_SUN4I_SPDIF
index c0b108aba..c0b108aba 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_SND_SUN4I_SPDIF
+++ b/configs/fedora/generic/arm/CONFIG_SND_SUN4I_SPDIF
diff --git a/configs/fedora/generic/arm/CONFIG_SPI_SUN6I b/configs/fedora/generic/arm/CONFIG_SPI_SUN6I
index 4ff64c12e..031cd17b9 100644
--- a/configs/fedora/generic/arm/CONFIG_SPI_SUN6I
+++ b/configs/fedora/generic/arm/CONFIG_SPI_SUN6I
@@ -1 +1 @@
-# CONFIG_SPI_SUN6I is not set
+CONFIG_SPI_SUN6I=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SUNXI_WATCHDOG b/configs/fedora/generic/arm/CONFIG_SUNXI_WATCHDOG
index 9b58f97fb..9b58f97fb 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_SUNXI_WATCHDOG
+++ b/configs/fedora/generic/arm/CONFIG_SUNXI_WATCHDOG
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_TOUCHSCREEN_SUN4I b/configs/fedora/generic/arm/CONFIG_TOUCHSCREEN_SUN4I
index af15c1f8c..af15c1f8c 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_TOUCHSCREEN_SUN4I
+++ b/configs/fedora/generic/arm/CONFIG_TOUCHSCREEN_SUN4I
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_MFD_SUN4I_GPADC b/configs/fedora/generic/arm/aarch64/CONFIG_MFD_SUN4I_GPADC
deleted file mode 100644
index d156cb188..000000000
--- a/configs/fedora/generic/arm/aarch64/CONFIG_MFD_SUN4I_GPADC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_SUN4I_GPADC=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SPI_SUN6I b/configs/fedora/generic/arm/aarch64/CONFIG_SPI_SUN6I
deleted file mode 100644
index 031cd17b9..000000000
--- a/configs/fedora/generic/arm/aarch64/CONFIG_SPI_SUN6I
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SPI_SUN6I=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SUN4I_GPADC b/configs/fedora/generic/arm/aarch64/CONFIG_SUN4I_GPADC
deleted file mode 100644
index 97139c216..000000000
--- a/configs/fedora/generic/arm/aarch64/CONFIG_SUN4I_GPADC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SUN4I_GPADC=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_AHCI_SUNXI b/configs/fedora/generic/arm/armv7/CONFIG_AHCI_SUNXI
deleted file mode 100644
index 91560d628..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_AHCI_SUNXI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_AHCI_SUNXI=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_ARCH_SUNXI b/configs/fedora/generic/arm/armv7/CONFIG_ARCH_SUNXI
deleted file mode 100644
index 6cf4026fd..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_ARCH_SUNXI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ARCH_SUNXI=y
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_AXP20X_ADC b/configs/fedora/generic/arm/armv7/CONFIG_AXP20X_ADC
deleted file mode 100644
index 025239f25..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_AXP20X_ADC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_AXP20X_ADC=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_AXP20X_POWER b/configs/fedora/generic/arm/armv7/CONFIG_AXP20X_POWER
deleted file mode 100644
index ddf89f551..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_AXP20X_POWER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_AXP20X_POWER=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_BATTERY_AXP20X b/configs/fedora/generic/arm/armv7/CONFIG_BATTERY_AXP20X
deleted file mode 100644
index 75591a277..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_BATTERY_AXP20X
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_BATTERY_AXP20X=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_CAN_SUN4I b/configs/fedora/generic/arm/armv7/CONFIG_CAN_SUN4I
deleted file mode 100644
index 925f02a15..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_CAN_SUN4I
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CAN_SUN4I=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_CHARGER_AXP20X b/configs/fedora/generic/arm/armv7/CONFIG_CHARGER_AXP20X
deleted file mode 100644
index 2e64e7733..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_CHARGER_AXP20X
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CHARGER_AXP20X=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_DMA_SUN6I b/configs/fedora/generic/arm/armv7/CONFIG_DMA_SUN6I
deleted file mode 100644
index 83eeb271f..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_DMA_SUN6I
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DMA_SUN6I=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_DWMAC_SUN8I b/configs/fedora/generic/arm/armv7/CONFIG_DWMAC_SUN8I
deleted file mode 100644
index ce05f93b3..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_DWMAC_SUN8I
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DWMAC_SUN8I=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_DWMAC_SUNXI b/configs/fedora/generic/arm/armv7/CONFIG_DWMAC_SUNXI
deleted file mode 100644
index 254fc7d8a..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_DWMAC_SUNXI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DWMAC_SUNXI=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_INPUT_AXP20X_PEK b/configs/fedora/generic/arm/armv7/CONFIG_INPUT_AXP20X_PEK
deleted file mode 100644
index e2fbdf907..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_INPUT_AXP20X_PEK
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INPUT_AXP20X_PEK=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_IR_SUNXI b/configs/fedora/generic/arm/armv7/CONFIG_IR_SUNXI
deleted file mode 100644
index fe2dc68a6..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_IR_SUNXI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_IR_SUNXI=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_MFD_AXP20X b/configs/fedora/generic/arm/armv7/CONFIG_MFD_AXP20X
deleted file mode 100644
index ada79c0d1..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_MFD_AXP20X
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_AXP20X=y
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_MFD_AXP20X_I2C b/configs/fedora/generic/arm/armv7/CONFIG_MFD_AXP20X_I2C
deleted file mode 100644
index 22c60295b..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_MFD_AXP20X_I2C
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_AXP20X_I2C=y
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_MFD_AXP20X_RSB b/configs/fedora/generic/arm/armv7/CONFIG_MFD_AXP20X_RSB
deleted file mode 100644
index 29150d51b..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_MFD_AXP20X_RSB
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_AXP20X_RSB=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_MFD_SUN6I_PRCM b/configs/fedora/generic/arm/armv7/CONFIG_MFD_SUN6I_PRCM
index 1784bb288..1784bb288 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_MFD_SUN6I_PRCM
+++ b/configs/fedora/generic/arm/armv7/CONFIG_MFD_SUN6I_PRCM
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_MMC_SUNXI b/configs/fedora/generic/arm/armv7/CONFIG_MMC_SUNXI
deleted file mode 100644
index 0f6eda36b..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_MMC_SUNXI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MMC_SUNXI=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_PHY_SUN4I_USB b/configs/fedora/generic/arm/armv7/CONFIG_PHY_SUN4I_USB
deleted file mode 100644
index f619228c3..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_PHY_SUN4I_USB
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PHY_SUN4I_USB=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_PWM_SUN4I b/configs/fedora/generic/arm/armv7/CONFIG_PWM_SUN4I
deleted file mode 100644
index d4f562f3f..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_PWM_SUN4I
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PWM_SUN4I=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_REGULATOR_AXP20X b/configs/fedora/generic/arm/armv7/CONFIG_REGULATOR_AXP20X
deleted file mode 100644
index 6694810a6..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_REGULATOR_AXP20X
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_REGULATOR_AXP20X=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_RTC_DRV_SUN6I b/configs/fedora/generic/arm/armv7/CONFIG_RTC_DRV_SUN6I
deleted file mode 100644
index 54410db09..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_RTC_DRV_SUN6I
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_RTC_DRV_SUN6I=y
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_SND_SUN4I_CODEC b/configs/fedora/generic/arm/armv7/CONFIG_SND_SUN4I_CODEC
deleted file mode 100644
index 6cce5a1f7..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_SND_SUN4I_CODEC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SUN4I_CODEC=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_SND_SUN4I_I2S b/configs/fedora/generic/arm/armv7/CONFIG_SND_SUN4I_I2S
deleted file mode 100644
index d9270e25b..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_SND_SUN4I_I2S
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SUN4I_I2S=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_SND_SUN4I_SPDIF b/configs/fedora/generic/arm/armv7/CONFIG_SND_SUN4I_SPDIF
deleted file mode 100644
index c0b108aba..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_SND_SUN4I_SPDIF
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SUN4I_SPDIF=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_SPI_SUN6I b/configs/fedora/generic/arm/armv7/CONFIG_SPI_SUN6I
deleted file mode 100644
index 031cd17b9..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_SPI_SUN6I
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SPI_SUN6I=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_SUNXI_WATCHDOG b/configs/fedora/generic/arm/armv7/CONFIG_SUNXI_WATCHDOG
deleted file mode 100644
index 9b58f97fb..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_SUNXI_WATCHDOG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SUNXI_WATCHDOG=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_MXS_DCP b/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_MXS_DCP
index 7e925a191..37f2c81d0 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_MXS_DCP
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_MXS_DCP
@@ -1 +1 @@
-# CONFIG_CRYPTO_DEV_MXS_DCP is not set
+CONFIG_CRYPTO_DEV_MXS_DCP=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_DA9063_WATCHDOG b/configs/fedora/generic/arm/armv7/armv7/CONFIG_DA9063_WATCHDOG
new file mode 100644
index 000000000..8d161eccb
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_DA9063_WATCHDOG
@@ -0,0 +1 @@
+CONFIG_DA9063_WATCHDOG=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_INPUT_DA9063_ONKEY b/configs/fedora/generic/arm/armv7/armv7/CONFIG_INPUT_DA9063_ONKEY
new file mode 100644
index 000000000..bf11200d1
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_INPUT_DA9063_ONKEY
@@ -0,0 +1 @@
+CONFIG_INPUT_DA9063_ONKEY=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_MFD_DA9063 b/configs/fedora/generic/arm/armv7/armv7/CONFIG_MFD_DA9063
new file mode 100644
index 000000000..f9ff9c010
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_MFD_DA9063
@@ -0,0 +1 @@
+CONFIG_MFD_DA9063=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_REGULATOR_DA9063 b/configs/fedora/generic/arm/armv7/armv7/CONFIG_REGULATOR_DA9063
new file mode 100644
index 000000000..57ff6d021
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_REGULATOR_DA9063
@@ -0,0 +1 @@
+CONFIG_REGULATOR_DA9063=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_REGULATOR_MAX8952 b/configs/fedora/generic/arm/armv7/armv7/CONFIG_REGULATOR_MAX8952
deleted file mode 100644
index 7998d5171..000000000
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_REGULATOR_MAX8952
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_REGULATOR_MAX8952=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_RTC_DRV_DA9063 b/configs/fedora/generic/arm/armv7/armv7/CONFIG_RTC_DRV_DA9063
new file mode 100644
index 000000000..7f63ea1c0
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_RTC_DRV_DA9063
@@ -0,0 +1 @@
+CONFIG_RTC_DRV_DA9063=m
diff --git a/configs/fedora/generic/arm/CONFIG_VIDEO_IMX_PXP b/configs/fedora/generic/arm/armv7/armv7/CONFIG_VIDEO_IMX_PXP
index 6b98c7c3f..6b98c7c3f 100644
--- a/configs/fedora/generic/arm/CONFIG_VIDEO_IMX_PXP
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_VIDEO_IMX_PXP
diff --git a/configs/fedora/generic/x86/x86_64/CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT b/configs/fedora/generic/x86/x86_64/CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT
index be1de779f..e41f0cf8f 100644
--- a/configs/fedora/generic/x86/x86_64/CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT
+++ b/configs/fedora/generic/x86/x86_64/CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT
@@ -1 +1 @@
-CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT=y
+# CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT is not set
diff --git a/configs/fedora/generic/x86/x86_64/CONFIG_REGULATOR_MAX8952 b/configs/fedora/generic/x86/x86_64/CONFIG_REGULATOR_MAX8952
deleted file mode 100644
index f8346c0fc..000000000
--- a/configs/fedora/generic/x86/x86_64/CONFIG_REGULATOR_MAX8952
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_REGULATOR_MAX8952 is not set
diff --git a/gitrev b/gitrev
index eb9c027b8..618da14c3 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-40e020c129cfc991e8ab4736d2665351ffd1468d
+65e08c5e86311143f45c3e4389561af3107fc8f6
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 3700e4c4a..9e1ebd58a 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -1110,6 +1110,7 @@ CONFIG_CRYPTO_DEV_QCOM_RNG=m
CONFIG_CRYPTO_DEV_ROCKCHIP=m
CONFIG_CRYPTO_DEV_SAFEXCEL=m
# CONFIG_CRYPTO_DEV_SP_CCP is not set
+CONFIG_CRYPTO_DEV_SUN4I_SS=m
CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG=y
CONFIG_CRYPTO_DEV_VIRTIO=m
CONFIG_CRYPTO_DH=y
@@ -1319,7 +1320,8 @@ CONFIG_DMA_OF=y
# CONFIG_DMARD06 is not set
# CONFIG_DMARD09 is not set
CONFIG_DMARD10=m
-# CONFIG_DMA_SUN6I is not set
+# CONFIG_DMA_SUN4I is not set
+CONFIG_DMA_SUN6I=m
# CONFIG_DMATEST is not set
CONFIG_DMA_VIRTUAL_CHANNELS=y
CONFIG_DM_CACHE=m
@@ -3152,6 +3154,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_CEC_RC=y
CONFIG_MEDIA_CEC_SUPPORT=y
# CONFIG_MEDIA_CONTROLLER_DVB is not set
+# CONFIG_MEDIA_CONTROLLER_REQUEST_API is not set
CONFIG_MEDIA_CONTROLLER=y
CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
CONFIG_MEDIA_PCI_SUPPORT=y
@@ -3270,8 +3273,8 @@ CONFIG_MFD_SM501=m
# CONFIG_MFD_SMSC is not set
CONFIG_MFD_SPMI_PMIC=m
# CONFIG_MFD_STMPE is not set
-CONFIG_MFD_SUN4I_GPADC=m
-CONFIG_MFD_SUN6I_PRCM=y
+# CONFIG_MFD_SUN4I_GPADC is not set
+# CONFIG_MFD_SUN6I_PRCM is not set
CONFIG_MFD_SYSCON=y
# CONFIG_MFD_TC3589X is not set
# CONFIG_MFD_TC6393XB is not set
@@ -5950,7 +5953,6 @@ CONFIG_ST_UVIS25_I2C=m
CONFIG_ST_UVIS25=m
CONFIG_ST_UVIS25_SPI=m
# CONFIG_SUN4I_EMAC is not set
-CONFIG_SUN4I_GPADC=m
CONFIG_SUN50I_A64_CCU=y
CONFIG_SUN50I_A64_UNSTABLE_TIMER=y
CONFIG_SUN50I_DE2_BUS=y
@@ -6799,7 +6801,6 @@ CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
CONFIG_VIDEO_HDPVR=m
CONFIG_VIDEO_HEXIUM_GEMINI=m
CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_IMX_PXP=m
# CONFIG_VIDEO_IVTV_ALSA is not set
# CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set
CONFIG_VIDEO_IVTV=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 95927c991..ecb1738ba 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -1110,6 +1110,7 @@ CONFIG_CRYPTO_DEV_QCOM_RNG=m
CONFIG_CRYPTO_DEV_ROCKCHIP=m
CONFIG_CRYPTO_DEV_SAFEXCEL=m
# CONFIG_CRYPTO_DEV_SP_CCP is not set
+CONFIG_CRYPTO_DEV_SUN4I_SS=m
CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG=y
CONFIG_CRYPTO_DEV_VIRTIO=m
CONFIG_CRYPTO_DH=y
@@ -1310,7 +1311,8 @@ CONFIG_DMA_OF=y
# CONFIG_DMARD06 is not set
# CONFIG_DMARD09 is not set
CONFIG_DMARD10=m
-# CONFIG_DMA_SUN6I is not set
+# CONFIG_DMA_SUN4I is not set
+CONFIG_DMA_SUN6I=m
# CONFIG_DMATEST is not set
CONFIG_DMA_VIRTUAL_CHANNELS=y
CONFIG_DM_CACHE=m
@@ -3132,6 +3134,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_CEC_RC=y
CONFIG_MEDIA_CEC_SUPPORT=y
# CONFIG_MEDIA_CONTROLLER_DVB is not set
+# CONFIG_MEDIA_CONTROLLER_REQUEST_API is not set
CONFIG_MEDIA_CONTROLLER=y
CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
CONFIG_MEDIA_PCI_SUPPORT=y
@@ -3250,8 +3253,8 @@ CONFIG_MFD_SM501=m
# CONFIG_MFD_SMSC is not set
CONFIG_MFD_SPMI_PMIC=m
# CONFIG_MFD_STMPE is not set
-CONFIG_MFD_SUN4I_GPADC=m
-CONFIG_MFD_SUN6I_PRCM=y
+# CONFIG_MFD_SUN4I_GPADC is not set
+# CONFIG_MFD_SUN6I_PRCM is not set
CONFIG_MFD_SYSCON=y
# CONFIG_MFD_TC3589X is not set
# CONFIG_MFD_TC6393XB is not set
@@ -5927,7 +5930,6 @@ CONFIG_ST_UVIS25_I2C=m
CONFIG_ST_UVIS25=m
CONFIG_ST_UVIS25_SPI=m
# CONFIG_SUN4I_EMAC is not set
-CONFIG_SUN4I_GPADC=m
CONFIG_SUN50I_A64_CCU=y
CONFIG_SUN50I_A64_UNSTABLE_TIMER=y
CONFIG_SUN50I_DE2_BUS=y
@@ -6776,7 +6778,6 @@ CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
CONFIG_VIDEO_HDPVR=m
CONFIG_VIDEO_HEXIUM_GEMINI=m
CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_IMX_PXP=m
# CONFIG_VIDEO_IVTV_ALSA is not set
# CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set
CONFIG_VIDEO_IVTV=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index cbab408fe..d02018cf4 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1136,7 +1136,7 @@ CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
# CONFIG_CRYPTO_DEV_HISI_SEC is not set
CONFIG_CRYPTO_DEV_MARVELL_CESA=m
# CONFIG_CRYPTO_DEV_MXC_SCC is not set
-# CONFIG_CRYPTO_DEV_MXS_DCP is not set
+CONFIG_CRYPTO_DEV_MXS_DCP=m
# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
CONFIG_CRYPTO_DEV_OMAP_AES=m
CONFIG_CRYPTO_DEV_OMAP_DES=m
@@ -1238,6 +1238,7 @@ CONFIG_DA280=m
CONFIG_DA311=m
CONFIG_DA9052_WATCHDOG=m
CONFIG_DA9055_WATCHDOG=m
+CONFIG_DA9063_WATCHDOG=m
CONFIG_DAVICOM_PHY=m
CONFIG_DAX=y
CONFIG_DCB=y
@@ -2547,6 +2548,7 @@ CONFIG_INPUT_CMA3000_I2C=m
CONFIG_INPUT_CMA3000=m
CONFIG_INPUT_DA9052_ONKEY=m
CONFIG_INPUT_DA9055_ONKEY=m
+CONFIG_INPUT_DA9063_ONKEY=m
# CONFIG_INPUT_DRV260X_HAPTICS is not set
# CONFIG_INPUT_DRV2665_HAPTICS is not set
# CONFIG_INPUT_DRV2667_HAPTICS is not set
@@ -3309,6 +3311,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_CEC_RC=y
CONFIG_MEDIA_CEC_SUPPORT=y
# CONFIG_MEDIA_CONTROLLER_DVB is not set
+# CONFIG_MEDIA_CONTROLLER_REQUEST_API is not set
CONFIG_MEDIA_CONTROLLER=y
CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
CONFIG_MEDIA_PCI_SUPPORT=y
@@ -3383,7 +3386,7 @@ CONFIG_MFD_DA9052_I2C=y
CONFIG_MFD_DA9052_SPI=y
CONFIG_MFD_DA9055=y
# CONFIG_MFD_DA9062 is not set
-# CONFIG_MFD_DA9063 is not set
+CONFIG_MFD_DA9063=m
# CONFIG_MFD_DA9150 is not set
# CONFIG_MFD_DLN2 is not set
CONFIG_MFD_EXYNOS_LPASS=m
@@ -3429,6 +3432,7 @@ CONFIG_MFD_SM501=m
CONFIG_MFD_SPMI_PMIC=m
CONFIG_MFD_STMPE=y
CONFIG_MFD_SUN4I_GPADC=m
+CONFIG_MFD_SUN6I_PRCM=y
CONFIG_MFD_SYSCON=y
CONFIG_MFD_T7L66XB=y
# CONFIG_MFD_TC3589X is not set
@@ -4961,6 +4965,7 @@ CONFIG_REGULATOR_AXP20X=m
CONFIG_REGULATOR_BD9571MWV=m
CONFIG_REGULATOR_DA9052=m
CONFIG_REGULATOR_DA9055=m
+CONFIG_REGULATOR_DA9063=m
CONFIG_REGULATOR_DA9210=m
CONFIG_REGULATOR_DA9211=m
# CONFIG_REGULATOR_DEBUG is not set
@@ -5131,6 +5136,7 @@ CONFIG_RTC_DRV_CMOS=y
CONFIG_RTC_DRV_CROS_EC=m
CONFIG_RTC_DRV_DA9052=m
CONFIG_RTC_DRV_DA9055=m
+CONFIG_RTC_DRV_DA9063=m
CONFIG_RTC_DRV_DS1286=m
# CONFIG_RTC_DRV_DS1302 is not set
CONFIG_RTC_DRV_DS1305=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 613ab32f8..157e5597e 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -3165,6 +3165,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_CEC_RC=y
CONFIG_MEDIA_CEC_SUPPORT=y
# CONFIG_MEDIA_CONTROLLER_DVB is not set
+# CONFIG_MEDIA_CONTROLLER_REQUEST_API is not set
CONFIG_MEDIA_CONTROLLER=y
CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
CONFIG_MEDIA_PCI_SUPPORT=y
@@ -3282,6 +3283,7 @@ CONFIG_MFD_SM501=m
# CONFIG_MFD_SMSC is not set
# CONFIG_MFD_STMPE is not set
CONFIG_MFD_SUN4I_GPADC=m
+CONFIG_MFD_SUN6I_PRCM=y
CONFIG_MFD_SYSCON=y
# CONFIG_MFD_T7L66XB is not set
# CONFIG_MFD_TC3589X is not set
@@ -6815,7 +6817,6 @@ CONFIG_VIDEO_HDPVR=m
CONFIG_VIDEO_HEXIUM_GEMINI=m
CONFIG_VIDEO_HEXIUM_ORION=m
# CONFIG_VIDEO_IMX_MEDIA is not set
-CONFIG_VIDEO_IMX_PXP=m
# CONFIG_VIDEO_IVTV_ALSA is not set
# CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set
CONFIG_VIDEO_IVTV=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 300edada0..f0e4ac84a 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -3146,6 +3146,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_CEC_RC=y
CONFIG_MEDIA_CEC_SUPPORT=y
# CONFIG_MEDIA_CONTROLLER_DVB is not set
+# CONFIG_MEDIA_CONTROLLER_REQUEST_API is not set
CONFIG_MEDIA_CONTROLLER=y
CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
CONFIG_MEDIA_PCI_SUPPORT=y
@@ -3263,6 +3264,7 @@ CONFIG_MFD_SM501=m
# CONFIG_MFD_SMSC is not set
# CONFIG_MFD_STMPE is not set
CONFIG_MFD_SUN4I_GPADC=m
+CONFIG_MFD_SUN6I_PRCM=y
CONFIG_MFD_SYSCON=y
# CONFIG_MFD_T7L66XB is not set
# CONFIG_MFD_TC3589X is not set
@@ -6793,7 +6795,6 @@ CONFIG_VIDEO_HDPVR=m
CONFIG_VIDEO_HEXIUM_GEMINI=m
CONFIG_VIDEO_HEXIUM_ORION=m
# CONFIG_VIDEO_IMX_MEDIA is not set
-CONFIG_VIDEO_IMX_PXP=m
# CONFIG_VIDEO_IVTV_ALSA is not set
# CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set
CONFIG_VIDEO_IVTV=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index b0d4ac78e..14a40a00e 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1136,7 +1136,7 @@ CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
# CONFIG_CRYPTO_DEV_HISI_SEC is not set
CONFIG_CRYPTO_DEV_MARVELL_CESA=m
# CONFIG_CRYPTO_DEV_MXC_SCC is not set
-# CONFIG_CRYPTO_DEV_MXS_DCP is not set
+CONFIG_CRYPTO_DEV_MXS_DCP=m
# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
CONFIG_CRYPTO_DEV_OMAP_AES=m
CONFIG_CRYPTO_DEV_OMAP_DES=m
@@ -1238,6 +1238,7 @@ CONFIG_DA280=m
CONFIG_DA311=m
CONFIG_DA9052_WATCHDOG=m
CONFIG_DA9055_WATCHDOG=m
+CONFIG_DA9063_WATCHDOG=m
CONFIG_DAVICOM_PHY=m
CONFIG_DAX=y
CONFIG_DCB=y
@@ -2531,6 +2532,7 @@ CONFIG_INPUT_CMA3000_I2C=m
CONFIG_INPUT_CMA3000=m
CONFIG_INPUT_DA9052_ONKEY=m
CONFIG_INPUT_DA9055_ONKEY=m
+CONFIG_INPUT_DA9063_ONKEY=m
# CONFIG_INPUT_DRV260X_HAPTICS is not set
# CONFIG_INPUT_DRV2665_HAPTICS is not set
# CONFIG_INPUT_DRV2667_HAPTICS is not set
@@ -3290,6 +3292,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_CEC_RC=y
CONFIG_MEDIA_CEC_SUPPORT=y
# CONFIG_MEDIA_CONTROLLER_DVB is not set
+# CONFIG_MEDIA_CONTROLLER_REQUEST_API is not set
CONFIG_MEDIA_CONTROLLER=y
CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
CONFIG_MEDIA_PCI_SUPPORT=y
@@ -3364,7 +3367,7 @@ CONFIG_MFD_DA9052_I2C=y
CONFIG_MFD_DA9052_SPI=y
CONFIG_MFD_DA9055=y
# CONFIG_MFD_DA9062 is not set
-# CONFIG_MFD_DA9063 is not set
+CONFIG_MFD_DA9063=m
# CONFIG_MFD_DA9150 is not set
# CONFIG_MFD_DLN2 is not set
CONFIG_MFD_EXYNOS_LPASS=m
@@ -3410,6 +3413,7 @@ CONFIG_MFD_SM501=m
CONFIG_MFD_SPMI_PMIC=m
CONFIG_MFD_STMPE=y
CONFIG_MFD_SUN4I_GPADC=m
+CONFIG_MFD_SUN6I_PRCM=y
CONFIG_MFD_SYSCON=y
CONFIG_MFD_T7L66XB=y
# CONFIG_MFD_TC3589X is not set
@@ -4940,6 +4944,7 @@ CONFIG_REGULATOR_AXP20X=m
CONFIG_REGULATOR_BD9571MWV=m
CONFIG_REGULATOR_DA9052=m
CONFIG_REGULATOR_DA9055=m
+CONFIG_REGULATOR_DA9063=m
CONFIG_REGULATOR_DA9210=m
CONFIG_REGULATOR_DA9211=m
# CONFIG_REGULATOR_DEBUG is not set
@@ -5110,6 +5115,7 @@ CONFIG_RTC_DRV_CMOS=y
CONFIG_RTC_DRV_CROS_EC=m
CONFIG_RTC_DRV_DA9052=m
CONFIG_RTC_DRV_DA9055=m
+CONFIG_RTC_DRV_DA9063=m
CONFIG_RTC_DRV_DS1286=m
# CONFIG_RTC_DRV_DS1302 is not set
CONFIG_RTC_DRV_DS1305=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index cb9403d42..202339daf 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -1277,7 +1277,6 @@ CONFIG_DRM_RADEON_USERPTR=y
# CONFIG_DRM_SII902X is not set
CONFIG_DRM_SII9234=m
# CONFIG_DRM_SIL_SII8620 is not set
-# CONFIG_DRM_SUN6I_DSI is not set
# CONFIG_DRM_THINE_THC63LVD1024 is not set
# CONFIG_DRM_TINYDRM is not set
CONFIG_DRM_TI_SN65DSI86=m
@@ -3023,6 +3022,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_CEC_RC=y
CONFIG_MEDIA_CEC_SUPPORT=y
# CONFIG_MEDIA_CONTROLLER_DVB is not set
+# CONFIG_MEDIA_CONTROLLER_REQUEST_API is not set
CONFIG_MEDIA_CONTROLLER=y
CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
CONFIG_MEDIA_PCI_SUPPORT=y
diff --git a/kernel-i686.config b/kernel-i686.config
index 396b55931..a6a0ebd26 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -1267,7 +1267,6 @@ CONFIG_DRM_RADEON_USERPTR=y
# CONFIG_DRM_SII902X is not set
CONFIG_DRM_SII9234=m
# CONFIG_DRM_SIL_SII8620 is not set
-# CONFIG_DRM_SUN6I_DSI is not set
# CONFIG_DRM_THINE_THC63LVD1024 is not set
# CONFIG_DRM_TINYDRM is not set
CONFIG_DRM_TI_SN65DSI86=m
@@ -3003,6 +3002,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_CEC_RC=y
CONFIG_MEDIA_CEC_SUPPORT=y
# CONFIG_MEDIA_CONTROLLER_DVB is not set
+# CONFIG_MEDIA_CONTROLLER_REQUEST_API is not set
CONFIG_MEDIA_CONTROLLER=y
CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
CONFIG_MEDIA_PCI_SUPPORT=y
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 44124180a..873a33c92 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -1182,7 +1182,6 @@ CONFIG_DRM_RADEON_USERPTR=y
# CONFIG_DRM_SII902X is not set
CONFIG_DRM_SII9234=m
# CONFIG_DRM_SIL_SII8620 is not set
-# CONFIG_DRM_SUN6I_DSI is not set
# CONFIG_DRM_THINE_THC63LVD1024 is not set
# CONFIG_DRM_TINYDRM is not set
CONFIG_DRM_TI_SN65DSI86=m
@@ -2801,6 +2800,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_CEC_RC=y
CONFIG_MEDIA_CEC_SUPPORT=y
# CONFIG_MEDIA_CONTROLLER_DVB is not set
+# CONFIG_MEDIA_CONTROLLER_REQUEST_API is not set
CONFIG_MEDIA_CONTROLLER=y
CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
CONFIG_MEDIA_PCI_SUPPORT=y
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 80a02d4d5..cc27115ec 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -1172,7 +1172,6 @@ CONFIG_DRM_RADEON_USERPTR=y
# CONFIG_DRM_SII902X is not set
CONFIG_DRM_SII9234=m
# CONFIG_DRM_SIL_SII8620 is not set
-# CONFIG_DRM_SUN6I_DSI is not set
# CONFIG_DRM_THINE_THC63LVD1024 is not set
# CONFIG_DRM_TINYDRM is not set
CONFIG_DRM_TI_SN65DSI86=m
@@ -2780,6 +2779,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_CEC_RC=y
CONFIG_MEDIA_CEC_SUPPORT=y
# CONFIG_MEDIA_CONTROLLER_DVB is not set
+# CONFIG_MEDIA_CONTROLLER_REQUEST_API is not set
CONFIG_MEDIA_CONTROLLER=y
CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
CONFIG_MEDIA_PCI_SUPPORT=y
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 99926a907..c5496274a 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -1182,7 +1182,6 @@ CONFIG_DRM_RADEON_USERPTR=y
# CONFIG_DRM_SII902X is not set
CONFIG_DRM_SII9234=m
# CONFIG_DRM_SIL_SII8620 is not set
-# CONFIG_DRM_SUN6I_DSI is not set
# CONFIG_DRM_THINE_THC63LVD1024 is not set
# CONFIG_DRM_TINYDRM is not set
CONFIG_DRM_TI_SN65DSI86=m
@@ -2743,6 +2742,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_CEC_RC=y
CONFIG_MEDIA_CEC_SUPPORT=y
# CONFIG_MEDIA_CONTROLLER_DVB is not set
+# CONFIG_MEDIA_CONTROLLER_REQUEST_API is not set
CONFIG_MEDIA_CONTROLLER=y
CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
CONFIG_MEDIA_PCI_SUPPORT=y
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 1f1c8bd1d..3bb2f5bfe 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -1172,7 +1172,6 @@ CONFIG_DRM_RADEON_USERPTR=y
# CONFIG_DRM_SII902X is not set
CONFIG_DRM_SII9234=m
# CONFIG_DRM_SIL_SII8620 is not set
-# CONFIG_DRM_SUN6I_DSI is not set
# CONFIG_DRM_THINE_THC63LVD1024 is not set
# CONFIG_DRM_TINYDRM is not set
CONFIG_DRM_TI_SN65DSI86=m
@@ -2722,6 +2721,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_CEC_RC=y
CONFIG_MEDIA_CEC_SUPPORT=y
# CONFIG_MEDIA_CONTROLLER_DVB is not set
+# CONFIG_MEDIA_CONTROLLER_REQUEST_API is not set
CONFIG_MEDIA_CONTROLLER=y
CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
CONFIG_MEDIA_PCI_SUPPORT=y
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index d6130d162..0d516f4a4 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -215,7 +215,7 @@ CONFIG_AMD8111_ETH=m
# CONFIG_AMD_IOMMU_DEBUGFS is not set
CONFIG_AMD_IOMMU_V2=m
CONFIG_AMD_IOMMU=y
-CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT=y
+# CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT is not set
CONFIG_AMD_MEM_ENCRYPT=y
CONFIG_AMD_NUMA=y
CONFIG_AMD_PHY=m
@@ -1324,7 +1324,6 @@ CONFIG_DRM_RADEON_USERPTR=y
# CONFIG_DRM_SII902X is not set
CONFIG_DRM_SII9234=m
# CONFIG_DRM_SIL_SII8620 is not set
-# CONFIG_DRM_SUN6I_DSI is not set
# CONFIG_DRM_THINE_THC63LVD1024 is not set
# CONFIG_DRM_TINYDRM is not set
CONFIG_DRM_TI_SN65DSI86=m
@@ -3069,6 +3068,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_CEC_RC=y
CONFIG_MEDIA_CEC_SUPPORT=y
# CONFIG_MEDIA_CONTROLLER_DVB is not set
+# CONFIG_MEDIA_CONTROLLER_REQUEST_API is not set
CONFIG_MEDIA_CONTROLLER=y
CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
CONFIG_MEDIA_PCI_SUPPORT=y
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 7e04bf109..ff2f2ba0e 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -215,7 +215,7 @@ CONFIG_AMD8111_ETH=m
# CONFIG_AMD_IOMMU_DEBUGFS is not set
CONFIG_AMD_IOMMU_V2=m
CONFIG_AMD_IOMMU=y
-CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT=y
+# CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT is not set
CONFIG_AMD_MEM_ENCRYPT=y
CONFIG_AMD_NUMA=y
CONFIG_AMD_PHY=m
@@ -1314,7 +1314,6 @@ CONFIG_DRM_RADEON_USERPTR=y
# CONFIG_DRM_SII902X is not set
CONFIG_DRM_SII9234=m
# CONFIG_DRM_SIL_SII8620 is not set
-# CONFIG_DRM_SUN6I_DSI is not set
# CONFIG_DRM_THINE_THC63LVD1024 is not set
# CONFIG_DRM_TINYDRM is not set
CONFIG_DRM_TI_SN65DSI86=m
@@ -3049,6 +3048,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_CEC_RC=y
CONFIG_MEDIA_CEC_SUPPORT=y
# CONFIG_MEDIA_CONTROLLER_DVB is not set
+# CONFIG_MEDIA_CONTROLLER_REQUEST_API is not set
CONFIG_MEDIA_CONTROLLER=y
CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
CONFIG_MEDIA_PCI_SUPPORT=y
diff --git a/kernel.spec b/kernel.spec
index 7de9f0d8f..3b7f95baa 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
# The rc snapshot level
%global rcrev 6
# The git snapshot level
-%define gitrev 0
+%define gitrev 2
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -130,7 +130,7 @@ Summary: The Linux kernel
# Set debugbuildsenabled to 1 for production (build separate debug kernels)
# and 0 for rawhide (all kernels are debug kernels).
# See also 'make debug' and 'make release'.
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
# Kernel headers are being split out into a separate package
%if 0%{?fedora}
@@ -1901,6 +1901,18 @@ fi
#
#
%changelog
+* Thu Dec 13 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.20.0-0.rc6.git2.1
+- Linux v4.20-rc6-82-g65e08c5e8631
+
+* Wed Dec 12 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.20.0-0.rc6.git1.2
+- Reenable debugging options.
+
+* Tue Dec 11 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.20.0-0.rc6.git1.1
+- Linux v4.20-rc6-25-gf5d582777bcb
+
+* Tue Dec 11 2018 Hans de Goede <hdegoede@redhat.com>
+- Really fix non functional hotkeys on Asus FX503VD (#1645070)
+
* Mon Dec 10 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.20.0-0.rc6.git0.1
- Linux v4.20-rc6
diff --git a/sources b/sources
index 224664d3d..f533da905 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
SHA512 (linux-4.19.tar.xz) = ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
SHA512 (patch-4.20-rc6.xz) = 4958f79defd55bb5d66bd303f91089f0ff76816e8e13749865efe2e32fb264ea7a6d683e6e9efe3a65e0f5748c34ed1079afb930d1a2e12dac0ce236380bd755
+SHA512 (patch-4.20-rc6-git2.xz) = ee59825f935376097ac459ea01f08982cb6050fc71c8afaf36e03593841a9321bd0d358ac6e29d16c119d3034d3b562ea98beb11187583c4cee0ff9e1c2934d5