From: Mika Westerberg <mika.westerberg@linux.intel.com>
To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Darren Hart <dvhart@infradead.org>,
Lee Jones <lee.jones@linaro.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
"H . Peter Anvin" <hpa@zytor.com>,
x86@kernel.org, Zha Qipeng <qipeng.zha@intel.com>,
"David E . Box" <david.e.box@linux.intel.com>,
Guenter Roeck <linux@roeck-us.net>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Wim Van Sebroeck <wim@linux-watchdog.org>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
platform-driver-x86@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v5 04/18] platform/x86: intel_mid_powerbtn: Convert to use new SCU IPC API
Date: Tue, 11 Feb 2020 16:25:49 +0300 [thread overview]
Message-ID: <20200211132603.73509-5-mika.westerberg@linux.intel.com> (raw)
In-Reply-To: <20200211132603.73509-1-mika.westerberg@linux.intel.com>
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: Mika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/platform/x86/intel_mid_powerbtn.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/drivers/platform/x86/intel_mid_powerbtn.c b/drivers/platform/x86/intel_mid_powerbtn.c
index 6f436836fe50..1fdcdef1d89f 100644
--- a/drivers/platform/x86/intel_mid_powerbtn.c
+++ b/drivers/platform/x86/intel_mid_powerbtn.c
@@ -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) {
--
2.25.0
next prev parent reply other threads:[~2020-02-11 13:26 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-11 13:25 [PATCH v5 00/18] platform/x86: Rework intel_scu_ipc and intel_pmc_ipc drivers Mika Westerberg
2020-02-11 13:25 ` [PATCH v5 01/18] platform/x86: intel_scu_ipc: Split out SCU IPC functionality from the SCU driver Mika Westerberg
2020-02-11 15:39 ` Andy Shevchenko
2020-02-12 11:34 ` Mika Westerberg
2020-02-11 13:25 ` [PATCH v5 02/18] platform/x86: intel_scu_ipc: Log more information if SCU IPC command fails Mika Westerberg
2020-02-11 15:41 ` Andy Shevchenko
2020-02-12 11:36 ` Mika Westerberg
2020-02-12 11:54 ` Andy Shevchenko
2020-02-12 11:57 ` Mika Westerberg
2020-02-11 13:25 ` [PATCH v5 03/18] platform/x86: intel_scu_ipc: Introduce new SCU IPC API Mika Westerberg
2020-02-11 15:48 ` Andy Shevchenko
2020-02-12 11:43 ` Mika Westerberg
2020-02-12 11:55 ` Andy Shevchenko
2020-02-12 12:45 ` Mika Westerberg
2020-02-11 13:25 ` Mika Westerberg [this message]
2020-02-11 13:25 ` [PATCH v5 05/18] watchdog: intel-mid_wdt: Convert to use " Mika Westerberg
2020-02-11 13:25 ` [PATCH v5 06/18] platform/x86: intel_scu_ipcutil: " Mika Westerberg
2020-02-11 13:25 ` [PATCH v5 07/18] platform/x86: intel_scu_ipc: Add managed function to register SCU IPC Mika Westerberg
2020-02-11 15:51 ` Andy Shevchenko
2020-02-12 11:44 ` Mika Westerberg
2020-02-11 13:25 ` [PATCH v5 08/18] platform/x86: intel_pmc_ipc: Start using " Mika Westerberg
2020-02-11 13:25 ` [PATCH v5 09/18] mfd: intel_soc_pmic: Add SCU IPC member to struct intel_soc_pmic Mika Westerberg
2020-02-11 15:57 ` Andy Shevchenko
2020-02-12 11:44 ` Mika Westerberg
2020-02-11 13:25 ` [PATCH v5 10/18] mfd: intel_soc_pmic_bxtwc: Convert to use new SCU IPC API Mika Westerberg
2020-02-11 13:25 ` [PATCH v5 11/18] mfd: intel_soc_pmic_mrfld: " Mika Westerberg
2020-02-11 13:25 ` [PATCH v5 12/18] platform/x86: intel_telemetry: " Mika Westerberg
2020-02-11 13:25 ` [PATCH v5 13/18] platform/x86: intel_pmc_ipc: Drop intel_pmc_ipc_command() Mika Westerberg
2020-02-11 13:25 ` [PATCH v5 14/18] x86/platform/intel-mid: Add empty stubs for intel_scu_devices_[create|destroy]() Mika Westerberg
2020-02-11 13:26 ` [PATCH v5 15/18] platform/x86: intel_pmc_ipc: Move PCI IDs to intel_scu_pcidrv.c Mika Westerberg
2020-02-11 13:26 ` [PATCH v5 16/18] platform/x86: intel_telemetry: Add telemetry_get_pltdata() Mika Westerberg
2020-02-11 13:26 ` [PATCH v5 17/18] platform/x86: intel_pmc_ipc: Convert to MFD Mika Westerberg
2020-02-11 16:09 ` Andy Shevchenko
2020-02-11 13:26 ` [PATCH v5 18/18] MAINTAINERS: Update entry for Intel Broxton PMC driver Mika Westerberg
2020-02-11 16:01 ` Andy Shevchenko
2020-02-12 11:48 ` Mika Westerberg
2020-02-11 16:10 ` [PATCH v5 00/18] platform/x86: Rework intel_scu_ipc and intel_pmc_ipc drivers Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200211132603.73509-5-mika.westerberg@linux.intel.com \
--to=mika.westerberg@linux.intel.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=bp@alien8.de \
--cc=david.e.box@linux.intel.com \
--cc=dvhart@infradead.org \
--cc=gregkh@linuxfoundation.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=hpa@zytor.com \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=mingo@redhat.com \
--cc=platform-driver-x86@vger.kernel.org \
--cc=qipeng.zha@intel.com \
--cc=tglx@linutronix.de \
--cc=wim@linux-watchdog.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).