]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
platform/x86: intel_mid_powerbtn: Use SCU IPC directly
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Wed, 8 Feb 2017 17:03:19 +0000 (19:03 +0200)
committerDarren Hart <dvhart@linux.intel.com>
Sat, 25 Feb 2017 07:48:45 +0000 (23:48 -0800)
On older Intel MID platforms is using SCU IPC library beneath MSIC
calls.

To make access unified between old and new platforms use SCU IPC library
directly. It's safe since serialization is done in the library.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
drivers/platform/x86/intel_mid_powerbtn.c

index 38844f765345317490fc312ffb7a4eb64ff7cd77..871cfa682519c2256126edae36dffefc9537ed8b 100644 (file)
@@ -64,7 +64,7 @@ static int mid_pbstat(struct mid_pb_ddata *ddata, int *value)
        int ret;
        u8 pbstat;
 
-       ret = intel_msic_reg_read(ddata->pbstat_addr, &pbstat);
+       ret = intel_scu_ipc_ioread8(ddata->pbstat_addr, &pbstat);
        if (ret)
                return ret;
 
@@ -76,7 +76,7 @@ static int mid_pbstat(struct mid_pb_ddata *ddata, int *value)
 
 static int mid_irq_ack(struct mid_pb_ddata *ddata)
 {
-       return intel_msic_reg_update(ddata->mirqlvl1_addr, 0, MSIC_PWRBTNM);
+       return intel_scu_ipc_update_register(ddata->mirqlvl1_addr, 0, MSIC_PWRBTNM);
 }
 
 static int mrfld_setup(struct mid_pb_ddata *ddata)