This reverts commit 321f86e1.

The original bug has been fixed.
Signed-off-by: NSimon Glass <sjg@chromium.org>
Tested-on: Zedboard and ZC706 board
Tested-by: NMasahiro Yamada <yamada.masahiro@socionext.com>
Tested-on: zc702
Tested-by: NMichal Simek <michal.simek@xilinx.com>