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

Commit daa5ab9e authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/arizona' into asoc-next

parents c0060626 a1abfa86

drivers/input/misc/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -72,6 +72,16 @@ config INPUT_AD714X_SPI 
	  To compile this driver as a module, choose M here: the

	  module will be called ad714x-spi.



config INPUT_ARIZONA_HAPTICS

	tristate "Arizona haptics support"

	depends on MFD_ARIZONA && SND_SOC

	select INPUT_FF_MEMLESS

	help

	  Say Y to enable support for the haptics module in Arizona CODECs.



	  To compile this driver as a module, choose M here: the

	  module will be called arizona-haptics.



config INPUT_BMA150

	tristate "BMA150/SMB380 acceleration sensor support"

	depends on I2C

drivers/input/misc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ obj-$(CONFIG_INPUT_ADXL34X) += adxl34x.o 
obj-$(CONFIG_INPUT_ADXL34X_I2C)		+= adxl34x-i2c.o

obj-$(CONFIG_INPUT_ADXL34X_SPI)		+= adxl34x-spi.o

obj-$(CONFIG_INPUT_APANEL)		+= apanel.o

obj-$(CONFIG_INPUT_ARIZONA_HAPTICS)	+= arizona-haptics.o

obj-$(CONFIG_INPUT_ATI_REMOTE2)		+= ati_remote2.o

obj-$(CONFIG_INPUT_ATLAS_BTNS)		+= atlas_btns.o

obj-$(CONFIG_INPUT_BFIN_ROTARY)		+= bfin_rotary.o

drivers/input/misc/arizona-haptics.c

0 → 100644
+255 −0
Original line number Diff line number Diff line 
/*

 * Arizona haptics driver

 *

 * Copyright 2012 Wolfson Microelectronics plc

 *

 * Author: Mark Brown <broonie@opensource.wolfsonmicro.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/input.h>

#include <linux/slab.h>



#include <sound/soc.h>

#include <sound/soc-dapm.h>



#include <linux/mfd/arizona/core.h>

#include <linux/mfd/arizona/pdata.h>

#include <linux/mfd/arizona/registers.h>



struct arizona_haptics {

	struct arizona *arizona;

	struct input_dev *input_dev;

	struct work_struct work;



	struct mutex mutex;

	u8 intensity;

};



static void arizona_haptics_work(struct work_struct *work)

{

	struct arizona_haptics *haptics = container_of(work,

						       struct arizona_haptics,

						       work);

	struct arizona *arizona = haptics->arizona;

	struct mutex *dapm_mutex = &arizona->dapm->card->dapm_mutex;

	int ret;



	if (!haptics->arizona->dapm) {

		dev_err(arizona->dev, "No DAPM context\n");

		return;

	}



	if (haptics->intensity) {

		ret = regmap_update_bits(arizona->regmap,

					 ARIZONA_HAPTICS_PHASE_2_INTENSITY,

					 ARIZONA_PHASE2_INTENSITY_MASK,

					 haptics->intensity);

		if (ret != 0) {

			dev_err(arizona->dev, "Failed to set intensity: %d\n",

				ret);

			return;

		}



		/* This enable sequence will be a noop if already enabled */

		ret = regmap_update_bits(arizona->regmap,

					 ARIZONA_HAPTICS_CONTROL_1,

					 ARIZONA_HAP_CTRL_MASK,

					 1 << ARIZONA_HAP_CTRL_SHIFT);

		if (ret != 0) {

			dev_err(arizona->dev, "Failed to start haptics: %d\n",

				ret);

			return;

		}



		mutex_lock_nested(dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);



		ret = snd_soc_dapm_enable_pin(arizona->dapm, "HAPTICS");

		if (ret != 0) {

			dev_err(arizona->dev, "Failed to start HAPTICS: %d\n",

				ret);

			mutex_unlock(dapm_mutex);

			return;

		}



		ret = snd_soc_dapm_sync(arizona->dapm);

		if (ret != 0) {

			dev_err(arizona->dev, "Failed to sync DAPM: %d\n",

				ret);

			mutex_unlock(dapm_mutex);

			return;

		}



		mutex_unlock(dapm_mutex);



	} else {

		/* This disable sequence will be a noop if already enabled */

		mutex_lock_nested(dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);



		ret = snd_soc_dapm_disable_pin(arizona->dapm, "HAPTICS");

		if (ret != 0) {

			dev_err(arizona->dev, "Failed to disable HAPTICS: %d\n",

				ret);

			mutex_unlock(dapm_mutex);

			return;

		}



		ret = snd_soc_dapm_sync(arizona->dapm);

		if (ret != 0) {

			dev_err(arizona->dev, "Failed to sync DAPM: %d\n",

				ret);

			mutex_unlock(dapm_mutex);

			return;

		}



		mutex_unlock(dapm_mutex);



		ret = regmap_update_bits(arizona->regmap,

					 ARIZONA_HAPTICS_CONTROL_1,

					 ARIZONA_HAP_CTRL_MASK,

					 1 << ARIZONA_HAP_CTRL_SHIFT);

		if (ret != 0) {

			dev_err(arizona->dev, "Failed to stop haptics: %d\n",

				ret);

			return;

		}

	}

}



static int arizona_haptics_play(struct input_dev *input, void *data,

				struct ff_effect *effect)

{

