Skip to contentSkip to conversation

ALSA: drop outdated and broken sa11xx-uda1341 driver

PATCH In review Dmitry Artamonow 3 participants 6 messages Mar 11, 2009 – Mar 13, 2009 Sound

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ALSA: drop outdated and broken sa11xx-uda1341 driver

It depends on L3 support from 2.4 kernel (CONFIG_L3) that never got merged into mainline. Since there's no way to use it on any of supported machines (iPaq h3100 or h3600), better drop it for now. It can be reimplemented later using ASoC infrastructure (there's already a driver for uda1341 codec in mainline, so only CPU and machine parts need to be written).

---
 include/sound/uda1341.h    |  126 ------
 sound/arm/Kconfig          |   11 -
 sound/arm/Makefile         |    3 -
 sound/arm/sa11xx-uda1341.c |  983 --------------------------------------------
 sound/i2c/Makefile         |    2 -
 sound/i2c/l3/Makefile      |    8 -
 sound/i2c/l3/uda1341.c     |  935 -----------------------------------------
 7 files changed, 0 insertions(+), 2068 deletions(-)
 delete mode 100644 include/sound/uda1341.h
 delete mode 100644 sound/arm/sa11xx-uda1341.c
 delete mode 100644 sound/i2c/l3/Makefile
 delete mode 100644 sound/i2c/l3/uda1341.c
include/sound/uda1341.h deleted +0 -126
deleted file mode 100644
index 110d5dc..0000000
@@ -1,126 +0,0 @@
-/*
- *  linux/include/linux/l3/uda1341.h
- *
- * Philips UDA1341 mixer device driver for ALSA
- *
- * Copyright (c) 2002 Tomas Kasparek <[email protected]>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License.
- *
- * History:
- *
- * 2002-03-13 Tomas Kasparek Initial release - based on uda1341.h from OSS
- * 2002-03-30 Tomas Kasparek Proc filesystem support, complete mixer and DSP
- *                           features support
- */
-
-#define UDA1341_ALSA_NAME "snd-uda1341"
-
-/*
- * Default rate set after inicialization
- */
-#define AUDIO_RATE_DEFAULT	44100
-
-/*
- * UDA1341 L3 address and command types
- */
-#define UDA1341_L3ADDR		5
-#define UDA1341_DATA0		(UDA1341_L3ADDR << 2 | 0)
-#define UDA1341_DATA1		(UDA1341_L3ADDR << 2 | 1)
-#define UDA1341_STATUS		(UDA1341_L3ADDR << 2 | 2)
-
-enum uda1341_onoff {
-	OFF=0,
-	ON,
-};
-
-enum uda1341_format {
-	I2S=0,
-	LSB16,
-	LSB18,
-	LSB20,
-	MSB,
-	LSB16MSB,
-	LSB18MSB,
-	LSB20MSB,        
-};
-
-enum uda1341_fs {
-	F512=0,
-	F384,
-	F256,
-	Funused,
-};
-
-enum uda1341_peak {
-	BEFORE=0,
-	AFTER,
-};
-
-enum uda1341_filter {
-	FLAT=0,
-	MIN,
-	MIN2,
-	MAX,
-};
-
-enum uda1341_mixer {
-	DOUBLE,
-	LINE,
-	MIC,
-	MIXER,
-};
-
-enum uda1341_deemp {
-	NONE,
-	D32,
-	D44,
-	D48,
-};
-
-enum uda1341_config {
-	CMD_READ_REG = 0,
-	CMD_RESET,
-	CMD_FS,
-	CMD_FORMAT,
-	CMD_OGAIN,
-	CMD_IGAIN,
-	CMD_DAC,
-	CMD_ADC,
-	CMD_VOLUME,
-	CMD_BASS,
-	CMD_TREBBLE,
-	CMD_PEAK,
-	CMD_DEEMP,
-	CMD_MUTE,        
-	CMD_FILTER,
-	CMD_CH1,
-	CMD_CH2,
-	CMD_MIC,       
-	CMD_MIXER,
-	CMD_AGC,
-	CMD_IG,
-	CMD_AGC_TIME,
-	CMD_AGC_LEVEL,
-#ifdef CONFIG_PM
-	CMD_SUSPEND,
-	CMD_RESUME,
-#endif
-	CMD_LAST,
-};
-
-enum write_through {
-	//used in update_bits (write_cfg) to avoid l3_write - just update local copy of regs.
-	REGS_ONLY=0,
-	//update local regs and write value to uda1341 - do l3_write
-	FLUSH,
-};
-
-int __init snd_chip_uda1341_mixer_new(struct snd_card *card, struct l3_client **clnt);
-
-/*
- * Local variables:
- * indent-tabs-mode: t
- * End:
- */
sound/arm/Kconfig +0 -11
index f8e6de4..885683a 100644
@@ -11,17 +11,6 @@ menuconfig SND_ARM
 
 if SND_ARM
 
