]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
net: stmmac: socfpga: add additional ocp reset line for Stratix10
authorDinh Nguyen <dinguyen@kernel.org>
Tue, 19 Jun 2018 15:35:38 +0000 (10:35 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 24 Aug 2018 11:06:45 +0000 (13:06 +0200)
commitdd76b88049f9a18acdc36f858d85fa544e0d492c
tree61122d7fb0b13466287f3473fa3260d6e137cc12
parent3438b1147bd5f354138a32ee281b45010ec9fb42
net: stmmac: socfpga: add additional ocp reset line for Stratix10

[ Upstream commit bc8a2d9bcbf1ca548b1deb315d14e1da81945bea ]

The Stratix10 platform has an additional reset line, OCP(Open Core Protocol),
that also needs to get deasserted for the stmmac ethernet controller to work.
Thus we need to update the Kconfig to include ARCH_STRATIX10 in order to build
dwmac-socfpga.

Also, remove the redundant check for the reset controller pointer. The
reset driver already checks for the pointer and returns 0 if the pointer
is NULL.

Signed-off-by: Dinh Nguyen <dinguyen@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/ethernet/stmicro/stmmac/Kconfig
drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c