summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorGrygorii Strashko <grygorii.strashko@ti.com>2018-10-31 16:21:39 -0500
committerJoe Hershberger <joe.hershberger@ni.com>2018-11-05 10:41:59 -0600
commitffad5fa0cdc55c47bc023e9e0fe55e27b7317ea4 (patch)
tree4ff90e9453cd3eed2b820c3267c7ddc471446449 /drivers/net
parent05bbd676a7579545bc9c0b7ec590793bd33d2024 (diff)
driver: net: consolidate ti's code in separate folder
Add drivers/net/ti/ folder and move all TI's code in this folder for better maintenance. Reviewed-by: Tom Rini <trini@konsulko.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com> Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/Kconfig12
-rw-r--r--drivers/net/Makefile4
-rw-r--r--drivers/net/ti/Kconfig15
-rw-r--r--drivers/net/ti/Makefile7
-rw-r--r--drivers/net/ti/cpsw-common.c (renamed from drivers/net/cpsw-common.c)0
-rw-r--r--drivers/net/ti/cpsw.c (renamed from drivers/net/cpsw.c)0
-rw-r--r--drivers/net/ti/davinci_emac.c (renamed from drivers/net/davinci_emac.c)0
-rw-r--r--drivers/net/ti/davinci_emac.h (renamed from drivers/net/davinci_emac.h)0
-rw-r--r--drivers/net/ti/keystone_net.c (renamed from drivers/net/keystone_net.c)0
9 files changed, 24 insertions, 14 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index fd1c48049a9..8fb365fc5d2 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -11,13 +11,6 @@ config DM_ETH
This is currently implemented in net/eth-uclass.c
Look in include/net.h for details.
-config DRIVER_TI_CPSW
- bool "TI Common Platform Ethernet Switch"
- select PHYLIB
- help
- This driver supports the TI three port switch gigabit ethernet
- subsystem found in the TI SoCs.
-
menuconfig NETDEVICES
bool "Network device support"
depends on NET
@@ -355,10 +348,7 @@ config SH_ETHER
help
This driver supports the Ethernet for Renesas SH and ARM SoCs.
-config DRIVER_TI_EMAC
- bool "TI Davinci EMAC"
- help
- Support for davinci emac
+source "drivers/net/ti/Kconfig"
config XILINX_AXIEMAC
depends on DM_ETH && (MICROBLAZE || ARCH_ZYNQ || ARCH_ZYNQMP)
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index cc0971c614f..99056aa041d 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -30,7 +30,6 @@ obj-$(CONFIG_FTGMAC100) += ftgmac100.o
obj-$(CONFIG_FTMAC110) += ftmac110.o
obj-$(CONFIG_FTMAC100) += ftmac100.o
obj-$(CONFIG_GMAC_ROCKCHIP) += gmac_rockchip.o
-obj-$(CONFIG_DRIVER_TI_KEYSTONE_NET) += keystone_net.o
obj-$(CONFIG_KS8851_MLL) += ks8851_mll.o
obj-$(CONFIG_LAN91C96) += lan91c96.o
obj-$(CONFIG_LPC32XX_ETH) += lpc32xx_eth.o
@@ -57,9 +56,7 @@ obj-$(CONFIG_SH_ETHER) += sh_eth.o
obj-$(CONFIG_RENESAS_RAVB) += ravb.o
obj-$(CONFIG_SMC91111) += smc91111.o
obj-$(CONFIG_SMC911X) += smc911x.o
-obj-$(CONFIG_DRIVER_TI_EMAC) += davinci_emac.o
obj-$(CONFIG_TSEC_ENET) += tsec.o fsl_mdio.o
-obj-$(CONFIG_DRIVER_TI_CPSW) += cpsw.o cpsw-common.o
obj-$(CONFIG_FMAN_ENET) += fsl_mdio.o
obj-$(CONFIG_ULI526X) += uli526x.o
obj-$(CONFIG_VSC7385_ENET) += vsc7385.o
@@ -74,3 +71,4 @@ obj-$(CONFIG_PIC32_ETH) += pic32_mdio.o pic32_eth.o
obj-$(CONFIG_DWC_ETH_QOS) += dwc_eth_qos.o
obj-$(CONFIG_FSL_PFE) += pfe_eth/
obj-$(CONFIG_SNI_AVE) += sni_ave.o
+obj-y += ti/
diff --git a/drivers/net/ti/Kconfig b/drivers/net/ti/Kconfig
new file mode 100644
index 00000000000..35a6b5d499d
--- /dev/null
+++ b/drivers/net/ti/Kconfig
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: GPL-2.0+
+#
+# Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/
+
+config DRIVER_TI_CPSW
+ bool "TI Common Platform Ethernet Switch"
+ select PHYLIB
+ help
+ This driver supports the TI three port switch gigabit ethernet
+ subsystem found in the TI SoCs.
+
+config DRIVER_TI_EMAC
+ bool "TI Davinci EMAC"
+ help
+ Support for davinci emac
diff --git a/drivers/net/ti/Makefile b/drivers/net/ti/Makefile
new file mode 100644
index 00000000000..4ab4a27498e
--- /dev/null
+++ b/drivers/net/ti/Makefile
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
+#
+# Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/
+
+obj-$(CONFIG_DRIVER_TI_CPSW) += cpsw.o cpsw-common.o
+obj-$(CONFIG_DRIVER_TI_EMAC) += davinci_emac.o
+obj-$(CONFIG_DRIVER_TI_KEYSTONE_NET) += keystone_net.o
diff --git a/drivers/net/cpsw-common.c b/drivers/net/ti/cpsw-common.c
index 6c8ddbd9361..6c8ddbd9361 100644
--- a/drivers/net/cpsw-common.c
+++ b/drivers/net/ti/cpsw-common.c
diff --git a/drivers/net/cpsw.c b/drivers/net/ti/cpsw.c
index 8e2a48cfd67..8e2a48cfd67 100644
--- a/drivers/net/cpsw.c
+++ b/drivers/net/ti/cpsw.c
diff --git a/drivers/net/davinci_emac.c b/drivers/net/ti/davinci_emac.c
index bb879d8d4fe..bb879d8d4fe 100644
--- a/drivers/net/davinci_emac.c
+++ b/drivers/net/ti/davinci_emac.c
diff --git a/drivers/net/davinci_emac.h b/drivers/net/ti/davinci_emac.h
index 695855b4d54..695855b4d54 100644
--- a/drivers/net/davinci_emac.h
+++ b/drivers/net/ti/davinci_emac.h
diff --git a/drivers/net/keystone_net.c b/drivers/net/ti/keystone_net.c
index d4d909b983f..d4d909b983f 100644
--- a/drivers/net/keystone_net.c
+++ b/drivers/net/ti/keystone_net.c