-config SND_SA11XX_UDA1341
-	tristate "SA11xx UDA1341TS driver (iPaq H3600)"
-	depends on ARCH_SA1100 && L3
-	select SND_PCM
-	help
-	  Say Y here if you have a Compaq iPaq H3x00 handheld computer
-	  and want to use its Philips UDA 1341 audio chip.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called snd-sa11xx-uda1341.
-
 config SND_ARMAACI
 	tristate "ARM PrimeCell PL041 AC Link support"
 	depends on ARM_AMBA
sound/arm/Makefile +0 -3
index 2054de1..5a549ed 100644
@@ -2,9 +2,6 @@
 # Makefile for ALSA
 #
 
-obj-$(CONFIG_SND_SA11XX_UDA1341) += snd-sa11xx-uda1341.o 
-snd-sa11xx-uda1341-objs		:= sa11xx-uda1341.o
-
 obj-$(CONFIG_SND_ARMAACI)	+= snd-aaci.o
 snd-aaci-objs			:= aaci.o devdma.o
 
sound/arm/sa11xx-uda1341.c deleted +0 -983

983 lines not on this page · raw message

sound/i2c/Makefile +0 -2
index 3797066..36879bf 100644
@@ -7,8 +7,6 @@ snd-i2c-objs := i2c.o
 snd-cs8427-objs := cs8427.o
 snd-tea6330t-objs := tea6330t.o
 
-obj-$(CONFIG_L3) += l3/
-
 obj-$(CONFIG_SND) += other/
 
 # Toplevel Module Dependency
sound/i2c/l3/Makefile deleted +0 -8
deleted file mode 100644
index 49455b8..0000000
@@ -1,8 +0,0 @@
-#
-# Makefile for ALSA
-#
-
-snd-uda1341-objs := uda1341.o
-
-# Module Dependency
-obj-$(CONFIG_SND_SA11XX_UDA1341) += snd-uda1341.o
sound/i2c/l3/uda1341.c deleted +0 -935

935 lines not on this page · raw message

Signature · 1 line
1.6.1.3
#1 lore raw
Quoted 6 lines · Dmitry Artamonow

It depends on L3 support from 2.4 kernel (CONFIG_L3) that never got merged into mainline. Since there's no way to use it on any of supported machines (iPaq h3100 or h3600), better drop it for now. It can be reimplemented later using ASoC infrastructure (there's already a driver for uda1341 codec in mainline, so only CPU and machine parts need to be written).

Yay, someone finally removing this.

I never saw this going in, but when I read through it, it was totally iPAQ specific. Having seen soo much effort put in to the OSS driver to make it flexible, have the iPAQ people use that, and then write their own ALSA specific driver irked the people who contributed to the OSS driver, to the extent that the OSS support was ripped out. (So I have platforms here were there _was_ full sound support but with the advent of ALSA, lost all sound support.) It was certainly a sad day when this driver was merged.

#2 lore raw
Quoted 7 lines · Russell King - ARM Linux
Quoted 6 lines · Dmitry Artamonow

It depends on L3 support from 2.4 kernel (CONFIG_L3) that never got merged into mainline. Since there's no way to use it on any of supported machines (iPaq h3100 or h3600), better drop it for now. It can be reimplemented later using ASoC infrastructure (there's already a driver for uda1341 codec in mainline, so only CPU and machine parts need to be written).

Seems that my patch stuck somewhere in alsa-devel moderator's queue. My fault, sorry - posted first, and only then realised that I'm not subscribed yet. Anyway, I noticed that in alsa-kernel.git some changes to sa11xx-uda1341.c were added comparing to Linus' tree, so here's the rebased version - please find it at the end of the letter.

Quoted 10 lines

Yay, someone finally removing this.

I never saw this going in, but when I read through it, it was totally iPAQ specific. Having seen soo much effort put in to the OSS driver to make it flexible, have the iPAQ people use that, and then write their own ALSA specific driver irked the people who contributed to the OSS driver, to the extent that the OSS support was ripped out. (So I have platforms here were there _was_ full sound support but with the advent of ALSA, lost all sound support.) It was certainly a sad day when this driver was merged.

That saddens me most is that all this years since it was merged various people spent their time to do some small fixes, cleanups and API conversion in this driver, and nobody ever noticed that it can't even be compiled.

=======================================================================

Quoted 1 line

From 4b4e7524fd91d818a3b08f12c1ef3875ebf68673 Mon Sep 17 00:00:00 2001

From: Dmitry Artamonow <[email protected]>
Date: Thu, 12 Mar 2009 23:03:13 +0300
Subject: [PATCH] ALSA: drop outdated and broken sa11xx-uda1341 driver

