Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755966AbbFOJ5G (ORCPT ); Mon, 15 Jun 2015 05:57:06 -0400 Received: from mail-qg0-f52.google.com ([209.85.192.52]:36700 "EHLO mail-qg0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755674AbbFOJzB (ORCPT ); Mon, 15 Jun 2015 05:55:01 -0400 MIME-Version: 1.0 In-Reply-To: <20150611130734.GA1510@katana> References: <1434024707-6245-1-git-send-email-Vincent.Wan@amd.com> <1434024707-6245-2-git-send-email-Vincent.Wan@amd.com> <20150611130734.GA1510@katana> Date: Mon, 15 Jun 2015 11:55:00 +0200 Message-ID: Subject: Re: [PATCH V2 2/3] i2c-piix4: Use Macro for AMD CZ SMBus device ID From: Ulf Hansson To: Wan ZongShun Cc: linux-mmc , Wolfram Sang , "linux-i2c@vger.kernel.org" , bp@alien8.de, Jean Delvare , Linux PCI , "linux-kernel@vger.kernel.org" , ZongShun Wan Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2310 Lines: 57 On 11 June 2015 at 15:07, Wolfram Sang 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 > > 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 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-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/