This is a note to let you know that I've just added the patch titled
arm64: defconfig: Do not override the MTK_PMIC_WRAP symbol
to the 5.13-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
arm64-defconfig-do-not-override-the-mtk_pmic_wrap-sy.patch
and it can be found in the queue-5.13 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
commit 513e7eb8da74cf1f9b1f32e8d255ae0e37478e1b
Author: Enric Balletbo i Serra <enric.balletbo@xxxxxxxxxxxxx>
Date: Fri Apr 23 09:52:01 2021 +0200
arm64: defconfig: Do not override the MTK_PMIC_WRAP symbol
[ Upstream commit f0e70d4946332c681ceaba940652f30c7c33473d ]
Commit 'fbbe38309d56 ("arm64: defconfig: Allow mt8173-based boards to boot
from usb")' added the MTK_PMIC_WRAP config built-in. It needs to be
built-in in order to be able to boot from USB or the MMC without needing
a ramdisk, but that symbol was already defined as a module so now we are
getting the following warning:
arch/arm64/configs/defconfig:996:warning: override: reassigning to symbol MTK_PMIC_WRAP
Remove the MTK_PMIC_WRAP=m from the defconfig to remove the error.
Fixes: fbbe38309d56 ("arm64: defconfig: Allow mt8173-based boards to boot from usb")
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@xxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20210423075201.2616023-1-enric.balletbo@xxxxxxxxxxxxx
Signed-off-by: Matthias Brugger <matthias.bgg@xxxxxxxxx>
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 08c6f769df9a..9907a431db0d 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -491,7 +491,6 @@ CONFIG_SPI_S3C64XX=y
CONFIG_SPI_SH_MSIOF=m
CONFIG_SPI_SUN6I=y
CONFIG_SPI_SPIDEV=m
-CONFIG_MTK_PMIC_WRAP=m
CONFIG_SPMI=y
CONFIG_PINCTRL_SINGLE=y
CONFIG_PINCTRL_MAX77620=y
