Merge changes from topic "rockchip-uart-fixes" into integration