Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16f54164 authored by Grygorii Strashko's avatar Grygorii Strashko Committed by David S. Miller
Browse files

net: ethernet: ti: cpsw: drop CONFIG_TI_CPSW_ALE config option 



All TI drivers CPSW/NETCP can't work without ALE, hence simplify
build of those drivers by always linking cpsw_ale and drop
CONFIG_TI_CPSW_ALE config option.

Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 99f62971

drivers/net/ethernet/ti/Kconfig

+0 −7
Original line number Diff line number Diff line
@@ -44,16 +44,10 @@ config TI_CPSW_PHY_SEL 
	  This driver supports configuring of the phy mode connected to

	  the CPSW. DEPRECATED: use PHY_TI_GMII_SEL.



config TI_CPSW_ALE

	tristate "TI CPSW ALE Support"

	---help---

	  This driver supports TI's CPSW ALE module.



config TI_CPSW

	tristate "TI CPSW Switch Support"

	depends on ARCH_DAVINCI || ARCH_OMAP2PLUS || COMPILE_TEST

	select TI_DAVINCI_MDIO

	select TI_CPSW_ALE

	select MFD_SYSCON

	select REGMAP

	---help---
@@ -82,7 +76,6 @@ config TI_CPTS_MOD 


config TI_KEYSTONE_NETCP

	tristate "TI Keystone NETCP Core Support"

	select TI_CPSW_ALE

	select TI_DAVINCI_MDIO

	depends on OF

	depends on KEYSTONE_NAVIGATOR_DMA && KEYSTONE_NAVIGATOR_QMSS

drivers/net/ethernet/ti/Makefile

+2 −3
Original line number Diff line number Diff line
@@ -12,12 +12,11 @@ obj-$(CONFIG_TI_DAVINCI_EMAC) += ti_davinci_emac.o 
ti_davinci_emac-y := davinci_emac.o davinci_cpdma.o

obj-$(CONFIG_TI_DAVINCI_MDIO) += davinci_mdio.o

obj-$(CONFIG_TI_CPSW_PHY_SEL) += cpsw-phy-sel.o

obj-$(CONFIG_TI_CPSW_ALE) += cpsw_ale.o

obj-$(CONFIG_TI_CPTS_MOD) += cpts.o

obj-$(CONFIG_TI_CPSW) += ti_cpsw.o

ti_cpsw-y := cpsw.o davinci_cpdma.o

ti_cpsw-y := cpsw.o davinci_cpdma.o cpsw_ale.o



obj-$(CONFIG_TI_KEYSTONE_NETCP) += keystone_netcp.o

keystone_netcp-y := netcp_core.o

keystone_netcp-y := netcp_core.o cpsw_ale.o

obj-$(CONFIG_TI_KEYSTONE_NETCP_ETHSS) += keystone_netcp_ethss.o

keystone_netcp_ethss-y := netcp_ethss.o netcp_sgmii.o netcp_xgbepcsr.o

drivers/net/ethernet/ti/cpsw_ale.c

+0 −18
Original line number Diff line number Diff line
@@ -289,7 +289,6 @@ int cpsw_ale_flush_multicast(struct cpsw_ale *ale, int port_mask, int vid) 
	}

	return 0;

}

EXPORT_SYMBOL_GPL(cpsw_ale_flush_multicast);



static inline void cpsw_ale_set_vlan_entry_type(u32 *ale_entry,

						int flags, u16 vid)
@@ -327,7 +326,6 @@ int cpsw_ale_add_ucast(struct cpsw_ale *ale, const u8 *addr, int port, 
	cpsw_ale_write(ale, idx, ale_entry);

	return 0;

}

EXPORT_SYMBOL_GPL(cpsw_ale_add_ucast);



int cpsw_ale_del_ucast(struct cpsw_ale *ale, const u8 *addr, int port,

		       int flags, u16 vid)
@@ -343,7 +341,6 @@ int cpsw_ale_del_ucast(struct cpsw_ale *ale, const u8 *addr, int port, 
	cpsw_ale_write(ale, idx, ale_entry);

	return 0;

}

EXPORT_SYMBOL_GPL(cpsw_ale_del_ucast);



