diff options
| author | Olof Johansson <olof@lixom.net> | 2016-07-04 21:32:49 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-07-04 21:32:49 -0700 |
| commit | e124174e4ce6269fdf6b579ef1ab253454d28877 (patch) | |
| tree | e4eb92a9bd3ad9c8d8d085b166e627178a713911 /arch/arm64/configs | |
| parent | f88cbd2ef9071a0131c5396ac8e2f7f09d57be5f (diff) | |
| parent | 2a0e527c7ed60f9c85233bfe69a9023798c1d428 (diff) | |
| download | op-kernel-dev-e124174e4ce6269fdf6b579ef1ab253454d28877.zip op-kernel-dev-e124174e4ce6269fdf6b579ef1ab253454d28877.tar.gz | |
Merge tag 'juno-defconfig-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into next/arm64
ARMv8 Juno/Vexpress defconfig updates for v4.8
1. Enable support for SCPI based sensors(temperature, voltage,
current and power)
2. Enable the Generic on-chip SRAM driver. SRAM is used for SCPI based
communication with SCP on Juno
* tag 'juno-defconfig-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
arm64: defconfig: enable SENSORS_ARM_SCPI
arm64: defconfig: enable Generic on-chip SRAM driver
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm64/configs')
| -rw-r--r-- | arch/arm64/configs/defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index bfa006e..e8a99ee 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -102,6 +102,7 @@ CONFIG_MTD_M25P80=y CONFIG_MTD_SPI_NOR=y CONFIG_BLK_DEV_LOOP=y CONFIG_VIRTIO_BLK=y +CONFIG_SRAM=y # CONFIG_SCSI_PROC_FS is not set CONFIG_BLK_DEV_SD=y # CONFIG_SCSI_LOWLEVEL is not set @@ -201,6 +202,7 @@ CONFIG_POWER_RESET_XGENE=y CONFIG_POWER_RESET_SYSCON=y CONFIG_SENSORS_LM90=m CONFIG_SENSORS_INA2XX=m +CONFIG_SENSORS_ARM_SCPI=y CONFIG_THERMAL=y CONFIG_THERMAL_EMULATION=y CONFIG_EXYNOS_THERMAL=y |