	struct arizona_haptics *haptics = input_get_drvdata(input);

	struct arizona *arizona = haptics->arizona;



	if (!arizona->dapm) {

		dev_err(arizona->dev, "No DAPM context\n");

		return -EBUSY;

	}



	if (effect->u.rumble.strong_magnitude) {

		/* Scale the magnitude into the range the device supports */

		if (arizona->pdata.hap_act) {

			haptics->intensity =

				effect->u.rumble.strong_magnitude >> 9;

			if (effect->direction < 0x8000)

				haptics->intensity += 0x7f;

		} else {

			haptics->intensity =

				effect->u.rumble.strong_magnitude >> 8;

		}

	} else {

		haptics->intensity = 0;

	}



	schedule_work(&haptics->work);



	return 0;

}



static void arizona_haptics_close(struct input_dev *input)

{

	struct arizona_haptics *haptics = input_get_drvdata(input);

	struct mutex *dapm_mutex = &haptics->arizona->dapm->card->dapm_mutex;



	cancel_work_sync(&haptics->work);



	mutex_lock_nested(dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);



	if (haptics->arizona->dapm)

		snd_soc_dapm_disable_pin(haptics->arizona->dapm, "HAPTICS");



	mutex_unlock(dapm_mutex);

}



static int arizona_haptics_probe(struct platform_device *pdev)

{

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

	struct arizona_haptics *haptics;

	int ret;



	haptics = devm_kzalloc(&pdev->dev, sizeof(*haptics), GFP_KERNEL);

	if (!haptics)

		return -ENOMEM;



	haptics->arizona = arizona;



	ret = regmap_update_bits(arizona->regmap, ARIZONA_HAPTICS_CONTROL_1,

				 ARIZONA_HAP_ACT, arizona->pdata.hap_act);

	if (ret != 0) {

		dev_err(arizona->dev, "Failed to set haptics actuator: %d\n",

			ret);

		return ret;

	}



	INIT_WORK(&haptics->work, arizona_haptics_work);



	haptics->input_dev = input_allocate_device();

	if (haptics->input_dev == NULL) {

		dev_err(arizona->dev, "Failed to allocate input device\n");

		return -ENOMEM;

	}



	input_set_drvdata(haptics->input_dev, haptics);



	haptics->input_dev->name = "arizona:haptics";

	haptics->input_dev->dev.parent = pdev->dev.parent;

	haptics->input_dev->close = arizona_haptics_close;

	__set_bit(FF_RUMBLE, haptics->input_dev->ffbit);



	ret = input_ff_create_memless(haptics->input_dev, NULL,

				      arizona_haptics_play);

	if (ret < 0) {

		dev_err(arizona->dev, "input_ff_create_memless() failed: %d\n",

			ret);

		goto err_ialloc;

	}



	ret = input_register_device(haptics->input_dev);

	if (ret < 0) {

		dev_err(arizona->dev, "couldn't register input device: %d\n",

			ret);

		goto err_iff;

	}



	platform_set_drvdata(pdev, haptics);



	return 0;



err_iff:

	if (haptics->input_dev)

		input_ff_destroy(haptics->input_dev);

err_ialloc:

	input_free_device(haptics->input_dev);



	return ret;

}



static int arizona_haptics_remove(struct platform_device *pdev)

{

	struct arizona_haptics *haptics = platform_get_drvdata(pdev);



	input_unregister_device(haptics->input_dev);



	return 0;

}



static struct platform_driver arizona_haptics_driver = {

	.probe		= arizona_haptics_probe,

	.remove		= arizona_haptics_remove,

	.driver		= {

		.name	= "arizona-haptics",

		.owner	= THIS_MODULE,

	},

};

module_platform_driver(arizona_haptics_driver);



MODULE_ALIAS("platform:arizona-haptics");

MODULE_DESCRIPTION("Arizona haptics driver");

MODULE_LICENSE("GPL");

MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");

drivers/mfd/arizona-core.c

+2 −0
Original line number Diff line number Diff line
@@ -272,6 +272,7 @@ static struct mfd_cell early_devs[] = { 
static struct mfd_cell wm5102_devs[] = {

	{ .name = "arizona-extcon" },

	{ .name = "arizona-gpio" },

	{ .name = "arizona-haptics" },

	{ .name = "arizona-micsupp" },

	{ .name = "arizona-pwm" },

	{ .name = "wm5102-codec" },
@@ -280,6 +281,7 @@ static struct mfd_cell wm5102_devs[] = { 
static struct mfd_cell wm5110_devs[] = {

	{ .name = "arizona-extcon" },

	{ .name = "arizona-gpio" },

	{ .name = "arizona-haptics" },

	{ .name = "arizona-micsupp" },

	{ .name = "arizona-pwm" },

	{ .name = "wm5110-codec" },

include/linux/mfd/arizona/core.h

+4 −0
Original line number Diff line number Diff line
@@ -78,6 +78,8 @@ enum arizona_type { 


#define ARIZONA_NUM_IRQ                   50



struct snd_soc_dapm_context;



struct arizona {

	struct regmap *regmap;

	struct device *dev;
@@ -98,6 +100,8 @@ struct arizona { 


	struct mutex clk_lock;

	int clk32k_ref;



	struct snd_soc_dapm_context *dapm;

};



int arizona_clk32k_enable(struct arizona *arizona);