devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jon Hunter <jonathanh@nvidia.com>
To: Heikki Krogerus <heikki.krogerus@linux.intel.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Rob Herring <robh+dt@kernel.org>,
	"Krzysztof Kozlowski" <krzysztof.kozlowski+dt@linaro.org>,
	Thierry Reding <thierry.reding@gmail.com>
Cc: <linux-usb@vger.kernel.org>, <devicetree@vger.kernel.org>,
	<linux-tegra@vger.kernel.org>, Wayne Chang <waynec@nvidia.com>,
	Jon Hunter <jonathanh@nvidia.com>
Subject: [PATCH V5 5/6] usb: typec: ucsi_ccg: Remove ccgx,firmware-build property
Date: Thu, 19 Jan 2023 11:17:40 +0000	[thread overview]
Message-ID: <20230119111741.33901-6-jonathanh@nvidia.com> (raw)
In-Reply-To: <20230119111741.33901-1-jonathanh@nvidia.com>

From: Wayne Chang <waynec@nvidia.com>

Remove the property 'ccgx,firmware-build' now we have migrated devices
to using the 'firmware-name' property.

Signed-off-by: Wayne Chang <waynec@nvidia.com>
Co-developed-by: Jon Hunter <jonathanh@nvidia.com>
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
---
V5: Added this patch from V3

 drivers/usb/typec/ucsi/ucsi_ccg.c | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/drivers/usb/typec/ucsi/ucsi_ccg.c b/drivers/usb/typec/ucsi/ucsi_ccg.c
index 889a831e251d..0f18b32df8e6 100644
--- a/drivers/usb/typec/ucsi/ucsi_ccg.c
+++ b/drivers/usb/typec/ucsi/ucsi_ccg.c
@@ -1358,16 +1358,13 @@ static int ucsi_ccg_probe(struct i2c_client *client)
 	INIT_WORK(&uc->pm_work, ccg_pm_workaround_work);
 
 	/* Only fail FW flashing when FW build information is not provided */
-	status = device_property_read_u16(dev, "ccgx,firmware-build",
-					  &uc->fw_build);
-	if (status) {
-		status = device_property_read_string(dev, "firmware-name",
-						     &fw_name);
-		if (!status) {
-			if (!strcmp(fw_name, "nvidia,jetson-agx-xavier"))
-				uc->fw_build = CCG_FW_BUILD_NVIDIA_TEGRA;
-			else if (!strcmp(fw_name, "nvidia,gpu"))
-				uc->fw_build = CCG_FW_BUILD_NVIDIA;
+	status = device_property_read_string(dev, "firmware-name",
+					     &fw_name);
+	if (!status) {
+		if (!strcmp(fw_name, "nvidia,jetson-agx-xavier"))
+			uc->fw_build = CCG_FW_BUILD_NVIDIA_TEGRA;
+		else if (!strcmp(fw_name, "nvidia,gpu"))
+			uc->fw_build = CCG_FW_BUILD_NVIDIA;
 		}
 	}
 
-- 
2.25.1


  parent reply	other threads:[~2023-01-19 11:18 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-19 11:17 [PATCH V5 0/6] Add device-tree support for Cypress CYPD4226 Jon Hunter
2023-01-19 11:17 ` [PATCH V5 1/6] dt-bindings: usb: Add Cypress cypd4226 Type-C controller Jon Hunter
2023-01-19 11:17 ` [PATCH V5 2/6] i2c: nvidia-gpu: Add ACPI property to align with device-tree Jon Hunter
2023-01-19 11:17 ` [PATCH V5 3/6] usb: typec: ucsi_ccg: Add OF support Jon Hunter
2023-01-19 12:04   ` Jon Hunter
2023-01-19 11:17 ` [PATCH V5 4/6] i2c: nvidia-gpu: Remove ccgx,firmware-build property Jon Hunter
2023-01-19 11:17 ` Jon Hunter [this message]
2023-01-19 12:11   ` [PATCH V5 5/6] usb: typec: ucsi_ccg: " Jon Hunter
2023-01-19 11:17 ` [PATCH V5 6/6] arm64: tegra: Populate USB Type-C Controller for Jetson AGX Orin Jon Hunter
2023-01-19 12:17 ` [PATCH V5 0/6] Add device-tree support for Cypress CYPD4226 Jon Hunter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230119111741.33901-6-jonathanh@nvidia.com \
    --to=jonathanh@nvidia.com \
    --cc=devicetree@vger.kernel.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=heikki.krogerus@linux.intel.com \
    --cc=krzysztof.kozlowski+dt@linaro.org \
    --cc=linux-tegra@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=robh+dt@kernel.org \
    --cc=thierry.reding@gmail.com \
    --cc=waynec@nvidia.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).