HID: amd_sfh: Extend MP2 register access to SFH

[linux-2.6-microblaze.git] / drivers / hid / amd-sfh-hid / amd_sfh_pcie.c

diff --git a/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c b/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c
index 495ec11..9e97c26 100644 (file)
--- a/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c
+++ b/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c
@@ -99,9 +99,9 @@ static void amd_stop_all_sensor_v2(struct amd_mp2_dev *privdata)
 
 void amd_sfh_clear_intr_v2(struct amd_mp2_dev *privdata)
 {
-       if (readl(privdata->mmio + AMD_P2C_MSG(4))) {
-               writel(0, privdata->mmio + AMD_P2C_MSG(4));
-               writel(0xf, privdata->mmio + AMD_P2C_MSG(5));
+       if (readl(privdata->mmio + amd_get_p2c_val(privdata, 4))) {
+               writel(0, privdata->mmio + amd_get_p2c_val(privdata, 4));
+               writel(0xf, privdata->mmio + amd_get_p2c_val(privdata, 5));
        }
 }
 
@@ -410,6 +410,9 @@ static int amd_mp2_pci_probe(struct pci_dev *pdev, const struct pci_device_id *i
 
        privdata->sfh1_1_ops = (const struct amd_sfh1_1_ops *)id->driver_data;
        if (privdata->sfh1_1_ops) {
+               if (boot_cpu_data.x86 >= 0x1A)
+                       privdata->rver = 1;
+
                rc = devm_work_autocancel(&pdev->dev, &privdata->work, sfh1_1_init_work);
                if (rc)
                        return rc;