| Message ID | 1369987950-2894-1-git-send-email-shane.huang@amd.com |
|---|---|
| State | Not Applicable |
| Headers | show |
On Fri, May 31, 2013 at 04:12:30PM +0800, Shane Huang wrote: > To add AMD CZ SMBus controller device ID. > > Signed-off-by: Shane Huang <shane.huang@amd.com> All three patches look good to me. Reviewed-by: Tejun Heo <tj@kernel.org> Both 2 and 3 are dependent on the first patch, so it probably would be a good idea to route them together (probably w/ stable cc'd). Who wants these? Bjorn? Thanks.
On Fri, 31 May 2013 16:12:30 +0800, Shane Huang wrote: > To add AMD CZ SMBus controller device ID. > > Signed-off-by: Shane Huang <shane.huang@amd.com> > --- > 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 Reviewed-by: Jean Delvare <khali@linux-fr.org>
On Fri, May 31, 2013 at 2:16 AM, Tejun Heo <tj@kernel.org> wrote: > On Fri, May 31, 2013 at 04:12:30PM +0800, Shane Huang wrote: >> To add AMD CZ SMBus controller device ID. >> >> Signed-off-by: Shane Huang <shane.huang@amd.com> > > All three patches look good to me. > > Reviewed-by: Tejun Heo <tj@kernel.org> > > Both 2 and 3 are dependent on the first patch, so it probably would be > a good idea to route them together (probably w/ stable cc'd). Who > wants these? Bjorn? The pci_ids.h change is fine with me. I don't care how they're routed. If you want me to pick them up, maybe Shane could collect up the acks & reviewed-bys and add the appropriate stable tags and resend the series to me. Bjorn -- 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 Fri, May 31, 2013 at 01:24:57PM -0600, Bjorn Helgaas wrote: > On Fri, May 31, 2013 at 2:16 AM, Tejun Heo <tj@kernel.org> wrote: > > On Fri, May 31, 2013 at 04:12:30PM +0800, Shane Huang wrote: > >> To add AMD CZ SMBus controller device ID. > >> > >> Signed-off-by: Shane Huang <shane.huang@amd.com> > > > > All three patches look good to me. > > > > Reviewed-by: Tejun Heo <tj@kernel.org> > > > > Both 2 and 3 are dependent on the first patch, so it probably would be > > a good idea to route them together (probably w/ stable cc'd). Who > > wants these? Bjorn? > > The pci_ids.h change is fine with me. I don't care how they're > routed. If you want me to pick them up, maybe Shane could collect up > the acks & reviewed-bys and add the appropriate stable tags and resend > the series to me. Yeah, let's go through Bjorn's tree and preferably with stable cc'd and targeted for for-3.10-rcX. Shane? Thanks.
On Sun, 2 Jun 2013 01:02:32 -0700, Tejun Heo wrote: > On Fri, May 31, 2013 at 01:24:57PM -0600, Bjorn Helgaas wrote: > > On Fri, May 31, 2013 at 2:16 AM, Tejun Heo <tj@kernel.org> wrote: > > > On Fri, May 31, 2013 at 04:12:30PM +0800, Shane Huang wrote: > > >> To add AMD CZ SMBus controller device ID. > > >> > > >> Signed-off-by: Shane Huang <shane.huang@amd.com> > > > > > > All three patches look good to me. > > > > > > Reviewed-by: Tejun Heo <tj@kernel.org> > > > > > > Both 2 and 3 are dependent on the first patch, so it probably would be > > > a good idea to route them together (probably w/ stable cc'd). Who > > > wants these? Bjorn? > > > > The pci_ids.h change is fine with me. I don't care how they're > > routed. If you want me to pick them up, maybe Shane could collect up > > the acks & reviewed-bys and add the appropriate stable tags and resend > > the series to me. > > Yeah, let's go through Bjorn's tree and preferably with stable cc'd > and targeted for for-3.10-rcX. Shane? Fine with me.
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
To add AMD CZ SMBus controller device ID. Signed-off-by: Shane Huang <shane.huang@amd.com> --- 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(-)