Merge tag 'mvebu-defconfig64-4.7-1' of git://git.infradead.org/linux-mvebu into next...

Merge "mvebu defconfig for arm64 for 4.7" from Gregory CLEMENT:

- update arm64 defconfig with options useful for Armada 7K/8K support

* tag 'mvebu-defconfig64-4.7-1' of git://git.infradead.org/linux-mvebu:
  arm64: configs: add options useful for Armada 7K/8K support

diff --cc arch/arm64/configs/defconfig
index 220396f8e55995e72267dcf8d14e62b2a22dada0,ed3b2e9aefca9b43505752f9013462cdb8a08068..84bf86f1707973c367fc3474bc196c290e46c523
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -176,11 -154,10 +179,12 @@@ CONFIG_I2C_TEGRA=
  CONFIG_I2C_UNIPHIER_F=y
  CONFIG_I2C_RCAR=y
  CONFIG_SPI=y
+ CONFIG_SPI_ORION=y
  CONFIG_SPI_PL022=y
  CONFIG_SPI_QUP=y
 +CONFIG_SPI_SPIDEV=m
  CONFIG_SPMI=y
 +CONFIG_PINCTRL_SINGLE=y
  CONFIG_PINCTRL_MSM8916=y
  CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
  CONFIG_GPIO_SYSFS=y