i2c: designware-pci: Group AMD NAVI quirk parts together
Subsystems (3)
Andy Shevchenko
reviewerPATCH 1/2 i2c: designware-pci: Group AMD NAVI quirk parts together
The code is ogranazed in a way that all related parts to the certain platform quirk go toghether. This is not the case for AMD NAVI. Shuffle code to make it happen.
While at it, drop the frequency definition and use hard coded value as it's done for other platforms and add a comment to the PCI ID list.
--- drivers/i2c/busses/i2c-designware-pcidrv.c | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-)
drivers/i2c/busses/i2c-designware-pcidrv.c +15 -15
@@ -27,7 +27,6 @@#include "i2c-ccgx-ucsi.h" #define DRIVER_NAME "i2c-designware-pci" -#define AMD_CLK_RATE_HZ 100000enum dw_pci_ctl_id_t { medfield,
@@ -100,11 +99,6 @@ static u32 mfld_get_clk_rate_khz(struct dw_i2c_dev *dev)return 25000 ; } -static u32 navi_amd_get_clk_rate_khz (struct dw_i2c_dev *dev) -{ -return AMD_CLK_RATE_HZ ; -} -static int mfld_setup (struct pci_dev *pdev,struct dw_pci_controller *c) {struct dw_i2c_dev *dev =dev_get_drvdata (&pdev->dev);
@@ -126,15 +120,6 @@ static int mfld_setup(struct pci_dev *pdev, struct dw_pci_controller *c)return -ENODEV ; } -static int navi_amd_setup (struct pci_dev *pdev,struct dw_pci_controller *c) -{ -struct dw_i2c_dev *dev =dev_get_drvdata (&pdev->dev); - - dev->flags |=MODEL_AMD_NAVI_GPU ; - dev->timings.bus_freq_hz =I2C_MAX_STANDARD_MODE_FREQ ; -return 0 ; -} -static int mrfld_setup (struct pci_dev *pdev,struct dw_pci_controller *c) {/*
@@ -159,6 +144,20 @@ static u32 ehl_get_clk_rate_khz(struct dw_i2c_dev *dev)return 100000 ; } +static u32 navi_amd_get_clk_rate_khz (struct dw_i2c_dev *dev) +{ +return 100000 ; +} + +static int navi_amd_setup (struct pci_dev *pdev,struct dw_pci_controller *c) +{ +struct dw_i2c_dev *dev =dev_get_drvdata (&pdev->dev); + + dev->flags |=MODEL_AMD_NAVI_GPU ; + dev->timings.bus_freq_hz =I2C_MAX_STANDARD_MODE_FREQ ; +return 0 ; +} +static struct dw_pci_controller dw_pci_controllers[] = { [medfield] = { .bus_num =-1 ,
@@ -392,6 +391,7 @@ static const struct pci_device_id i2_designware_pci_ids[] = { { PCI_VDEVICE(INTEL, 0x4bbe), elkhartlake }, { PCI_VDEVICE(INTEL, 0x4bbf), elkhartlake }, { PCI_VDEVICE(INTEL, 0x4bc0), elkhartlake }, +/* AMD NAVI */ { PCI_VDEVICE(ATI, 0x7314), navi_amd }, { PCI_VDEVICE(ATI, 0x73a4), navi_amd }, { PCI_VDEVICE(ATI, 0x73e4), navi_amd },
Signature · 1 line
2.35.1
Andy Shevchenko
reviewerPATCH 2/2 i2c: designware-pci: Use standard pattern for memory allocation
The pattern
foo = kmalloc(sizeof(*foo), GFP_KERNEL);
has an advantage when foo type is changed. Since we are planning a such, better to be prepared by using standard pattern for memory allocation.
--- drivers/i2c/busses/i2c-designware-pcidrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i2c/busses/i2c-designware-pcidrv.c +1 -1
@@ -263,7 +263,7 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev,return dev_err_probe (&pdev->dev, r,"I/O memory remapping failed\n" ); - dev =devm_kzalloc (&pdev->dev,sizeof (struct dw_i2c_dev ),GFP_KERNEL ); + dev =devm_kzalloc (&pdev->dev,sizeof (*dev),GFP_KERNEL );if (!dev)return -ENOMEM ;
Signature · 1 line
2.35.1
Re: [PATCH v1 2/2] i2c: designware-pci: Use standard pattern for memory allocation
Quoted 10 lines · Andy Shevchenko
The pattern
foo = kmalloc(sizeof(*foo), GFP_KERNEL);has an advantage when foo type is changed. Since we are planning a such, better to be prepared by using standard pattern for memory allocation.
Signed-off-by Andy Shevchenko <[email protected]>--- drivers/i2c/busses/i2c-designware-pcidrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 4 lines · Andy Shevchenko
The code is ogranazed in a way that all related parts to the certain platform quirk go toghether. This is not the case for AMD NAVI. Shuffle code to make it happen.
Perhaps you want to change ogranazed and toghether?
Quoted 9 lines
While at it, drop the frequency definition and use hard coded value as it's done for other platforms and add a comment to the PCI ID list.
Signed-off-by Andy Shevchenko <[email protected]>--- drivers/i2c/busses/i2c-designware-pcidrv.c | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-)
You may add:
Andy Shevchenko
reviewerQuoted 6 lines · Jarkko Nikula
Quoted 4 lines · Andy Shevchenko
The code is ogranazed in a way that all related parts to the certain platform quirk go toghether. This is not the case for AMD NAVI. Shuffle code to make it happen.
Perhaps you want to change ogranazed and toghether?
Done in v2, thanks!
Signature · 2 lines
With Best Regards, Andy Shevchenko