[alsa-devel] [PATCH 0/2] twl4030_codec cleanup
This series of patches removes duplicate audio_mclk fields from twl4030_codec driver.
The patches have been compiled on sound-2.6/for-2.6.39 branch. I haven't tested them on any target board though.
Ilkka Koskinen (2): omap: Remove unnecessary twl4030_codec_audio settings from board files mfd: twl4030_codec: Remove unused and duplicate audio_mclk fields
arch/arm/mach-omap2/board-3430sdp.c | 4 +--- arch/arm/mach-omap2/board-devkit8000.c | 4 +--- arch/arm/mach-omap2/board-igep0020.c | 4 +--- arch/arm/mach-omap2/board-omap3beagle.c | 4 +--- arch/arm/mach-omap2/board-omap3evm.c | 4 +--- arch/arm/mach-omap2/board-omap3pandora.c | 4 +--- arch/arm/mach-omap2/board-omap3stalker.c | 4 +--- arch/arm/mach-omap2/board-omap3touchbook.c | 4 +--- arch/arm/mach-omap2/board-overo.c | 4 +--- arch/arm/mach-omap2/board-zoom-peripherals.c | 4 +--- include/linux/i2c/twl.h | 2 -- 11 files changed, 10 insertions(+), 32 deletions(-)
twl4030_codec_audio and twl4030_codec_vibra_data has unused field. In order to remove it, corresponding settings needs to be removed from board files.
Signed-off-by: Ilkka Koskinen ilkka.koskinen@nokia.com --- arch/arm/mach-omap2/board-3430sdp.c | 4 +--- arch/arm/mach-omap2/board-devkit8000.c | 4 +--- arch/arm/mach-omap2/board-igep0020.c | 4 +--- arch/arm/mach-omap2/board-omap3beagle.c | 4 +--- arch/arm/mach-omap2/board-omap3evm.c | 4 +--- arch/arm/mach-omap2/board-omap3pandora.c | 4 +--- arch/arm/mach-omap2/board-omap3stalker.c | 4 +--- arch/arm/mach-omap2/board-omap3touchbook.c | 4 +--- arch/arm/mach-omap2/board-overo.c | 4 +--- arch/arm/mach-omap2/board-zoom-peripherals.c | 4 +--- 10 files changed, 10 insertions(+), 30 deletions(-)
diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c index d4e41ef..4722ffa 100644 --- a/arch/arm/mach-omap2/board-3430sdp.c +++ b/arch/arm/mach-omap2/board-3430sdp.c @@ -567,9 +567,7 @@ static struct regulator_init_data sdp3430_vpll2 = { .consumer_supplies = sdp3430_vpll2_supplies, };
-static struct twl4030_codec_audio_data sdp3430_audio = { - .audio_mclk = 26000000, -}; +static struct twl4030_codec_audio_data sdp3430_audio;
static struct twl4030_codec_data sdp3430_codec = { .audio_mclk = 26000000, diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c index 00bb1fc..755f63a 100644 --- a/arch/arm/mach-omap2/board-devkit8000.c +++ b/arch/arm/mach-omap2/board-devkit8000.c @@ -346,9 +346,7 @@ static struct twl4030_usb_data devkit8000_usb_data = { .usb_mode = T2_USB_MODE_ULPI, };
-static struct twl4030_codec_audio_data devkit8000_audio_data = { - .audio_mclk = 26000000, -}; +static struct twl4030_codec_audio_data devkit8000_audio_data;
static struct twl4030_codec_data devkit8000_codec_data = { .audio_mclk = 26000000, diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c index 3be85a1..6022990 100644 --- a/arch/arm/mach-omap2/board-igep0020.c +++ b/arch/arm/mach-omap2/board-igep0020.c @@ -533,9 +533,7 @@ static void __init igep2_init_irq(void) omap_init_irq(); }
-static struct twl4030_codec_audio_data igep2_audio_data = { - .audio_mclk = 26000000, -}; +static struct twl4030_codec_audio_data igep2_audio_data;
static struct twl4030_codec_data igep2_codec_data = { .audio_mclk = 26000000, diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 46d814a..164b4c3 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -435,9 +435,7 @@ static struct twl4030_usb_data beagle_usb_data = { .usb_mode = T2_USB_MODE_ULPI, };
-static struct twl4030_codec_audio_data beagle_audio_data = { - .audio_mclk = 26000000, -}; +static struct twl4030_codec_audio_data beagle_audio_data;
static struct twl4030_codec_data beagle_codec_data = { .audio_mclk = 26000000, diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c index 323c380..db147d7 100644 --- a/arch/arm/mach-omap2/board-omap3evm.c +++ b/arch/arm/mach-omap2/board-omap3evm.c @@ -491,9 +491,7 @@ static struct twl4030_madc_platform_data omap3evm_madc_data = { .irq_line = 1, };
-static struct twl4030_codec_audio_data omap3evm_audio_data = { - .audio_mclk = 26000000, -}; +static struct twl4030_codec_audio_data omap3evm_audio_data;
static struct twl4030_codec_data omap3evm_codec_data = { .audio_mclk = 26000000, diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c index 0b34bed..51e8c20 100644 --- a/arch/arm/mach-omap2/board-omap3pandora.c +++ b/arch/arm/mach-omap2/board-omap3pandora.c @@ -524,9 +524,7 @@ static struct twl4030_usb_data omap3pandora_usb_data = { .usb_mode = T2_USB_MODE_ULPI, };
-static struct twl4030_codec_audio_data omap3pandora_audio_data = { - .audio_mclk = 26000000, -}; +static struct twl4030_codec_audio_data omap3pandora_audio_data;
static struct twl4030_codec_data omap3pandora_codec_data = { .audio_mclk = 26000000, diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c index 2a2dad4..2572f71 100644 --- a/arch/arm/mach-omap2/board-omap3stalker.c +++ b/arch/arm/mach-omap2/board-omap3stalker.c @@ -439,9 +439,7 @@ static struct twl4030_madc_platform_data omap3stalker_madc_data = { .irq_line = 1, };
-static struct twl4030_codec_audio_data omap3stalker_audio_data = { - .audio_mclk = 26000000, -}; +static struct twl4030_codec_audio_data omap3stalker_audio_data;
static struct twl4030_codec_data omap3stalker_codec_data = { .audio_mclk = 26000000, diff --git a/arch/arm/mach-omap2/board-omap3touchbook.c b/arch/arm/mach-omap2/board-omap3touchbook.c index db1f74f..25eb470 100644 --- a/arch/arm/mach-omap2/board-omap3touchbook.c +++ b/arch/arm/mach-omap2/board-omap3touchbook.c @@ -252,9 +252,7 @@ static struct twl4030_usb_data touchbook_usb_data = { .usb_mode = T2_USB_MODE_ULPI, };
-static struct twl4030_codec_audio_data touchbook_audio_data = { - .audio_mclk = 26000000, -}; +static struct twl4030_codec_audio_data touchbook_audio_data;
static struct twl4030_codec_data touchbook_codec_data = { .audio_mclk = 26000000, diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c index cb26e5d..faf6288 100644 --- a/arch/arm/mach-omap2/board-overo.c +++ b/arch/arm/mach-omap2/board-overo.c @@ -358,9 +358,7 @@ static struct regulator_init_data overo_vmmc1 = { .consumer_supplies = &overo_vmmc1_supply, };
-static struct twl4030_codec_audio_data overo_audio_data = { - .audio_mclk = 26000000, -}; +static struct twl4030_codec_audio_data overo_audio_data;
static struct twl4030_codec_data overo_codec_data = { .audio_mclk = 26000000, diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c index e0e040f..1ac9d35 100644 --- a/arch/arm/mach-omap2/board-zoom-peripherals.c +++ b/arch/arm/mach-omap2/board-zoom-peripherals.c @@ -322,9 +322,7 @@ static struct twl4030_madc_platform_data zoom_madc_data = { .irq_line = 1, };
-static struct twl4030_codec_audio_data zoom_audio_data = { - .audio_mclk = 26000000, -}; +static struct twl4030_codec_audio_data zoom_audio_data;
static struct twl4030_codec_data zoom_codec_data = { .audio_mclk = 26000000,
audio_mclk can be queried from mfd driver. Therefore, it is not needed in twl4030_codec_audio_data or in twl4030_codec_vibra_data anymore.
Signed-off-by: Ilkka Koskinen ilkka.koskinen@nokia.com --- include/linux/i2c/twl.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h index 61b9609..9d88b71 100644 --- a/include/linux/i2c/twl.h +++ b/include/linux/i2c/twl.h @@ -637,7 +637,6 @@ extern void twl4030_power_init(struct twl4030_power_data *triton2_scripts); extern int twl4030_remove_script(u8 flags);
struct twl4030_codec_audio_data { - unsigned int audio_mclk; /* not used, will be removed */ unsigned int digimic_delay; /* in ms */ unsigned int ramp_delay_value; unsigned int offset_cncl_path; @@ -648,7 +647,6 @@ struct twl4030_codec_audio_data { };
struct twl4030_codec_vibra_data { - unsigned int audio_mclk; unsigned int coexist; };
Hi Ilkka,
On Wed, Mar 02, 2011 at 03:24:06PM +0200, Ilkka Koskinen wrote:
audio_mclk can be queried from mfd driver. Therefore, it is not needed in twl4030_codec_audio_data or in twl4030_codec_vibra_data anymore.
Signed-off-by: Ilkka Koskinen ilkka.koskinen@nokia.com
Acked-by: Samuel Ortiz sameo@linux.intel.com
Cheers, Samuel.
On 03/02/11 15:24, Ilkka Koskinen wrote:
This series of patches removes duplicate audio_mclk fields from twl4030_codec driver.
The patches have been compiled on sound-2.6/for-2.6.39 branch. I haven't tested them on any target board though.
Ilkka Koskinen (2): omap: Remove unnecessary twl4030_codec_audio settings from board files mfd: twl4030_codec: Remove unused and duplicate audio_mclk fields
arch/arm/mach-omap2/board-3430sdp.c | 4 +--- arch/arm/mach-omap2/board-devkit8000.c | 4 +--- arch/arm/mach-omap2/board-igep0020.c | 4 +--- arch/arm/mach-omap2/board-omap3beagle.c | 4 +--- arch/arm/mach-omap2/board-omap3evm.c | 4 +--- arch/arm/mach-omap2/board-omap3pandora.c | 4 +--- arch/arm/mach-omap2/board-omap3stalker.c | 4 +--- arch/arm/mach-omap2/board-omap3touchbook.c | 4 +--- arch/arm/mach-omap2/board-overo.c | 4 +--- arch/arm/mach-omap2/board-zoom-peripherals.c | 4 +--- include/linux/i2c/twl.h | 2 -- 11 files changed, 10 insertions(+), 32 deletions(-)
Thanks Ilkka! This was in my to do list, now I can remove this item.
All: Acked-by: Peter Ujfalusi peter.ujfalusi@nokia.com
On Wed, Mar 02, 2011 at 03:24:04PM +0200, Ilkka Koskinen wrote:
Ilkka Koskinen (2): omap: Remove unnecessary twl4030_codec_audio settings from board files mfd: twl4030_codec: Remove unused and duplicate audio_mclk fields
Acked-by: Mark Brown broonie@opensource.wolfsonmicro.com
Hi Ilkka,
On Wed, Mar 02, 2011 at 03:24:04PM +0200, Ilkka Koskinen wrote:
This series of patches removes duplicate audio_mclk fields from twl4030_codec driver.
The patches have been compiled on sound-2.6/for-2.6.39 branch. I haven't tested them on any target board though.
I'm fine with the twl.h changes, but I think it would make sense for Tony to take this patchset. Tony, is that ok with you ?
Cheers, Samuel.
Hi Samuel,
* Samuel Ortiz sameo@linux.intel.com [110302 06:32]:
Hi Ilkka,
On Wed, Mar 02, 2011 at 03:24:04PM +0200, Ilkka Koskinen wrote:
This series of patches removes duplicate audio_mclk fields from twl4030_codec driver.
The patches have been compiled on sound-2.6/for-2.6.39 branch. I haven't tested them on any target board though.
I'm fine with the twl.h changes, but I think it would make sense for Tony to take this patchset. Tony, is that ok with you ?
Sure if you prefer that.
Tony
participants (5)
-
Ilkka Koskinen -
Mark Brown -
Peter Ujfalusi -
Samuel Ortiz -
Tony Lindgren