| Message ID | 20230119121639.226729-5-jonathanh@nvidia.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Add device-tree support for Cypress CYPD4226 | expand |
On Thu, Jan 19, 2023 at 12:16:37PM +0000, Jon Hunter wrote: > From: Wayne Chang <waynec@nvidia.com> > > 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> > --- > V6: no changes > V5: Added this patch from V3 > > drivers/i2c/busses/i2c-nvidia-gpu.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-nvidia-gpu.c b/drivers/i2c/busses/i2c-nvidia-gpu.c > index 6d81ea530a83..a8b99e7f6262 100644 > --- a/drivers/i2c/busses/i2c-nvidia-gpu.c > +++ b/drivers/i2c/busses/i2c-nvidia-gpu.c > @@ -259,8 +259,7 @@ static const struct pci_device_id gpu_i2c_ids[] = { > MODULE_DEVICE_TABLE(pci, gpu_i2c_ids); > > static const struct property_entry ccgx_props[] = { > - /* Use FW built for NVIDIA (nv) only */ > - PROPERTY_ENTRY_U16("ccgx,firmware-build", ('n' << 8) | 'v'), > + /* Use FW built for NVIDIA GPU only */ > PROPERTY_ENTRY_STRING("firmware-name", "nvidia,gpu"), > { } > }; This patch is fine, and it's in the right place, but you need to squash 5/6 into 3/6. thanks,
diff --git a/drivers/i2c/busses/i2c-nvidia-gpu.c b/drivers/i2c/busses/i2c-nvidia-gpu.c index 6d81ea530a83..a8b99e7f6262 100644 --- a/drivers/i2c/busses/i2c-nvidia-gpu.c +++ b/drivers/i2c/busses/i2c-nvidia-gpu.c @@ -259,8 +259,7 @@ static const struct pci_device_id gpu_i2c_ids[] = { MODULE_DEVICE_TABLE(pci, gpu_i2c_ids); static const struct property_entry ccgx_props[] = { - /* Use FW built for NVIDIA (nv) only */ - PROPERTY_ENTRY_U16("ccgx,firmware-build", ('n' << 8) | 'v'), + /* Use FW built for NVIDIA GPU only */ PROPERTY_ENTRY_STRING("firmware-name", "nvidia,gpu"), { } };