Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

MIPS: Octeon: Update OCTEON_FEATURE_PCIE for Octeon III

Currently the driver tries to probe the pci driver and oops.

Add CN7XXX to case so that driver probes the pcie driver.

Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
Cc: david.daney@cavium.com
Cc: matt.redfearn@imgtec.com
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/12530/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

authored by

Zubair Lutfullah Kakakhel and committed by
Ralf Baechle
b96d6a80 aaa0bf22

+2 -1
+2 -1
arch/mips/include/asm/octeon/octeon-feature.h
··· 128 128 case OCTEON_FEATURE_PCIE: 129 129 return OCTEON_IS_MODEL(OCTEON_CN56XX) 130 130 || OCTEON_IS_MODEL(OCTEON_CN52XX) 131 - || OCTEON_IS_MODEL(OCTEON_CN6XXX); 131 + || OCTEON_IS_MODEL(OCTEON_CN6XXX) 132 + || OCTEON_IS_MODEL(OCTEON_CN7XXX); 132 133 133 134 case OCTEON_FEATURE_SRIO: 134 135 return OCTEON_IS_MODEL(OCTEON_CN63XX)