A new branch derived from format-1 is going to be rolled out. Since
current format-2 still needs some adjustments, it's not really used
by driver yet. So, revert it and then reuse format-2 for new branch
derived from format-1.
Signed-off-by: Zong-Zhe Yang <kevin_yang@realtek.com> Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>