Merge tag 'v5.11-berlin-dts64' of...

Merge tag 'v5.11-berlin-dts64' of git://git.kernel.org/pub/scm/linux/kernel/git/jszhang/linux-berlin into arm/dt

v5.11-berlin-dts64

* tag 'v5.11-berlin-dts64' of git://git.kernel.org/pub/scm/linux/kernel/git/jszhang/linux-berlin:
  arm64: dts: synaptics: Use generic "ngpios" rather than "snps,nr-gpios"

Link: https://lore.kernel.org/r/20201211100235.2b0b795b@xhacker.debian


Signed-off-by: Arnd Bergmann <arnd@arndb.de>