diff options
| author | Vignesh R <vigneshr@ti.com> | 2019-02-05 17:31:25 +0530 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-04-11 20:07:12 -0400 |
| commit | 91dba55ca6ae0ae22702852f9a73748eb1e21cf9 (patch) | |
| tree | 364110f8892efeeafafcfed52db6d4feb5230386 /drivers/soc | |
| parent | ffcc66e8fec52d9c8d909f21c627c80596582dca (diff) | |
soc: keystone: Merge into ti specific directory
Merge drivers/soc/keystone/ into drivers/soc/ti/
and convert CONFIG_TI_KEYSTONE_SERDES into Kconfig.
Signed-off-by: Vignesh R <vigneshr@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/Makefile | 1 | ||||
| -rw-r--r-- | drivers/soc/keystone/Makefile | 3 | ||||
| -rw-r--r-- | drivers/soc/ti/Kconfig | 6 | ||||
| -rw-r--r-- | drivers/soc/ti/Makefile | 5 | ||||
| -rw-r--r-- | drivers/soc/ti/keystone_serdes.c (renamed from drivers/soc/keystone/keystone_serdes.c) | 0 |
5 files changed, 8 insertions, 7 deletions
diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile index 8b7ead546e..ce253b7aa8 100644 --- a/drivers/soc/Makefile +++ b/drivers/soc/Makefile @@ -2,5 +2,4 @@ # # Makefile for the U-Boot SOC specific device drivers. -obj-$(CONFIG_ARCH_KEYSTONE) += keystone/ obj-$(CONFIG_SOC_TI) += ti/ diff --git a/drivers/soc/keystone/Makefile b/drivers/soc/keystone/Makefile deleted file mode 100644 index dfebb143e0..0000000000 --- a/drivers/soc/keystone/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ - -obj-$(CONFIG_TI_KEYSTONE_SERDES) += keystone_serdes.o diff --git a/drivers/soc/ti/Kconfig b/drivers/soc/ti/Kconfig index 8c0f3c07b2..e4f8834448 100644 --- a/drivers/soc/ti/Kconfig +++ b/drivers/soc/ti/Kconfig @@ -16,5 +16,11 @@ config TI_K3_NAVSS_RINGACC and a consumer. There is one RINGACC module per NAVSS on TI AM65x SoCs If unsure, say N. +config TI_KEYSTONE_SERDES + bool "Keystone SerDes driver for ethernet" + depends on ARCH_KEYSTONE + help + SerDes driver for Keystone SoC used for ethernet support on TI + K2 platforms. endif # SOC_TI diff --git a/drivers/soc/ti/Makefile b/drivers/soc/ti/Makefile index 63e21aaad4..4ec04ee125 100644 --- a/drivers/soc/ti/Makefile +++ b/drivers/soc/ti/Makefile @@ -1,5 +1,4 @@ # SPDX-License-Identifier: GPL-2.0+ -# -# TI K3 SOC drivers -# + obj-$(CONFIG_TI_K3_NAVSS_RINGACC) += k3-navss-ringacc.o +obj-$(CONFIG_TI_KEYSTONE_SERDES) += keystone_serdes.o diff --git a/drivers/soc/keystone/keystone_serdes.c b/drivers/soc/ti/keystone_serdes.c index 7907e6f977..7907e6f977 100644 --- a/drivers/soc/keystone/keystone_serdes.c +++ b/drivers/soc/ti/keystone_serdes.c |