diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index 44ae1254..04116edf 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -2,3 +2,4 @@ # Copyright (c) 2022, NVIDIA CORPORATION. All rights reserved. obj-m += nvidia/ +obj-m += marvell/ diff --git a/drivers/net/ethernet/marvell/Makefile b/drivers/net/ethernet/marvell/Makefile new file mode 100644 index 00000000..68e8d7db --- /dev/null +++ b/drivers/net/ethernet/marvell/Makefile @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Makefile for the Marvell device drivers. +# + +obj-m += oak/ diff --git a/drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/m b/drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/m deleted file mode 100755 index 13466ac8..00000000 --- a/drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/m +++ /dev/null @@ -1,9 +0,0 @@ - - -KDIR=/lib/modules/5.4.2/build - -CONFIG_OAK_DEBUG=y -export CONFIG_OAK_DEBUG - -make -C $KDIR M=`pwd` modules - diff --git a/drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/Makefile b/drivers/net/ethernet/marvell/oak/Makefile similarity index 93% rename from drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/Makefile rename to drivers/net/ethernet/marvell/oak/Makefile index 3b094c74..1a253a36 100644 --- a/drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/Makefile +++ b/drivers/net/ethernet/marvell/oak/Makefile @@ -23,10 +23,6 @@ EXTRA_CFLAGS += -DKERNEL -Werror oak_pci-objs := oak.o oak_net.o oak_irq.o oak_ethtool.o oak_unimac.o oak_debug.o oak_chksum.o oak_dpm.o -ifeq ($(CONFIG_OAK_DEBUG),y) -EXTRA_CFLAGS += -DDEBUG -DSIMULATION -DUNIMAC_MQ_RR -endif - all: make W=1 -C /lib/modules/`uname -r`/build M=`pwd` modules diff --git a/drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/README b/drivers/net/ethernet/marvell/oak/README similarity index 100% rename from drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/README rename to drivers/net/ethernet/marvell/oak/README diff --git a/drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/Readme b/drivers/net/ethernet/marvell/oak/Readme similarity index 100% rename from drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/Readme rename to drivers/net/ethernet/marvell/oak/Readme diff --git a/drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/ldg_t.h b/drivers/net/ethernet/marvell/oak/ldg_t.h similarity index 100% rename from drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/ldg_t.h rename to drivers/net/ethernet/marvell/oak/ldg_t.h diff --git a/drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/license.txt b/drivers/net/ethernet/marvell/oak/license.txt similarity index 100% rename from drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/license.txt rename to drivers/net/ethernet/marvell/oak/license.txt diff --git a/drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak.c b/drivers/net/ethernet/marvell/oak/oak.c similarity index 100% rename from drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak.c rename to drivers/net/ethernet/marvell/oak/oak.c diff --git a/drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak.h b/drivers/net/ethernet/marvell/oak/oak.h similarity index 100% rename from drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak.h rename to drivers/net/ethernet/marvell/oak/oak.h diff --git a/drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_channel_stat.c b/drivers/net/ethernet/marvell/oak/oak_channel_stat.c similarity index 100% rename from drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_channel_stat.c rename to drivers/net/ethernet/marvell/oak/oak_channel_stat.c diff --git a/drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_channel_stat.h b/drivers/net/ethernet/marvell/oak/oak_channel_stat.h similarity index 100% rename from drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_channel_stat.h rename to drivers/net/ethernet/marvell/oak/oak_channel_stat.h diff --git a/drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_chksum.c b/drivers/net/ethernet/marvell/oak/oak_chksum.c similarity index 100% rename from drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_chksum.c rename to drivers/net/ethernet/marvell/oak/oak_chksum.c diff --git a/drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_chksum.h b/drivers/net/ethernet/marvell/oak/oak_chksum.h similarity index 100% rename from drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_chksum.h rename to drivers/net/ethernet/marvell/oak/oak_chksum.h diff --git a/drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_debug.c b/drivers/net/ethernet/marvell/oak/oak_debug.c similarity index 100% rename from drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_debug.c rename to drivers/net/ethernet/marvell/oak/oak_debug.c diff --git a/drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_debug.h b/drivers/net/ethernet/marvell/oak/oak_debug.h similarity index 100% rename from drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_debug.h rename to drivers/net/ethernet/marvell/oak/oak_debug.h diff --git a/drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_dpm.c b/drivers/net/ethernet/marvell/oak/oak_dpm.c similarity index 100% rename from drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_dpm.c rename to drivers/net/ethernet/marvell/oak/oak_dpm.c diff --git a/drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_dpm.h b/drivers/net/ethernet/marvell/oak/oak_dpm.h similarity index 100% rename from drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_dpm.h rename to drivers/net/ethernet/marvell/oak/oak_dpm.h diff --git a/drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_ethtool.c b/drivers/net/ethernet/marvell/oak/oak_ethtool.c similarity index 100% rename from drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_ethtool.c rename to drivers/net/ethernet/marvell/oak/oak_ethtool.c diff --git a/drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_ethtool.h b/drivers/net/ethernet/marvell/oak/oak_ethtool.h similarity index 100% rename from drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_ethtool.h rename to drivers/net/ethernet/marvell/oak/oak_ethtool.h diff --git a/drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_gicu.h b/drivers/net/ethernet/marvell/oak/oak_gicu.h similarity index 100% rename from drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_gicu.h rename to drivers/net/ethernet/marvell/oak/oak_gicu.h diff --git a/drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_ioc_flow.h b/drivers/net/ethernet/marvell/oak/oak_ioc_flow.h similarity index 100% rename from drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_ioc_flow.h rename to drivers/net/ethernet/marvell/oak/oak_ioc_flow.h diff --git a/drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_ioc_lgen.h b/drivers/net/ethernet/marvell/oak/oak_ioc_lgen.h similarity index 100% rename from drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_ioc_lgen.h rename to drivers/net/ethernet/marvell/oak/oak_ioc_lgen.h diff --git a/drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_ioc_reg.h b/drivers/net/ethernet/marvell/oak/oak_ioc_reg.h similarity index 100% rename from drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_ioc_reg.h rename to drivers/net/ethernet/marvell/oak/oak_ioc_reg.h diff --git a/drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_ioc_set.h b/drivers/net/ethernet/marvell/oak/oak_ioc_set.h similarity index 100% rename from drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_ioc_set.h rename to drivers/net/ethernet/marvell/oak/oak_ioc_set.h diff --git a/drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_ioc_stat.h b/drivers/net/ethernet/marvell/oak/oak_ioc_stat.h similarity index 100% rename from drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_ioc_stat.h rename to drivers/net/ethernet/marvell/oak/oak_ioc_stat.h diff --git a/drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_irq.c b/drivers/net/ethernet/marvell/oak/oak_irq.c similarity index 100% rename from drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_irq.c rename to drivers/net/ethernet/marvell/oak/oak_irq.c diff --git a/drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_irq.h b/drivers/net/ethernet/marvell/oak/oak_irq.h similarity index 100% rename from drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_irq.h rename to drivers/net/ethernet/marvell/oak/oak_irq.h diff --git a/drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_module.h b/drivers/net/ethernet/marvell/oak/oak_module.h similarity index 100% rename from drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_module.h rename to drivers/net/ethernet/marvell/oak/oak_module.h diff --git a/drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_net.c b/drivers/net/ethernet/marvell/oak/oak_net.c similarity index 100% rename from drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_net.c rename to drivers/net/ethernet/marvell/oak/oak_net.c diff --git a/drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_net.h b/drivers/net/ethernet/marvell/oak/oak_net.h similarity index 100% rename from drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_net.h rename to drivers/net/ethernet/marvell/oak/oak_net.h diff --git a/drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_unimac.c b/drivers/net/ethernet/marvell/oak/oak_unimac.c similarity index 100% rename from drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_unimac.c rename to drivers/net/ethernet/marvell/oak/oak_unimac.c diff --git a/drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_unimac.h b/drivers/net/ethernet/marvell/oak/oak_unimac.h similarity index 100% rename from drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_unimac.h rename to drivers/net/ethernet/marvell/oak/oak_unimac.h diff --git a/drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_unimac_desc.c b/drivers/net/ethernet/marvell/oak/oak_unimac_desc.c similarity index 100% rename from drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_unimac_desc.c rename to drivers/net/ethernet/marvell/oak/oak_unimac_desc.c diff --git a/drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_unimac_desc.h b/drivers/net/ethernet/marvell/oak/oak_unimac_desc.h similarity index 100% rename from drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_unimac_desc.h rename to drivers/net/ethernet/marvell/oak/oak_unimac_desc.h diff --git a/drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_unimac_stat.h b/drivers/net/ethernet/marvell/oak/oak_unimac_stat.h similarity index 100% rename from drivers/net/ethernet/marvell/mvae_lin5_gpl_v3.01.0001/oak_unimac_stat.h rename to drivers/net/ethernet/marvell/oak/oak_unimac_stat.h