From patchwork Wed Dec 27 15:49:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 122804 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp2337438qgn; Wed, 27 Dec 2017 07:50:17 -0800 (PST) X-Google-Smtp-Source: ACJfBovIcNLnojnmIrsuDBULvH1tgUK/TW+hiiGRI+im+6Yy7sl/pgTC0Y9H1Amet3obGKp2ebCx X-Received: by 10.84.178.37 with SMTP id y34mr29225197plb.260.1514389817862; Wed, 27 Dec 2017 07:50:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514389817; cv=none; d=google.com; s=arc-20160816; b=h3IwRPeMHLoffO3OJGb14lgsY6lFKXcTGBGnz1Kof7lRjViNECLiMujEqzU/bu3ZOC +5x7ue1jmow8LieUoAzfUcT62sBVsBIxHd+CDkPZZYnZVWCFyMY4qJbhVg/5Yj2E5pBm Im6ale3NLTNPIaujqey7Aqy4SJ9uUGol4xe+cpMcJqalmgk6NsQdVImyMV0nGGKcsmD2 Wth5MwVnnwwgDIBkpwp96bWneI2GCZE3feIqgrcxpT90+PkvLRy8VLf5+uDSmyeymRd8 yR6yM5xYscRwO8k4UeUpzPkykNBPXqUxD+Gnz7uWVYry3O4oVjdtHgkwH3ER+pTPxCjh 67RA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=i+dtjVa1PL/APbIUM7MYatmf4hXXvopjpwZKJoGZDrA=; b=WpWdVoaRjammFDozUg8OeOSSKi68ndC/OWX75vxTk1q4z2/IuMRO4Yi4tTeeejgDYz Raa6w3GeeWOKoDYI4mS9H9r7AkF8mjWIklqz24WEHiLqsgoNMCQCOc8+b+M20LpXl/iF ZNnfgomk7ratQmXaCj/sBOGzwmOkNoXV5fKVNtpKmbDhQl8Smbbh8iHZTx1OBuLK+kfB rbrHDTbuMc99UN31tksw9JkhYYYP0t7DxaOZJiYraRjzbYs1Qh2NXqrMkuSX6fiMKXf0 sHHwk8nvkzXYIxDxXMzMvnmi3WhxiJxoNMZzIkbkyCik+YfMv9bv7TLE8xG2f+Y9tM1G Uejg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=NrHZd+ZK; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id b77si24905360pfe.377.2017.12.27.07.50.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Dec 2017 07:50:17 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=NrHZd+ZK; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 6D92522280C3B; Wed, 27 Dec 2017 07:45:21 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c0c::243; helo=mail-wr0-x243.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr0-x243.google.com (mail-wr0-x243.google.com [IPv6:2a00:1450:400c:c0c::243]) (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 34AEE22280C23 for ; Wed, 27 Dec 2017 07:45:18 -0800 (PST) Received: by mail-wr0-x243.google.com with SMTP id v21so26329257wrc.0 for ; Wed, 27 Dec 2017 07:50:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=k0wbVGLYY4HN9+L0ra084kQmTeTi4EYAgHcPZu26Qhs=; b=NrHZd+ZKGqeAznx7ecw97BRVGl5Gha/jRMS19+aCFLLoJAWpTERWt7RutErmwdMPRF 8TpQQzli3brOPmedGaE0zX5sDZKMuh/OrAw3qwJmCNHQ8UsZ4gKm/PqM99Bs6XoottZ9 Iiyhs0XXxoW28OHp002xw2qPEQvq3R5fGFdag= 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=k0wbVGLYY4HN9+L0ra084kQmTeTi4EYAgHcPZu26Qhs=; b=CynKkrftLQgkCKA7OxlqBniWpQ50jRV1TpdDgg1T6nr8foIv0GQ8kGPddK0RIau8pR zMoIGGMbQrh00Sy2hvV+zRvTftOQ7DkD3BXKJotJRnYMWgrYksz2SqVdfFQZGVJYov2g fAq/TBbYTl+ejtJEffZI5sFocXYGMRYAZuRMMnrWzp+u1XrN4kjH91et5GxtKQQ16sXy 1oT5LnqBjWehGs4JCgEwM30ykPOyBwACkF5R2BAoz8rYEJtEmJ2WFhXPZAGNn2MX9+na ulzGEe4D7+SXgc8UjdaGGieWJpteCZkG14D1R3YWBFd4KBDezc3rXjYW1+RBgpvzP7O3 dkPw== X-Gm-Message-State: AKGB3mJoudCiM3Z+8P08Y4meLhfzCumhpccEv6w6/Q19cQrZWvEL3HRP hOJWQpKQuJPfLznkZaVrXpzwgtJxdT8= X-Received: by 10.223.179.77 with SMTP id k13mr29390370wrd.116.1514389812313; Wed, 27 Dec 2017 07:50:12 -0800 (PST) Received: from localhost.localdomain ([105.137.110.132]) by smtp.gmail.com with ESMTPSA id i17sm20840876wrf.71.2017.12.27.07.50.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Dec 2017 07:50:11 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 27 Dec 2017 15:49:56 +0000 Message-Id: <20171227155001.25886-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171227155001.25886-1-ard.biesheuvel@linaro.org> References: <20171227155001.25886-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-platforms 1/6] Silicon: fix typo in gPcf8563RealTimeClockLibI2cMasterProtocolGuid X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: leif.lindholm@linaro.org, Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Do a global replace of gPcf8563RealTimeClockLibI2cMasterProtolGuid with gPcf8563RealTimeClockLibI2cMasterProtocolGuid. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Silicon/NXP/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.c | 2 +- Silicon/NXP/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.dec | 2 +- Silicon/NXP/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.inf | 4 ++-- Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/PlatformDxe.c | 2 +- Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/PlatformDxe.inf | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Silicon/NXP/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.c b/Silicon/NXP/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.c index 67f8e7de4025..6bc4aef28849 100644 --- a/Silicon/NXP/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.c +++ b/Silicon/NXP/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.c @@ -373,7 +373,7 @@ LibRtcInitialize ( // BufferSize = sizeof (EFI_HANDLE); Status = gBS->LocateHandle (ByProtocol, - &gPcf8563RealTimeClockLibI2cMasterProtolGuid, NULL, + &gPcf8563RealTimeClockLibI2cMasterProtocolGuid, NULL, &BufferSize, &mI2cMasterHandle); ASSERT_EFI_ERROR (Status); diff --git a/Silicon/NXP/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.dec b/Silicon/NXP/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.dec index 3849056f164a..94c4a3f1ef4c 100644 --- a/Silicon/NXP/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.dec +++ b/Silicon/NXP/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.dec @@ -22,7 +22,7 @@ [Guids] gPcf8563RealTimeClockLibTokenSpaceGuid = { 0xaaf5b169, 0x93a0, 0x4d60, { 0xba, 0xe4, 0x06, 0x07, 0x92, 0x8e, 0x63, 0xdd }} [Protocols] - gPcf8563RealTimeClockLibI2cMasterProtolGuid = { 0xa6af18ae, 0x3bd5, 0x4af9, { 0xbb, 0x6a, 0xdb, 0x85, 0x07, 0x62, 0x81, 0x38 }} + gPcf8563RealTimeClockLibI2cMasterProtocolGuid = { 0xa6af18ae, 0x3bd5, 0x4af9, { 0xbb, 0x6a, 0xdb, 0x85, 0x07, 0x62, 0x81, 0x38 }} [PcdsFixedAtBuild] gPcf8563RealTimeClockLibTokenSpaceGuid.PcdI2cSlaveAddress|0x51|UINT8|0x00000001 diff --git a/Silicon/NXP/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.inf b/Silicon/NXP/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.inf index 9907e343ba78..1a9a6f6c9cf3 100644 --- a/Silicon/NXP/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.inf +++ b/Silicon/NXP/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.inf @@ -42,11 +42,11 @@ [Guids] [Protocols] gEfiDriverBindingProtocolGuid ## CONSUMES gEfiI2cMasterProtocolGuid ## CONSUMES - gPcf8563RealTimeClockLibI2cMasterProtolGuid ## CONSUMES + gPcf8563RealTimeClockLibI2cMasterProtocolGuid ## CONSUMES [FixedPcd] gPcf8563RealTimeClockLibTokenSpaceGuid.PcdI2cSlaveAddress gPcf8563RealTimeClockLibTokenSpaceGuid.PcdI2cBusFrequency [Depex] - gPcf8563RealTimeClockLibI2cMasterProtolGuid + gPcf8563RealTimeClockLibI2cMasterProtocolGuid diff --git a/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/PlatformDxe.c b/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/PlatformDxe.c index 098a4dbd324e..91c1b66ea1f8 100644 --- a/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/PlatformDxe.c +++ b/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/PlatformDxe.c @@ -183,7 +183,7 @@ PlatformDxeEntryPoint ( // through the I2C driver stack (which cannot be used at runtime) // Status = gBS->InstallProtocolInterface (&Handle, - &gPcf8563RealTimeClockLibI2cMasterProtolGuid, + &gPcf8563RealTimeClockLibI2cMasterProtocolGuid, EFI_NATIVE_INTERFACE, NULL); ASSERT_EFI_ERROR (Status); diff --git a/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/PlatformDxe.inf b/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/PlatformDxe.inf index 7d3b88a5b52e..9778574be1bf 100644 --- a/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/PlatformDxe.inf +++ b/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/PlatformDxe.inf @@ -53,7 +53,7 @@ [Guids] [Protocols] gEdkiiNonDiscoverableDeviceProtocolGuid ## PRODUCES gEfiPciIoProtocolGuid ## CONSUMES - gPcf8563RealTimeClockLibI2cMasterProtolGuid ## PRODUCES + gPcf8563RealTimeClockLibI2cMasterProtocolGuid ## PRODUCES [FixedPcd] gSynQuacerTokenSpaceGuid.PcdNetsecEepromBase From patchwork Wed Dec 27 15:49:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 122805 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp2337465qgn; Wed, 27 Dec 2017 07:50:19 -0800 (PST) X-Google-Smtp-Source: ACJfBosKiS4yGXOgsHqtw5xpFJko1yN5q2KFDrz4hKugm4bhULt+AYJzZo6ewgY0cvgf9pHQwxG4 X-Received: by 10.99.144.193 with SMTP id a184mr24991378pge.318.1514389819542; Wed, 27 Dec 2017 07:50:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514389819; cv=none; d=google.com; s=arc-20160816; b=pv7jZkaxDwfV5YxOX51JUFz+7//c3vNAL0djshxrXo3CG1kmF1D5IOcp31XY4HrUwK 0nuMZK4BjahAUUGl5a/hI8DZKz+OR+6Zr3Yz3rvzT5Ue/OdAuqN9w2JJUPY/abJUB7di 4sxa0vNjz06zJQOziqIFHDklE5cAyaMlshPz+YSwxcijREgHU1owf9UzYOEV8eo+gjzc BxUFadwxMeCtGccNAwSKCTBsz1Qteh7PL3GMrHQo+fhJ0ty3HBvOTtdRkU52dYyunLxr 9p57FOV9FtUHoiSWAQPNFDX/Obzq2kgHuZtz0UnIlfk6Os5becSKNiSOSad0Jq7iilSy jEog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=jALQrmjuI+kbvXHCgw2I+DBv+iyMyphbykznkQ6vWPE=; b=R6BKwodPW/C2UvOsN9pqLjcbkWSfE5VYnh7lgsq0FEJtzuIhKHOXfgY9ZbqSE++LWV uR8xNmAvGVQoI/fPQqFdvhpB5tCJUM1HctjF9LIiICC9rcz817yzasRT+bzCpAiNuVZa v+FSIX9SYs7C4Fpex/BZPMsJzTX968z4tcxHBP1MeXs2nsLyhXfnCeQR7BrC/H7EJp2x asCaGU55QC0xwmnEqFjBuedRXypoM1Kw8ReEYU5+03bjmpnV6SBY+Fl273VHSpplho8f NPMtDgbb8U5FN6W2GqZ7Fa7n1emEze+cFehThGt0fE/K/CTaKX1qMb9F7gDrvXgd0C9A Z/ow== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=J7gnxf4z; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id a1si7796122pff.387.2017.12.27.07.50.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Dec 2017 07:50:19 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=J7gnxf4z; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id D521522280C3F; Wed, 27 Dec 2017 07:45:21 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c0c::241; helo=mail-wr0-x241.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr0-x241.google.com (mail-wr0-x241.google.com [IPv6:2a00:1450:400c:c0c::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 B618E22280C27 for ; Wed, 27 Dec 2017 07:45:19 -0800 (PST) Received: by mail-wr0-x241.google.com with SMTP id o2so37037782wro.5 for ; Wed, 27 Dec 2017 07:50:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mYfkUwmOQm2oWGvmPBoBYxum1hPxS1NW1MLnfykGhRY=; b=J7gnxf4zMudJWe33wojE8hWAvD3Cuaq7uUgiVM5Ay8JL3ICGch7NqR9I7ByS56vdsK dEXWDeqK7SpJO/qEBjMURtPQdc8qAF750ckV1ZmKBqWTJ2pqloPsa2AUMw3Gw9UPZEjM nGGIDlBTzYhEehDpTZQJFYSFP0fGDIgKszFMw= 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=mYfkUwmOQm2oWGvmPBoBYxum1hPxS1NW1MLnfykGhRY=; b=ZKDvymnDHN+JUnAwdDGlnWtfD9JvEq70BHkTjJHV+7H3KttThCXaoGcFBFpDsem4xF 0FqN4xzHzbNeRr0TnT+r9SlHk8rz0JwrSVtUVmBI+RIYLpNyApRAerMWMwtAnjTmb+GJ BtsCGMdM3EKmhFn11Xi3d2Fo+uAxnu5JxfWxPPEysIYbXDwCHTUwH6E9jX0My4KPiYCI A/JOIikjQkB6JwZG7xr9r9WJGvIsXxEp2n6RLOYNgCeoQ156Q8kNq1f6Q63dh6sgu3FK gy3iD3aLSqiZiLqDDqP6b+IFeuyuTXmS2qYmbj8wDc7RP3DmU5L0HvhxoUHehAxz/Lxm 8h2Q== X-Gm-Message-State: AKGB3mKq5ydfnzx/b2aTd9xBvnQ8iPFfuhegqsUpcVoySvQgy9OzP5Hq r0kc6x2TCknhpVQerFinSVJD6EzXLfQ= X-Received: by 10.223.188.66 with SMTP id a2mr30212691wrh.249.1514389813896; Wed, 27 Dec 2017 07:50:13 -0800 (PST) Received: from localhost.localdomain ([105.137.110.132]) by smtp.gmail.com with ESMTPSA id i17sm20840876wrf.71.2017.12.27.07.50.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Dec 2017 07:50:13 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 27 Dec 2017 15:49:57 +0000 Message-Id: <20171227155001.25886-3-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171227155001.25886-1-ard.biesheuvel@linaro.org> References: <20171227155001.25886-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-platforms 2/6] Silicon/NXP/Pcf8563RealTimeClockLib: avoid driver binding protocol X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: leif.lindholm@linaro.org, Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Instead of registering a notification callback on the driver binding protocol, and attempting to connect our I2C master handle each time a new driver is registered, switch to the more obvious approach of registering a notification callback on the I2C master protocol directly. The original code was written under the assumption that it would make the RTC available at an earlier time, but given that all handles that are created during the execution of a driver entry point are connected by DXE core right away (i.e., before StartImage() returns), this is not really necessary, and in fact, may result in the driver already having been connected by the time we attempt to connect it. Note that it is now up to the platform to ensure that ConnectController() is called for the handle if DXE core does not call it by itself, or does call it but at a time when no I2C master protocol driver is available yet. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Silicon/NXP/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.c | 31 ++++++++------------ Silicon/NXP/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.inf | 1 - 2 files changed, 13 insertions(+), 19 deletions(-) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Silicon/NXP/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.c b/Silicon/NXP/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.c index 6bc4aef28849..fb58e1feb424 100644 --- a/Silicon/NXP/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.c +++ b/Silicon/NXP/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.c @@ -41,7 +41,7 @@ #define EPOCH_BASE 2000 STATIC EFI_HANDLE mI2cMasterHandle; -STATIC VOID *mDriverEventRegistration; +STATIC VOID *mI2cMasterEventRegistration; STATIC EFI_I2C_MASTER_PROTOCOL *mI2cMaster; STATIC EFI_EVENT mRtcVirtualAddrChangeEvent; @@ -263,12 +263,12 @@ LibSetWakeupTime ( STATIC VOID -DriverRegistrationEvent ( +I2cMasterRegistrationEvent ( IN EFI_EVENT Event, IN VOID *Context ) { - EFI_HANDLE Handle[2]; + EFI_HANDLE Handle; UINTN BufferSize; EFI_STATUS Status; EFI_I2C_MASTER_PROTOCOL *I2cMaster; @@ -280,10 +280,10 @@ DriverRegistrationEvent ( do { BufferSize = sizeof (EFI_HANDLE); Status = gBS->LocateHandle (ByRegisterNotify, - &gEfiDriverBindingProtocolGuid, - mDriverEventRegistration, + &gEfiI2cMasterProtocolGuid, + mI2cMasterEventRegistration, &BufferSize, - Handle); + &Handle); if (EFI_ERROR (Status)) { if (Status != EFI_NOT_FOUND) { DEBUG ((DEBUG_WARN, "%a: gBS->LocateHandle () returned %r\n", @@ -292,12 +292,7 @@ DriverRegistrationEvent ( break; } - // - // Check if we can connect our handle to this driver. - // - Handle[1] = NULL; - Status = gBS->ConnectController (mI2cMasterHandle, Handle, NULL, FALSE); - if (EFI_ERROR (Status)) { + if (Handle != mI2cMasterHandle) { continue; } @@ -378,16 +373,16 @@ LibRtcInitialize ( ASSERT_EFI_ERROR (Status); // - // Register a protocol registration notification callback on the driver - // binding protocol so we can attempt to connect our I2C master to it - // as soon as it appears. + // Register a protocol registration notification callback on the I2C master + // protocol. This will notify us even if the protocol instance we are looking + // for has already been installed. // EfiCreateProtocolNotifyEvent ( - &gEfiDriverBindingProtocolGuid, + &gEfiI2cMasterProtocolGuid, TPL_CALLBACK, - DriverRegistrationEvent, + I2cMasterRegistrationEvent, NULL, - &mDriverEventRegistration); + &mI2cMasterEventRegistration); // // Register for the virtual address change event diff --git a/Silicon/NXP/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.inf b/Silicon/NXP/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.inf index 1a9a6f6c9cf3..e232902c6b5d 100644 --- a/Silicon/NXP/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.inf +++ b/Silicon/NXP/Library/Pcf8563RealTimeClockLib/Pcf8563RealTimeClockLib.inf @@ -40,7 +40,6 @@ [Guids] gEfiEventVirtualAddressChangeGuid [Protocols] - gEfiDriverBindingProtocolGuid ## CONSUMES gEfiI2cMasterProtocolGuid ## CONSUMES gPcf8563RealTimeClockLibI2cMasterProtocolGuid ## CONSUMES From patchwork Wed Dec 27 15:49:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 122806 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp2337515qgn; Wed, 27 Dec 2017 07:50:22 -0800 (PST) X-Google-Smtp-Source: ACJfBouEFtAKCeJddKdKLAXAzZKb3OLQ9oJ1eMwDn6DLC+VoQI9pewhsiXrCcrbwl+KTQ+5gliZS X-Received: by 10.98.144.141 with SMTP id q13mr29155085pfk.140.1514389822028; Wed, 27 Dec 2017 07:50:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514389822; cv=none; d=google.com; s=arc-20160816; b=O9wTAbnEj126/dmzGm3zk2anYLzQi0SO/PjAwTUN8AwLJNq46lw8DHondvxVn5U4lD tgqOiLmoA7ldNqlP1ZF6/GYsCUkNnlIw8SNqDfSGXmq4Hn13TAtnOiJW4qJAIZn24Mph sDoq1s9TBw0Nvt8U5DzPjnIrp4tLEfa2CVkX7sGJXFNTjg1g6uJ6Sn0vh+f8Tn/Tb7tc asX9OeNnmxNYQgK3q7btI8i6id/AzF0Ool/qLdVXW+UPGDKPjdOJGB2jn2v+gjXAOAan L5r9WquZr/mxegOMkHFZKXrGyWVtoqQ9E+NLfGExO1x1KrXJVLGlg69gA6pSIH/5nzaQ k2Sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=tO//1DuJAPhFmj09c/wKY6OI99VHvyrbMSacYrzrOaE=; b=gE0xJiFnO0m6R8da4d8S5OdmXpreSHGHeParokRXTDJstnPE6whJWhF/xvCi0vRj7r ux7nwsFHCIw1e1aKkUi8ZhsRlYQ9UflTRqNAoFKEaoA5Rv/v9ptyM9wRpQ39O4KmCEQR KzZ1KKclLVBg/rQf5iIRRIT4mo9X2fVddBK/yt9YuelO4oqaNbINbnYOsdUEBKyQcYMl rYSWFCSeDMHVEa+Wq/4EFvnhu/TdIO81IawckhZgCH165mvtKSpn/pTxxSNW+Q3aYO8K mqWQXcUxiKFjfhE2phyz9ysKJVoqcxGb5VgfqIsncRMb4qf2yxBRHInVEhlwsW6MmHDz 7/sQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=bJbCndGs; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id e17si25037751pfd.398.2017.12.27.07.50.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Dec 2017 07:50:22 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=bJbCndGs; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 55BA922280C42; Wed, 27 Dec 2017 07:45:25 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c0c::241; helo=mail-wr0-x241.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr0-x241.google.com (mail-wr0-x241.google.com [IPv6:2a00:1450:400c:c0c::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 7172522280C3C for ; Wed, 27 Dec 2017 07:45:21 -0800 (PST) Received: by mail-wr0-x241.google.com with SMTP id l19so24661367wrc.2 for ; Wed, 27 Dec 2017 07:50:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tftp2UE80/8QxkH+5zL9DVRzwGTyGZ4lxt+6iGbau7k=; b=bJbCndGsD/s+gF7Ghw4NZyg0n+CluLXu30zr+uWZ8Zn595p1UZBOHmKd1t0TP/P1Qz agzFtHckvOG5sk5Gz6O7EoxKTtZZ+rtXCixUwlVNCL0s6Jdi9x73OyPChUotHk5SUuve 4WeYthcuvPsovAL/d3GFvDG8rNM796ictANhE= 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=tftp2UE80/8QxkH+5zL9DVRzwGTyGZ4lxt+6iGbau7k=; b=GD5mRcLpZWBOYAV5ugVAVvX5RxF8HS+YNLacgnjW/8GpWY3HSwN6o0kRw1xwb6+dn8 n8NaLL6eXaldb6oP+dYqpK3QEBY9j7IIFgCs7LmgtwU+VZRec5f/IEVA+AgISLQlhhNy wqHNQ4r0bid61KospNY+1qczQ9ACJoTICdtYmhBG4eJ5pR3i+Ukp5FE1eOdkuqQOZvpK VYhK5HRCAceTeonfSG64w8M6KyiOs5WEuVFe6frIxU6LmvreKQoVQ56okwn4Adq9Oef8 A6gtv2LX0fSvhvfWQe3mhDWb8qJpcfKjfqBMI6MDWLYpM37bDixBBz25hwBfh+GcqPKp fFzQ== X-Gm-Message-State: AKGB3mKj2mya5wBP/gx2x2Net1DQSrkD2qAFjFQi5t0H0XXj/Go/EKEe MDeEqALTAKXuVHVS2wcTTo4w6VVrgMI= X-Received: by 10.223.190.12 with SMTP id n12mr21186173wrh.34.1514389815676; Wed, 27 Dec 2017 07:50:15 -0800 (PST) Received: from localhost.localdomain ([105.137.110.132]) by smtp.gmail.com with ESMTPSA id i17sm20840876wrf.71.2017.12.27.07.50.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Dec 2017 07:50:14 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 27 Dec 2017 15:49:58 +0000 Message-Id: <20171227155001.25886-4-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171227155001.25886-1-ard.biesheuvel@linaro.org> References: <20171227155001.25886-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-platforms 3/6] Silicon/SynQuacerI2cDxe: remove spurious format specifier X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: leif.lindholm@linaro.org, Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Remove a %r without an associated parameter. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Silicon/Socionext/SynQuacer/Drivers/SynQuacerI2cDxe/SynQuacerI2cDxe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Silicon/Socionext/SynQuacer/Drivers/SynQuacerI2cDxe/SynQuacerI2cDxe.c b/Silicon/Socionext/SynQuacer/Drivers/SynQuacerI2cDxe/SynQuacerI2cDxe.c index c3703dfb6c33..46c512a20151 100644 --- a/Silicon/Socionext/SynQuacer/Drivers/SynQuacerI2cDxe/SynQuacerI2cDxe.c +++ b/Silicon/Socionext/SynQuacer/Drivers/SynQuacerI2cDxe/SynQuacerI2cDxe.c @@ -335,7 +335,7 @@ SynQuacerI2cStartRequest ( } if (MmioRead8 (I2c->MmioBase + F_I2C_REG_BSR) & F_I2C_BSR_LRB) { - BOOTTIME_DEBUG ((DEBUG_WARN, "%a: No ack received - %r\n", __FUNCTION__)); + BOOTTIME_DEBUG ((DEBUG_WARN, "%a: No ack received\n", __FUNCTION__)); Status = EFI_DEVICE_ERROR; break; } From patchwork Wed Dec 27 15:49:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 122807 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp2337554qgn; Wed, 27 Dec 2017 07:50:24 -0800 (PST) X-Google-Smtp-Source: ACJfBotAWMlg8mGM6HssQ/+p0zq0B3nxmgXA45cq3AUFVgzpve3v5lZG/wXM5LN/dGvbHTctV39e X-Received: by 10.84.238.136 with SMTP id v8mr29117684plk.381.1514389824359; Wed, 27 Dec 2017 07:50:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514389824; cv=none; d=google.com; s=arc-20160816; b=kBhn8D1IVpVsv0KwW0Lo/O4MlQD3gY2dMRm5tdpxWa/MaU3t+Le7KhAu8MJ7iAtw1D 1jcDJGINgvH5RKTvSpWPGpEVZgfxz5633vsANkxo6COHyrj1ss8TvEGi8BWzT8gCFB0K +lXz4mrUXIFxUH2DK2IKVeHLDTHpQMcNwsdq2+KyIL5kb9kkGJ0X+HM0yFouCEvgnyNE a17VajcCk7WzgFuyU5zERr+5+WHTKcbA/OGoDdSROQm8Vbs8t2wbA+/rP6hG/axKKeJo 4wKa46YNDxqDw3NkVhnnk/GPiCrpHGRlclr64reZ9ZoL3trmasi62dHjD1/Jmyh9NUFL MSJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=cO56RrtHuyzNhP+0FcSbmbyGB2SCBMxNLocn5pepDlM=; b=N2pPLXcXcBqSzQGZ9+iN95TQ9CVFPfkj3iTGP6c4OCPVXP35azd5ZYcvHsZdApPse/ 1DSAhZ2PAS6a2f1ARM6qkClw8VpuzrZJbxGsjGc7gDcWn8To3lKGQ4v5i7q7MseiC+nc mLPo7FHzsxrYGKlGT0UxyUSnr5Tq5abQu8FPFkiLIB+QktHxiSMVhkRgoOiqlcu1JLU8 ruIca5NcjLfUAi5TJgZltwz20KbZ4jodo1sNv6NqTiEZLij4oksCCJ/Ejm1RVfMWp9ge M+k/T+zojj0cMAVMexz7HZ2wyEsiWRH5WsLBxH92OeXDEuLD+Z1GmQO7Fr1If8Ya7bqD dMEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=ZZwhkn2O; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id o3si22501210pgd.463.2017.12.27.07.50.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Dec 2017 07:50:24 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=ZZwhkn2O; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id B5C5C22280C46; Wed, 27 Dec 2017 07:45:25 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c0c::244; helo=mail-wr0-x244.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr0-x244.google.com (mail-wr0-x244.google.com [IPv6:2a00:1450:400c:c0c::244]) (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 106A521CB87DD for ; Wed, 27 Dec 2017 07:45:23 -0800 (PST) Received: by mail-wr0-x244.google.com with SMTP id g17so27804578wrd.13 for ; Wed, 27 Dec 2017 07:50:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=KD0d8WFpK7lu5CpOnB36A4OmThKNNcOm2YfqjLjgaVo=; b=ZZwhkn2O0VpmdlLNh4x4KbZXUFbrX5zmWnlYfJEF4m4tJCbz5KihYicvWwpVBgnZwe 1d5DGfSnhr5uJeugKIlODoQzxOulf5T+IUonpZU3IBJaLbvwqTgRT1U+yclFUcgjjUTb DXdomU8nB4AG523gTP0dkSjPe1ZtyMaCOLPjs= 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=KD0d8WFpK7lu5CpOnB36A4OmThKNNcOm2YfqjLjgaVo=; b=EKbx6+Jf37D0YN35KM9i5WNBuWIGSOKgtOTZS9w9+ES0DBYnltwd7EbdzcNhYUHsXE zezgaR7NlzwebHlt36JkDi2Gi7QH4wvjHri1PLjslkKQve3T3TNSYZJPEh/2s31tr7Z3 MV7VENfTOIVBosw3RcK5E+xOC8xdy34q3Sr/mBBL8U0qDA4J953Yc0wc4bGD2+AcUM0z 01gis2fE4Xr255OYcVEPMP5+VDKjzxILAZp6thGfaATZLe1n6tty6paZ90/IOylF93tl TJMPOgfnK/JeBFE9SxRImQ9/xLC+ISAv9MRD+2A8u+cB60GV8bA8hOFqlplMjtYq0suV dIKQ== X-Gm-Message-State: AKGB3mLPOS8kAx3uJckk3IVcUnlw9aIIGkhevkb3iosv2izTU1kq5on1 6EmZVIVEJ2GFH2qq5z+jGk1Oa+uq+ho= X-Received: by 10.223.135.39 with SMTP id a36mr13397044wra.50.1514389817224; Wed, 27 Dec 2017 07:50:17 -0800 (PST) Received: from localhost.localdomain ([105.137.110.132]) by smtp.gmail.com with ESMTPSA id i17sm20840876wrf.71.2017.12.27.07.50.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Dec 2017 07:50:16 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 27 Dec 2017 15:49:59 +0000 Message-Id: <20171227155001.25886-5-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171227155001.25886-1-ard.biesheuvel@linaro.org> References: <20171227155001.25886-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-platforms 4/6] Silicon/SynQuacer: load I2C driver before platform DXE driver X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: leif.lindholm@linaro.org, Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" To ensure that the I2C master protocol is installed immediately onto the handles created by PlatformDxe in its entry point, force the SynQuacerI2cDxe driver to be loaded before PlatformDxe. These handles are recursively connected by the DXE core as soon as they appear, and so ensuring that the I2C master protocol driver is available at this time will ensure that these handles will be connected to it right away. This is useful when implementations of architectural protocols such as RTC or the EFI variable store, which should become available long before the ordinary dispatch of UEFI driver model drivers is started at the end of DXE, are based on I2C. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/PlatformDxe.inf | 2 +- Silicon/Socionext/SynQuacer/Drivers/SynQuacerI2cDxe/SynQuacerI2cDxe.inf | 2 +- Silicon/Socionext/SynQuacer/SynQuacer.dec | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/PlatformDxe.inf b/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/PlatformDxe.inf index 9778574be1bf..587dc111e75b 100644 --- a/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/PlatformDxe.inf +++ b/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/PlatformDxe.inf @@ -17,7 +17,7 @@ [Defines] INF_VERSION = 0x0001001A BASE_NAME = PlatformDxe - FILE_GUID = ac422cc1-d916-489a-b165-536fdfc633c2 + FILE_GUID = ac422cc1-d916-489a-b165-536fdfc633c2 # gSynQuacerPlatformDxeFileGuid MODULE_TYPE = DXE_DRIVER VERSION_STRING = 1.0 ENTRY_POINT = PlatformDxeEntryPoint diff --git a/Silicon/Socionext/SynQuacer/Drivers/SynQuacerI2cDxe/SynQuacerI2cDxe.inf b/Silicon/Socionext/SynQuacer/Drivers/SynQuacerI2cDxe/SynQuacerI2cDxe.inf index fa715366878c..325816ba0b88 100644 --- a/Silicon/Socionext/SynQuacer/Drivers/SynQuacerI2cDxe/SynQuacerI2cDxe.inf +++ b/Silicon/Socionext/SynQuacer/Drivers/SynQuacerI2cDxe/SynQuacerI2cDxe.inf @@ -56,4 +56,4 @@ [FixedPcd] gSynQuacerTokenSpaceGuid.PcdI2cReferenceClock [Depex] - TRUE + BEFORE gSynQuacerPlatformDxeFileGuid diff --git a/Silicon/Socionext/SynQuacer/SynQuacer.dec b/Silicon/Socionext/SynQuacer/SynQuacer.dec index a21f12b5bc32..76529e3c2164 100644 --- a/Silicon/Socionext/SynQuacer/SynQuacer.dec +++ b/Silicon/Socionext/SynQuacer/SynQuacer.dec @@ -25,6 +25,8 @@ [Guids] gSynQuacerNonDiscoverableI2cMasterGuid = { 0x364ee675, 0x9e44, 0x42b7, { 0xa5, 0xe4, 0x92, 0x84, 0xdb, 0x85, 0xda, 0x09 } } gSynQuacerNonDiscoverableRuntimeI2cMasterGuid = { 0x5f35aa9b, 0x8c6f, 0x4828, { 0xbd, 0x44, 0x7c, 0xc0, 0xeb, 0x2d, 0xfe, 0xb9 } } + gSynQuacerPlatformDxeFileGuid = { 0xac422cc1, 0xd916, 0x489a, { 0xb1, 0x65, 0x53, 0x6f, 0xdf, 0xc6, 0x33, 0xc2 } } + [Ppis] gSynQuacerDramInfoPpiGuid = { 0x3e1d7356, 0xdda4, 0x4b1a, { 0x93, 0x46, 0xbf, 0x89, 0x1c, 0x86, 0x46, 0xcc } } From patchwork Wed Dec 27 15:50:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 122808 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp2337604qgn; Wed, 27 Dec 2017 07:50:27 -0800 (PST) X-Google-Smtp-Source: ACJfBosb1C0HSz8H4BxtpbQgYplR7q0+AoEynIUzrFaQGC/Vlj0suTDaugQasTkW0IhmRSW9Dxuu X-Received: by 10.99.151.2 with SMTP id n2mr25828366pge.374.1514389827006; Wed, 27 Dec 2017 07:50:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514389827; cv=none; d=google.com; s=arc-20160816; b=DsJCxL7tFvmnR/mu3/T0KA0p5x/OzQRP/o1xyq8JqjebRBB83ginLY1is2BcwdS/s4 rrKYR5gSHDI3G12RKOHcscDgBjAv4/judZ4L97bJC7qoIOBdWhyuSS1Ex5xAFDOmuAAv PRbtxjAB0W4PT9wsml0nzkbJJv5XrEwJiXGuE8pYfkpXvDWZfKkkPjfEUw25rIfcJW4n b9LYVjV+UofqaIuQBtQikCp65/YYmZZ81ZrZRM52k7izPqbl8Nf7oPCPUGfkVOcsFNr0 Hq3m3cqSYXKwcHskbbEWKqsxvvsw4o4gOfuNAh2qwkieHQvK1X2Kk3LrOJsGX6X2Tr5x asAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=yjwwNKRIU7EzgKeyAKFDIKEtB8bcN93gqweNtvoWlo8=; b=aX5h0WdDLrZD/jyYo/CI47d8sH9pfLbmDZi6A46xwiR3oZ34heOwtSCsBprtAFm2HS yVMXH9QcyjvQpxFMn4FpZ2Rms/S+ML1dirNaojzBO9H1XB8hgFwn498kW9IBM75x1awA g8UuPKb9tmHyG586z2TN818FBRhwueM+WRrzelF/vgxESQKnZprhwaH8fKjlwg3lesT6 +EsiSDIvybLganj/P+iFUWh1cosuxhqBDVesw9BXP6T7FAUdLLGLG8Vn8E+UMy9xzgZR rA+oliCwGOlKdnjA9yYuDQV/uLheImhWJ/nwN2E4Ab2CQUiD2sdBO+EKe8Bj1K7A2PKF hjbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=PkYoYD4q; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id i7si24823842plt.427.2017.12.27.07.50.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Dec 2017 07:50:26 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=PkYoYD4q; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 041C822280C4A; Wed, 27 Dec 2017 07:45:26 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c0c::241; helo=mail-wr0-x241.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr0-x241.google.com (mail-wr0-x241.google.com [IPv6:2a00:1450:400c:c0c::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 60D5622280C23 for ; Wed, 27 Dec 2017 07:45:24 -0800 (PST) Received: by mail-wr0-x241.google.com with SMTP id f8so26257733wre.4 for ; Wed, 27 Dec 2017 07:50:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=YwXCUsXGEZG7l0j2D4LD5Utf9ZA5PX8svNffjnw+wBc=; b=PkYoYD4q4yt5EKGxpmWIWWjRh0e6JZvyW8CwE6SVU2Jbz5PkV4nDGEAfS3xKzZgysg hvU8djf7u71dMQUU1ZOQoWDPDSI1Veb+P+t1EZOGQINSOjc/W1fqyOzclu6IxUh6yhfJ zLXPFsqlebHTaLY7Ege3VsP/8IA3tehEzTQps= 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=YwXCUsXGEZG7l0j2D4LD5Utf9ZA5PX8svNffjnw+wBc=; b=BisHBM8KtpdFYEvwJz/fZCcSgI2EGH0zzy7sdH4BgjzaNIFtEHEkBa1Vx0bZZNv/Jt p/EZ1DA/cwIak446D+51LmBUdRAUj1LZdh4otechqWnwivjtMx2y9jBuf3sRd8XGRU1c cixuIZQURX5KW7HnTn5z+0SgMBBrsIGZ1GhuUIz3omPBN8VlG3dTAovRHcVzL5z7/Yne 7L1hJTIkEDei/Q6fJq2DJCGzIjv5TGEwWaKSmHPECWi1VEVHq44RZ5JwLL7dX+o0I7ZX t/XzHnut6QDoxdtIoAKGfwRj9Npbp3WoeD59o954JLzuZz/KPeLK8/1gOCJOY4/Va0Eq Tqqw== X-Gm-Message-State: AKGB3mLkC7paPMxQllEdGTKk07gTxcH+w5Di4KBkUSn9R3rU52Eaej1a qFMXBESDX+ksCElCNukQwXtrk7aUGBo= X-Received: by 10.223.138.143 with SMTP id y15mr29937114wry.273.1514389818590; Wed, 27 Dec 2017 07:50:18 -0800 (PST) Received: from localhost.localdomain ([105.137.110.132]) by smtp.gmail.com with ESMTPSA id i17sm20840876wrf.71.2017.12.27.07.50.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Dec 2017 07:50:17 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 27 Dec 2017 15:50:00 +0000 Message-Id: <20171227155001.25886-6-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171227155001.25886-1-ard.biesheuvel@linaro.org> References: <20171227155001.25886-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-platforms 5/6] Silicon/SynQuacer/DeviceTree: align uart DT nodes X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: leif.lindholm@linaro.org, Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Align the UART DT nodes: - use 'uart' not 'fuart' as node name for the second serial port - create an alias 'serial1' for the second serial port - use UART clock reference instead of hardcoded frequency - split 'clocks' property into 1 cell per phandle Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Silicon/Socionext/SynQuacer/DeviceTree/SynQuacer.dtsi | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacer.dtsi b/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacer.dtsi index 37a3981f0360..7c3518facb98 100644 --- a/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacer.dtsi +++ b/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacer.dtsi @@ -32,6 +32,7 @@ aliases { serial0 = &soc_uart0; + serial1 = &fuart; }; chosen { @@ -436,15 +437,16 @@ compatible = "arm,pl011", "arm,primecell"; reg = <0x0 0x2a400000 0x0 0x1000>; interrupts = ; - clocks = <&clk_uart &clk_apb>; + clocks = <&clk_uart>, <&clk_apb>; clock-names = "uartclk", "apb_pclk"; }; - fuart: fuart@51040000 { + fuart: uart@51040000 { compatible = "snps,dw-apb-uart"; reg = <0x0 0x51040000 0x0 0x1000>; interrupts = ; - clock-frequency = <62500000>; + clocks = <&clk_uart>, <&clk_apb>; + clock-names = "baudclk", "apb_pclk"; reg-io-width = <4>; reg-shift = <2>; }; From patchwork Wed Dec 27 15:50:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 122809 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp2337661qgn; Wed, 27 Dec 2017 07:50:29 -0800 (PST) X-Google-Smtp-Source: ACJfBovt9GlBKOFj1N6LLnmzF4NJWGxj7ETXpPnebqYSuy6WSKeQEGJHrDVCkt+Tzh3c4iBemdIs X-Received: by 10.98.57.131 with SMTP id u3mr28685602pfj.7.1514389829535; Wed, 27 Dec 2017 07:50:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514389829; cv=none; d=google.com; s=arc-20160816; b=xG4V5no2NEqFeFOozDCboDEKV44PWxfJFGjLiKlpxKTqS0T8joFBMFMxkBJ0gBN0qD p5jNdlZxTD3M9gTIsrmkeryPBcpm+CdwCj1dRKWeoe7oRvbfRvVPiU8QFw60FRG0jND8 4SSnk6qvNkYhXP5r6CuAGbFTOepWKRzeqE1FFhCteZXV5bI1qVVWM4voxdsdqc3KHXRI Ica5Hs2wzfkIILEmmg3wt6Sg8FWsYKkk7faFy49SKvqjDHvKDD2IsG27cwh6t6I0QvK0 mp4WTVIF/lvLA7wMks1K2+J4EBNpUM2nbydX3jhyLd7W13Tfy0CQui1sPtQAosfQ64Mb 2Q7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=vhMEW0gac41EBkvDoTwsTF0fCfqVr8KVy0c3mpirWj4=; b=0Swk1VJ1MNfTklJZ7qIuqt7qIs5PatUrPwuaELAEH9QyQn5ea8dq2Ylukq1r5waSUV YkeMRCjyOsWdPDmHuhf157io5tcn/dsucaqKrpfd8WucV7v0n4GVMSXppjC/6pmrFvo3 Cm6KY42iZN6bTzJ7JGE956OfTYs1p+5T2hVqfxSsG8/1GQHTbC7aH1dGXtEiBCTauRLi LABAjtWHPwWkievTmSxlA1uN0z+7KiB0z7Q+eB4gifo9y0OvT6h6IIra8Qia5x7bZ3YV sBC7gBP98CJlzStn8qiIU4OL7Nnjku966aQaiCQvKDhean/dQt9fZF9fdDi4q73DeT9p QpOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=YFA5eM0R; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id i8si22438500pgv.497.2017.12.27.07.50.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Dec 2017 07:50:29 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=YFA5eM0R; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 4027622280C39; Wed, 27 Dec 2017 07:45:29 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c0c::242; helo=mail-wr0-x242.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr0-x242.google.com (mail-wr0-x242.google.com [IPv6:2a00:1450:400c:c0c::242]) (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 461AE22280C39 for ; Wed, 27 Dec 2017 07:45:26 -0800 (PST) Received: by mail-wr0-x242.google.com with SMTP id f8so26257810wre.4 for ; Wed, 27 Dec 2017 07:50:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8k9YmZa9twWh4ctXDShlfsVZyUXNyp4wyHgUtlWqAp4=; b=YFA5eM0R29wpdpFVbaSoW1Rjc5qTTCChSrKO8mt8jSfSeziHA9IGB/v5O+MdiX/9xR BXyT2KfLv9teDWKKhIKgLmlQt7IQoyPT3r40F7elGjg8xWzeXP9EU5wX346Zt/ZneWoi 2wmzSm/518oArX8ZLvh1trAsB/DrzSVSRfJ44= 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=8k9YmZa9twWh4ctXDShlfsVZyUXNyp4wyHgUtlWqAp4=; b=NesgFQGMdfJat8N2SF64ZTEjSsU0SK/lowcDjP0V1z4bhmN3D70zi0bbe8A3WieHcr XluTcuK4US51z65WUMaofS8a2pQLsCW+A8h7P4okes2phmzthRvJwuGcB8lYqgMp4ONR z8EqhTgs4zN2CuMyQW+UlasayVWt7llnUul6A2Yu8mBxI8Yf2xUJcfpk0//fDbYSkRIo biH0xOkZ3m9xcuiAZ3W+09O8RCb+hvdruWyeKybpyZbgHTTm4b2jm1e9OTBSh+j5HVq9 wNdIjWD30W48hgVlKKxo7Je4rHyc+Wzi5TOuLiJaExXUloa1pR4/4LcTlzflKABik5jd HsYA== X-Gm-Message-State: AKGB3mJwgMKwuxo/x7efUH35KiUc/Wr4mNJEOr3akFm6dS9AKhglkxAb xu7ab3vnbUiicheWmdtBNLPdvYNLZmQ= X-Received: by 10.223.153.151 with SMTP id y23mr29804534wrb.130.1514389820349; Wed, 27 Dec 2017 07:50:20 -0800 (PST) Received: from localhost.localdomain ([105.137.110.132]) by smtp.gmail.com with ESMTPSA id i17sm20840876wrf.71.2017.12.27.07.50.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Dec 2017 07:50:19 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 27 Dec 2017 15:50:01 +0000 Message-Id: <20171227155001.25886-7-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171227155001.25886-1-ard.biesheuvel@linaro.org> References: <20171227155001.25886-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-platforms 6/6] Silicon/SynQuacer/DeviceTree: update NETSEC DT node to latest binding X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: leif.lindholm@linaro.org, Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" The upstream version of the Linux NETSEC driver expects the PHY DT node to appear under a MDIO subnode, so fix this in the device tree. Fix the node name as well, this should be 'ethernet' not 'netsec' Also, move the PHY subnode into the per-platform .dts file so we can set the unit address in the node name. This is necessary because recent versions of the DT compiler are more finicky about this. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Silicon/Socionext/SynQuacer/DeviceTree/DeveloperBox.dts | 7 +++++ Silicon/Socionext/SynQuacer/DeviceTree/SynQuacer.dtsi | 29 +++++++++----------- Silicon/Socionext/SynQuacer/DeviceTree/SynQuacerEvalBoard.dts | 7 +++++ 3 files changed, 27 insertions(+), 16 deletions(-) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Silicon/Socionext/SynQuacer/DeviceTree/DeveloperBox.dts b/Silicon/Socionext/SynQuacer/DeviceTree/DeveloperBox.dts index d2cd7ef90e6f..77b7b1b118a6 100644 --- a/Silicon/Socionext/SynQuacer/DeviceTree/DeveloperBox.dts +++ b/Silicon/Socionext/SynQuacer/DeviceTree/DeveloperBox.dts @@ -44,3 +44,10 @@ "GPIO-K", "GPIO-L", "PEC-PD26", "PEC-PD27", "PEC-PD28", "PEC-PD29", "PEC-PD30", "PEC-PD31"; }; + +&mdio_netsec { + phy_netsec: ethernet-phy@7 { + compatible = "ethernet-phy-ieee802.3-c22"; + reg = <7>; + }; +}; diff --git a/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacer.dtsi b/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacer.dtsi index 7c3518facb98..8817ec0f150e 100644 --- a/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacer.dtsi +++ b/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacer.dtsi @@ -457,25 +457,22 @@ #clock-cells = <0>; }; - eth0: netsec@522D0000 { - compatible = "socionext,synquacer-netsec"; - reg = <0 0x522d0000 0x0 0x10000>, - <0 FixedPcdGet32 (PcdNetsecEepromBase) 0x0 0x10000>; - interrupts = ; - clocks = <&clk_netsec>; - phy-mode = "rgmii"; - max-speed = <1000>; - max-frame-size = <9000>; - phy-handle = <ðphy0>; - dma-coherent; + ethernet@522D0000 { + compatible = "socionext,synquacer-netsec"; + reg = <0 0x522d0000 0x0 0x10000>, + <0 FixedPcdGet32 (PcdNetsecEepromBase) 0x0 0x10000>; + interrupts = ; + clocks = <&clk_netsec>; + phy-mode = "rgmii"; + max-speed = <1000>; + max-frame-size = <9000>; + phy-handle = <&phy_netsec>; + dma-coherent; + mdio_netsec: mdio { #address-cells = <1>; #size-cells = <0>; - - ethphy0: ethernet-phy { - compatible = "ethernet-phy-ieee802.3-c22"; - reg = ; - }; + }; }; smmu: iommu@582c0000 { diff --git a/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacerEvalBoard.dts b/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacerEvalBoard.dts index 132fd370a71b..5873e415c246 100644 --- a/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacerEvalBoard.dts +++ b/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacerEvalBoard.dts @@ -34,3 +34,10 @@ &sdhci { status = "okay"; }; + +&mdio_netsec { + phy_netsec: ethernet-phy@1 { + compatible = "ethernet-phy-ieee802.3-c22"; + reg = <1>; + }; +};