ARM: at91/PMC: use at91_usb_rate() for UTMI PLL

We are using this function, now that we have introduced
the support for UTMI clock for computing the USB host rate.

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Tested-by: Bo Shen <voice.shen@atmel.com>
Merge tag 'omap-pm-v3.11/fixes/omap5-voltdm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into next/soc

From Kevin Hilman:

OMAP5: PM: fix boot by removing unneeded dummy voltage domain data

* tag 'omap-pm-v3.11/fixes/omap5-voltdm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm:
  ARM: OMAP5: voltagedomain data: remove temporary OMAP4 voltage data

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dt

From Nicolas Ferre:

- more SPI DT activation for rm9200
- SPI DMA for at91sam9n12/sama5d3
And one little fix for SPI compatibility string

* tag 'at91-dt' of git://github.com/at91linux/linux-at91:
  ARM: at91: dt: rm9200ek: add spi support
  ARM: at91: dt: rm9200: add spi support
  ARM: at91/DT: at91sam9n12: add SPI DMA client infos
  ARM: at91/DT: sama5d3: add SPI DMA client infos
  ARM: at91/DT: fix SPI compatibility string

Conflicts:
	arch/arm/boot/dts/sama5d3.dtsi

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
spi/s3c64xx: Rely on the compiler eliminating the OF ID table

This should work with modern compilers, isn't that much of an issue if
it goes wrong and it ensures that the DT-only hardware variants don't
leave unreferenced parameters structures lying around.

Signed-off-by: Mark Brown <broonie@linaro.org>
Merge remote-tracking branch 'spi/fix/pxa' into spi-linus
Merge remote-tracking branch 'spi/fix/s3c64xx' into spi-linus
Merge remote-tracking branch 'spi/fix/xilinx' into spi-linus
Merge remote-tracking branch 'spi/topic/atmel' into spi-next
Merge remote-tracking branch 'spi/topic/bcm2835' into spi-next
Merge remote-tracking branch 'spi/topic/bpw' into spi-next
Merge remote-tracking branch 'spi/topic/coldfire-qspi' into spi-next
Merge remote-tracking branch 'spi/topic/core' into spi-next
Merge remote-tracking branch 'spi/topic/ep93xx' into spi-next
Merge remote-tracking branch 'spi/topic/fsl' into spi-next
Merge remote-tracking branch 'spi/topic/imx' into spi-next
Merge remote-tracking branch 'spi/topic/mpc512x' into spi-next
Merge remote-tracking branch 'spi/topic/mxs' into spi-next
Merge remote-tracking branch 'spi/topic/nuc900' into spi-next
Merge remote-tracking branch 'spi/topic/omap' into spi-next
Merge remote-tracking branch 'spi/topic/pdata' into spi-next