From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: None (no SPF record) identity=mailfrom; client-ip=2a00:1450:4010:c07::241; helo=mail-lf0-x241.google.com; envelope-from=mw@semihalf.com; receiver=edk2-devel@lists.01.org Received: from mail-lf0-x241.google.com (mail-lf0-x241.google.com [IPv6:2a00:1450:4010:c07::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 310AE21B02840 for ; Thu, 7 Dec 2017 11:16:26 -0800 (PST) Received: by mail-lf0-x241.google.com with SMTP id j124so9396181lfg.2 for ; Thu, 07 Dec 2017 11:20:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=M8WSWbjUdGc0s3gAINmGoJollcdCORlAth4c7zILL7E=; b=s/ZYXLbsm+YYuSkZrwCCWIht1iFw2Oqqv3n8HFqa/o3rNY2enYLbtqfttbyhvj6rEh tidJVmGTgPc3wJewwkGS0z3+EHLOm3knfZh2L50ZGMrFZnALv/vtLLZuc21U4XwcuzQq 5UVMe3faprIByRTyp32+ADtazz2NeqZ/ojIuquGFCtO3miFprZMVus2ez+7A+ViLVDRi aWaBzCR24mfCD8DBz2W0+INy+IoB0pOogcEUNVabsaEGfyKEsog/nrdrgDE35IkfthYe dJR6+dyTYuOPjJV6gUtVketZ15ynUG5nDqS0YSraHs+GIKkNKkRUV/cxcprgz5tV0lZC 3dpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=M8WSWbjUdGc0s3gAINmGoJollcdCORlAth4c7zILL7E=; b=oZY4AXzq1jWOfGwTORlpOnKK2qtoFlkaYz4AFJP9nDXxz+RyW5zmChDAHzKvO8WxQZ Z2H96o0yLvJxiIN+Gv8PNC88f3QQIIZvu3Lt9yP0Vyg483n4w/EBd78sE5UzGm6sDj8U WWbiaKcBg2A0XncoCe6FUoOGGI3+rV4ZYyM2CLbqY/5eIbxLXgS2Kjn7tDotM3omcepX dKTNc4BcmhilUz9+mhQXRAztO9/51b6MnjWHahyT1E8K0t4PJU809GjO5W2mBH0dM0j7 PXX4kEdB2iO66KDi+P+uAmcOSsy09T4JQtiUgZ/12fP+CazAQ7owVoXJglzWfIfrI66e UNIA== X-Gm-Message-State: AJaThX6ruBSSAZS+5im387r7n5bNywTaCETlxvwTjkaO0nD7MEp72PDB 00ypJzGlqVHAOvmN91NCdZY1jorpWeg= X-Google-Smtp-Source: AGs4zMY8Xh0l552qk7spnhxe3qonYUIkPoUlt1TtpFXZmqN2YUQhefr9UFsr1ZKQ/zlKw7NpG4poEw== X-Received: by 10.46.86.149 with SMTP id k21mr15399936lje.105.1512674457668; Thu, 07 Dec 2017 11:20:57 -0800 (PST) Received: from gilgamesh.semihalf.com (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id b84sm1164363ljf.60.2017.12.07.11.20.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Dec 2017 11:20:56 -0800 (PST) From: Marcin Wojtas To: edk2-devel@lists.01.org Cc: leif.lindholm@linaro.org, ard.biesheuvel@linaro.org, nadavh@marvell.com, neta@marvell.com, kostap@marvell.com, jinghua@marvell.com, mw@semihalf.com, jsd@semihalf.com, ka@semihalf.com Date: Thu, 7 Dec 2017 20:20:33 +0100 Message-Id: <1512674434-32326-5-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1512674434-32326-1-git-send-email-mw@semihalf.com> References: <1512674434-32326-1-git-send-email-mw@semihalf.com> Subject: [platforms: PATCH v2 4/5] Marvell/Drivers: Rename SPI master driver X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Dec 2017 19:16:26 -0000 Hitherto driver name was very generic. In order to be ready for adding new SPI master drivers, use the controller's traditional name (it's called SPI Orion in Linux and U-Boot) for files and the entry point. Additionally, move the files to new 'Controllers' directory, which is paralel to existing 'Devices' and 'Variables', so that to make the separation more clear. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Marcin Wojtas --- Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf | 2 +- Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 2 +- Silicon/Marvell/Drivers/Spi/{MvSpiDxe.c => Controllers/MvSpiOrionDxe.c} | 4 ++-- Silicon/Marvell/Drivers/Spi/{MvSpiDxe.h => Controllers/MvSpiOrionDxe.h} | 0 Silicon/Marvell/Drivers/Spi/{MvSpiDxe.inf => Controllers/MvSpiOrionDxe.inf} | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) rename Silicon/Marvell/Drivers/Spi/{MvSpiDxe.c => Controllers/MvSpiOrionDxe.c} (95%) rename Silicon/Marvell/Drivers/Spi/{MvSpiDxe.h => Controllers/MvSpiOrionDxe.h} (100%) rename Silicon/Marvell/Drivers/Spi/{MvSpiDxe.inf => Controllers/MvSpiOrionDxe.inf} (92%) diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf b/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf index 3b0646e..6d57b9a 100644 --- a/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf +++ b/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf @@ -110,7 +110,7 @@ FvNameGuid = 5eda4200-2c5f-43cb-9da3-0baf74b1b30c INF Silicon/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.inf INF MdeModulePkg/Bus/I2c/I2cDxe/I2cDxe.inf INF Silicon/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.inf - INF Silicon/Marvell/Drivers/Spi/MvSpiDxe.inf + INF Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.inf INF Silicon/Marvell/Drivers/Spi/Devices/MvSpiFlash.inf INF Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.inf diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc index 7d87766..0eb3ef3 100644 --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc @@ -411,7 +411,7 @@ Silicon/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.inf MdeModulePkg/Bus/I2c/I2cDxe/I2cDxe.inf Silicon/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.inf - Silicon/Marvell/Drivers/Spi/MvSpiDxe.inf + Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.inf Silicon/Marvell/Drivers/Spi/Devices/MvSpiFlash.inf Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.inf diff --git a/Silicon/Marvell/Drivers/Spi/MvSpiDxe.c b/Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.c similarity index 95% rename from Silicon/Marvell/Drivers/Spi/MvSpiDxe.c rename to Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.c index bab6cf4..c657daf 100755 --- a/Silicon/Marvell/Drivers/Spi/MvSpiDxe.c +++ b/Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.c @@ -31,7 +31,7 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *******************************************************************************/ -#include "MvSpiDxe.h" +#include "MvSpiOrionDxe.h" SPI_MASTER *mSpiMasterInstance; @@ -399,7 +399,7 @@ SpiMasterInitProtocol ( EFI_STATUS EFIAPI -SpiMasterEntryPoint ( +SpiOrionEntryPoint ( IN EFI_HANDLE ImageHandle, IN EFI_SYSTEM_TABLE *SystemTable ) diff --git a/Silicon/Marvell/Drivers/Spi/MvSpiDxe.h b/Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.h similarity index 100% rename from Silicon/Marvell/Drivers/Spi/MvSpiDxe.h rename to Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.h diff --git a/Silicon/Marvell/Drivers/Spi/MvSpiDxe.inf b/Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.inf similarity index 92% rename from Silicon/Marvell/Drivers/Spi/MvSpiDxe.inf rename to Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.inf index e7bc170..3f85b40 100644 --- a/Silicon/Marvell/Drivers/Spi/MvSpiDxe.inf +++ b/Silicon/Marvell/Drivers/Spi/Controllers/MvSpiOrionDxe.inf @@ -31,15 +31,15 @@ [Defines] INF_VERSION = 0x00010005 - BASE_NAME = SpiMasterDxe + BASE_NAME = SpiOrionDxe FILE_GUID = c19dbc8a-f4f9-43b0-aee5-802e3ed03d15 MODULE_TYPE = DXE_RUNTIME_DRIVER VERSION_STRING = 1.0 - ENTRY_POINT = SpiMasterEntryPoint + ENTRY_POINT = SpiOrionEntryPoint [Sources] - MvSpiDxe.c - MvSpiDxe.h + MvSpiOrionDxe.c + MvSpiOrionDxe.h [Packages] EmbeddedPkg/EmbeddedPkg.dec -- 2.7.4