diff options
Diffstat (limited to 'meta-steppeeagle/recipes-kernel/linux/linux-yocto/0053-yocto-amd-i2c-piix4-add-support-for-AMD-ML-and-CZ-SMBus-changes.patch')
| -rw-r--r-- | meta-steppeeagle/recipes-kernel/linux/linux-yocto/0053-yocto-amd-i2c-piix4-add-support-for-AMD-ML-and-CZ-SMBus-changes.patch | 87 |
1 files changed, 0 insertions, 87 deletions
diff --git a/meta-steppeeagle/recipes-kernel/linux/linux-yocto/0053-yocto-amd-i2c-piix4-add-support-for-AMD-ML-and-CZ-SMBus-changes.patch b/meta-steppeeagle/recipes-kernel/linux/linux-yocto/0053-yocto-amd-i2c-piix4-add-support-for-AMD-ML-and-CZ-SMBus-changes.patch deleted file mode 100644 index 556e5806..00000000 --- a/meta-steppeeagle/recipes-kernel/linux/linux-yocto/0053-yocto-amd-i2c-piix4-add-support-for-AMD-ML-and-CZ-SMBus-changes.patch +++ /dev/null @@ -1,87 +0,0 @@ -Backport of commit id 032f708bc4f6da868ec49dac48ddf3670d8035d3 - -i2c: piix4: Add support for AMD ML and CZ SMBus changes - -The locations of SMBus register base address and enablement bit are changed -from AMD ML, which need this patch to be supported. - -Signed-off-by: Shane Huang <shane.huang@amd.com> -Reviewed-by: Jean Delvare <khali@linux-fr.org> -Signed-off-by: Wolfram Sang <wsa@the-dreams.de> -Cc: stable@vger.kernel.org -Signed-off-by: Arindam Nath <arindam.nath@amd.com> -diff -Naur a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c ---- a/drivers/i2c/busses/i2c-piix4.c 2013-11-04 05:11:51.000000000 +0530 -+++ b/drivers/i2c/busses/i2c-piix4.c 2014-05-06 22:03:36.945675193 +0530 -@@ -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, CZ -+ AMD Hudson-2, ML, CZ - SMSC Victory66 - - Note: we assume there can only be one device, with one or more -@@ -235,7 +235,8 @@ - { - unsigned short piix4_smba; - unsigned short smba_idx = 0xcd6; -- u8 smba_en_lo, smba_en_hi, i2ccfg, i2ccfg_offset = 0x10, smb_en; -+ u8 smba_en_lo, smba_en_hi, smb_en, smb_en_status; -+ u8 i2ccfg, i2ccfg_offset = 0x10; - - /* SB800 and later SMBus does not support forcing address */ - if (force || force_addr) { -@@ -245,7 +246,15 @@ - } - - /* Determine the address of the SMBus areas */ -- smb_en = (aux) ? 0x28 : 0x2c; -+ if ((PIIX4_dev->vendor == PCI_VENDOR_ID_AMD && -+ 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->revision >= 0x49)) -+ smb_en = 0x00; -+ else -+ smb_en = (aux) ? 0x28 : 0x2c; - - if (!request_region(smba_idx, 2, "smba_idx")) { - dev_err(&PIIX4_dev->dev, "SMBus base address index region " -@@ -258,13 +267,22 @@ - smba_en_hi = inb_p(smba_idx + 1); - release_region(smba_idx, 2); - -- if ((smba_en_lo & 1) == 0) { -+ if (!smb_en) { -+ smb_en_status = smba_en_lo & 0x10; -+ piix4_smba = smba_en_hi << 8; -+ if (aux) -+ piix4_smba |= 0x20; -+ } else { -+ smb_en_status = smba_en_lo & 0x01; -+ piix4_smba = ((smba_en_hi << 8) | smba_en_lo) & 0xffe0; -+ } -+ -+ if (!smb_en_status) { - dev_err(&PIIX4_dev->dev, - "Host SMBus controller not enabled!\n"); - return -ENODEV; - } - -- piix4_smba = ((smba_en_hi << 8) | smba_en_lo) & 0xffe0; - if (acpi_check_region(piix4_smba, SMBIOSIZE, piix4_driver.name)) - return -ENODEV; - -diff -Naur a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig ---- a/drivers/i2c/busses/Kconfig 2013-11-04 05:11:51.000000000 +0530 -+++ b/drivers/i2c/busses/Kconfig 2014-05-06 21:47:27.557717841 +0530 -@@ -151,6 +151,7 @@ - ATI SB700/SP5100 - ATI SB800 - AMD Hudson-2 -+ AMD ML - AMD CZ - Serverworks OSB4 - Serverworks CSB5 |