Merge pull request #918 from rockchip-linux/rk3328