ARM: ux500: move GPIO217/218 config to device tree

This moves the input-pulled-up setting for GPIO217 as used
on the HREFs prior to v60 from the boardfile to the device
tree. GPIO218 is only used with the TVK UIB so move it to
that .dtsi file.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --cc arch/arm/boot/dts/ste-href-tvk1281618.dtsi
Simple merge

diff --cc arch/arm/boot/dts/ste-hrefprev60.dtsi
Simple merge

diff --cc arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi
Simple merge

diff --cc arch/arm/mach-ux500/board-mop500-pins.c
Simple merge