Merge "add PN54x chip selection"