From: Arnd Bergmann Date: Thu, 1 Apr 2021 20:45:15 +0000 (+0200) Subject: Merge tag 'v5.12-next-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=03c623535fbd7313f854f944b1e22f364e7b4c98;p=linux.git Merge tag 'v5.12-next-defconfig' of git://git./linux/kernel/git/matthias.bgg/linux into arm/defconfig Enable option to boot MediaTek based chromebook (mt8173 and mt8183) with defconfig * tag 'v5.12-next-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux: arm64: defconfig: Enable options to support panel display for Mediatek Chromebooks arm64: defconfig: Allow mt8173-based boards to boot from usb Signed-off-by: Arnd Bergmann --- 03c623535fbd7313f854f944b1e22f364e7b4c98 diff --cc arch/arm64/configs/defconfig index c64eb9ca92e3b,f2dc42c9b9327..23f0775369910 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@@ -1001,7 -998,7 +1011,8 @@@ CONFIG_OWL_PM_DOMAINS= CONFIG_RASPBERRYPI_POWER=y CONFIG_FSL_DPAA=y CONFIG_FSL_MC_DPIO=y +CONFIG_FSL_RCPM=y + CONFIG_MTK_PMIC_WRAP=y CONFIG_QCOM_AOSS_QMP=y CONFIG_QCOM_COMMAND_DB=y CONFIG_QCOM_GENI_SE=y