Merge branch 'prima2/pinctrl' into next/pinctrl

* prima2/pinctrl:
  ARM: prima2: enable gpiolib unconditionally