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

Unverified Commit 6aa08988 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Paul Burton
Browse files

MIPS: OCTEON: delete SMI/MDIO enable 



SMI/MDIO enable is handled by the OCTEON MDIO driver, so we can delete
the duplicated functionality from the platform code.

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarPaul Burton <paul.burton@mips.com>
Cc: linux-mips@vger.kernel.org
parent a0f0b69f

arch/mips/cavium-octeon/executive/cvmx-helper.c

+0 −20
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ 
#include <asm/octeon/cvmx-helper-board.h>



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

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

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



/* Port count per interface */
@@ -1026,7 +1025,6 @@ int cvmx_helper_initialize_packet_io_global(void) 
	int result = 0;

	int interface;

	union cvmx_l2c_cfg l2c_cfg;

	union cvmx_smix_en smix_en;

	const int num_interfaces = cvmx_helper_get_number_of_interfaces();



	/*
@@ -1046,24 +1044,6 @@ int cvmx_helper_initialize_packet_io_global(void) 
	l2c_cfg.s.rfb_arb_mode = 0;

	cvmx_write_csr(CVMX_L2C_CFG, l2c_cfg.u64);



	/* Make sure SMI/MDIO is enabled so we can query PHYs */

	smix_en.u64 = cvmx_read_csr(CVMX_SMIX_EN(0));

	if (!smix_en.s.en) {

		smix_en.s.en = 1;

		cvmx_write_csr(CVMX_SMIX_EN(0), smix_en.u64);

	}



	/* Newer chips actually have two SMI/MDIO interfaces */

	if (!OCTEON_IS_MODEL(OCTEON_CN3XXX) &&

	    !OCTEON_IS_MODEL(OCTEON_CN58XX) &&

	    !OCTEON_IS_MODEL(OCTEON_CN50XX)) {

		smix_en.u64 = cvmx_read_csr(CVMX_SMIX_EN(1));

		if (!smix_en.s.en) {

			smix_en.s.en = 1;

			cvmx_write_csr(CVMX_SMIX_EN(1), smix_en.u64);

		}

	}



	cvmx_pko_initialize_global();

	for (interface = 0; interface < num_interfaces; interface++) {

		result |= cvmx_helper_interface_probe(interface);