From patchwork Mon Jun 3 10:24:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shane Huang X-Patchwork-Id: 248161 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4B9382C00A4 for ; Mon, 3 Jun 2013 12:23:34 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756883Ab3FCCXW (ORCPT ); Sun, 2 Jun 2013 22:23:22 -0400 Received: from co9ehsobe001.messaging.microsoft.com ([207.46.163.24]:23477 "EHLO co9outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756922Ab3FCCXQ (ORCPT ); Sun, 2 Jun 2013 22:23:16 -0400 Received: from mail49-co9-R.bigfish.com (10.236.132.243) by CO9EHSOBE014.bigfish.com (10.236.130.77) with Microsoft SMTP Server id 14.1.225.23; Mon, 3 Jun 2013 02:23:15 +0000 Received: from mail49-co9 (localhost [127.0.0.1]) by mail49-co9-R.bigfish.com (Postfix) with ESMTP id 53958780134; Mon, 3 Jun 2013 02:23:15 +0000 (UTC) X-Forefront-Antispam-Report: CIP:163.181.249.108; KIP:(null); UIP:(null); IPV:NLI; H:ausb3twp01.amd.com; RD:none; EFVD:NLI X-SpamScore: -2 X-BigFish: VPS-2(z551bizzz1f42h1ee6h1de0h1fdah1202h1e76h1d1ah1d2ah1fc6hzz17326ah1954cbh5eeeK8275bh8275dhz2dh668h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1d0ch1d2eh1d3fh1dc1h1dfeh1dffh1155h) Received: from mail49-co9 (localhost.localdomain [127.0.0.1]) by mail49-co9 (MessageSwitch) id 1370226193450074_3887; Mon, 3 Jun 2013 02:23:13 +0000 (UTC) Received: from CO9EHSMHS032.bigfish.com (unknown [10.236.132.248]) by mail49-co9.bigfish.com (Postfix) with ESMTP id 60F1838004E; Mon, 3 Jun 2013 02:23:13 +0000 (UTC) Received: from ausb3twp01.amd.com (163.181.249.108) by CO9EHSMHS032.bigfish.com (10.236.130.42) with Microsoft SMTP Server id 14.1.225.23; Mon, 3 Jun 2013 02:23:12 +0000 X-WSS-ID: 0MNSPAL-01-NGN-02 X-M-MSG: Received: from sausexedgep02.amd.com (sausexedgep02-ext.amd.com [163.181.249.73]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by ausb3twp01.amd.com (Axway MailGate 3.8.1) with ESMTP id 29352102806E; Sun, 2 Jun 2013 21:23:09 -0500 (CDT) Received: from SAUSEXDAG03.amd.com (163.181.55.3) by sausexedgep02.amd.com (163.181.36.59) with Microsoft SMTP Server (TLS) id 8.3.192.1; Sun, 2 Jun 2013 21:22:53 -0500 Received: from SCYBEXDAG02.amd.com (10.34.11.12) by sausexdag03.amd.com (163.181.55.3) with Microsoft SMTP Server (TLS) id 14.2.328.9; Sun, 2 Jun 2013 21:23:09 -0500 Received: from shane-Annapurna.amd.com (10.237.74.105) by SCYBEXDAG02.amd.com (10.34.11.12) with Microsoft SMTP Server id 14.2.328.9; Mon, 3 Jun 2013 10:23:08 +0800 From: Shane Huang To: Bjorn Helgaas CC: Tejun Heo , Jean Delvare , , , , Shane Huang , Subject: [PATCH RESEND v2 3/3] i2c-piix4: add AMD CZ SMBus device ID Date: Mon, 3 Jun 2013 18:24:55 +0800 Message-ID: <1370255095-2525-1-git-send-email-shane.huang@amd.com> X-Mailer: git-send-email 1.8.1.2 MIME-Version: 1.0 X-OriginatorOrg: amd.com Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org To add AMD CZ SMBus controller device ID. Signed-off-by: Shane Huang Reviewed-by: Tejun Heo Reviewed-by: Jean Delvare Cc: stable@vger.kernel.org --- Documentation/i2c/busses/i2c-piix4 | 2 +- drivers/i2c/busses/Kconfig | 1 + drivers/i2c/busses/i2c-piix4.c | 3 ++- include/linux/pci_ids.h | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Documentation/i2c/busses/i2c-piix4 b/Documentation/i2c/busses/i2c-piix4 index 1e6634f..a370b20 100644 --- a/Documentation/i2c/busses/i2c-piix4 +++ b/Documentation/i2c/busses/i2c-piix4 @@ -13,7 +13,7 @@ Supported adapters: * AMD SP5100 (SB700 derivative found on some server mainboards) Datasheet: Publicly available at the AMD website http://support.amd.com/us/Embedded_TechDocs/44413.pdf - * AMD Hudson-2 + * AMD Hudson-2, CZ Datasheet: Not publicly available * Standard Microsystems (SMSC) SLC90E66 (Victory66) southbridge Datasheet: Publicly available at the SMSC website http://www.smsc.com diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index 631736e..4faf02b 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -150,6 +150,7 @@ config I2C_PIIX4 ATI SB700/SP5100 ATI SB800 AMD Hudson-2 + AMD CZ Serverworks OSB4 Serverworks CSB5 Serverworks CSB6 diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c index 39ab78c..43c2e11 100644 --- a/drivers/i2c/busses/i2c-piix4.c +++ b/drivers/i2c/busses/i2c-piix4.c @@ -22,7 +22,7 @@ Intel PIIX4, 440MX Serverworks OSB4, CSB5, CSB6, HT-1000, HT-1100 ATI IXP200, IXP300, IXP400, SB600, SB700/SP5100, SB800 - AMD Hudson-2 + AMD Hudson-2, CZ SMSC Victory66 Note: we assume there can only be one device, with one or more @@ -522,6 +522,7 @@ static DEFINE_PCI_DEVICE_TABLE(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, PCI_DEVICE_ID_AMD_CZ_SMBUS) }, { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_OSB4) }, { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 22449c1..b10a5b4 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -571,6 +571,7 @@ #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 +#define PCI_DEVICE_ID_AMD_CZ_SMBUS 0x790b #define PCI_VENDOR_ID_TRIDENT 0x1023 #define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX 0x2000