Commit 82e527df authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-marvell-freescale-compile-test' 



Florian Fainelli says:

====================
net: Enable COMPILE_TEST for Marvell & Freescale drivers

This patch series allows building the Freescale and Marvell Ethernet network
drivers with COMPILE_TEST.

Changes in v4:

- add proper HAS_DMA to fix build errors on m32r
- provide an inline stub for mvebu_mbus_get_dram_win_info
- added an additional patch to fix build errors with mv88e6xxx on m32r

Changes in v3:

- reorder patches to avoid introducing a build warning between commits

Changes in v2:

- rename register define clash when building for i386 (spotted by LKP)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5a4e4c8f 0717b876

drivers/net/dsa/mv88e6xxx/Kconfig

+1 −0
Original line number Diff line number Diff line 
config NET_DSA_MV88E6XXX

	tristate "Marvell 88E6xxx Ethernet switch fabric support"

	depends on NET_DSA

	select IRQ_DOMAIN

	select NET_DSA_TAG_EDSA

	select NET_DSA_TAG_DSA

	help

drivers/net/ethernet/freescale/Kconfig

+3 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ config NET_VENDOR_FREESCALE 
	depends on FSL_SOC || QUICC_ENGINE || CPM1 || CPM2 || PPC_MPC512x || \

		   M523x || M527x || M5272 || M528x || M520x || M532x || \

		   ARCH_MXC || ARCH_MXS || (PPC_MPC52xx && PPC_BESTCOMM) || \

		   ARCH_LAYERSCAPE

		   ARCH_LAYERSCAPE || COMPILE_TEST

	---help---

	  If you have a network (Ethernet) card belonging to this class, say Y.
@@ -65,6 +65,7 @@ config FSL_PQ_MDIO 
config FSL_XGMAC_MDIO

	tristate "Freescale XGMAC MDIO"

	select PHYLIB

	depends on OF

	select OF_MDIO

	---help---

	  This driver supports the MDIO bus on the Fman 10G Ethernet MACs, and
@@ -85,6 +86,7 @@ config UGETH_TX_ON_DEMAND 


config GIANFAR

	tristate "Gianfar Ethernet"

	depends on HAS_DMA

	select FSL_PQ_MDIO

	select PHYLIB

	select CRC32

drivers/net/ethernet/freescale/gianfar_ptp.c

+2 −2
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ struct gianfar_ptp_registers { 
/* Bit definitions for the TMR_CTRL register */

#define ALM1P                 (1<<31) /* Alarm1 output polarity */

#define ALM2P                 (1<<30) /* Alarm2 output polarity */

#define FS                    (1<<28) /* FIPER start indication */

#define FIPERST               (1<<28) /* FIPER start indication */

#define PP1L                  (1<<27) /* Fiper1 pulse loopback mode enabled. */

#define PP2L                  (1<<26) /* Fiper2 pulse loopback mode enabled. */

#define TCLK_PERIOD_SHIFT     (16) /* 1588 timer reference clock period. */
@@ -502,7 +502,7 @@ static int gianfar_ptp_probe(struct platform_device *dev) 
	gfar_write(&etsects->regs->tmr_fiper1, etsects->tmr_fiper1);

	gfar_write(&etsects->regs->tmr_fiper2, etsects->tmr_fiper2);

	set_alarm(etsects);

	gfar_write(&etsects->regs->tmr_ctrl,   tmr_ctrl|FS|RTPE|TE|FRD);

	gfar_write(&etsects->regs->tmr_ctrl,   tmr_ctrl|FIPERST|RTPE|TE|FRD);



	spin_unlock_irqrestore(&etsects->lock, flags);

drivers/net/ethernet/marvell/Kconfig

+7 −4
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
config NET_VENDOR_MARVELL

	bool "Marvell devices"

	default y

	depends on PCI || CPU_PXA168 || MV64X60 || PPC32 || PLAT_ORION || INET

	depends on PCI || CPU_PXA168 || MV64X60 || PPC32 || PLAT_ORION || INET || COMPILE_TEST

	---help---

	  If you have a network (Ethernet) card belonging to this class, say Y.
@@ -18,7 +18,8 @@ if NET_VENDOR_MARVELL 


config MV643XX_ETH

	tristate "Marvell Discovery (643XX) and Orion ethernet support"

	depends on (MV64X60 || PPC32 || PLAT_ORION) && INET

	depends on (MV64X60 || PPC32 || PLAT_ORION || COMPILE_TEST) && INET

	depends on HAS_DMA

	select PHYLIB

	select MVMDIO

	---help---
@@ -55,7 +56,8 @@ config MVNETA_BM_ENABLE 


config MVNETA

	tristate "Marvell Armada 370/38x/XP network interface support"

	depends on PLAT_ORION

	depends on PLAT_ORION || COMPILE_TEST

	depends on HAS_DMA

	select MVMDIO

	select FIXED_PHY

	---help---
@@ -77,7 +79,8 @@ config MVNETA_BM 


config MVPP2

	tristate "Marvell Armada 375 network interface support"

	depends on MACH_ARMADA_375

	depends on MACH_ARMADA_375 || COMPILE_TEST

	depends on HAS_DMA

	select MVMDIO

	---help---

	  This driver supports the network interface units in the

include/linux/mbus.h

+8 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ static inline int mvebu_mbus_get_io_win_info(phys_addr_t phyaddr, u32 *size, 
}

#endif



#ifdef CONFIG_MVEBU_MBUS

int mvebu_mbus_save_cpu_target(u32 __iomem *store_addr);

void mvebu_mbus_get_pcie_mem_aperture(struct resource *res);

void mvebu_mbus_get_pcie_io_aperture(struct resource *res);
@@ -97,5 +98,12 @@ int mvebu_mbus_init(const char *soc, phys_addr_t mbus_phys_base, 
		    size_t mbus_size, phys_addr_t sdram_phys_base,

		    size_t sdram_size);

int mvebu_mbus_dt_init(bool is_coherent);

#else

static inline int mvebu_mbus_get_dram_win_info(phys_addr_t phyaddr, u8 *target,

					       u8 *attr)

{

	return -EINVAL;

}

#endif /* CONFIG_MVEBU_MBUS */



#endif /* __LINUX_MBUS_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE