Commit 595694bd authored by Mika Westerberg's avatar Mika Westerberg Committed by Lee Jones
Browse files

platform/x86: intel_mid_powerbtn: Convert to use new SCU IPC API 



This converts the power button driver to use the new SCU IPC API where
the SCU IPC instance is passed to the functions.

Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent f57fa185

drivers/platform/x86/intel_mid_powerbtn.c

+11 −4
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ struct mid_pb_ddata { 
	unsigned short mirqlvl1_addr;

	unsigned short pbstat_addr;

	u8 pbstat_mask;

	struct intel_scu_ipc_dev *scu;

	int (*setup)(struct mid_pb_ddata *ddata);

};
@@ -55,7 +56,8 @@ static int mid_pbstat(struct mid_pb_ddata *ddata, int *value) 
	int ret;

	u8 pbstat;



	ret = intel_scu_ipc_ioread8(ddata->pbstat_addr, &pbstat);

	ret = intel_scu_ipc_dev_ioread8(ddata->scu, ddata->pbstat_addr,

					&pbstat);

	if (ret)

		return ret;
@@ -67,14 +69,15 @@ static int mid_pbstat(struct mid_pb_ddata *ddata, int *value) 


static int mid_irq_ack(struct mid_pb_ddata *ddata)

{

	return intel_scu_ipc_update_register(ddata->mirqlvl1_addr, 0, MSIC_PWRBTNM);

	return intel_scu_ipc_dev_update(ddata->scu, ddata->mirqlvl1_addr, 0,

					MSIC_PWRBTNM);

}



static int mrfld_setup(struct mid_pb_ddata *ddata)

{

	/* Unmask the PBIRQ and MPBIRQ on Tangier */

	intel_scu_ipc_update_register(BCOVE_PBIRQ, 0, MSIC_PWRBTNM);

	intel_scu_ipc_update_register(BCOVE_PBIRQMASK, 0, MSIC_PWRBTNM);

	intel_scu_ipc_dev_update(ddata->scu, BCOVE_PBIRQ, 0, MSIC_PWRBTNM);

	intel_scu_ipc_dev_update(ddata->scu, BCOVE_PBIRQMASK, 0, MSIC_PWRBTNM);



	return 0;

}
@@ -161,6 +164,10 @@ static int mid_pb_probe(struct platform_device *pdev) 
			return error;

	}



	ddata->scu = devm_intel_scu_ipc_dev_get(&pdev->dev);

	if (!ddata->scu)

		return -EPROBE_DEFER;



	error = devm_request_threaded_irq(&pdev->dev, irq, NULL, mid_pb_isr,

					  IRQF_ONESHOT, DRIVER_NAME, ddata);

	if (error) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE