Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45945869 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

mvebu arm64 for 4.18 (part 1)

Adding thermal for Armada 7K/8K and SPI for Armada 3700

* tag 'mvebu-arm64-4.18-1' of git://git.infradead.org/linux-mvebu

:
  arm64: defconfig: enable the Armada thermal driver
  arm64: defconfig: enable CONFIG_SPI_ARMADA_3700

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 25537b86 3eb0a48a

arch/arm64/configs/defconfig

+2 −0
Original line number Diff line number Diff line
@@ -313,6 +313,7 @@ CONFIG_I2C_UNIPHIER_F=y 
CONFIG_I2C_RCAR=y

CONFIG_I2C_CROS_EC_TUNNEL=y

CONFIG_SPI=y

CONFIG_SPI_ARMADA_3700=y

CONFIG_SPI_MESON_SPICC=m

CONFIG_SPI_MESON_SPIFC=m

CONFIG_SPI_BCM2835=m
@@ -356,6 +357,7 @@ CONFIG_SENSORS_INA2XX=m 
CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y

CONFIG_CPU_THERMAL=y

CONFIG_THERMAL_EMULATION=y

CONFIG_ARMADA_THERMAL=y

CONFIG_BRCMSTB_THERMAL=m

CONFIG_EXYNOS_THERMAL=y

CONFIG_RCAR_GEN3_THERMAL=y