From patchwork Tue Feb 5 12:01:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Raghavendra, Vignesh" X-Patchwork-Id: 1036683 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) header.from=ti.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ti.com header.i=@ti.com header.b="n7bxHD1K"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43v3GT2fRZz9sMx for ; Tue, 5 Feb 2019 23:06:57 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id E9947C21EBD; Tue, 5 Feb 2019 12:06:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 6031BC21EC5; Tue, 5 Feb 2019 12:01:44 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E22E2C21EAE; Tue, 5 Feb 2019 12:01:42 +0000 (UTC) Received: from fllv0015.ext.ti.com (fllv0015.ext.ti.com [198.47.19.141]) by lists.denx.de (Postfix) with ESMTPS id 1AB0CC21F06 for ; Tue, 5 Feb 2019 12:00:43 +0000 (UTC) Received: from fllv0035.itg.ti.com ([10.64.41.0]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id x15C0gcu110901; Tue, 5 Feb 2019 06:00:42 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1549368042; bh=nJLXSK/oaAqIZFiBEN9k9lmRH2itTeQjwJzthT2Xdpg=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=n7bxHD1KUu6jNLbzxTDPp/wQDRxSd2B6eUtzqYbtTpzUxQTwDt/SuSNxacglV69oq TuaDWVONccLxI4iQY/mm9/HoH6kfTP5V8ztTFBXI+F8NaKn87tXRaACMn1JYuCaVsH 0anltbD7POKpEnpYfj+fptpxCPOxHbH4gqb0dPyA= Received: from DLEE105.ent.ti.com (dlee105.ent.ti.com [157.170.170.35]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x15C0gvG077956 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 5 Feb 2019 06:00:42 -0600 Received: from DLEE104.ent.ti.com (157.170.170.34) by DLEE105.ent.ti.com (157.170.170.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1591.10; Tue, 5 Feb 2019 06:00:42 -0600 Received: from dlep33.itg.ti.com (157.170.170.75) by DLEE104.ent.ti.com (157.170.170.34) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1591.10 via Frontend Transport; Tue, 5 Feb 2019 06:00:41 -0600 Received: from a0132425.india.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id x15C0Uif011117; Tue, 5 Feb 2019 06:00:40 -0600 From: Vignesh R To: Tom Rini Date: Tue, 5 Feb 2019 17:31:25 +0530 Message-ID: <20190205120127.13901-6-vigneshr@ti.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190205120127.13901-1-vigneshr@ti.com> References: <20190205120127.13901-1-vigneshr@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH v4 5/7] soc: keystone: Merge into ti specific directory X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Merge drivers/soc/keystone/ into drivers/soc/ti/ and convert CONFIG_TI_KEYSTONE_SERDES into Kconfig. Signed-off-by: Vignesh R Reviewed-by: Tom Rini --- arch/arm/mach-keystone/Kconfig | 8 ++++++++ drivers/soc/Makefile | 1 - drivers/soc/keystone/Makefile | 3 --- drivers/soc/ti/Kconfig | 6 ++++++ drivers/soc/ti/Makefile | 5 ++--- drivers/soc/{keystone => ti}/keystone_serdes.c | 0 include/configs/ti_armv7_keystone2.h | 3 --- scripts/config_whitelist.txt | 1 - 8 files changed, 16 insertions(+), 11 deletions(-) delete mode 100644 drivers/soc/keystone/Makefile rename drivers/soc/{keystone => ti}/keystone_serdes.c (100%) diff --git a/arch/arm/mach-keystone/Kconfig b/arch/arm/mach-keystone/Kconfig index d24596eccb0d..e06eba5aea1f 100644 --- a/arch/arm/mach-keystone/Kconfig +++ b/arch/arm/mach-keystone/Kconfig @@ -9,18 +9,24 @@ config TARGET_K2HK_EVM select SPL_BOARD_INIT if SPL select CMD_DDR3 imply DM_I2C + imply SOC_TI + imply TI_KEYSTONE_SERDES config TARGET_K2E_EVM bool "TI Keystone 2 Edison EVM" select SPL_BOARD_INIT if SPL select CMD_DDR3 imply DM_I2C + imply SOC_TI + imply TI_KEYSTONE_SERDES config TARGET_K2L_EVM bool "TI Keystone 2 Lamar EVM" select SPL_BOARD_INIT if SPL select CMD_DDR3 imply DM_I2C + imply SOC_TI + imply TI_KEYSTONE_SERDES config TARGET_K2G_EVM bool "TI Keystone 2 Galileo EVM" @@ -29,6 +35,8 @@ config TARGET_K2G_EVM select TI_I2C_BOARD_DETECT select CMD_DDR3 imply DM_I2C + imply SOC_TI + imply TI_KEYSTONE_SERDES endchoice diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile index 8b7ead546e1c..ce253b7aa886 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 dfebb143e09b..000000000000 --- 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 8c0f3c07b23f..e4f88344487e 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 63e21aaad40f..4ec04ee1257e 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 similarity index 100% rename from drivers/soc/keystone/keystone_serdes.c rename to drivers/soc/ti/keystone_serdes.c diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index 0c7d66486832..6d8536a815f8 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -134,9 +134,6 @@ #define CONFIG_KSNET_SERDES_SGMII2_BASE KS2_SGMII_SERDES2_BASE #define CONFIG_KSNET_SERDES_LANES_PER_SGMII KS2_LANES_PER_SGMII_SERDES -/* SerDes */ -#define CONFIG_TI_KEYSTONE_SERDES - #define CONFIG_AEMIF_CNTRL_BASE KS2_AEMIF_CNTRL_BASE /* I2C Configuration */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index b425cc360fe1..294d5238b414 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4419,7 +4419,6 @@ CONFIG_THOR_RESET_OFF CONFIG_THUNDERX CONFIG_TIMESTAMP CONFIG_TIZEN -CONFIG_TI_KEYSTONE_SERDES CONFIG_TI_KSNAV CONFIG_TI_SPI_MMAP CONFIG_TMU_TIMER