Merge branch 'pci/controller/kirin'