Commit 538e2de1 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-Allow-more-drivers-with-COMPILE_TEST' 



Florian Fainelli says:

====================
net: Allow more drivers with COMPILE_TEST

This patch series includes more drivers to be build tested with COMPILE_TEST
enabled. This helps cover some of the issues I just ran into with missing
a driver *sigh*.

Chanves in v3:

- drop the TI Keystone NETCP driver from the COMPILE_TEST additions

Changes in v2:

- allow FEC to build outside of CONFIG_ARM/ARM64 by defining a layout of
  registers, this is not meant to run, so this is not a real issue if we
  are not matching the correct register layout
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 33fa3823 3c0596f8

drivers/net/ethernet/freescale/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ if NET_VENDOR_FREESCALE 
config FEC

	tristate "FEC ethernet controller (of ColdFire and some i.MX CPUs)"

	depends on (M523x || M527x || M5272 || M528x || M520x || M532x || \

		   ARCH_MXC || SOC_IMX28)

		   ARCH_MXC || SOC_IMX28 || COMPILE_TEST)

	default ARCH_MXC || SOC_IMX28 if ARM

	select PHYLIB

	imply PTP_1588_CLOCK

drivers/net/ethernet/freescale/fec.h

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 


#if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) || \

    defined(CONFIG_M520x) || defined(CONFIG_M532x) || defined(CONFIG_ARM) || \

    defined(CONFIG_ARM64)

    defined(CONFIG_ARM64) || defined(CONFIG_COMPILE_TEST)

/*

 *	Just figures, Motorola would have to change the offsets for

 *	registers in the same peripheral device on different models

drivers/net/ethernet/freescale/fec_main.c

+1 −1
Original line number Diff line number Diff line
@@ -2107,7 +2107,7 @@ static int fec_enet_get_regs_len(struct net_device *ndev) 
/* List of registers that can be safety be read to dump them with ethtool */

#if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) || \

	defined(CONFIG_M520x) || defined(CONFIG_M532x) || defined(CONFIG_ARM) || \

	defined(CONFIG_ARM64)

	defined(CONFIG_ARM64) || defined(CONFIG_COMPILE_TEST)

static u32 fec_enet_register_offset[] = {

	FEC_IEVENT, FEC_IMASK, FEC_R_DES_ACTIVE_0, FEC_X_DES_ACTIVE_0,

	FEC_ECNTRL, FEC_MII_DATA, FEC_MII_SPEED, FEC_MIB_CTRLSTAT, FEC_R_CNTRL,

drivers/net/ethernet/ti/Kconfig

+5 −5
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ if NET_VENDOR_TI 


config TI_DAVINCI_EMAC

	tristate "TI DaVinci EMAC Support"

	depends on ARM && ( ARCH_DAVINCI || ARCH_OMAP3 )

	depends on ARM && ( ARCH_DAVINCI || ARCH_OMAP3 ) || COMPILE_TEST

	select TI_DAVINCI_MDIO

	select TI_DAVINCI_CPDMA

	select PHYLIB
@@ -30,7 +30,7 @@ config TI_DAVINCI_EMAC 


config TI_DAVINCI_MDIO

	tristate "TI DaVinci MDIO Support"

	depends on ARCH_DAVINCI || ARCH_OMAP2PLUS || ARCH_KEYSTONE

	depends on ARCH_DAVINCI || ARCH_OMAP2PLUS || ARCH_KEYSTONE || COMPILE_TEST

	select PHYLIB

	---help---

	  This driver supports TI's DaVinci MDIO module.
@@ -40,7 +40,7 @@ config TI_DAVINCI_MDIO 


config TI_DAVINCI_CPDMA

	tristate "TI DaVinci CPDMA Support"

	depends on ARCH_DAVINCI || ARCH_OMAP2PLUS

	depends on ARCH_DAVINCI || ARCH_OMAP2PLUS || COMPILE_TEST

	---help---

	  This driver supports TI's DaVinci CPDMA dma engine.
@@ -60,7 +60,7 @@ config TI_CPSW_ALE 


config TI_CPSW

	tristate "TI CPSW Switch Support"

	depends on ARCH_DAVINCI || ARCH_OMAP2PLUS

	depends on ARCH_DAVINCI || ARCH_OMAP2PLUS || COMPILE_TEST

	select TI_DAVINCI_CPDMA

	select TI_DAVINCI_MDIO

	select TI_CPSW_PHY_SEL
@@ -75,7 +75,7 @@ config TI_CPSW 


config TI_CPTS

	bool "TI Common Platform Time Sync (CPTS) Support"

	depends on TI_CPSW || TI_KEYSTONE_NETCP

	depends on TI_CPSW || TI_KEYSTONE_NETCP || COMPILE_TEST

	depends on POSIX_TIMERS

	---help---

	  This driver supports the Common Platform Time Sync unit of

drivers/net/phy/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ config MDIO_I2C 


config MDIO_MOXART

	tristate "MOXA ART MDIO interface support"

	depends on ARCH_MOXART

	depends on ARCH_MOXART || COMPILE_TEST

	help

	  This driver supports the MDIO interface found in the network

	  interface units of the MOXA ART SoC
@@ -142,7 +142,7 @@ config MDIO_OCTEON 


config MDIO_SUN4I

	tristate "Allwinner sun4i MDIO interface support"

	depends on ARCH_SUNXI

	depends on ARCH_SUNXI || COMPILE_TEST

	help

	  This driver supports the MDIO interface found in the network

	  interface units of the Allwinner SoC that have an EMAC (A10,

CRA Git | Maintained and supported by SUSTech CRA and CCSE