* [PATCH] powerpc/82xx: Select FSL_SOC
@ 2023-09-14 15:23 Christophe Leroy
2023-09-14 19:30 ` Randy Dunlap
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Christophe Leroy @ 2023-09-14 15:23 UTC (permalink / raw)
To: Michael Ellerman, Nicholas Piggin
Cc: Randy Dunlap, linuxppc-dev, linux-kernel
It used to be impossible to select CONFIG_CPM2 without selecting
CONFIG_FSL_SOC at the same time because CONFIG_CPM2 was dependent
on CONFIG_8260 and CONFIG_8260 was selecting CONFIG_FSL_SOC.
But after commit eb5aa2137275 ("powerpc/82xx: Remove CONFIG_8260
and CONFIG_8272") CONFIG_CPM2 depends on CONFIG_MPC82xx instead
but CONFIG_MPC82xx doesn't directly selects CONFIG_FSL_SOC.
Fix it by forcing CONFIG_MPC82xx to select CONFIG_FSL_SOC just
like already done by MPC8xx, MPC512x, MPC83xx, PPC_86xx.
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Fixes: eb5aa2137275 ("powerpc/82xx: Remove CONFIG_8260 and CONFIG_8272")
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
arch/powerpc/platforms/82xx/Kconfig | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/powerpc/platforms/82xx/Kconfig b/arch/powerpc/platforms/82xx/Kconfig
index d9f1a2a83158..1824536cf6f2 100644
--- a/arch/powerpc/platforms/82xx/Kconfig
+++ b/arch/powerpc/platforms/82xx/Kconfig
@@ -2,6 +2,7 @@
menuconfig PPC_82xx
bool "82xx-based boards (PQ II)"
depends on PPC_BOOK3S_32
+ select FSL_SOC
if PPC_82xx
@@ -9,7 +10,6 @@ config EP8248E
bool "Embedded Planet EP8248E (a.k.a. CWH-PPC-8248N-VE)"
select CPM2
select PPC_INDIRECT_PCI if PCI
- select FSL_SOC
select PHYLIB if NETDEVICES
select MDIO_BITBANG if PHYLIB
help
@@ -22,7 +22,6 @@ config MGCOGE
bool "Keymile MGCOGE"
select CPM2
select PPC_INDIRECT_PCI if PCI
- select FSL_SOC
help
This enables support for the Keymile MGCOGE board.
--
2.41.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] powerpc/82xx: Select FSL_SOC
2023-09-14 15:23 [PATCH] powerpc/82xx: Select FSL_SOC Christophe Leroy
@ 2023-09-14 19:30 ` Randy Dunlap
2023-09-15 0:43 ` Michael Ellerman
2023-09-21 9:24 ` Michael Ellerman
2 siblings, 0 replies; 6+ messages in thread
From: Randy Dunlap @ 2023-09-14 19:30 UTC (permalink / raw)
To: Christophe Leroy, Michael Ellerman, Nicholas Piggin
Cc: linuxppc-dev, linux-kernel
On 9/14/23 08:23, Christophe Leroy wrote:
> It used to be impossible to select CONFIG_CPM2 without selecting
> CONFIG_FSL_SOC at the same time because CONFIG_CPM2 was dependent
> on CONFIG_8260 and CONFIG_8260 was selecting CONFIG_FSL_SOC.
>
> But after commit eb5aa2137275 ("powerpc/82xx: Remove CONFIG_8260
> and CONFIG_8272") CONFIG_CPM2 depends on CONFIG_MPC82xx instead
> but CONFIG_MPC82xx doesn't directly selects CONFIG_FSL_SOC.
>
> Fix it by forcing CONFIG_MPC82xx to select CONFIG_FSL_SOC just
> like already done by MPC8xx, MPC512x, MPC83xx, PPC_86xx.
>
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Fixes: eb5aa2137275 ("powerpc/82xx: Remove CONFIG_8260 and CONFIG_8272")
> Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Tested-by: Randy Dunlap <rdunlap@infradead.org>
Thanks for tracking this down.
> ---
> arch/powerpc/platforms/82xx/Kconfig | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/arch/powerpc/platforms/82xx/Kconfig b/arch/powerpc/platforms/82xx/Kconfig
> index d9f1a2a83158..1824536cf6f2 100644
> --- a/arch/powerpc/platforms/82xx/Kconfig
> +++ b/arch/powerpc/platforms/82xx/Kconfig
> @@ -2,6 +2,7 @@
> menuconfig PPC_82xx
> bool "82xx-based boards (PQ II)"
> depends on PPC_BOOK3S_32
> + select FSL_SOC
>
> if PPC_82xx
>
> @@ -9,7 +10,6 @@ config EP8248E
> bool "Embedded Planet EP8248E (a.k.a. CWH-PPC-8248N-VE)"
> select CPM2
> select PPC_INDIRECT_PCI if PCI
> - select FSL_SOC
> select PHYLIB if NETDEVICES
> select MDIO_BITBANG if PHYLIB
> help
> @@ -22,7 +22,6 @@ config MGCOGE
> bool "Keymile MGCOGE"
> select CPM2
> select PPC_INDIRECT_PCI if PCI
> - select FSL_SOC
> help
> This enables support for the Keymile MGCOGE board.
>
--
~Randy
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] powerpc/82xx: Select FSL_SOC
2023-09-14 15:23 [PATCH] powerpc/82xx: Select FSL_SOC Christophe Leroy
2023-09-14 19:30 ` Randy Dunlap
@ 2023-09-15 0:43 ` Michael Ellerman
2023-09-15 5:05 ` Christophe Leroy
2023-09-21 9:24 ` Michael Ellerman
2 siblings, 1 reply; 6+ messages in thread
From: Michael Ellerman @ 2023-09-15 0:43 UTC (permalink / raw)
To: Christophe Leroy, Nicholas Piggin
Cc: Randy Dunlap, linuxppc-dev, linux-kernel
Christophe Leroy <christophe.leroy@csgroup.eu> writes:
> It used to be impossible to select CONFIG_CPM2 without selecting
> CONFIG_FSL_SOC at the same time because CONFIG_CPM2 was dependent
> on CONFIG_8260 and CONFIG_8260 was selecting CONFIG_FSL_SOC.
>
> But after commit eb5aa2137275 ("powerpc/82xx: Remove CONFIG_8260
> and CONFIG_8272") CONFIG_CPM2 depends on CONFIG_MPC82xx instead
^
CONFIG_PPC_82xx
All the references to CONFIG_MPC82xx should be CONFIG_PPC_82xx right?
I can update when applying.
cheers
> but CONFIG_MPC82xx doesn't directly selects CONFIG_FSL_SOC.
>
> Fix it by forcing CONFIG_MPC82xx to select CONFIG_FSL_SOC just
> like already done by MPC8xx, MPC512x, MPC83xx, PPC_86xx.
>
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Fixes: eb5aa2137275 ("powerpc/82xx: Remove CONFIG_8260 and CONFIG_8272")
> Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
> ---
> arch/powerpc/platforms/82xx/Kconfig | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/arch/powerpc/platforms/82xx/Kconfig b/arch/powerpc/platforms/82xx/Kconfig
> index d9f1a2a83158..1824536cf6f2 100644
> --- a/arch/powerpc/platforms/82xx/Kconfig
> +++ b/arch/powerpc/platforms/82xx/Kconfig
> @@ -2,6 +2,7 @@
> menuconfig PPC_82xx
> bool "82xx-based boards (PQ II)"
> depends on PPC_BOOK3S_32
> + select FSL_SOC
>
> if PPC_82xx
>
> @@ -9,7 +10,6 @@ config EP8248E
> bool "Embedded Planet EP8248E (a.k.a. CWH-PPC-8248N-VE)"
> select CPM2
> select PPC_INDIRECT_PCI if PCI
> - select FSL_SOC
> select PHYLIB if NETDEVICES
> select MDIO_BITBANG if PHYLIB
> help
> @@ -22,7 +22,6 @@ config MGCOGE
> bool "Keymile MGCOGE"
> select CPM2
> select PPC_INDIRECT_PCI if PCI
> - select FSL_SOC
> help
> This enables support for the Keymile MGCOGE board.
>
> --
> 2.41.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] powerpc/82xx: Select FSL_SOC
2023-09-15 0:43 ` Michael Ellerman
@ 2023-09-15 5:05 ` Christophe Leroy
2023-09-15 7:25 ` Michael Ellerman
0 siblings, 1 reply; 6+ messages in thread
From: Christophe Leroy @ 2023-09-15 5:05 UTC (permalink / raw)
To: Michael Ellerman, Nicholas Piggin
Cc: Randy Dunlap, linuxppc-dev@lists.ozlabs.org,
linux-kernel@vger.kernel.org
Le 15/09/2023 à 02:43, Michael Ellerman a écrit :
> Christophe Leroy <christophe.leroy@csgroup.eu> writes:
>> It used to be impossible to select CONFIG_CPM2 without selecting
>> CONFIG_FSL_SOC at the same time because CONFIG_CPM2 was dependent
>> on CONFIG_8260 and CONFIG_8260 was selecting CONFIG_FSL_SOC.
>>
>> But after commit eb5aa2137275 ("powerpc/82xx: Remove CONFIG_8260
>> and CONFIG_8272") CONFIG_CPM2 depends on CONFIG_MPC82xx instead
> ^
> CONFIG_PPC_82xx
>
> All the references to CONFIG_MPC82xx should be CONFIG_PPC_82xx right?
> I can update when applying.
Ah right, I mixed things up. This is CONFIG_PPC_82xx, CONFIG_PPC_8xx,
CONFIG_PPC_83xx and CONFIG_PPC_MPC512x
>
> cheers
>
>
>> but CONFIG_MPC82xx doesn't directly selects CONFIG_FSL_SOC.
>>
>> Fix it by forcing CONFIG_MPC82xx to select CONFIG_FSL_SOC just
>> like already done by MPC8xx, MPC512x, MPC83xx, PPC_86xx.
>>
>> Reported-by: Randy Dunlap <rdunlap@infradead.org>
>> Fixes: eb5aa2137275 ("powerpc/82xx: Remove CONFIG_8260 and CONFIG_8272")
>> Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
>> ---
>> arch/powerpc/platforms/82xx/Kconfig | 3 +--
>> 1 file changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git a/arch/powerpc/platforms/82xx/Kconfig b/arch/powerpc/platforms/82xx/Kconfig
>> index d9f1a2a83158..1824536cf6f2 100644
>> --- a/arch/powerpc/platforms/82xx/Kconfig
>> +++ b/arch/powerpc/platforms/82xx/Kconfig
>> @@ -2,6 +2,7 @@
>> menuconfig PPC_82xx
>> bool "82xx-based boards (PQ II)"
>> depends on PPC_BOOK3S_32
>> + select FSL_SOC
>>
>> if PPC_82xx
>>
>> @@ -9,7 +10,6 @@ config EP8248E
>> bool "Embedded Planet EP8248E (a.k.a. CWH-PPC-8248N-VE)"
>> select CPM2
>> select PPC_INDIRECT_PCI if PCI
>> - select FSL_SOC
>> select PHYLIB if NETDEVICES
>> select MDIO_BITBANG if PHYLIB
>> help
>> @@ -22,7 +22,6 @@ config MGCOGE
>> bool "Keymile MGCOGE"
>> select CPM2
>> select PPC_INDIRECT_PCI if PCI
>> - select FSL_SOC
>> help
>> This enables support for the Keymile MGCOGE board.
>>
>> --
>> 2.41.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] powerpc/82xx: Select FSL_SOC
2023-09-15 5:05 ` Christophe Leroy
@ 2023-09-15 7:25 ` Michael Ellerman
0 siblings, 0 replies; 6+ messages in thread
From: Michael Ellerman @ 2023-09-15 7:25 UTC (permalink / raw)
To: Christophe Leroy, Nicholas Piggin
Cc: Randy Dunlap, linuxppc-dev@lists.ozlabs.org,
linux-kernel@vger.kernel.org
Christophe Leroy <christophe.leroy@csgroup.eu> writes:
> Le 15/09/2023 à 02:43, Michael Ellerman a écrit :
>> Christophe Leroy <christophe.leroy@csgroup.eu> writes:
>>> It used to be impossible to select CONFIG_CPM2 without selecting
>>> CONFIG_FSL_SOC at the same time because CONFIG_CPM2 was dependent
>>> on CONFIG_8260 and CONFIG_8260 was selecting CONFIG_FSL_SOC.
>>>
>>> But after commit eb5aa2137275 ("powerpc/82xx: Remove CONFIG_8260
>>> and CONFIG_8272") CONFIG_CPM2 depends on CONFIG_MPC82xx instead
>> ^
>> CONFIG_PPC_82xx
>>
>> All the references to CONFIG_MPC82xx should be CONFIG_PPC_82xx right?
>> I can update when applying.
>
> Ah right, I mixed things up. This is CONFIG_PPC_82xx, CONFIG_PPC_8xx,
> CONFIG_PPC_83xx and CONFIG_PPC_MPC512x
Thanks.
cheers
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] powerpc/82xx: Select FSL_SOC
2023-09-14 15:23 [PATCH] powerpc/82xx: Select FSL_SOC Christophe Leroy
2023-09-14 19:30 ` Randy Dunlap
2023-09-15 0:43 ` Michael Ellerman
@ 2023-09-21 9:24 ` Michael Ellerman
2 siblings, 0 replies; 6+ messages in thread
From: Michael Ellerman @ 2023-09-21 9:24 UTC (permalink / raw)
To: Nicholas Piggin, Christophe Leroy
Cc: Randy Dunlap, linuxppc-dev, linux-kernel
On Thu, 14 Sep 2023 17:23:45 +0200, Christophe Leroy wrote:
> It used to be impossible to select CONFIG_CPM2 without selecting
> CONFIG_FSL_SOC at the same time because CONFIG_CPM2 was dependent
> on CONFIG_8260 and CONFIG_8260 was selecting CONFIG_FSL_SOC.
>
> But after commit eb5aa2137275 ("powerpc/82xx: Remove CONFIG_8260
> and CONFIG_8272") CONFIG_CPM2 depends on CONFIG_MPC82xx instead
> but CONFIG_MPC82xx doesn't directly selects CONFIG_FSL_SOC.
>
> [...]
Applied to powerpc/fixes.
[1/1] powerpc/82xx: Select FSL_SOC
https://git.kernel.org/powerpc/c/6901a9f9ef1561111283a0d8c8d1cea634d089ef
cheers
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-09-21 9:27 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-14 15:23 [PATCH] powerpc/82xx: Select FSL_SOC Christophe Leroy
2023-09-14 19:30 ` Randy Dunlap
2023-09-15 0:43 ` Michael Ellerman
2023-09-15 5:05 ` Christophe Leroy
2023-09-15 7:25 ` Michael Ellerman
2023-09-21 9:24 ` Michael Ellerman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).