diff options
| author | Olof Johansson <olof@lixom.net> | 2015-01-27 16:15:44 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-01-27 16:15:44 -0800 |
| commit | 2f5b93c24a14880f211bd7f963c67d3d0accf977 (patch) | |
| tree | 202f0e7be0bbf16ca3e85ea0bced64b6b32f334a /arch/arm64/configs | |
| parent | b288ca404761e65b1a5efab13719a16cee3a3032 (diff) | |
| parent | 4727a6f631bf3ab2a0373acd27d40483446fcb8a (diff) | |
| download | talos-obmc-linux-2f5b93c24a14880f211bd7f963c67d3d0accf977.tar.gz talos-obmc-linux-2f5b93c24a14880f211bd7f963c67d3d0accf977.zip | |
Merge tag 'v3.20-next-arm64' of https://github.com/mbgg/linux-mediatek into next/arm64
Merge "ARM: mediatek: arm64 changes for v3.20" from Matthias Brugger:
Add support for mt8173 SoC from Mediatek.
- add DT bindings documentation
- add dts files for SoC and evaluation board
- add to Kconfig and defconfig
* tag 'v3.20-next-arm64' of https://github.com/mbgg/linux-mediatek:
arm64: mediatek: Add MT8173 SoC Kconfig and defconfig
arm64: dts: Add mediatek MT8173 SoC and evaluation board dts and Makefile
Document: DT: Add bindings for mediatek MT8173 SoC Platform
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 24c23341a181..d6a53e8fa8db 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -32,6 +32,7 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_BLK_DEV_BSG is not set # CONFIG_IOSCHED_DEADLINE is not set CONFIG_ARCH_FSL_LS2085A=y +CONFIG_ARCH_MEDIATEK=y CONFIG_ARCH_THUNDER=y CONFIG_ARCH_VEXPRESS=y CONFIG_ARCH_XGENE=y @@ -87,6 +88,7 @@ CONFIG_SERIO_AMBAKMI=y CONFIG_LEGACY_PTY_COUNT=16 CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_MT6577=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_SERIAL_OF_PLATFORM=y |
