Merge "add PN54x chip selection"
am: 8c3bbf44cb

* commit '8c3bbf44cbb767b12d79e7402dc8178bd5db07c7':
  add PN54x chip selection