It depends on L3 support from 2.4 kernel (CONFIG_L3) that never got merged into mainline. Since there's no way to use it on any of supported machines (iPaq h3100 or h3600), better drop it for now. It can be reimplemented later using ASoC infrastructure (there's already a driver for uda1341 codec in mainline, so only CPU and machine parts need to be written).

---
 include/sound/uda1341.h    |  126 ------
 sound/arm/Kconfig          |   11 -
 sound/arm/Makefile         |    3 -
 sound/arm/sa11xx-uda1341.c |  984 --------------------------------------------
 sound/i2c/Makefile         |    2 -
 sound/i2c/l3/Makefile      |    8 -
 sound/i2c/l3/uda1341.c     |  935 -----------------------------------------
 7 files changed, 0 insertions(+), 2069 deletions(-)
 delete mode 100644 include/sound/uda1341.h
 delete mode 100644 sound/arm/sa11xx-uda1341.c
 delete mode 100644 sound/i2c/l3/Makefile
 delete mode 100644 sound/i2c/l3/uda1341.c
include/sound/uda1341.h deleted +0 -126
deleted file mode 100644
index 110d5dc..0000000
@@ -1,126 +0,0 @@
-/*
- *  linux/include/linux/l3/uda1341.h
- *
- * Philips UDA1341 mixer device driver for ALSA
- *
- * Copyright (c) 2002 Tomas Kasparek <[email protected]>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License.
- *
- * History:
- *
- * 2002-03-13 Tomas Kasparek Initial release - based on uda1341.h from OSS
- * 2002-03-30 Tomas Kasparek Proc filesystem support, complete mixer and DSP
- *                           features support
- */
-
-#define UDA1341_ALSA_NAME "snd-uda1341"
-
-/*
- * Default rate set after inicialization
- */
-#define AUDIO_RATE_DEFAULT	44100
-
-/*
- * UDA1341 L3 address and command types
- */
-#define UDA1341_L3ADDR		5
-#define UDA1341_DATA0		(UDA1341_L3ADDR << 2 | 0)
-#define UDA1341_DATA1		(UDA1341_L3ADDR << 2 | 1)
-#define UDA1341_STATUS		(UDA1341_L3ADDR << 2 | 2)
-
-enum uda1341_onoff {
-	OFF=0,
-	ON,
-};
-
-enum uda1341_format {
-	I2S=0,
-	LSB16,
-	LSB18,
-	LSB20,
-	MSB,
-	LSB16MSB,
-	LSB18MSB,
-	LSB20MSB,        
-};
-
-enum uda1341_fs {
-	F512=0,
-	F384,
-	F256,
-	Funused,
-};
-
-enum uda1341_peak {
-	BEFORE=0,
-	AFTER,
-};
-
-enum uda1341_filter {
-	FLAT=0,
-	MIN,
-	MIN2,
-	MAX,
-};
-
-enum uda1341_mixer {
-	DOUBLE,
-	LINE,
-	MIC,
-	MIXER,
-};
-
-enum uda1341_deemp {
-	NONE,
-	D32,
-	D44,
-	D48,
-};
-
-enum uda1341_config {
-	CMD_READ_REG = 0,
-	CMD_RESET,
-	CMD_FS,
-	CMD_FORMAT,
-	CMD_OGAIN,
-	CMD_IGAIN,
-	CMD_DAC,
-	CMD_ADC,
-	CMD_VOLUME,
-	CMD_BASS,
-	CMD_TREBBLE,
-	CMD_PEAK,
-	CMD_DEEMP,
-	CMD_MUTE,        
-	CMD_FILTER,
-	CMD_CH1,
-	CMD_CH2,
-	CMD_MIC,       
-	CMD_MIXER,
-	CMD_AGC,
-	CMD_IG,
-	CMD_AGC_TIME,
-	CMD_AGC_LEVEL,
-#ifdef CONFIG_PM
-	CMD_SUSPEND,
-	CMD_RESUME,
-#endif
-	CMD_LAST,
-};
-
-enum write_through {
-	//used in update_bits (write_cfg) to avoid l3_write - just update local copy of regs.
-	REGS_ONLY=0,
-	//update local regs and write value to uda1341 - do l3_write
-	FLUSH,
-};
-
-int __init snd_chip_uda1341_mixer_new(struct snd_card *card, struct l3_client **clnt);
-
-/*
- * Local variables:
- * indent-tabs-mode: t
- * End:
- */
sound/arm/Kconfig +0 -11
index f8e6de4..885683a 100644
@@ -11,17 +11,6 @@ menuconfig SND_ARM
 
 if SND_ARM
 
