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

Unverified Commit 036d0823 authored Dec 04, 2018 by Aaro Koskinen Committed by Paul Burton Dec 04, 2018

MIPS: OCTEON: cvmx_gmxx_inf_mode: use oldest forward compatible definition



Use oldest forward compatible definition.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Paul Burton <paul.burton@mips.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: linux-mips@vger.kernel.org

parent 2bb17713

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -218,7 +218,7 @@ static cvmx_helper_interface_mode_t __cvmx_get_mode_octeon2(int interface)
		mode.u64 = cvmx_read_csr(CVMX_GMXX_INF_MODE(interface));

		if (OCTEON_IS_MODEL(OCTEON_CN63XX)) {
		switch (mode.cn63xx.mode) {
		switch (mode.cn61xx.mode) {
		case 0:
		return CVMX_HELPER_INTERFACE_MODE_SGMII;
		case 1:
		@@ -342,7 +342,7 @@ cvmx_helper_interface_mode_t cvmx_helper_interface_get_mode(int interface)
		mode.u64 = cvmx_read_csr(CVMX_GMXX_INF_MODE(interface));

		if (OCTEON_IS_MODEL(OCTEON_CN56XX) \|\| OCTEON_IS_MODEL(OCTEON_CN52XX)) {
		switch (mode.cn56xx.mode) {
		switch (mode.cn52xx.mode) {
		case 0:
		return CVMX_HELPER_INTERFACE_MODE_DISABLED;
		case 1:

arch/mips/cavium-octeon/executive/cvmx-interrupt-rsl.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -84,7 +84,7 @@ void __cvmx_interrupt_gmxx_enable(int interface)

		if (OCTEON_IS_MODEL(OCTEON_CN56XX) \|\| OCTEON_IS_MODEL(OCTEON_CN52XX)) {
		if (mode.s.en) {
		switch (mode.cn56xx.mode) {
		switch (mode.cn52xx.mode) {
		case 1: /* XAUI */
		num_ports = 1;
		break;