From: David S. Miller Date: Thu, 22 Sep 2016 06:20:16 +0000 (-0400) Subject: Merge branch 'mv88e6390-prep' X-Git-Tag: v4.9-rc1~127^2~107 X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=0f1100c13a4870b6d8dd0bf87b1e25036acb1849 Merge branch 'mv88e6390-prep' Andrew Lunn says: ==================== Preparation for mv88e6390 These two patches are a couple of preparation steps for supporting the the MV88E6390 family of chips. This is a new generation from Marvell, and will need more feature flags than are currently available in an unsigned long. Expand to an unsigned long long. The MV88E6390 also places its port registers somewhere else, so add a wrapper around port register access. v2: Rework wrappers to use mv88e6xxx_{read|write} Simpliy some (err < ) to (err) Add Reviewed by tag. v3:: reg = reg & foo -> reg &= foo Fix over zealous s/ret/err ==================== Signed-off-by: David S. Miller --- 0f1100c13a4870b6d8dd0bf87b1e25036acb1849