Skip to content

Commit 6f662a8

Browse files
committed
i2c: nvidia-gpu: Remove ccgx,firmware-build property
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2122414 Upstream Status: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git Tested: Verify USB-A and USB-C are functional on Nvidia Orin board, and no regressions on other platforms. commit 430b387 Author: Wayne Chang <waynec@nvidia.com> Date: Tue Jan 31 17:57:46 2023 +0000 i2c: nvidia-gpu: Remove ccgx,firmware-build property Now the Cypress CCG driver has been updated to support the 'firmware-name' property to align with device-tree, remove the 'ccgx,firmware-build' property as this is no longer needed. Signed-off-by: Wayne Chang <waynec@nvidia.com> Signed-off-by: Jon Hunter <jonathanh@nvidia.com> Acked-by: Ajay Gupta <ajayg@nvidia.com> Acked-by: Wolfram Sang <wsa@kernel.org> Link: https://lore.kernel.org/r/20230131175748.256423-5-jonathanh@nvidia.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from commit 430b387) Signed-off-by: David Marlin <dmarlin@redhat.com>
1 parent 704ad05 commit 6f662a8

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

drivers/i2c/busses/i2c-nvidia-gpu.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,7 @@ static const struct pci_device_id gpu_i2c_ids[] = {
257257
MODULE_DEVICE_TABLE(pci, gpu_i2c_ids);
258258

259259
static const struct property_entry ccgx_props[] = {
260-
/* Use FW built for NVIDIA (nv) only */
261-
PROPERTY_ENTRY_U16("ccgx,firmware-build", ('n' << 8) | 'v'),
260+
/* Use FW built for NVIDIA GPU only */
262261
PROPERTY_ENTRY_STRING("firmware-name", "nvidia,gpu"),
263262
{ }
264263
};

0 commit comments

Comments
 (0)