net: dsa: ocelot: fix selecting MFD_OCELOT

Message ID 20230215104631.31568-1-lukas.bulwahn@gmail.com
State New
Headers
Series net: dsa: ocelot: fix selecting MFD_OCELOT |

Commit Message

Lukas Bulwahn Feb. 15, 2023, 10:46 a.m. UTC
  Commit 3d7316ac81ac ("net: dsa: ocelot: add external ocelot switch
control") adds config NET_DSA_MSCC_OCELOT_EXT, which selects the
non-existing config MFD_OCELOT_CORE.

Replace this select with the intended and existing MFD_OCELOT.

Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
---
 drivers/net/dsa/ocelot/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Colin Foster Feb. 15, 2023, 4:29 p.m. UTC | #1
Hi Lukas,

On Wed, Feb 15, 2023 at 11:46:31AM +0100, Lukas Bulwahn wrote:
> Commit 3d7316ac81ac ("net: dsa: ocelot: add external ocelot switch
> control") adds config NET_DSA_MSCC_OCELOT_EXT, which selects the
> non-existing config MFD_OCELOT_CORE.
> 
> Replace this select with the intended and existing MFD_OCELOT.

Thanks for this. We pivoted away from *_CORE a while back and I clearly
missed this. It can go through net-next this week.

Acked-by: Colin Foster <colin.foster@in-advantage.com>

> 
> Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
> ---
>  drivers/net/dsa/ocelot/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/dsa/ocelot/Kconfig b/drivers/net/dsa/ocelot/Kconfig
> index eff0a7dfcd21..081e7a88ea02 100644
> --- a/drivers/net/dsa/ocelot/Kconfig
> +++ b/drivers/net/dsa/ocelot/Kconfig
> @@ -14,7 +14,7 @@ config NET_DSA_MSCC_OCELOT_EXT
>  	depends on NET_VENDOR_MICROSEMI
>  	depends on PTP_1588_CLOCK_OPTIONAL
>  	select MDIO_MSCC_MIIM
> -	select MFD_OCELOT_CORE
> +	select MFD_OCELOT
>  	select MSCC_OCELOT_SWITCH_LIB
>  	select NET_DSA_MSCC_FELIX_DSA_LIB
>  	select NET_DSA_TAG_OCELOT_8021Q
> -- 
> 2.17.1
>
  
patchwork-bot+netdevbpf@kernel.org Feb. 16, 2023, 12:20 p.m. UTC | #2
Hello:

This patch was applied to netdev/net-next.git (master)
by Paolo Abeni <pabeni@redhat.com>:

On Wed, 15 Feb 2023 11:46:31 +0100 you wrote:
> Commit 3d7316ac81ac ("net: dsa: ocelot: add external ocelot switch
> control") adds config NET_DSA_MSCC_OCELOT_EXT, which selects the
> non-existing config MFD_OCELOT_CORE.
> 
> Replace this select with the intended and existing MFD_OCELOT.
> 
> Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
> 
> [...]

Here is the summary with links:
  - net: dsa: ocelot: fix selecting MFD_OCELOT
    https://git.kernel.org/netdev/net-next/c/f5b12be34249

You are awesome, thank you!
  

Patch

diff --git a/drivers/net/dsa/ocelot/Kconfig b/drivers/net/dsa/ocelot/Kconfig
index eff0a7dfcd21..081e7a88ea02 100644
--- a/drivers/net/dsa/ocelot/Kconfig
+++ b/drivers/net/dsa/ocelot/Kconfig
@@ -14,7 +14,7 @@  config NET_DSA_MSCC_OCELOT_EXT
 	depends on NET_VENDOR_MICROSEMI
 	depends on PTP_1588_CLOCK_OPTIONAL
 	select MDIO_MSCC_MIIM
-	select MFD_OCELOT_CORE
+	select MFD_OCELOT
 	select MSCC_OCELOT_SWITCH_LIB
 	select NET_DSA_MSCC_FELIX_DSA_LIB
 	select NET_DSA_TAG_OCELOT_8021Q