After someone tested real hardware, the patch needs tweaks to match the 3.0 ISA
behaviour. It won't change much from our perspective but may as well keep the
patch in sync.
(From OE-Core rev: 5a698a53bc0b8d5f518916b6a03d31db1272707a)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>