From 4c66157f427ad87d683b76d6819a00138e9f71dd Mon Sep 17 00:00:00 2001 From: Horatiu Vultur Date: Thu, 31 Jan 2019 15:30:33 +0100 Subject: [PATCH] net: mscc: Move ocelot_switch to mscc_eswitch folder Move file ocelot_switch to mscc_eswitch to prepare to add new net drivers for other MSCC SoCs. Signed-off-by: Horatiu Vultur --- MAINTAINERS | 2 +- drivers/net/Kconfig | 7 +------ drivers/net/Makefile | 2 +- drivers/net/mscc_eswitch/Kconfig | 10 ++++++++++ drivers/net/mscc_eswitch/Makefile | 2 ++ drivers/net/{ => mscc_eswitch}/ocelot_switch.c | 0 6 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 drivers/net/mscc_eswitch/Kconfig create mode 100644 drivers/net/mscc_eswitch/Makefile rename drivers/net/{ => mscc_eswitch}/ocelot_switch.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 95e9bda09d..e3a15868bc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -561,7 +561,7 @@ F: drivers/gpio/mscc_sgpio.c F: drivers/spi/mscc_bb_spi.c F: include/configs/vcoreiii.h F: drivers/pinctrl/mscc/ -F: drivers/net/ocelot_switch.c +F: drivers/net/mscc_eswitch/ MIPS JZ4780 M: Ezequiel Garcia diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 39ce4e8a1f..6a570285aa 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -432,12 +432,7 @@ config SNI_AVE This driver implements support for the Socionext AVE Ethernet controller, as found on the Socionext UniPhier family. -config MSCC_OCELOT_SWITCH - bool "Ocelot switch driver" - depends on DM_ETH && ARCH_MSCC - select PHYLIB - help - This driver supports the Ocelot network switch device. +source "drivers/net/mscc_eswitch/Kconfig" config ETHER_ON_FEC1 bool "FEC1" diff --git a/drivers/net/Makefile b/drivers/net/Makefile index e38c164644..51be72b0aa 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -75,4 +75,4 @@ obj-$(CONFIG_FSL_PFE) += pfe_eth/ obj-$(CONFIG_SNI_AVE) += sni_ave.o obj-y += ti/ obj-$(CONFIG_MEDIATEK_ETH) += mtk_eth.o -obj-$(CONFIG_MSCC_OCELOT_SWITCH) += ocelot_switch.o +obj-y += mscc_eswitch/ diff --git a/drivers/net/mscc_eswitch/Kconfig b/drivers/net/mscc_eswitch/Kconfig new file mode 100644 index 0000000000..2f3c8cca4c --- /dev/null +++ b/drivers/net/mscc_eswitch/Kconfig @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0+ +# +# Copyright (c) 2019 Microsemi Corporation + +config MSCC_OCELOT_SWITCH + bool "Ocelot switch driver" + depends on DM_ETH && ARCH_MSCC + select PHYLIB + help + This driver supports the Ocelot network switch device. diff --git a/drivers/net/mscc_eswitch/Makefile b/drivers/net/mscc_eswitch/Makefile new file mode 100644 index 0000000000..32f411dd92 --- /dev/null +++ b/drivers/net/mscc_eswitch/Makefile @@ -0,0 +1,2 @@ + +obj-$(CONFIG_MSCC_OCELOT_SWITCH) += ocelot_switch.o diff --git a/drivers/net/ocelot_switch.c b/drivers/net/mscc_eswitch/ocelot_switch.c similarity index 100% rename from drivers/net/ocelot_switch.c rename to drivers/net/mscc_eswitch/ocelot_switch.c -- 2.25.1