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

Commit 57fe7251 authored by Peter Ujfalusi's avatar Peter Ujfalusi
Browse files

MFD: twl4030-codec -> twl4030-audio: Rename the driver 



Rename the driver, and header file from twl4030-codec to
twl4030-audio.
To avoid breakage change depending drivers at the same time.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
CC: Misael Lopez Cruz <misael.lopez@ti.com>
Acked-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 4fe5668b

drivers/input/misc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ config INPUT_TWL4030_PWRBUTTON 
config INPUT_TWL4030_VIBRA

	tristate "Support for TWL4030 Vibrator"

	depends on TWL4030_CORE

	select TWL4030_CODEC

	select MFD_TWL4030_AUDIO

	select INPUT_FF_MEMLESS

	help

	  This option enables support for TWL4030 Vibrator Driver.

drivers/input/misc/twl4030-vibra.c

+5 −5
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
#include <linux/platform_device.h>

#include <linux/workqueue.h>

#include <linux/i2c/twl.h>

#include <linux/mfd/twl4030-codec.h>

#include <linux/mfd/twl4030-audio.h>

#include <linux/input.h>

#include <linux/slab.h>
@@ -67,7 +67,7 @@ static void vibra_enable(struct vibra_info *info) 
{

	u8 reg;



	twl4030_codec_enable_resource(TWL4030_CODEC_RES_POWER);

	twl4030_audio_enable_resource(TWL4030_AUDIO_RES_POWER);



	/* turn H-Bridge on */

	twl_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE,
@@ -75,7 +75,7 @@ static void vibra_enable(struct vibra_info *info) 
	twl_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE,

			 (reg | TWL4030_VIBRA_EN), TWL4030_REG_VIBRA_CTL);



	twl4030_codec_enable_resource(TWL4030_CODEC_RES_APLL);

	twl4030_audio_enable_resource(TWL4030_AUDIO_RES_APLL);



	info->enabled = true;

}
@@ -90,8 +90,8 @@ static void vibra_disable(struct vibra_info *info) 
	twl_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE,

			 (reg & ~TWL4030_VIBRA_EN), TWL4030_REG_VIBRA_CTL);



	twl4030_codec_disable_resource(TWL4030_CODEC_RES_APLL);

	twl4030_codec_disable_resource(TWL4030_CODEC_RES_POWER);

	twl4030_audio_disable_resource(TWL4030_AUDIO_RES_APLL);

	twl4030_audio_disable_resource(TWL4030_AUDIO_RES_POWER);



	info->enabled = false;

}

drivers/mfd/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ config TWL4030_POWER 
	  and load scripts controlling which resources are switched off/on

	  or reset when a sleep, wakeup or warm reset event occurs.



config TWL4030_CODEC

config MFD_TWL4030_AUDIO

	bool

	depends on TWL4030_CORE

	select MFD_CORE

drivers/mfd/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ obj-$(CONFIG_MENELAUS) += menelaus.o 
obj-$(CONFIG_TWL4030_CORE)	+= twl-core.o twl4030-irq.o twl6030-irq.o

obj-$(CONFIG_TWL4030_MADC)      += twl4030-madc.o

obj-$(CONFIG_TWL4030_POWER)    += twl4030-power.o

obj-$(CONFIG_TWL4030_CODEC)	+= twl4030-codec.o

obj-$(CONFIG_MFD_TWL4030_AUDIO)	+= twl4030-audio.o

obj-$(CONFIG_TWL6030_PWM)	+= twl6030-pwm.o



obj-$(CONFIG_MFD_MC13XXX)	+= mc13xxx-core.o

drivers/mfd/twl4030-codec.c→drivers/mfd/twl4030-audio.c

+16 −17
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include <linux/platform_device.h>

#include <linux/i2c/twl.h>

#include <linux/mfd/core.h>

#include <linux/mfd/twl4030-codec.h>

#include <linux/mfd/twl4030-audio.h>



