Skip to content

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

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
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 44 deletions
drivers/input/misc/Kconfig
View file @ 57fe7251
...@@ -267,7 +267,7 @@ config INPUT_TWL4030_PWRBUTTON ...@@ -267,7 +267,7 @@ config INPUT_TWL4030_PWRBUTTON
config INPUT_TWL4030_VIBRA config INPUT_TWL4030_VIBRA
tristate "Support for TWL4030 Vibrator" tristate "Support for TWL4030 Vibrator"
depends on TWL4030_CORE depends on TWL4030_CORE
select TWL4030_CODEC select MFD_TWL4030_AUDIO
select INPUT_FF_MEMLESS select INPUT_FF_MEMLESS
help help
This option enables support for TWL4030 Vibrator Driver. This option enables support for TWL4030 Vibrator Driver.
......
drivers/input/misc/twl4030-vibra.c
View file @ 57fe7251
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <linux/i2c/twl.h> #include <linux/i2c/twl.h>
#include <linux/mfd/twl4030-codec.h> #include <linux/mfd/twl4030-audio.h>
#include <linux/input.h> #include <linux/input.h>
#include <linux/slab.h> #include <linux/slab.h>
...@@ -67,7 +67,7 @@ static void vibra_enable(struct vibra_info *info) ...@@ -67,7 +67,7 @@ static void vibra_enable(struct vibra_info *info)
{ {
u8 reg; u8 reg;
twl4030_codec_enable_resource(TWL4030_CODEC_RES_POWER); twl4030_audio_enable_resource(TWL4030_AUDIO_RES_POWER);
/* turn H-Bridge on */ /* turn H-Bridge on */
twl_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, twl_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE,
...@@ -75,7 +75,7 @@ static void vibra_enable(struct vibra_info *info) ...@@ -75,7 +75,7 @@ static void vibra_enable(struct vibra_info *info)
twl_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, twl_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE,
(reg | TWL4030_VIBRA_EN), TWL4030_REG_VIBRA_CTL); (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; info->enabled = true;
} }
...@@ -90,8 +90,8 @@ static void vibra_disable(struct vibra_info *info) ...@@ -90,8 +90,8 @@ static void vibra_disable(struct vibra_info *info)
twl_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, twl_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE,
(reg & ~TWL4030_VIBRA_EN), TWL4030_REG_VIBRA_CTL); (reg & ~TWL4030_VIBRA_EN), TWL4030_REG_VIBRA_CTL);
twl4030_codec_disable_resource(TWL4030_CODEC_RES_APLL); twl4030_audio_disable_resource(TWL4030_AUDIO_RES_APLL);
twl4030_codec_disable_resource(TWL4030_CODEC_RES_POWER); twl4030_audio_disable_resource(TWL4030_AUDIO_RES_POWER);
info->enabled = false; info->enabled = false;
} }
......
drivers/mfd/Kconfig
View file @ 57fe7251
...@@ -218,7 +218,7 @@ config TWL4030_POWER ...@@ -218,7 +218,7 @@ config TWL4030_POWER
and load scripts controlling which resources are switched off/on and load scripts controlling which resources are switched off/on
or reset when a sleep, wakeup or warm reset event occurs. or reset when a sleep, wakeup or warm reset event occurs.
config TWL4030_CODEC config MFD_TWL4030_AUDIO
bool bool
depends on TWL4030_CORE depends on TWL4030_CORE
select MFD_CORE select MFD_CORE
......
drivers/mfd/Makefile
View file @ 57fe7251
...@@ -40,7 +40,7 @@ obj-$(CONFIG_MENELAUS) += menelaus.o ...@@ -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_CORE) += twl-core.o twl4030-irq.o twl6030-irq.o
obj-$(CONFIG_TWL4030_MADC) += twl4030-madc.o obj-$(CONFIG_TWL4030_MADC) += twl4030-madc.o
obj-$(CONFIG_TWL4030_POWER) += twl4030-power.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_TWL6030_PWM) += twl6030-pwm.o
obj-$(CONFIG_MFD_MC13XXX) += mc13xxx-core.o obj-$(CONFIG_MFD_MC13XXX) += mc13xxx-core.o
......
drivers/mfd/twl4030-codec.c → drivers/mfd/twl4030-audio.c
View file @ 57fe7251
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/i2c/twl.h> #include <linux/i2c/twl.h>
#include <linux/mfd/core.h> #include <linux/mfd/core.h>
#include <linux/mfd/twl4030-codec.h> #include <linux/mfd/twl4030-audio.h>
#define TWL4030_AUDIO_CELLS 2 #define TWL4030_AUDIO_CELLS 2
...@@ -45,7 +45,7 @@ struct twl4030_audio_resource { ...@@ -45,7 +45,7 @@ struct twl4030_audio_resource {
struct twl4030_audio { struct twl4030_audio {
unsigned int audio_mclk; unsigned int audio_mclk;
struct mutex mutex; 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]; struct mfd_cell cells[TWL4030_AUDIO_CELLS];
}; };
...@@ -53,7 +53,7 @@ struct twl4030_audio { ...@@ -53,7 +53,7 @@ struct twl4030_audio {
* Modify the resource, the function returns the content of the register * Modify the resource, the function returns the content of the register
* after the modification. * 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); struct twl4030_audio *audio = platform_get_drvdata(twl4030_audio_dev);
u8 val; u8 val;
...@@ -72,7 +72,7 @@ static int twl4030_audio_set_resource(enum twl4030_codec_res id, int enable) ...@@ -72,7 +72,7 @@ static int twl4030_audio_set_resource(enum twl4030_codec_res id, int enable)
return val; 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); struct twl4030_audio *audio = platform_get_drvdata(twl4030_audio_dev);
u8 val; u8 val;
...@@ -87,12 +87,12 @@ static inline int twl4030_audio_get_resource(enum twl4030_codec_res id) ...@@ -87,12 +87,12 @@ static inline int twl4030_audio_get_resource(enum twl4030_codec_res id)
* Enable the resource. * Enable the resource.
* The function returns with error or the content of the register * 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); struct twl4030_audio *audio = platform_get_drvdata(twl4030_audio_dev);
int val; int val;
if (id >= TWL4030_CODEC_RES_MAX) { if (id >= TWL4030_AUDIO_RES_MAX) {
dev_err(&twl4030_audio_dev->dev, dev_err(&twl4030_audio_dev->dev,
"Invalid resource ID (%u)\n", id); "Invalid resource ID (%u)\n", id);
return -EINVAL; return -EINVAL;
...@@ -110,18 +110,18 @@ int twl4030_codec_enable_resource(enum twl4030_codec_res id) ...@@ -110,18 +110,18 @@ int twl4030_codec_enable_resource(enum twl4030_codec_res id)
return val; return val;
} }
EXPORT_SYMBOL_GPL(twl4030_codec_enable_resource); EXPORT_SYMBOL_GPL(twl4030_audio_enable_resource);
/* /*
* Disable the resource. * Disable the resource.
* The function returns with error or the content of the register * 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); struct twl4030_audio *audio = platform_get_drvdata(twl4030_audio_dev);
int val; int val;
if (id >= TWL4030_CODEC_RES_MAX) { if (id >= TWL4030_AUDIO_RES_MAX) {
dev_err(&twl4030_audio_dev->dev, dev_err(&twl4030_audio_dev->dev,
"Invalid resource ID (%u)\n", id); "Invalid resource ID (%u)\n", id);
return -EINVAL; return -EINVAL;
...@@ -146,15 +146,15 @@ int twl4030_codec_disable_resource(unsigned id) ...@@ -146,15 +146,15 @@ int twl4030_codec_disable_resource(unsigned id)
return val; 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); struct twl4030_audio *audio = platform_get_drvdata(twl4030_audio_dev);
return audio->audio_mclk; 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) static int __devinit twl4030_audio_probe(struct platform_device *pdev)
{ {
...@@ -199,12 +199,12 @@ 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; audio->audio_mclk = pdata->audio_mclk;
/* Codec power */ /* Codec power */
audio->resource[TWL4030_CODEC_RES_POWER].reg = TWL4030_REG_CODEC_MODE; audio->resource[TWL4030_AUDIO_RES_POWER].reg = TWL4030_REG_CODEC_MODE;
audio->resource[TWL4030_CODEC_RES_POWER].mask = TWL4030_CODECPDZ; audio->resource[TWL4030_AUDIO_RES_POWER].mask = TWL4030_CODECPDZ;
/* PLL */ /* PLL */
audio->resource[TWL4030_CODEC_RES_APLL].reg = TWL4030_REG_APLL_CTL; audio->resource[TWL4030_AUDIO_RES_APLL].reg = TWL4030_REG_APLL_CTL;
audio->resource[TWL4030_CODEC_RES_APLL].mask = TWL4030_APLL_EN; audio->resource[TWL4030_AUDIO_RES_APLL].mask = TWL4030_APLL_EN;
if (pdata->audio) { if (pdata->audio) {
cell = &audio->cells[childs]; cell = &audio->cells[childs];
...@@ -275,4 +275,3 @@ module_exit(twl4030_audio_exit); ...@@ -275,4 +275,3 @@ module_exit(twl4030_audio_exit);
MODULE_AUTHOR("Peter Ujfalusi <peter.ujfalusi@ti.com>"); MODULE_AUTHOR("Peter Ujfalusi <peter.ujfalusi@ti.com>");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
include/linux/mfd/twl4030-codec.h → include/linux/mfd/twl4030-audio.h
View file @ 57fe7251
/* /*
* MFD driver for twl4030 codec submodule * MFD driver for twl4030 audio submodule
* *
* Author: Peter Ujfalusi <peter.ujfalusi@ti.com> * Author: Peter Ujfalusi <peter.ujfalusi@ti.com>
* *
...@@ -259,14 +259,14 @@ ...@@ -259,14 +259,14 @@
#define TWL4030_VIBRA_DIR_SEL 0x20 #define TWL4030_VIBRA_DIR_SEL 0x20
/* TWL4030 codec resource IDs */ /* TWL4030 codec resource IDs */
enum twl4030_codec_res { enum twl4030_audio_res {
TWL4030_CODEC_RES_POWER = 0, TWL4030_AUDIO_RES_POWER = 0,
TWL4030_CODEC_RES_APLL, TWL4030_AUDIO_RES_APLL,
TWL4030_CODEC_RES_MAX, TWL4030_AUDIO_RES_MAX,
}; };
int twl4030_codec_disable_resource(enum twl4030_codec_res id); int twl4030_audio_disable_resource(enum twl4030_audio_res id);
int twl4030_codec_enable_resource(enum twl4030_codec_res id); int twl4030_audio_enable_resource(enum twl4030_audio_res id);
unsigned int twl4030_codec_get_mclk(void); unsigned int twl4030_audio_get_mclk(void);
#endif /* End of __TWL4030_CODEC_H__ */ #endif /* End of __TWL4030_CODEC_H__ */
sound/soc/codecs/Kconfig
View file @ 57fe7251
...@@ -236,7 +236,7 @@ config SND_SOC_TLV320DAC33 ...@@ -236,7 +236,7 @@ config SND_SOC_TLV320DAC33
tristate tristate
config SND_SOC_TWL4030 config SND_SOC_TWL4030
select TWL4030_CODEC select MFD_TWL4030_AUDIO
tristate tristate
config SND_SOC_TWL6040 config SND_SOC_TWL6040
......
sound/soc/codecs/twl4030.c
View file @ 57fe7251
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include <sound/tlv.h> #include <sound/tlv.h>
/* Register descriptions are here */ /* Register descriptions are here */
#include <linux/mfd/twl4030-codec.h> #include <linux/mfd/twl4030-audio.h>
/* Shadow register used by the audio driver */ /* Shadow register used by the audio driver */
#define TWL4030_REG_SW_SHADOW 0x4A #define TWL4030_REG_SW_SHADOW 0x4A
...@@ -251,9 +251,9 @@ static void twl4030_codec_enable(struct snd_soc_codec *codec, int enable) ...@@ -251,9 +251,9 @@ static void twl4030_codec_enable(struct snd_soc_codec *codec, int enable)
return; return;
if (enable) if (enable)
mode = twl4030_codec_enable_resource(TWL4030_CODEC_RES_POWER); mode = twl4030_audio_enable_resource(TWL4030_AUDIO_RES_POWER);
else else
mode = twl4030_codec_disable_resource(TWL4030_CODEC_RES_POWER); mode = twl4030_audio_disable_resource(TWL4030_AUDIO_RES_POWER);
if (mode >= 0) { if (mode >= 0) {
twl4030_write_reg_cache(codec, TWL4030_REG_CODEC_MODE, mode); twl4030_write_reg_cache(codec, TWL4030_REG_CODEC_MODE, mode);
...@@ -375,13 +375,13 @@ static void twl4030_apll_enable(struct snd_soc_codec *codec, int enable) ...@@ -375,13 +375,13 @@ static void twl4030_apll_enable(struct snd_soc_codec *codec, int enable)
if (enable) { if (enable) {
twl4030->apll_enabled++; twl4030->apll_enabled++;
if (twl4030->apll_enabled == 1) if (twl4030->apll_enabled == 1)
status = twl4030_codec_enable_resource( status = twl4030_audio_enable_resource(
TWL4030_CODEC_RES_APLL); TWL4030_AUDIO_RES_APLL);
} else { } else {
twl4030->apll_enabled--; twl4030->apll_enabled--;
if (!twl4030->apll_enabled) if (!twl4030->apll_enabled)
status = twl4030_codec_disable_resource( status = twl4030_audio_disable_resource(
TWL4030_CODEC_RES_APLL); TWL4030_AUDIO_RES_APLL);
} }
if (status >= 0) if (status >= 0)
...@@ -2260,7 +2260,7 @@ static int twl4030_soc_probe(struct snd_soc_codec *codec) ...@@ -2260,7 +2260,7 @@ static int twl4030_soc_probe(struct snd_soc_codec *codec)
} }
snd_soc_codec_set_drvdata(codec, twl4030); snd_soc_codec_set_drvdata(codec, twl4030);
/* Set the defaults, and power up the codec */ /* Set the defaults, and power up the codec */
twl4030->sysclk = twl4030_codec_get_mclk() / 1000; twl4030->sysclk = twl4030_audio_get_mclk() / 1000;
codec->dapm.idle_bias_off = 1; codec->dapm.idle_bias_off = 1;
twl4030_init_chip(codec); twl4030_init_chip(codec);
......
sound/soc/omap/sdp3430.c
View file @ 57fe7251
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include <plat/mcbsp.h> #include <plat/mcbsp.h>
/* Register descriptions for twl4030 codec part */ /* Register descriptions for twl4030 codec part */
#include <linux/mfd/twl4030-codec.h> #include <linux/mfd/twl4030-audio.h>
#include "omap-mcbsp.h" #include "omap-mcbsp.h"
#include "omap-pcm.h" #include "omap-pcm.h"
......
sound/soc/omap/zoom2.c
View file @ 57fe7251
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include <plat/mcbsp.h> #include <plat/mcbsp.h>
/* Register descriptions for twl4030 codec part */ /* Register descriptions for twl4030 codec part */
#include <linux/mfd/twl4030-codec.h> #include <linux/mfd/twl4030-audio.h>
#include "omap-mcbsp.h" #include "omap-mcbsp.h"
#include "omap-pcm.h" #include "omap-pcm.h"
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7