Commit 6a0f9988 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Darren Hart

platform/x86: intel_mid_powerbtn: Enable driver for Merrifield

Enable this driver to handle events from Basin Cove PMIC, which is
installed on Intel Merrifield platform.
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
parent 553e9c18
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include <asm/cpu_device_id.h> #include <asm/cpu_device_id.h>
#include <asm/intel-family.h> #include <asm/intel-family.h>
#include <asm/intel_scu_ipc.h>
#define DRIVER_NAME "msic_power_btn" #define DRIVER_NAME "msic_power_btn"
...@@ -39,12 +40,23 @@ ...@@ -39,12 +40,23 @@
*/ */
#define MSIC_PWRBTNM (1 << 0) #define MSIC_PWRBTNM (1 << 0)
/* Intel Tangier */
#define MRFLD_PBSTAT_ADDR 0xfffff61a
#define MRFLD_PB_LEVEL (1 << 4) /* 1 - release, 0 - press */
/* Basin Cove PMIC */
#define BCOVE_PBIRQ 0x02
#define BCOVE_IRQLVL1MSK 0x0c
#define BCOVE_PBIRQMASK 0x0d
struct mid_pb_ddata { struct mid_pb_ddata {
struct device *dev; struct device *dev;
void __iomem *reg;
int irq; int irq;
struct input_dev *input; struct input_dev *input;
int (*pbstat)(struct mid_pb_ddata *ddata, int *value); int (*pbstat)(struct mid_pb_ddata *ddata, int *value);
int (*ack)(struct mid_pb_ddata *ddata); int (*ack)(struct mid_pb_ddata *ddata);
int (*setup)(struct mid_pb_ddata *ddata);
}; };
static int mfld_pbstat(struct mid_pb_ddata *ddata, int *value) static int mfld_pbstat(struct mid_pb_ddata *ddata, int *value)
...@@ -78,6 +90,37 @@ static int mfld_ack(struct mid_pb_ddata *ddata) ...@@ -78,6 +90,37 @@ static int mfld_ack(struct mid_pb_ddata *ddata)
return intel_msic_reg_update(INTEL_MSIC_IRQLVL1MSK, 0, MSIC_PWRBTNM); return intel_msic_reg_update(INTEL_MSIC_IRQLVL1MSK, 0, MSIC_PWRBTNM);
} }
static int mrfld_pbstat(struct mid_pb_ddata *ddata, int *value)
{
struct input_dev *input = ddata->input;
u8 pbstat;
pbstat = readb(ddata->reg);
dev_dbg(input->dev.parent, "PB_INT status= %d\n", pbstat);
*value = !(pbstat & MRFLD_PB_LEVEL);
return 0;
}
static int mrfld_ack(struct mid_pb_ddata *ddata)
{
return intel_scu_ipc_update_register(BCOVE_IRQLVL1MSK, 0, MSIC_PWRBTNM);
}
static int mrfld_setup(struct mid_pb_ddata *ddata)
{
ddata->reg = devm_ioremap_nocache(ddata->dev, MRFLD_PBSTAT_ADDR, 1);
if (!ddata->reg)
return -ENOMEM;
/* 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);
return 0;
}
static irqreturn_t mid_pb_isr(int irq, void *dev_id) static irqreturn_t mid_pb_isr(int irq, void *dev_id)
{ {
struct mid_pb_ddata *ddata = dev_id; struct mid_pb_ddata *ddata = dev_id;
...@@ -103,11 +146,18 @@ static struct mid_pb_ddata mfld_ddata = { ...@@ -103,11 +146,18 @@ static struct mid_pb_ddata mfld_ddata = {
.ack = mfld_ack, .ack = mfld_ack,
}; };
static struct mid_pb_ddata mrfld_ddata = {
.pbstat = mrfld_pbstat,
.ack = mrfld_ack,
.setup = mrfld_setup,
};
#define ICPU(model, ddata) \ #define ICPU(model, ddata) \
{ X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, (kernel_ulong_t)&ddata } { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, (kernel_ulong_t)&ddata }
static const struct x86_cpu_id mid_pb_cpu_ids[] = { static const struct x86_cpu_id mid_pb_cpu_ids[] = {
ICPU(INTEL_FAM6_ATOM_PENWELL, mfld_ddata), ICPU(INTEL_FAM6_ATOM_PENWELL, mfld_ddata),
ICPU(INTEL_FAM6_ATOM_MERRIFIELD, mrfld_ddata),
{} {}
}; };
...@@ -145,6 +195,12 @@ static int mid_pb_probe(struct platform_device *pdev) ...@@ -145,6 +195,12 @@ static int mid_pb_probe(struct platform_device *pdev)
ddata->irq = irq; ddata->irq = irq;
ddata->input = input; ddata->input = input;
if (ddata->setup) {
error = ddata->setup(ddata);
if (error)
return error;
}
error = devm_request_threaded_irq(&pdev->dev, irq, NULL, mid_pb_isr, error = devm_request_threaded_irq(&pdev->dev, irq, NULL, mid_pb_isr,
IRQF_ONESHOT, DRIVER_NAME, ddata); IRQF_ONESHOT, DRIVER_NAME, ddata);
if (error) { if (error) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment