Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2853378b authored by Jett.Zhou's avatar Jett.Zhou Committed by Samuel Ortiz
Browse files

mfd: Add ability to wake the system for 88pm860x 



For 88pm860x pmic, it can wake the system from low power mode by irq,
its sub-devs like RTC and onkey can be enabled for this usage.

Signed-off-by: default avatarJett.Zhou <jtzhou@marvell.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent b8b8d793

drivers/input/misc/88pm860x_onkey.c

+26 −0
Original line number Diff line number Diff line
@@ -105,6 +105,8 @@ static int __devinit pm860x_onkey_probe(struct platform_device *pdev) 
	}



	platform_set_drvdata(pdev, info);

	device_init_wakeup(&pdev->dev, 1);



	return 0;



out_irq:
@@ -129,10 +131,34 @@ static int __devexit pm860x_onkey_remove(struct platform_device *pdev) 
	return 0;

}



#ifdef CONFIG_PM_SLEEP

static int pm860x_onkey_suspend(struct device *dev)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent);



	if (device_may_wakeup(dev))

		chip->wakeup_flag |= 1 << PM8607_IRQ_ONKEY;

	return 0;

}

static int pm860x_onkey_resume(struct device *dev)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent);



	if (device_may_wakeup(dev))

		chip->wakeup_flag &= ~(1 << PM8607_IRQ_ONKEY);

	return 0;

}

#endif



static SIMPLE_DEV_PM_OPS(pm860x_onkey_pm_ops, pm860x_onkey_suspend, pm860x_onkey_resume);



static struct platform_driver pm860x_onkey_driver = {

	.driver		= {

		.name	= "88pm860x-onkey",

		.owner	= THIS_MODULE,

		.pm	= &pm860x_onkey_pm_ops,

	},

	.probe		= pm860x_onkey_probe,

	.remove		= __devexit_p(pm860x_onkey_remove),

drivers/mfd/88pm860x-i2c.c

+25 −0
Original line number Diff line number Diff line
@@ -334,10 +334,35 @@ static int __devexit pm860x_remove(struct i2c_client *client) 
	return 0;

}



#ifdef CONFIG_PM_SLEEP

static int pm860x_suspend(struct device *dev)

{

	struct i2c_client *client = container_of(dev, struct i2c_client, dev);

	struct pm860x_chip *chip = i2c_get_clientdata(client);



	if (device_may_wakeup(dev) && chip->wakeup_flag)

		enable_irq_wake(chip->core_irq);

	return 0;

}



static int pm860x_resume(struct device *dev)

{

	struct i2c_client *client = container_of(dev, struct i2c_client, dev);

	struct pm860x_chip *chip = i2c_get_clientdata(client);



	if (device_may_wakeup(dev) && chip->wakeup_flag)

		disable_irq_wake(chip->core_irq);

	return 0;

}

#endif



static SIMPLE_DEV_PM_OPS(pm860x_pm_ops, pm860x_suspend, pm860x_resume);



static struct i2c_driver pm860x_driver = {

	.driver	= {

		.name	= "88PM860x",

		.owner	= THIS_MODULE,

		.pm     = &pm860x_pm_ops,

	},

	.probe		= pm860x_probe,

	.remove		= __devexit_p(pm860x_remove),

drivers/rtc/rtc-88pm860x.c

+27 −0
Original line number Diff line number Diff line
@@ -376,6 +376,9 @@ static int __devinit pm860x_rtc_probe(struct platform_device *pdev) 
	INIT_DELAYED_WORK(&info->calib_work, calibrate_vrtc_work);

	schedule_delayed_work(&info->calib_work, VRTC_CALIB_INTERVAL);

#endif	/* VRTC_CALIBRATION */



	device_init_wakeup(&pdev->dev, 1);



	return 0;

out_rtc:

	free_irq(info->irq, info);
@@ -401,10 +404,34 @@ static int __devexit pm860x_rtc_remove(struct platform_device *pdev) 
	return 0;

}



#ifdef CONFIG_PM_SLEEP

static int pm860x_rtc_suspend(struct device *dev)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent);



	if (device_may_wakeup(dev))

		chip->wakeup_flag |= 1 << PM8607_IRQ_RTC;

	return 0;

}

static int pm860x_rtc_resume(struct device *dev)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent);



	if (device_may_wakeup(dev))

		chip->wakeup_flag &= ~(1 << PM8607_IRQ_RTC);

	return 0;

}

#endif



static SIMPLE_DEV_PM_OPS(pm860x_rtc_pm_ops, pm860x_rtc_suspend, pm860x_rtc_resume);



static struct platform_driver pm860x_rtc_driver = {

	.driver		= {

		.name	= "88pm860x-rtc",

		.owner	= THIS_MODULE,

		.pm	= &pm860x_rtc_pm_ops,

	},

	.probe		= pm860x_rtc_probe,

	.remove		= __devexit_p(pm860x_rtc_remove),

include/linux/mfd/88pm860x.h

+1 −0
Original line number Diff line number Diff line
@@ -311,6 +311,7 @@ struct pm860x_chip { 
	int			core_irq;

	unsigned char		chip_version;



	unsigned int            wakeup_flag;

};



enum {