pinctrl: bcm2835: Fix some merge fallout