| Message ID | 1434024707-6245-2-git-send-email-Vincent.Wan@amd.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
On Thu, Jun 11, 2015 at 08:11:46PM +0800, Wan ZongShun wrote: > Change AMD CZ SMBUS device ID from 0x790b to > use Macro definition > > Signed-off-by: Wan ZongShun <Vincent.Wan@amd.com> I think it makes sense that this patch goes in via MMC. This I2C change is trivial, but for MMC there is more to handle. I don't expect conflicts. So: Acked-by: Wolfram Sang <wsa@the-dreams.de> > --- > drivers/i2c/busses/i2c-piix4.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c > index 67cbec6..630bce6 100644 > --- a/drivers/i2c/busses/i2c-piix4.c > +++ b/drivers/i2c/busses/i2c-piix4.c > @@ -245,7 +245,7 @@ static int piix4_setup_sb800(struct pci_dev *PIIX4_dev, > PIIX4_dev->device == PCI_DEVICE_ID_AMD_HUDSON2_SMBUS && > PIIX4_dev->revision >= 0x41) || > (PIIX4_dev->vendor == PCI_VENDOR_ID_AMD && > - PIIX4_dev->device == 0x790b && > + PIIX4_dev->device == PCI_DEVICE_ID_AMD_KERNCZ_SMBUS && > PIIX4_dev->revision >= 0x49)) > smb_en = 0x00; > else > @@ -545,7 +545,7 @@ static const struct pci_device_id piix4_ids[] = { > { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_SMBUS) }, > { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS) }, > { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_HUDSON2_SMBUS) }, > - { PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x790b) }, > + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_KERNCZ_SMBUS) }, > { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, > PCI_DEVICE_ID_SERVERWORKS_OSB4) }, > { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, > -- > 1.9.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-i2c" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
On 11 June 2015 at 15:07, Wolfram Sang <wsa@the-dreams.de> wrote: > On Thu, Jun 11, 2015 at 08:11:46PM +0800, Wan ZongShun wrote: >> Change AMD CZ SMBUS device ID from 0x790b to >> use Macro definition >> >> Signed-off-by: Wan ZongShun <Vincent.Wan@amd.com> > > I think it makes sense that this patch goes in via MMC. This I2C change > is trivial, but for MMC there is more to handle. I don't expect > conflicts. So: > > Acked-by: Wolfram Sang <wsa@the-dreams.de> Thanks, applied! Kind regards Uffe > >> --- >> drivers/i2c/busses/i2c-piix4.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c >> index 67cbec6..630bce6 100644 >> --- a/drivers/i2c/busses/i2c-piix4.c >> +++ b/drivers/i2c/busses/i2c-piix4.c >> @@ -245,7 +245,7 @@ static int piix4_setup_sb800(struct pci_dev *PIIX4_dev, >> PIIX4_dev->device == PCI_DEVICE_ID_AMD_HUDSON2_SMBUS && >> PIIX4_dev->revision >= 0x41) || >> (PIIX4_dev->vendor == PCI_VENDOR_ID_AMD && >> - PIIX4_dev->device == 0x790b && >> + PIIX4_dev->device == PCI_DEVICE_ID_AMD_KERNCZ_SMBUS && >> PIIX4_dev->revision >= 0x49)) >> smb_en = 0x00; >> else >> @@ -545,7 +545,7 @@ static const struct pci_device_id piix4_ids[] = { >> { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_SMBUS) }, >> { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS) }, >> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_HUDSON2_SMBUS) }, >> - { PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x790b) }, >> + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_KERNCZ_SMBUS) }, >> { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, >> PCI_DEVICE_ID_SERVERWORKS_OSB4) }, >> { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, >> -- >> 1.9.1 >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-i2c" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, 11 Jun 2015 20:11:46 +0800, Wan ZongShun wrote: > Change AMD CZ SMBUS device ID from 0x790b to > use Macro definition > > Signed-off-by: Wan ZongShun <Vincent.Wan@amd.com> > --- > drivers/i2c/busses/i2c-piix4.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c > index 67cbec6..630bce6 100644 > --- a/drivers/i2c/busses/i2c-piix4.c > +++ b/drivers/i2c/busses/i2c-piix4.c > @@ -245,7 +245,7 @@ static int piix4_setup_sb800(struct pci_dev *PIIX4_dev, > PIIX4_dev->device == PCI_DEVICE_ID_AMD_HUDSON2_SMBUS && > PIIX4_dev->revision >= 0x41) || > (PIIX4_dev->vendor == PCI_VENDOR_ID_AMD && > - PIIX4_dev->device == 0x790b && > + PIIX4_dev->device == PCI_DEVICE_ID_AMD_KERNCZ_SMBUS && > PIIX4_dev->revision >= 0x49)) > smb_en = 0x00; > else > @@ -545,7 +545,7 @@ static const struct pci_device_id piix4_ids[] = { > { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_SMBUS) }, > { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS) }, > { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_HUDSON2_SMBUS) }, > - { PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x790b) }, > + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_KERNCZ_SMBUS) }, > { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, > PCI_DEVICE_ID_SERVERWORKS_OSB4) }, > { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, Probably too late but anyway: Acked-by: Jean Delvare <jdelvare@suse.de>
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c index 67cbec6..630bce6 100644 --- a/drivers/i2c/busses/i2c-piix4.c +++ b/drivers/i2c/busses/i2c-piix4.c @@ -245,7 +245,7 @@ static int piix4_setup_sb800(struct pci_dev *PIIX4_dev, PIIX4_dev->device == PCI_DEVICE_ID_AMD_HUDSON2_SMBUS && PIIX4_dev->revision >= 0x41) || (PIIX4_dev->vendor == PCI_VENDOR_ID_AMD && - PIIX4_dev->device == 0x790b && + PIIX4_dev->device == PCI_DEVICE_ID_AMD_KERNCZ_SMBUS && PIIX4_dev->revision >= 0x49)) smb_en = 0x00; else @@ -545,7 +545,7 @@ static const struct pci_device_id piix4_ids[] = { { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_SMBUS) }, { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_HUDSON2_SMBUS) }, - { PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x790b) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_KERNCZ_SMBUS) }, { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_OSB4) }, { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS,
Change AMD CZ SMBUS device ID from 0x790b to use Macro definition Signed-off-by: Wan ZongShun <Vincent.Wan@amd.com> --- drivers/i2c/busses/i2c-piix4.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)