With the integration of chip-id detection scheme in kernel[1], there
is no specific need to maintain multitudes of SoC specific config
options, discussed as per [2], we have deprecated the usage in other
places for v5.10-rc1. Drop the configuration for the follow on kernel.
[1] drivers/soc/ti/k3-socinfo.c commit 907a2b7e2fc7 ("soc: ti: add k3 platforms chipid module driver")
[2] https://lore.kernel.org/linux-arm-kernel/20200908112534.t5bgrjf7y3a6l2ss@akan/
Signed-off-by: Nishanth Menon <[email protected]>
---
drivers/soc/ti/Kconfig | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/drivers/soc/ti/Kconfig b/drivers/soc/ti/Kconfig
index f5b82ffa637b..7e2fb1c16af1 100644
--- a/drivers/soc/ti/Kconfig
+++ b/drivers/soc/ti/Kconfig
@@ -1,22 +1,4 @@
# SPDX-License-Identifier: GPL-2.0-only
-# 64-bit ARM SoCs from TI
-if ARM64
-
-if ARCH_K3
-
-config ARCH_K3_AM6_SOC
- bool "K3 AM6 SoC"
- help
- Enable support for TI's AM6 SoC Family support
-
-config ARCH_K3_J721E_SOC
- bool "K3 J721E SoC"
- help
- Enable support for TI's J721E SoC Family support
-
-endif
-
-endif
#
# TI SOC drivers
--
2.28.0
On 26/10/20 10:36 pm, Nishanth Menon wrote:
> With the integration of chip-id detection scheme in kernel[1], there
> is no specific need to maintain multitudes of SoC specific config
> options, discussed as per [2], we have deprecated the usage in other
> places for v5.10-rc1. Drop the configuration for the follow on kernel.
>
> [1] drivers/soc/ti/k3-socinfo.c commit 907a2b7e2fc7 ("soc: ti: add k3 platforms chipid module driver")
> [2] https://lore.kernel.org/linux-arm-kernel/20200908112534.t5bgrjf7y3a6l2ss@akan/
>
> Signed-off-by: Nishanth Menon <[email protected]>
> ---
> drivers/soc/ti/Kconfig | 18 ------------------
> 1 file changed, 18 deletions(-)
>
> diff --git a/drivers/soc/ti/Kconfig b/drivers/soc/ti/Kconfig
> index f5b82ffa637b..7e2fb1c16af1 100644
> --- a/drivers/soc/ti/Kconfig
> +++ b/drivers/soc/ti/Kconfig
> @@ -1,22 +1,4 @@
> # SPDX-License-Identifier: GPL-2.0-only
> -# 64-bit ARM SoCs from TI
> -if ARM64
> -
> -if ARCH_K3
> -
> -config ARCH_K3_AM6_SOC
> - bool "K3 AM6 SoC"
> - help
> - Enable support for TI's AM6 SoC Family support
> -
> -config ARCH_K3_J721E_SOC
> - bool "K3 J721E SoC"
> - help
> - Enable support for TI's J721E SoC Family support
> -
> -endif
> -
> -endif
➜ linux git:(master) git grep -in ARCH_K3_AM6_SOC
arch/arm64/configs/defconfig:961:CONFIG_ARCH_K3_AM6_SOC=y
drivers/soc/ti/Kconfig:7:config ARCH_K3_AM6_SOC
➜ linux git:(master) git grep -in ARCH_K3_J721E_SOC
arch/arm64/configs/defconfig:962:CONFIG_ARCH_K3_J721E_SOC=y
drivers/gpu/drm/bridge/cadence/Kconfig:16: depends on ARCH_K3_J721E_SOC ||
COMPILE_TEST
drivers/soc/ti/Kconfig:12:config ARCH_K3_J721E_SOC
I see drm bridge Kconfig is cleaned[0]. Please clean the defconfig as well.
[0]
https://patchwork.kernel.org/project/linux-arm-kernel/patch/[email protected]/
Thanks and regards,
Lokesh
On 23:30-20201026, Lokesh Vutla wrote:
[..]
> ➜ linux git:(master) git grep -in ARCH_K3_AM6_SOC
> arch/arm64/configs/defconfig:961:CONFIG_ARCH_K3_AM6_SOC=y
> drivers/soc/ti/Kconfig:7:config ARCH_K3_AM6_SOC
> ➜ linux git:(master) git grep -in ARCH_K3_J721E_SOC
> arch/arm64/configs/defconfig:962:CONFIG_ARCH_K3_J721E_SOC=y
> drivers/gpu/drm/bridge/cadence/Kconfig:16: depends on ARCH_K3_J721E_SOC ||
> COMPILE_TEST
> drivers/soc/ti/Kconfig:12:config ARCH_K3_J721E_SOC
>
>
> I see drm bridge Kconfig is cleaned[0]. Please clean the defconfig as well.
>
> [0]
> https://patchwork.kernel.org/project/linux-arm-kernel/patch/[email protected]/
>
Yes, the defconfig patches have to be queued up in a different queue,
Lets see where the two patches fall and will post the defconfig
updates as well.
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
On 21:29-20201027, Lokesh Vutla wrote:
>
>
> On 27/10/20 12:38 am, Nishanth Menon wrote:
> > On 23:30-20201026, Lokesh Vutla wrote:
> > [..]
> >> ➜ linux git:(master) git grep -in ARCH_K3_AM6_SOC
> >> arch/arm64/configs/defconfig:961:CONFIG_ARCH_K3_AM6_SOC=y
> >> drivers/soc/ti/Kconfig:7:config ARCH_K3_AM6_SOC
> >> ➜ linux git:(master) git grep -in ARCH_K3_J721E_SOC
> >> arch/arm64/configs/defconfig:962:CONFIG_ARCH_K3_J721E_SOC=y
> >> drivers/gpu/drm/bridge/cadence/Kconfig:16: depends on ARCH_K3_J721E_SOC ||
> >> COMPILE_TEST
> >> drivers/soc/ti/Kconfig:12:config ARCH_K3_J721E_SOC
> >>
> >>
> >> I see drm bridge Kconfig is cleaned[0]. Please clean the defconfig as well.
> >>
> >> [0]
> >> https://patchwork.kernel.org/project/linux-arm-kernel/patch/[email protected]/
> >>
> >
> > Yes, the defconfig patches have to be queued up in a different queue,
> > Lets see where the two patches fall and will post the defconfig
> > updates as well.
>
> Sure. IMHO, the cleanup patches should get merged before this Kconfig removal patch.
>
> Otherwise, this patch as-is looks good to me.
>
> Acked-by: Lokesh Vutla <[email protected]>
Ofcourse, thanks for highlighting the dependencies.
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
On 27/10/20 12:38 am, Nishanth Menon wrote:
> On 23:30-20201026, Lokesh Vutla wrote:
> [..]
>> ➜ linux git:(master) git grep -in ARCH_K3_AM6_SOC
>> arch/arm64/configs/defconfig:961:CONFIG_ARCH_K3_AM6_SOC=y
>> drivers/soc/ti/Kconfig:7:config ARCH_K3_AM6_SOC
>> ➜ linux git:(master) git grep -in ARCH_K3_J721E_SOC
>> arch/arm64/configs/defconfig:962:CONFIG_ARCH_K3_J721E_SOC=y
>> drivers/gpu/drm/bridge/cadence/Kconfig:16: depends on ARCH_K3_J721E_SOC ||
>> COMPILE_TEST
>> drivers/soc/ti/Kconfig:12:config ARCH_K3_J721E_SOC
>>
>>
>> I see drm bridge Kconfig is cleaned[0]. Please clean the defconfig as well.
>>
>> [0]
>> https://patchwork.kernel.org/project/linux-arm-kernel/patch/[email protected]/
>>
>
> Yes, the defconfig patches have to be queued up in a different queue,
> Lets see where the two patches fall and will post the defconfig
> updates as well.
Sure. IMHO, the cleanup patches should get merged before this Kconfig removal patch.
Otherwise, this patch as-is looks good to me.
Acked-by: Lokesh Vutla <[email protected]>
Thanks and regards,
Lokesh
On 14:08-20201026, Nishanth Menon wrote:
> On 23:30-20201026, Lokesh Vutla wrote:
> [..]
> > ➜ linux git:(master) git grep -in ARCH_K3_AM6_SOC
> > arch/arm64/configs/defconfig:961:CONFIG_ARCH_K3_AM6_SOC=y
> > drivers/soc/ti/Kconfig:7:config ARCH_K3_AM6_SOC
> > ➜ linux git:(master) git grep -in ARCH_K3_J721E_SOC
> > arch/arm64/configs/defconfig:962:CONFIG_ARCH_K3_J721E_SOC=y
> > drivers/gpu/drm/bridge/cadence/Kconfig:16: depends on ARCH_K3_J721E_SOC ||
> > COMPILE_TEST
> > drivers/soc/ti/Kconfig:12:config ARCH_K3_J721E_SOC
> >
> >
> > I see drm bridge Kconfig is cleaned[0]. Please clean the defconfig as well.
> >
> > [0]
> > https://patchwork.kernel.org/project/linux-arm-kernel/patch/[email protected]/
> >
>
> Yes, the defconfig patches have to be queued up in a different queue,
> Lets see where the two patches fall and will post the defconfig
> updates as well.
Santosh,
https://patchwork.kernel.org/project/linux-arm-kernel/patch/[email protected]/
looks available in next now.
Can we queue this patch[1] up for 5.11 window?
Depending on your preference, I can carry the defconfig patch[2] (to
prevent merge dependencies, might be good to get an immutable tag) OR
you can pick the defconfig patch up that cleans after removing the
symbol.
[1] https://patchwork.kernel.org/project/linux-arm-kernel/patch/[email protected]/
[2] https://lore.kernel.org/lkml/[email protected]/
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
On 11/12/20 1:56 PM, Nishanth Menon wrote:
> On 14:08-20201026, Nishanth Menon wrote:
>> On 23:30-20201026, Lokesh Vutla wrote:
>> [..]
>>> ➜ linux git:(master) git grep -in ARCH_K3_AM6_SOC
>>> arch/arm64/configs/defconfig:961:CONFIG_ARCH_K3_AM6_SOC=y
>>> drivers/soc/ti/Kconfig:7:config ARCH_K3_AM6_SOC
>>> ➜ linux git:(master) git grep -in ARCH_K3_J721E_SOC
>>> arch/arm64/configs/defconfig:962:CONFIG_ARCH_K3_J721E_SOC=y
>>> drivers/gpu/drm/bridge/cadence/Kconfig:16: depends on ARCH_K3_J721E_SOC ||
>>> COMPILE_TEST
>>> drivers/soc/ti/Kconfig:12:config ARCH_K3_J721E_SOC
>>>
>>>
>>> I see drm bridge Kconfig is cleaned[0]. Please clean the defconfig as well.
>>>
>>> [0]
>>> https://urldefense.com/v3/__https://patchwork.kernel.org/project/linux-arm-kernel/patch/[email protected]/__;!!GqivPVa7Brio!KWOx2aLl7hlHQrN--kiz1N5WaPWgeZzFZ12ptg8NzJE2BSnxxrWmsoqn5vjMvpfO1bSGYQ$
>>>
>>
>> Yes, the defconfig patches have to be queued up in a different queue,
>> Lets see where the two patches fall and will post the defconfig
>> updates as well.
>
>
> Santosh,
>
> https://urldefense.com/v3/__https://patchwork.kernel.org/project/linux-arm-kernel/patch/[email protected]/__;!!GqivPVa7Brio!KWOx2aLl7hlHQrN--kiz1N5WaPWgeZzFZ12ptg8NzJE2BSnxxrWmsoqn5vjMvpfO1bSGYQ$
> looks available in next now.
>
> Can we queue this patch[1] up for 5.11 window?
>
> Depending on your preference, I can carry the defconfig patch[2] (to
> prevent merge dependencies, might be good to get an immutable tag) OR
> you can pick the defconfig patch up that cleans after removing the
> symbol.
>
I can apply SOC kconfig patch [1] to my soc branch. That branch with
some additional patches am going to send up, so it should
work. Let me know.
Regards,
Santosh
On 13:59-20201112, [email protected] wrote:
> On 11/12/20 1:56 PM, Nishanth Menon wrote:
> > On 14:08-20201026, Nishanth Menon wrote:
> > > On 23:30-20201026, Lokesh Vutla wrote:
> > > [..]
> > > > ➜ linux git:(master) git grep -in ARCH_K3_AM6_SOC
> > > > arch/arm64/configs/defconfig:961:CONFIG_ARCH_K3_AM6_SOC=y
> > > > drivers/soc/ti/Kconfig:7:config ARCH_K3_AM6_SOC
> > > > ➜ linux git:(master) git grep -in ARCH_K3_J721E_SOC
> > > > arch/arm64/configs/defconfig:962:CONFIG_ARCH_K3_J721E_SOC=y
> > > > drivers/gpu/drm/bridge/cadence/Kconfig:16: depends on ARCH_K3_J721E_SOC ||
> > > > COMPILE_TEST
> > > > drivers/soc/ti/Kconfig:12:config ARCH_K3_J721E_SOC
> > > >
> > > >
> > > > I see drm bridge Kconfig is cleaned[0]. Please clean the defconfig as well.
> > > >
> > > > [0]
> > > > https://urldefense.com/v3/__https://patchwork.kernel.org/project/linux-arm-kernel/patch/[email protected]/__;!!GqivPVa7Brio!KWOx2aLl7hlHQrN--kiz1N5WaPWgeZzFZ12ptg8NzJE2BSnxxrWmsoqn5vjMvpfO1bSGYQ$
> > > >
> > >
> > > Yes, the defconfig patches have to be queued up in a different queue,
> > > Lets see where the two patches fall and will post the defconfig
> > > updates as well.
> >
> >
> > Santosh,
> >
> > https://urldefense.com/v3/__https://patchwork.kernel.org/project/linux-arm-kernel/patch/[email protected]/__;!!GqivPVa7Brio!KWOx2aLl7hlHQrN--kiz1N5WaPWgeZzFZ12ptg8NzJE2BSnxxrWmsoqn5vjMvpfO1bSGYQ$
> > looks available in next now.
> >
> > Can we queue this patch[1] up for 5.11 window?
> >
> > Depending on your preference, I can carry the defconfig patch[2] (to
> > prevent merge dependencies, might be good to get an immutable tag) OR
> > you can pick the defconfig patch up that cleans after removing the
> > symbol.
> >
>
> I can apply SOC kconfig patch [1] to my soc branch. That branch with
> some additional patches am going to send up, so it should
> work. Let me know.
OK, sounds fine to me, If you can give me a tag, I can add queue up
defconfig on top to prevent bisect issues.
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
On 11/12/20 2:22 PM, Nishanth Menon wrote:
> On 13:59-20201112, [email protected] wrote:
>> On 11/12/20 1:56 PM, Nishanth Menon wrote:
>>> On 14:08-20201026, Nishanth Menon wrote:
>>>> On 23:30-20201026, Lokesh Vutla wrote:
>>>> [..]
>>>>> ➜ linux git:(master) git grep -in ARCH_K3_AM6_SOC
>>>>> arch/arm64/configs/defconfig:961:CONFIG_ARCH_K3_AM6_SOC=y
>>>>> drivers/soc/ti/Kconfig:7:config ARCH_K3_AM6_SOC
>>>>> ➜ linux git:(master) git grep -in ARCH_K3_J721E_SOC
>>>>> arch/arm64/configs/defconfig:962:CONFIG_ARCH_K3_J721E_SOC=y
>>>>> drivers/gpu/drm/bridge/cadence/Kconfig:16: depends on ARCH_K3_J721E_SOC ||
>>>>> COMPILE_TEST
>>>>> drivers/soc/ti/Kconfig:12:config ARCH_K3_J721E_SOC
>>>>>
>>>>>
>>>>> I see drm bridge Kconfig is cleaned[0]. Please clean the defconfig as well.
>>>>>
>>>>> [0]
>>>>> https://urldefense.com/v3/__https://patchwork.kernel.org/project/linux-arm-kernel/patch/[email protected]/__;!!GqivPVa7Brio!KWOx2aLl7hlHQrN--kiz1N5WaPWgeZzFZ12ptg8NzJE2BSnxxrWmsoqn5vjMvpfO1bSGYQ$
>>>>>
>>>>
>>>> Yes, the defconfig patches have to be queued up in a different queue,
>>>> Lets see where the two patches fall and will post the defconfig
>>>> updates as well.
>>>
>>>
>>> Santosh,
>>>
>>> https://urldefense.com/v3/__https://patchwork.kernel.org/project/linux-arm-kernel/patch/[email protected]/__;!!GqivPVa7Brio!KWOx2aLl7hlHQrN--kiz1N5WaPWgeZzFZ12ptg8NzJE2BSnxxrWmsoqn5vjMvpfO1bSGYQ$
>>> looks available in next now.
>>>
>>> Can we queue this patch[1] up for 5.11 window?
>>>
>>> Depending on your preference, I can carry the defconfig patch[2] (to
>>> prevent merge dependencies, might be good to get an immutable tag) OR
>>> you can pick the defconfig patch up that cleans after removing the
>>> symbol.
>>>
>>
>> I can apply SOC kconfig patch [1] to my soc branch. That branch with
>> some additional patches am going to send up, so it should
>> work. Let me know.
>
> OK, sounds fine to me, If you can give me a tag, I can add queue up
> defconfig on top to prevent bisect issues.
>
I won't be adding tag till all the commits are lineup but branch will
be immutable.
Regards.
Santosh
On 13:59-20201112, [email protected] wrote:
[...]
> >
>
> I can apply SOC kconfig patch [1] to my soc branch. That branch with
> some additional patches am going to send up, so it should
> work. Let me know.
I think that should work, thanks.
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D