On Mon, Jun 3, 2013 at 4:04 AM, Sergei Shtylyov <[email protected]> wrote: > Hello. > > > On 03-06-2013 14:24, Shane Huang wrote: > >> To add AMD CZ SATA controller device ID of IDE mode. > > >> Signed-off-by: Shane Huang <[email protected]> >> Reviewed-by: Tejun Heo <[email protected]> >> Cc: [email protected] >> --- >> drivers/ata/ahci.c | 1 + >> drivers/pci/quirks.c | 2 ++ >> include/linux/pci_ids.h | 1 + >> 3 files changed, 4 insertions(+) > > >> diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c >> index 751f1ea..548f1c3 100644 >> --- a/drivers/ata/ahci.c >> +++ b/drivers/ata/ahci.c >> @@ -310,6 +310,7 @@ static const struct pci_device_id ahci_pci_tbl[] = { >> >> /* AMD */ >> { PCI_VDEVICE(AMD, 0x7800), board_ahci }, /* AMD Hudson-2 */ >> + { PCI_VDEVICE(AMD, 0x7900), board_ahci }, /* AMD CZ */ >> /* AMD is using RAID class only for ahci controllers */ >> { PCI_VENDOR_ID_AMD, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, >> PCI_CLASS_STORAGE_RAID << 8, 0xffffff, board_ahci }, > > [...] > >> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h >> index e0b5623..22449c1 100644 >> --- a/include/linux/pci_ids.h >> +++ b/include/linux/pci_ids.h >> @@ -570,6 +570,7 @@ >> #define PCI_DEVICE_ID_AMD_HUDSON2_IDE 0x780c >> #define PCI_DEVICE_ID_AMD_HUDSON2_SATA_IDE 0x7800 >> #define PCI_DEVICE_ID_AMD_HUDSON2_SMBUS 0x780b >> +#define PCI_DEVICE_ID_AMD_CZ_SATA_IDE 0x7900 > > > We don't add the device IDs to this file anymore. And if you added it, > why didn't you use it in ahci.c?
Sergei has a good point. I first thought it was used in both ahci.c and quirks.c, but since it's not, it seems easier to forget about the pci_ids.h update. I dropped the pci_ids.h updates from patches 2 and 3 and pushed the result to http://git.kernel.org/cgit/linux/kernel/git/helgaas/pci.git/log/?h=pci/shane-amd-ahci-i2c Let me know if anybody objects. Otherwise, I'll merge it into my -next branch tomorrow. Bjorn -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
