Re: [PATCH] arm64: configs: remove redundant CONFIG_MTK_PMIC_WRAP

Matthias Brugger
2021-06-14T08:58:26Z

Hi Petr,

On 11/06/2021 23:39, Petr Vorel wrote:
> Hi,
>
>> Hi all,
>
>> On 11/05/2021 22:04, Enric Balletbo i Serra wrote:
>>> Hi Catalin,
>
>>> Thanks for cc'ing me.
>
>>> On 11/5/21 19:20, Catalin Marinas wrote:
>>>> On Sat, May 08, 2021 at 02:24:10AM +0800, Luo Longjun wrote:
>>>>> When I compile kernel in ARM64, it produces the following output:
>
>>>>> *** Default configuration is based on 'defconfig'
>>>>> arch/arm64/configs/defconfig:1018:warning: override: reassigning to
>>>>> symbol MTK_PMIC_WRAP
>
>>>>> After checking defcofnig, I found two CONFIG_MTK_PMIC_WRAP options.
>
>>>>> Signed-off-by: Luo Longjun <luolongjun@huawei.com>
>>>>> ---
>>>>> arch/arm64/configs/defconfig | 1 -
>>>>> 1 file changed, 1 deletion(-)
>
>>>>> 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
>
>>>> Adding Matthias and Enric. This change looks fine to me but I think it
>>>> should go in via the arm-soc tree. Commit 9fd5449e061e introduced the =m
>>>> option while commit fbbe38309d56 introduced the =y variant.
>
>>>> You could add:
>
>>>> Fixes: fbbe38309d56 ("arm64: defconfig: Allow mt8173-based boards to boot from usb")
>
> Reviewed-by: Petr Vorel <petr.vorel@gmail.com>
>
> I was going to send fix myself, I'd prefer also y, but weren't 100% sure sure.
>

This has landed in the arm-soc tree this weekend.
Anyway, thanks for looking into this as well.

Regards,
Matthias

> For a record:
>
> * CONFIG_MTK_PMIC_WRAP=m committed by author in 2021-01-04, merged 2021-01-31 15:31:01
> 9fd5449e061e ("arm64: configs: Support pwrap on Mediatek MT6779 platform")
> sent: 4 Jan 2021
> https://lore.kernel.org/r/1609747703-27207-3-git-send-email-argus.lin@mediatek.com
> Applied to v5.11-next/defconfig 31 Jan 2021 15:32:26 by Matthias Brugger <matthias.bgg@gmail.com>
> https://lore.kernel.org/linux-devicetree/5d5a67a5-ac2d-9ef9-b20c-66cbd55ebb8f@gmail.com/
>
> * CONFIG_MTK_PMIC_WRAP=y was committed by author in 2021-03-31 11:06:57, merged 2021-03-31 12:12:59
> fbbe38309d56 ("arm64: defconfig: Allow mt8173-based boards to boot from usb")
> sent: 31 Mar 2021 11:06:57
> https://lore.kernel.org/r/20210331090659.4169966-1-enric.balletbo@collabora.com
> But originally sent: 9 Feb 2021 10:11:11
> https://lore.kernel.org/lkml/20210209091112.2075478-1-enric.balletbo@collabora.com/
>
> Kind regards,
> Petr
>
>>> I sent the same patch some time ago [1].
>
>>> I agree, either land this patch or mine. In any case,
>
>>> Reviewed-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
>
>>> Matthias is this something that should go through your tree?
>
>
>> Yes, this should go through my tree. I'll take care of it.
>
>> Regards,
>> Matthias