Patchwork [3/3] i2c-piix4: add AMD CZ SMBus device ID

login
register
mail settings
Submitter Shane Huang
Date May 31, 2013, 11:22 a.m.
Message ID <1369999333-2073-1-git-send-email-shane.huang@amd.com>
Download mbox | patch
Permalink /patch/247838/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

Jean Delvare - May 31, 2013, 6:03 a.m.
Hi Shane,

On Fri, 31 May 2013 19:22:13 +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         | 3 ++-
>  drivers/i2c/busses/i2c-piix4.c     | 3 ++-
>  include/linux/pci_ids.h            | 1 +
>  4 files changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/Documentation/i2c/busses/i2c-piix4 b/Documentation/i2c/busses/i2c-piix4
> index 1e6634f..c136148 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..a43086d 100644
> --- a/drivers/i2c/busses/Kconfig
> +++ b/drivers/i2c/busses/Kconfig
> @@ -149,7 +149,8 @@ config I2C_PIIX4
>  	    ATI SB600
>  	    ATI SB700/SP5100
>  	    ATI SB800
> -	    AMD Hudson-2
> +	    AMD HUDSON-2

Please don't change the case. This makes your patch larger and
increases the risk of conflict with other patches, for no good reason.

Other than that, the patch looks OK.

> +	    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..16a4d89 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
Shane Huang - May 31, 2013, 6:42 a.m.
Hi Jean,

> Please don't change the case. This makes your patch larger and
> increases the risk of conflict with other patches, for no good reason.
> 
> Other than that, the patch looks OK.

I didn't want to change it but checkpatch.pl warns due to
"Hudson-2" in i2c-piix4.c

Thanks,
Shane


--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Jean Delvare - May 31, 2013, 7:28 a.m.
On Fri, 31 May 2013 06:42:54 +0000, Huang, Shane wrote:
> Hi Jean,
> 
> > Please don't change the case. This makes your patch larger and
> > increases the risk of conflict with other patches, for no good reason.
> > 
> > Other than that, the patch looks OK.
> 
> I didn't want to change it but checkpatch.pl warns due to
> "Hudson-2" in i2c-piix4.c

Can you show the exact message? checkpatch doesn't complain here, and I
can't think of any reason why it would care about that.
Shane Huang - May 31, 2013, 7:33 a.m.
> Can you show the exact message? checkpatch doesn't complain here, and I
> can't think of any reason why it would care about that.

$ ./scripts/checkpatch.pl 0003-i2c-piix4-add-AMD-CZ-SMBus-device-ID.patch
WARNING: Avoid CamelCase: <Hudson>
#52: FILE: drivers/i2c/busses/i2c-piix4.c:25:
+       AMD Hudson-2, CZ

total: 0 errors, 1 warnings, 39 lines checked


Thanks,
Shane

--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Tejun Heo - May 31, 2013, 7:38 a.m.
On Fri, May 31, 2013 at 07:33:51AM +0000, Huang, Shane wrote:
> > Can you show the exact message? checkpatch doesn't complain here, and I
> > can't think of any reason why it would care about that.
> 
> $ ./scripts/checkpatch.pl 0003-i2c-piix4-add-AMD-CZ-SMBus-device-ID.patch
> WARNING: Avoid CamelCase: <Hudson>
> #52: FILE: drivers/i2c/busses/i2c-piix4.c:25:
> +       AMD Hudson-2, CZ
> 
> total: 0 errors, 1 warnings, 39 lines checked

Even if checkpatch complains, there's no point in following it
religiously.  If addressing the complaint doesn't make the code
better, there's no point in doing so.

Thanks.
Jean Delvare - May 31, 2013, 7:46 a.m.
On Fri, 31 May 2013 07:33:51 +0000, Huang, Shane wrote:
> > Can you show the exact message? checkpatch doesn't complain here, and I
> > can't think of any reason why it would care about that.
> 
> $ ./scripts/checkpatch.pl 0003-i2c-piix4-add-AMD-CZ-SMBus-device-ID.patch
> WARNING: Avoid CamelCase: <Hudson>
> #52: FILE: drivers/i2c/busses/i2c-piix4.c:25:
> +       AMD Hudson-2, CZ
> 
> total: 0 errors, 1 warnings, 39 lines checked

checkpatch is twice wrong here, firstly because there is no CamelCase
and secondly because this is a comment and not code (ideally middle
comment lines would start with "*" to avoid this false positive, but
that style wasn't yet in use when the i2c-piix4 driver was written.)

So, just ignore it.
Shane Huang - May 31, 2013, 11:22 a.m.
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         | 3 ++-
 drivers/i2c/busses/i2c-piix4.c     | 3 ++-
 include/linux/pci_ids.h            | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

Patch

diff --git a/Documentation/i2c/busses/i2c-piix4 b/Documentation/i2c/busses/i2c-piix4
index 1e6634f..c136148 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..a43086d 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -149,7 +149,8 @@  config I2C_PIIX4
 	    ATI SB600
 	    ATI SB700/SP5100
 	    ATI SB800
-	    AMD Hudson-2
+	    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..16a4d89 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