diff options
| author | Olof Johansson <olof@lixom.net> | 2018-05-25 05:17:14 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-05-25 05:17:14 -0700 |
| commit | 4594586981ebbb3f4b86eab66c8e70fbd7e3f8ad (patch) | |
| tree | cc388cc80bc7050899a1f815dd8b0858235ab364 /arch/arm64/configs | |
| parent | 25537b86ca77d36d6ef8d3090a4c3f7273cbb301 (diff) | |
| parent | 3eb0a48af488b5e83d2986943a1b6905ca753571 (diff) | |
| download | lwn-4594586981ebbb3f4b86eab66c8e70fbd7e3f8ad.tar.gz lwn-4594586981ebbb3f4b86eab66c8e70fbd7e3f8ad.zip | |
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: 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 178dc02b9620..0565ae5c1b6a 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -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 |