int cpsw_ale_add_mcast(struct cpsw_ale *ale, const u8 *addr, int port_mask,

		       int flags, u16 vid, int mcast_state)
@@ -377,7 +374,6 @@ int cpsw_ale_add_mcast(struct cpsw_ale *ale, const u8 *addr, int port_mask, 
	cpsw_ale_write(ale, idx, ale_entry);

	return 0;

}

EXPORT_SYMBOL_GPL(cpsw_ale_add_mcast);



int cpsw_ale_del_mcast(struct cpsw_ale *ale, const u8 *addr, int port_mask,

		       int flags, u16 vid)
@@ -400,7 +396,6 @@ int cpsw_ale_del_mcast(struct cpsw_ale *ale, const u8 *addr, int port_mask, 
	cpsw_ale_write(ale, idx, ale_entry);

	return 0;

}

EXPORT_SYMBOL_GPL(cpsw_ale_del_mcast);



/* ALE NetCP NU switch specific vlan functions */

static void cpsw_ale_set_vlan_mcast(struct cpsw_ale *ale, u32 *ale_entry,
@@ -451,7 +446,6 @@ int cpsw_ale_add_vlan(struct cpsw_ale *ale, u16 vid, int port, int untag, 
	cpsw_ale_write(ale, idx, ale_entry);

	return 0;

}

EXPORT_SYMBOL_GPL(cpsw_ale_add_vlan);



int cpsw_ale_del_vlan(struct cpsw_ale *ale, u16 vid, int port_mask)

{
@@ -473,7 +467,6 @@ int cpsw_ale_del_vlan(struct cpsw_ale *ale, u16 vid, int port_mask) 
	cpsw_ale_write(ale, idx, ale_entry);

	return 0;

}

EXPORT_SYMBOL_GPL(cpsw_ale_del_vlan);



void cpsw_ale_set_allmulti(struct cpsw_ale *ale, int allmulti)

{
@@ -506,7 +499,6 @@ void cpsw_ale_set_allmulti(struct cpsw_ale *ale, int allmulti) 
		cpsw_ale_write(ale, idx, ale_entry);

	}

}

EXPORT_SYMBOL_GPL(cpsw_ale_set_allmulti);



struct ale_control_info {

	const char	*name;
@@ -732,7 +724,6 @@ int cpsw_ale_control_set(struct cpsw_ale *ale, int port, int control, 


	return 0;

}

EXPORT_SYMBOL_GPL(cpsw_ale_control_set);



int cpsw_ale_control_get(struct cpsw_ale *ale, int port, int control)

{
@@ -756,7 +747,6 @@ int cpsw_ale_control_get(struct cpsw_ale *ale, int port, int control) 
	tmp = readl_relaxed(ale->params.ale_regs + offset) >> shift;

	return tmp & BITMASK(info->bits);

}

EXPORT_SYMBOL_GPL(cpsw_ale_control_get);



static void cpsw_ale_timer(struct timer_list *t)

{
@@ -781,14 +771,12 @@ void cpsw_ale_start(struct cpsw_ale *ale) 
		add_timer(&ale->timer);

	}

}

EXPORT_SYMBOL_GPL(cpsw_ale_start);



void cpsw_ale_stop(struct cpsw_ale *ale)

{

	del_timer_sync(&ale->timer);

	cpsw_ale_control_set(ale, 0, ALE_ENABLE, 0);

}

EXPORT_SYMBOL_GPL(cpsw_ale_stop);



struct cpsw_ale *cpsw_ale_create(struct cpsw_ale_params *params)

{
@@ -872,7 +860,6 @@ struct cpsw_ale *cpsw_ale_create(struct cpsw_ale_params *params) 


	return ale;

}

EXPORT_SYMBOL_GPL(cpsw_ale_create);



void cpsw_ale_dump(struct cpsw_ale *ale, u32 *data)

{
@@ -883,8 +870,3 @@ void cpsw_ale_dump(struct cpsw_ale *ale, u32 *data) 
		data += ALE_ENTRY_WORDS;

	}

}
 
EXPORT_SYMBOL_GPL(cpsw_ale_dump);



MODULE_LICENSE("GPL v2");

MODULE_DESCRIPTION("TI CPSW ALE driver");

MODULE_AUTHOR("Texas Instruments");