From 613e26bbec9f6f62fe7f9989c39370c1273d545a Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 15 Mar 2021 10:57:59 -0500 Subject: kernel-5.12.0-0.rc3.170 * Mon Mar 15 2021 Fedora Kernel Team [5.12.0-0.rc3.170] - Fedora: filters: update to move dfl-emif to modules (Peter Robinson) - drop duplicate DEVFREQ_GOV_SIMPLE_ONDEMAND config (Peter Robinson) - efi: The EFI_VARS is legacy and now x86 only (Peter Robinson) - common: enable RTC_SYSTOHC to supplement update_persistent_clock64 (Peter Robinson) - generic: arm: enable SCMI for all options (Peter Robinson) - fedora: the PCH_CAN driver is x86-32 only (Peter Robinson) - common: disable legacy CAN device support (Peter Robinson) - common: Enable Microchip MCP251x/MCP251xFD CAN controllers (Peter Robinson) - common: Bosch MCAN support for Intel Elkhart Lake (Peter Robinson) - common: enable CAN_PEAK_PCIEFD PCI-E driver (Peter Robinson) - common: disable CAN_PEAK_PCIEC PCAN-ExpressCard (Peter Robinson) - common: enable common CAN layer 2 protocols (Peter Robinson) - ark: disable CAN_LEDS option (Peter Robinson) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- kernel-armv7hl-fedora.config | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) (limited to 'kernel-armv7hl-fedora.config') diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index d579b2870..fcd673754 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -890,12 +890,8 @@ CONFIG_CADENCE_WATCHDOG=m CONFIG_CAN_8DEV_USB=m CONFIG_CAN_BCM=m CONFIG_CAN_CALC_BITTIMING=y -# CONFIG_CAN_CC770_ISA is not set -CONFIG_CAN_CC770=m -CONFIG_CAN_CC770_PLATFORM=m -CONFIG_CAN_C_CAN=m -CONFIG_CAN_C_CAN_PCI=m -CONFIG_CAN_C_CAN_PLATFORM=m +# CONFIG_CAN_CC770 is not set +# CONFIG_CAN_C_CAN is not set # CONFIG_CAN_DEBUG_DEVICES is not set CONFIG_CAN_DEV=m CONFIG_CAN_EMS_PCI=m @@ -908,20 +904,22 @@ CONFIG_CAN_GS_USB=m CONFIG_CAN_GW=m CONFIG_CAN_HI311X=m CONFIG_CAN_IFI_CANFD=m -# CONFIG_CAN_ISOTP is not set -# CONFIG_CAN_J1939 is not set +CONFIG_CAN_ISOTP=m +CONFIG_CAN_J1939=m # CONFIG_CAN_KVASER_PCIEFD is not set CONFIG_CAN_KVASER_PCI=m CONFIG_CAN_KVASER_USB=m +# CONFIG_CAN_LEDS is not set CONFIG_CAN=m CONFIG_CAN_M_CAN=m -# CONFIG_CAN_M_CAN_PCI is not set +CONFIG_CAN_M_CAN_PCI=m # CONFIG_CAN_M_CAN_PLATFORM is not set # CONFIG_CAN_M_CAN_TCAN4X5X is not set CONFIG_CAN_MCBA_USB=m -# CONFIG_CAN_MCP251XFD is not set +CONFIG_CAN_MCP251XFD=m +# CONFIG_CAN_MCP251XFD_SANITY is not set CONFIG_CAN_MCP251X=m -CONFIG_CAN_PEAK_PCIEC=y +# CONFIG_CAN_PEAK_PCIEC is not set CONFIG_CAN_PEAK_PCIEFD=m CONFIG_CAN_PEAK_PCI=m CONFIG_CAN_PEAK_USB=m @@ -929,9 +927,7 @@ CONFIG_CAN_PLX_PCI=m CONFIG_CAN_RAW=m # CONFIG_CAN_RCAR_CANFD is not set # CONFIG_CAN_RCAR is not set -# CONFIG_CAN_SJA1000_ISA is not set -CONFIG_CAN_SJA1000=m -CONFIG_CAN_SJA1000_PLATFORM=m +# CONFIG_CAN_SJA1000 is not set CONFIG_CAN_SLCAN=m # CONFIG_CAN_SOFTING_CS is not set CONFIG_CAN_SOFTING=m @@ -2024,7 +2020,6 @@ CONFIG_EFI_TEST=m CONFIG_EFIVAR_FS=y CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_EFI_VARS_PSTORE=y -CONFIG_EFI_VARS=y CONFIG_EFI=y # CONFIG_EFS_FS is not set CONFIG_EMAC_ROCKCHIP=m @@ -5933,7 +5928,8 @@ CONFIG_RTC_INTF_DEV=y CONFIG_RTC_INTF_PROC=y CONFIG_RTC_INTF_SYSFS=y CONFIG_RTC_NVMEM=y -# CONFIG_RTC_SYSTOHC is not set +CONFIG_RTC_SYSTOHC_DEVICE="rtc0" +CONFIG_RTC_SYSTOHC=y # CONFIG_RT_GROUP_SCHED is not set CONFIG_RTL8180=m CONFIG_RTL8187=m -- cgit