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

Commit af866496 authored by David Daney's avatar David Daney Committed by Ralf Baechle
Browse files

MIPS: Octeon: Move some Ethernet support files out of staging. 



Signed-off-by: default avatarDavid Daney <david.daney@cavium.com>
Cc: linux-mips@linux-mips.org
Cc: netdev@vger.kernel.org
Cc: devel@driverdev.osuosl.org
Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Patchwork: https://patchwork.linux-mips.org/patch/2942/
Patchwork: https://patchwork.linux-mips.org/patch/3012/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 751c9f68

arch/mips/cavium-octeon/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -86,10 +86,6 @@ config ARCH_SPARSEMEM_ENABLE 
	def_bool y

	select SPARSEMEM_STATIC



config CAVIUM_OCTEON_HELPER

	def_bool y

	depends on OCTEON_ETHERNET || PCI



config IOMMU_HELPER

	bool

arch/mips/cavium-octeon/executive/Makefile

+6 −1
Original line number Diff line number Diff line
@@ -10,5 +10,10 @@ 
#



obj-y += cvmx-bootmem.o cvmx-l2c.o cvmx-sysinfo.o octeon-model.o

obj-y += cvmx-pko.o cvmx-spi.o cvmx-cmd-queue.o \

	cvmx-helper-board.o cvmx-helper.o cvmx-helper-xaui.o \

	cvmx-helper-rgmii.o cvmx-helper-sgmii.o cvmx-helper-npi.o \

	cvmx-helper-loop.o cvmx-helper-spi.o cvmx-helper-util.o \

	cvmx-interrupt-decodes.o cvmx-interrupt-rsl.o



obj-$(CONFIG_CAVIUM_OCTEON_HELPER) += cvmx-helper-errata.o cvmx-helper-jtag.o
 
obj-y += cvmx-helper-errata.o cvmx-helper-jtag.o

drivers/staging/octeon/cvmx-cmd-queue.c→arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c

+4 −4
Original line number Diff line number Diff line
@@ -34,13 +34,13 @@ 


#include <asm/octeon/octeon.h>



#include "cvmx-config.h"

#include "cvmx-fpa.h"

#include "cvmx-cmd-queue.h"

#include <asm/octeon/cvmx-config.h>

#include <asm/octeon/cvmx-fpa.h>

#include <asm/octeon/cvmx-cmd-queue.h>



#include <asm/octeon/cvmx-npei-defs.h>

#include <asm/octeon/cvmx-pexp-defs.h>

#include "cvmx-pko-defs.h"

#include <asm/octeon/cvmx-pko-defs.h>



/**

 * This application uses this pointer to access the global queue

drivers/staging/octeon/cvmx-helper-board.c→arch/mips/cavium-octeon/executive/cvmx-helper-board.c

+7 −11
Original line number Diff line number Diff line
@@ -34,16 +34,16 @@ 
#include <asm/octeon/octeon.h>

#include <asm/octeon/cvmx-bootinfo.h>



#include "cvmx-config.h"

#include <asm/octeon/cvmx-config.h>



#include "cvmx-mdio.h"

#include <asm/octeon/cvmx-mdio.h>



#include "cvmx-helper.h"

#include "cvmx-helper-util.h"

#include "cvmx-helper-board.h"

#include <asm/octeon/cvmx-helper.h>

#include <asm/octeon/cvmx-helper-util.h>

#include <asm/octeon/cvmx-helper-board.h>



#include "cvmx-gmxx-defs.h"

#include "cvmx-asxx-defs.h"

#include <asm/octeon/cvmx-gmxx-defs.h>

#include <asm/octeon/cvmx-asxx-defs.h>



/**

 * cvmx_override_board_link_get(int ipd_port) is a function
@@ -493,7 +493,6 @@ int cvmx_helper_board_link_set_phy(int phy_addr, 
		cvmx_mdio_phy_reg_control_t reg_control;

		cvmx_mdio_phy_reg_status_t reg_status;

		cvmx_mdio_phy_reg_autoneg_adver_t reg_autoneg_adver;

		cvmx_mdio_phy_reg_extended_status_t reg_extended_status;

		cvmx_mdio_phy_reg_control_1000_t reg_control_1000;



		reg_status.u16 =
@@ -508,9 +507,6 @@ int cvmx_helper_board_link_set_phy(int phy_addr, 
		reg_autoneg_adver.s.advert_100base_tx_full = 0;

		reg_autoneg_adver.s.advert_100base_tx_half = 0;

		if (reg_status.s.capable_extended_status) {

			reg_extended_status.u16 =

			    cvmx_mdio_read(phy_addr >> 8, phy_addr & 0xff,

					   CVMX_MDIO_PHY_REG_EXTENDED_STATUS);

			reg_control_1000.u16 =

			    cvmx_mdio_read(phy_addr >> 8, phy_addr & 0xff,

					   CVMX_MDIO_PHY_REG_CONTROL_1000);