merge with zc2501-taiwan

Signed-off-by: Fuang.Cao <cavan.cfa@gmail.com>