OSDN Git Service

Revert "net/ibm/emac: wrong bit is used for STA control"
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 7 Dec 2018 04:05:04 +0000 (15:05 +1100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 17 Dec 2018 08:24:28 +0000 (09:24 +0100)
commitf5c9c30da73017edf3ec45fce06beb4469bc6b39
treea4b350169529e7598a749cbccc46f35c3bc5b672
parent7fafda16bb64c134658ffde0ac9332d23ba26fd0
Revert "net/ibm/emac: wrong bit is used for STA control"

[ Upstream commit 5b3279e2cba2238b37f6c18adfdea8bddb32715a ]

This reverts commit 624ca9c33c8a853a4a589836e310d776620f4ab9.

This commit is completely bogus. The STACR register has two formats, old
and new, depending on the version of the IP block used. There's a pair of
device-tree properties that can be used to specify the format used:

has-inverted-stacr-oc
has-new-stacr-staopc

What this commit did was to change the bit definition used with the old
parts to match the new parts. This of course breaks the driver on all
the old ones.

Instead, the author should have set the appropriate properties in the
device-tree for the variant used on his board.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/ethernet/ibm/emac/emac.h