#define TWL4030_AUDIO_CELLS	2
@@ -45,7 +45,7 @@ struct twl4030_audio_resource { 
struct twl4030_audio {

	unsigned int audio_mclk;

	struct mutex mutex;

	struct twl4030_audio_resource resource[TWL4030_CODEC_RES_MAX];

	struct twl4030_audio_resource resource[TWL4030_AUDIO_RES_MAX];

	struct mfd_cell cells[TWL4030_AUDIO_CELLS];

};
@@ -53,7 +53,7 @@ struct twl4030_audio { 
 * Modify the resource, the function returns the content of the register

 * after the modification.

 */

static int twl4030_audio_set_resource(enum twl4030_codec_res id, int enable)

static int twl4030_audio_set_resource(enum twl4030_audio_res id, int enable)

{

	struct twl4030_audio *audio = platform_get_drvdata(twl4030_audio_dev);

	u8 val;
@@ -72,7 +72,7 @@ static int twl4030_audio_set_resource(enum twl4030_codec_res id, int enable) 
	return val;

}



static inline int twl4030_audio_get_resource(enum twl4030_codec_res id)

static inline int twl4030_audio_get_resource(enum twl4030_audio_res id)

{

	struct twl4030_audio *audio = platform_get_drvdata(twl4030_audio_dev);

	u8 val;
@@ -87,12 +87,12 @@ static inline int twl4030_audio_get_resource(enum twl4030_codec_res id) 
 * Enable the resource.

 * The function returns with error or the content of the register

 */

int twl4030_codec_enable_resource(enum twl4030_codec_res id)

int twl4030_audio_enable_resource(enum twl4030_audio_res id)

{

	struct twl4030_audio *audio = platform_get_drvdata(twl4030_audio_dev);

	int val;



	if (id >= TWL4030_CODEC_RES_MAX) {

	if (id >= TWL4030_AUDIO_RES_MAX) {

		dev_err(&twl4030_audio_dev->dev,

				"Invalid resource ID (%u)\n", id);

		return -EINVAL;
@@ -110,18 +110,18 @@ int twl4030_codec_enable_resource(enum twl4030_codec_res id) 


	return val;

}

EXPORT_SYMBOL_GPL(twl4030_codec_enable_resource);

EXPORT_SYMBOL_GPL(twl4030_audio_enable_resource);



/*

 * Disable the resource.

 * The function returns with error or the content of the register

 */

int twl4030_codec_disable_resource(unsigned id)

int twl4030_audio_disable_resource(unsigned id)

{

	struct twl4030_audio *audio = platform_get_drvdata(twl4030_audio_dev);

	int val;



	if (id >= TWL4030_CODEC_RES_MAX) {

	if (id >= TWL4030_AUDIO_RES_MAX) {

		dev_err(&twl4030_audio_dev->dev,

				"Invalid resource ID (%u)\n", id);

		return -EINVAL;
@@ -146,15 +146,15 @@ int twl4030_codec_disable_resource(unsigned id) 


	return val;

}

EXPORT_SYMBOL_GPL(twl4030_codec_disable_resource);

EXPORT_SYMBOL_GPL(twl4030_audio_disable_resource);



unsigned int twl4030_codec_get_mclk(void)

unsigned int twl4030_audio_get_mclk(void)

{

	struct twl4030_audio *audio = platform_get_drvdata(twl4030_audio_dev);



	return audio->audio_mclk;

}

EXPORT_SYMBOL_GPL(twl4030_codec_get_mclk);

EXPORT_SYMBOL_GPL(twl4030_audio_get_mclk);



static int __devinit twl4030_audio_probe(struct platform_device *pdev)

{
@@ -199,12 +199,12 @@ static int __devinit twl4030_audio_probe(struct platform_device *pdev) 
	audio->audio_mclk = pdata->audio_mclk;



	/* Codec power */

	audio->resource[TWL4030_CODEC_RES_POWER].reg = TWL4030_REG_CODEC_MODE;

	audio->resource[TWL4030_CODEC_RES_POWER].mask = TWL4030_CODECPDZ;

	audio->resource[TWL4030_AUDIO_RES_POWER].reg = TWL4030_REG_CODEC_MODE;

	audio->resource[TWL4030_AUDIO_RES_POWER].mask = TWL4030_CODECPDZ;



	/* PLL */

	audio->resource[TWL4030_CODEC_RES_APLL].reg = TWL4030_REG_APLL_CTL;

	audio->resource[TWL4030_CODEC_RES_APLL].mask = TWL4030_APLL_EN;

	audio->resource[TWL4030_AUDIO_RES_APLL].reg = TWL4030_REG_APLL_CTL;

	audio->resource[TWL4030_AUDIO_RES_APLL].mask = TWL4030_APLL_EN;



	if (pdata->audio) {

		cell = &audio->cells[childs];
@@ -275,4 +275,3 @@ module_exit(twl4030_audio_exit); 


MODULE_AUTHOR("Peter Ujfalusi <peter.ujfalusi@ti.com>");

MODULE_LICENSE("GPL");