diff options
| author | Abhimanyu Kapur <abhimany@codeaurora.org> | 2016-02-24 00:55:37 -0800 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-22 11:16:35 -0700 |
| commit | f6f00f860d8310495f809450800067ee67cdbabc (patch) | |
| tree | 2db709f600f9fddef295a62abe55a3c8beab938e /arch | |
| parent | 5d8ee90e7f7e576b877813535d08a4123bedc49e (diff) | |
defconfig: arm64: disable SPI on msmcortex configs
Disable SPI on msmcortex debug and perf configs
since it fails to compile.
Change-Id: Ia9e4077428a0760f1428b81597503e92402bad2a
Signed-off-by: Abhimanyu Kapur <abhimany@codeaurora.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/configs/msmcortex-perf_defconfig | 12 | ||||
| -rw-r--r-- | arch/arm64/configs/msmcortex_defconfig | 12 |
2 files changed, 8 insertions, 16 deletions
diff --git a/arch/arm64/configs/msmcortex-perf_defconfig b/arch/arm64/configs/msmcortex-perf_defconfig index 8cac1619ab9c..721508802d16 100644 --- a/arch/arm64/configs/msmcortex-perf_defconfig +++ b/arch/arm64/configs/msmcortex-perf_defconfig @@ -95,22 +95,19 @@ CONFIG_VIRTIO_CONSOLE=y # CONFIG_HW_RANDOM is not set CONFIG_I2C=y CONFIG_I2C_QUP=y -CONFIG_SPI=y -CONFIG_SPI_PL022=y -CONFIG_SPI_QUP=y CONFIG_SPMI=y CONFIG_PINCTRL_MSMCOBALT=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y CONFIG_GPIO_QPNP_PIN=y -CONFIG_SMB1351_USB_CHARGER=y -CONFIG_SMB135X_CHARGER=y -CONFIG_QPNP_SMBCHARGER=y CONFIG_POWER_RESET_QCOM=y CONFIG_QCOM_DLOAD_MODE=y CONFIG_POWER_RESET_XGENE=y CONFIG_POWER_RESET_SYSCON=y CONFIG_MSM_APM=y +CONFIG_QPNP_SMBCHARGER=y +CONFIG_SMB135X_CHARGER=y +CONFIG_SMB1351_USB_CHARGER=y # CONFIG_HWMON is not set CONFIG_MFD_SPMI_PMIC=y CONFIG_REGULATOR=y @@ -141,7 +138,6 @@ CONFIG_MMC=y CONFIG_MMC_ARMMMCI=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y -CONFIG_MMC_SPI=y CONFIG_MMC_DW=y CONFIG_MMC_DW_EXYNOS=y CONFIG_NEW_LEDS=y @@ -165,11 +161,11 @@ CONFIG_ION=y CONFIG_ION_MSM=y CONFIG_QPNP_REVID=y CONFIG_QPNP_COINCELL=y -CONFIG_QPNP_HAPTIC=y CONFIG_GPIO_USB_DETECT=y CONFIG_REMOTE_SPINLOCK_MSM=y CONFIG_ARM_SMMU=y CONFIG_MSM_SMEM=y +CONFIG_QPNP_HAPTIC=y CONFIG_MSM_SMD=y CONFIG_MSM_GLINK=y CONFIG_MSM_GLINK_LOOPBACK_SERVER=y diff --git a/arch/arm64/configs/msmcortex_defconfig b/arch/arm64/configs/msmcortex_defconfig index 8aa7a092255d..309a8d526876 100644 --- a/arch/arm64/configs/msmcortex_defconfig +++ b/arch/arm64/configs/msmcortex_defconfig @@ -105,22 +105,19 @@ CONFIG_VIRTIO_CONSOLE=y # CONFIG_HW_RANDOM is not set CONFIG_I2C=y CONFIG_I2C_QUP=y -CONFIG_SPI=y -CONFIG_SPI_PL022=y -CONFIG_SPI_QUP=y CONFIG_SPMI=y CONFIG_PINCTRL_MSMCOBALT=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y CONFIG_GPIO_QPNP_PIN=y -CONFIG_SMB1351_USB_CHARGER=y -CONFIG_SMB135X_CHARGER=y -CONFIG_QPNP_SMBCHARGER=y CONFIG_POWER_RESET_QCOM=y CONFIG_QCOM_DLOAD_MODE=y CONFIG_POWER_RESET_XGENE=y CONFIG_POWER_RESET_SYSCON=y CONFIG_MSM_APM=y +CONFIG_QPNP_SMBCHARGER=y +CONFIG_SMB135X_CHARGER=y +CONFIG_SMB1351_USB_CHARGER=y # CONFIG_HWMON is not set CONFIG_MFD_SPMI_PMIC=y CONFIG_REGULATOR=y @@ -151,7 +148,6 @@ CONFIG_MMC=y CONFIG_MMC_ARMMMCI=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y -CONFIG_MMC_SPI=y CONFIG_MMC_DW=y CONFIG_MMC_DW_EXYNOS=y CONFIG_NEW_LEDS=y @@ -181,11 +177,11 @@ CONFIG_ION=y CONFIG_ION_MSM=y CONFIG_QPNP_REVID=y CONFIG_QPNP_COINCELL=y -CONFIG_QPNP_HAPTIC=y CONFIG_GPIO_USB_DETECT=y CONFIG_REMOTE_SPINLOCK_MSM=y CONFIG_ARM_SMMU=y CONFIG_MSM_SMEM=y +CONFIG_QPNP_HAPTIC=y CONFIG_MSM_SMD=y CONFIG_MSM_GLINK=y CONFIG_MSM_GLINK_LOOPBACK_SERVER=y |