From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 10 May 2016 15:46:15 +0000 (+0200)
Subject: Merge tag 'mvebu-defconfig64-4.7-1' of git://git.infradead.org/linux-mvebu into next... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=da4a95d23beea1c3d1d131480f681b0b276e207e;p=linux-beck.git

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

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
---

da4a95d23beea1c3d1d131480f681b0b276e207e
diff --cc arch/arm64/configs/defconfig
index 220396f8e559,ed3b2e9aefca..84bf86f17079
--- a/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