diff options
| author | Olof Johansson <olof@lixom.net> | 2019-11-03 16:53:37 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-11-03 16:53:38 -0800 |
| commit | 4454c069f1e484a89b9e55642e6a19ce9c265af3 (patch) | |
| tree | 5276bc17ee331af66baf9aa5188dcfcd51e73e43 /arch/arm/configs | |
| parent | 3760828a8b489e23c6320f017d0e86d38a8d33cc (diff) | |
| parent | cfc0e76bbbde6875e026c18ea72f181e5d00d93f (diff) | |
Merge branch 'for_5.5/keystone-dts' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into arm/dt
* 'for_5.5/keystone-dts' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
ARM: configs: keystone: enable cpts
ARM: dts: k2l-netcp: add cpts refclk_mux node
ARM: dts: k2hk-netcp: add cpts refclk_mux node
ARM: dts: k2e-netcp: add cpts refclk_mux node
ARM: dts: k2e-clocks: add input ext. fixed clocks tsipclka/b
ARM: dts: keystone-clocks: add input fixed clocks
Link: https://lore.kernel.org/r/1572372856-20598-2-git-send-email-santosh.shilimkar@oracle.com
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/keystone_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/keystone_defconfig b/arch/arm/configs/keystone_defconfig index 3d5f5b501330..6a9f47d7f072 100644 --- a/arch/arm/configs/keystone_defconfig +++ b/arch/arm/configs/keystone_defconfig @@ -135,6 +135,7 @@ CONFIG_BLK_DEV_SD=y CONFIG_NETDEVICES=y CONFIG_TI_KEYSTONE_NETCP=y CONFIG_TI_KEYSTONE_NETCP_ETHSS=y +CONFIG_TI_CPTS=y CONFIG_MARVELL_PHY=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y |