Merge branch 'pci/host/rockchip'