| Message ID | 20230116155045.100780-5-jonathanh@nvidia.com |
|---|---|
| State | New |
| Headers | show |
| Series | Add device-tree support for Cypress CYP4226 | expand |
On Mon, Jan 16, 2023 at 03:50:44PM +0000, Jon Hunter wrote: > From: Wayne Chang <waynec@nvidia.com> > > ccgx is refer to the cypress cypd4226 typec controller. > Replace ccgx to well-known regex "cypress". > > Signed-off-by: Wayne Chang <waynec@nvidia.com> > Signed-off-by: Jon Hunter <jonathanh@nvidia.com> > --- > V2 -> V4: nothing has changed > V1 -> V2: New change for adding cypress,firmware-build > > drivers/i2c/busses/i2c-nvidia-gpu.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/i2c/busses/i2c-nvidia-gpu.c b/drivers/i2c/busses/i2c-nvidia-gpu.c > index 12e330cd7635..0934f8ad7f49 100644 > --- a/drivers/i2c/busses/i2c-nvidia-gpu.c > +++ b/drivers/i2c/busses/i2c-nvidia-gpu.c > @@ -260,7 +260,7 @@ 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'), > + PROPERTY_ENTRY_U16("cypress,firmware-build", ('n' << 8) | 'v'), > { } > }; So you need a new patch where you first introduce that "cypress,firmware-build" property. That patch comes before patch 3/5. Then in this patch you only remove the old property "ccgx,firmware-build" property. thanks,
diff --git a/drivers/i2c/busses/i2c-nvidia-gpu.c b/drivers/i2c/busses/i2c-nvidia-gpu.c index 12e330cd7635..0934f8ad7f49 100644 --- a/drivers/i2c/busses/i2c-nvidia-gpu.c +++ b/drivers/i2c/busses/i2c-nvidia-gpu.c @@ -260,7 +260,7 @@ 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'), + PROPERTY_ENTRY_U16("cypress,firmware-build", ('n' << 8) | 'v'), { } };