-config SND_SA11XX_UDA1341
-	tristate "SA11xx UDA1341TS driver (iPaq H3600)"
-	depends on ARCH_SA1100 && L3
-	select SND_PCM
-	help
-	  Say Y here if you have a Compaq iPaq H3x00 handheld computer
-	  and want to use its Philips UDA 1341 audio chip.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called snd-sa11xx-uda1341.
-
 config SND_ARMAACI
 	tristate "ARM PrimeCell PL041 AC Link support"
 	depends on ARM_AMBA
sound/arm/Makefile +0 -3
index 2054de1..5a549ed 100644
@@ -2,9 +2,6 @@
 # Makefile for ALSA
 #
 
-obj-$(CONFIG_SND_SA11XX_UDA1341) += snd-sa11xx-uda1341.o 
-snd-sa11xx-uda1341-objs		:= sa11xx-uda1341.o
-
 obj-$(CONFIG_SND_ARMAACI)	+= snd-aaci.o
 snd-aaci-objs			:= aaci.o devdma.o
 
sound/arm/sa11xx-uda1341.c deleted +0 -984

984 lines not on this page · raw message

sound/i2c/Makefile +0 -2
index 3797066..36879bf 100644
@@ -7,8 +7,6 @@ snd-i2c-objs := i2c.o
 snd-cs8427-objs := cs8427.o
 snd-tea6330t-objs := tea6330t.o
 
-obj-$(CONFIG_L3) += l3/
-
 obj-$(CONFIG_SND) += other/
 
 # Toplevel Module Dependency
sound/i2c/l3/Makefile deleted +0 -8
deleted file mode 100644
index 49455b8..0000000
@@ -1,8 +0,0 @@
-#
-# Makefile for ALSA
-#
-
-snd-uda1341-objs := uda1341.o
-
-# Module Dependency
-obj-$(CONFIG_SND_SA11XX_UDA1341) += snd-uda1341.o
sound/i2c/l3/uda1341.c deleted +0 -935

935 lines not on this page · raw message

Signature · 5 lines
1.6.1.3

-- 
Best regards,
Dmitry "MAD" Artamonow
#3 lore raw

At Fri, 13 Mar 2009 00:46:47 +0300,

Quoted 12 lines · Dmitry Artamonow
Quoted 11 lines

Yay, someone finally removing this.

I never saw this going in, but when I read through it, it was totally iPAQ specific. Having seen soo much effort put in to the OSS driver to make it flexible, have the iPAQ people use that, and then write their own ALSA specific driver irked the people who contributed to the OSS driver, to the extent that the OSS support was ripped out. (So I have platforms here were there _was_ full sound support but with the advent of ALSA, lost all sound support.) It was certainly a sad day when this driver was merged.

Quoted 3 lines

That saddens me most is that all this years since it was merged various people spent their time to do some small fixes, cleanups and API conversion in this driver, and nobody ever noticed that it can't even be compiled.

It could be still built with alsa-driver tree, which works for 2.2 and 2.4 kernels (unfortunately 1.x and 2.0 kernels aren't supported ;) But it doesn't make sense to keep the code in 2.6 tree, of course. So now it's moved into out-of-kernel tree again.

thanks,

Takashi

#4 lore raw
In reply to Russell King - ARM Linux

At Wed, 11 Mar 2009 21:26:54 +0000,

Quoted 11 lines · Russell King - ARM Linux
Quoted 6 lines · Dmitry Artamonow

It depends on L3 support from 2.4 kernel (CONFIG_L3) that never got merged into mainline. Since there's no way to use it on any of supported machines (iPaq h3100 or h3600), better drop it for now. It can be reimplemented later using ASoC infrastructure (there's already a driver for uda1341 codec in mainline, so only CPU and machine parts need to be written).

Yay, someone finally removing this.

Quoted 8 lines

I never saw this going in, but when I read through it, it was totally iPAQ specific. Having seen soo much effort put in to the OSS driver to make it flexible, have the iPAQ people use that, and then write their own ALSA specific driver irked the people who contributed to the OSS driver, to the extent that the OSS support was ripped out. (So I have platforms here were there _was_ full sound support but with the advent of ALSA, lost all sound support.) It was certainly a sad day when this driver was merged.

The lesson of today: upstream first :-)

Takashi

#5 lore raw
In reply to Dmitry Artamonow

At Thu, 12 Mar 2009 00:11:13 +0300,

Quoted 10 lines · Dmitry Artamonow

It depends on L3 support from 2.4 kernel (CONFIG_L3) that never got merged into mainline. Since there's no way to use it on any of supported machines (iPaq h3100 or h3600), better drop it for now. It can be reimplemented later using ASoC infrastructure (there's already a driver for uda1341 codec in mainline, so only CPU and machine parts need to be written).

Makes sense. Applied now.

thanks,

Takashi