diff --git a/arch/arm64/configs/phytium_defconfig b/arch/arm64/configs/phytium_defconfig index 072baaed4b1afa479f2a7c086b8945ab5c11e7b0..1c13e80f9f1a971b39cb7e3370e826415a2dbff8 100644 --- a/arch/arm64/configs/phytium_defconfig +++ b/arch/arm64/configs/phytium_defconfig @@ -1,4 +1,4 @@ -CONFIG_LOCALVERSION="-phytium-embedded-v2.2" +CONFIG_LOCALVERSION="-phytium-embedded-v2.3" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y @@ -523,6 +523,7 @@ CONFIG_SND_HDA_INPUT_BEEP=y CONFIG_SND_HDA_PATCH_LOADER=y CONFIG_SND_HDA_CODEC_REALTEK=y CONFIG_SND_HDA_CODEC_HDMI=y +CONFIG_SND_USB_AUDIO=m CONFIG_SND_SOC=y CONFIG_SND_SOC_FSL_SAI=m CONFIG_SND_SOC_PHYTIUM_I2S=y diff --git a/drivers/rtc/rtc-efi.c b/drivers/rtc/rtc-efi.c index edb64debd173e1fdc53c301444485977bd9c71b8..0e36eb57b12d1973a16a8825d0bfc7cb13b7fd1a 100644 --- a/drivers/rtc/rtc-efi.c +++ b/drivers/rtc/rtc-efi.c @@ -260,7 +260,8 @@ static int __init efi_rtc_probe(struct platform_device *dev) /* First check if the RTC is usable */ if (efi.get_time(&eft, &cap) != EFI_SUCCESS) return -ENODEV; - + device_set_wakeup_capable(&dev->dev, true); + device_set_wakeup_enable(&dev->dev, true); rtc = devm_rtc_device_register(&dev->dev, "rtc-efi", &efi_rtc_ops, THIS_MODULE); if (IS_ERR(rtc))