[alsa-devel] [PATCH] ASoC: OMAP: enable Overo driver for CM-T35
Signed-off-by: Mike Rapoport mike@compulab.co.il --- sound/soc/omap/Kconfig | 7 ++++--- sound/soc/omap/overo.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index 653a362..bb42681 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig @@ -43,12 +43,13 @@ config SND_OMAP_SOC_OSK5912 Say Y if you want to add support for SoC audio on osk5912.
config SND_OMAP_SOC_OVERO - tristate "SoC Audio support for Gumstix Overo" - depends on TWL4030_CORE && SND_OMAP_SOC && MACH_OVERO + tristate "SoC Audio support for Gumstix Overo and CompuLab CM-T35" + depends on TWL4030_CORE && SND_OMAP_SOC && (MACH_OVERO || MACH_CM_T35) select SND_OMAP_SOC_MCBSP select SND_SOC_TWL4030 help - Say Y if you want to add support for SoC audio on the Gumstix Overo. + Say Y if you want to add support for SoC audio on the + Gumstix Overo or CompuLab CM-T35
config SND_OMAP_SOC_OMAP2EVM tristate "SoC Audio support for OMAP2EVM board" diff --git a/sound/soc/omap/overo.c b/sound/soc/omap/overo.c index 624f40e..1bf440b 100644 --- a/sound/soc/omap/overo.c +++ b/sound/soc/omap/overo.c @@ -107,7 +107,7 @@ static int __init overo_soc_init(void) { int ret;
- if (!machine_is_overo()) { + if (!(machine_is_overo() || machine_is_cm_t35())) { pr_debug("Not Overo!\n"); return -ENODEV; }
On Mon, 2009-11-16 at 15:53 +0200, Mike Rapoport wrote:
Signed-off-by: Mike Rapoport mike@compulab.co.il
sound/soc/omap/Kconfig | 7 ++++--- sound/soc/omap/overo.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index 653a362..bb42681 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig @@ -43,12 +43,13 @@ config SND_OMAP_SOC_OSK5912 Say Y if you want to add support for SoC audio on osk5912.
config SND_OMAP_SOC_OVERO
- tristate "SoC Audio support for Gumstix Overo"
- depends on TWL4030_CORE && SND_OMAP_SOC && MACH_OVERO
- tristate "SoC Audio support for Gumstix Overo and CompuLab CM-T35"
- depends on TWL4030_CORE && SND_OMAP_SOC && (MACH_OVERO || MACH_CM_T35) select SND_OMAP_SOC_MCBSP select SND_SOC_TWL4030 help
Say Y if you want to add support for SoC audio on the Gumstix Overo.
Say Y if you want to add support for SoC audio on theGumstix Overo or CompuLab CM-T35config SND_OMAP_SOC_OMAP2EVM tristate "SoC Audio support for OMAP2EVM board" diff --git a/sound/soc/omap/overo.c b/sound/soc/omap/overo.c index 624f40e..1bf440b 100644 --- a/sound/soc/omap/overo.c +++ b/sound/soc/omap/overo.c @@ -107,7 +107,7 @@ static int __init overo_soc_init(void) { int ret;
- if (!machine_is_overo()) {
- if (!(machine_is_overo() || machine_is_cm_t35())) { pr_debug("Not Overo!\n");
Its probably best to update the pr_debug message too.
Liam
Signed-off-by: Mike Rapoport mike@compulab.co.il --- sound/soc/omap/Kconfig | 7 ++++--- sound/soc/omap/overo.c | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index 653a362..bb42681 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig @@ -43,12 +43,13 @@ config SND_OMAP_SOC_OSK5912 Say Y if you want to add support for SoC audio on osk5912.
config SND_OMAP_SOC_OVERO - tristate "SoC Audio support for Gumstix Overo" - depends on TWL4030_CORE && SND_OMAP_SOC && MACH_OVERO + tristate "SoC Audio support for Gumstix Overo and CompuLab CM-T35" + depends on TWL4030_CORE && SND_OMAP_SOC && (MACH_OVERO || MACH_CM_T35) select SND_OMAP_SOC_MCBSP select SND_SOC_TWL4030 help - Say Y if you want to add support for SoC audio on the Gumstix Overo. + Say Y if you want to add support for SoC audio on the + Gumstix Overo or CompuLab CM-T35
config SND_OMAP_SOC_OMAP2EVM tristate "SoC Audio support for OMAP2EVM board" diff --git a/sound/soc/omap/overo.c b/sound/soc/omap/overo.c index 624f40e..c25f527 100644 --- a/sound/soc/omap/overo.c +++ b/sound/soc/omap/overo.c @@ -107,8 +107,8 @@ static int __init overo_soc_init(void) { int ret;
- if (!machine_is_overo()) { - pr_debug("Not Overo!\n"); + if (!(machine_is_overo() || machine_is_cm_t35())) { + pr_debug("Incomatible machine!\n"); return -ENODEV; } printk(KERN_INFO "overo SoC init\n");
Liam Girdwood wrote:
On Mon, 2009-11-16 at 15:53 +0200, Mike Rapoport wrote:
Signed-off-by: Mike Rapoport mike@compulab.co.il
sound/soc/omap/Kconfig | 7 ++++--- sound/soc/omap/overo.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index 653a362..bb42681 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig @@ -43,12 +43,13 @@ config SND_OMAP_SOC_OSK5912 Say Y if you want to add support for SoC audio on osk5912.
config SND_OMAP_SOC_OVERO
- tristate "SoC Audio support for Gumstix Overo"
- depends on TWL4030_CORE && SND_OMAP_SOC && MACH_OVERO
- tristate "SoC Audio support for Gumstix Overo and CompuLab CM-T35"
- depends on TWL4030_CORE && SND_OMAP_SOC && (MACH_OVERO || MACH_CM_T35) select SND_OMAP_SOC_MCBSP select SND_SOC_TWL4030 help
Say Y if you want to add support for SoC audio on the Gumstix Overo.
Say Y if you want to add support for SoC audio on theGumstix Overo or CompuLab CM-T35config SND_OMAP_SOC_OMAP2EVM tristate "SoC Audio support for OMAP2EVM board" diff --git a/sound/soc/omap/overo.c b/sound/soc/omap/overo.c index 624f40e..1bf440b 100644 --- a/sound/soc/omap/overo.c +++ b/sound/soc/omap/overo.c @@ -107,7 +107,7 @@ static int __init overo_soc_init(void) { int ret;
- if (!machine_is_overo()) {
- if (!(machine_is_overo() || machine_is_cm_t35())) { pr_debug("Not Overo!\n");
Its probably best to update the pr_debug message too.
I'm ok if it'll say "Not Overo!" :) Anyway, here's the update:
On Mon, 2009-11-16 at 16:19 +0200, Mike Rapoport wrote:
From 4f3628ff75bdeb57e751622f2a92e223f68e81e3 Mon Sep 17 00:00:00 2001
In-Reply-To: 1258380019.3570.113.camel@odin References: 1258380019.3570.113.camel@odin From: Mike Rapoport mike@compulab.co.il Date: Mon, 16 Nov 2009 15:35:00 +0200 Subject: [PATCH] ASoC: OMAP: enable Overo driver for CM-T35
Signed-off-by: Mike Rapoport mike@compulab.co.il
sound/soc/omap/Kconfig | 7 ++++--- sound/soc/omap/overo.c | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index 653a362..bb42681 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig @@ -43,12 +43,13 @@ config SND_OMAP_SOC_OSK5912 Say Y if you want to add support for SoC audio on osk5912.
config SND_OMAP_SOC_OVERO
- tristate "SoC Audio support for Gumstix Overo"
- depends on TWL4030_CORE && SND_OMAP_SOC && MACH_OVERO
- tristate "SoC Audio support for Gumstix Overo and CompuLab CM-T35"
- depends on TWL4030_CORE && SND_OMAP_SOC && (MACH_OVERO || MACH_CM_T35) select SND_OMAP_SOC_MCBSP select SND_SOC_TWL4030 help
Say Y if you want to add support for SoC audio on the Gumstix Overo.
Say Y if you want to add support for SoC audio on theGumstix Overo or CompuLab CM-T35config SND_OMAP_SOC_OMAP2EVM tristate "SoC Audio support for OMAP2EVM board" diff --git a/sound/soc/omap/overo.c b/sound/soc/omap/overo.c index 624f40e..c25f527 100644 --- a/sound/soc/omap/overo.c +++ b/sound/soc/omap/overo.c @@ -107,8 +107,8 @@ static int __init overo_soc_init(void) { int ret;
- if (!machine_is_overo()) {
pr_debug("Not Overo!\n");
- if (!(machine_is_overo() || machine_is_cm_t35())) {
pr_debug("Incomatible machine!\n");-- 1.6.4.4
Acked-by: Liam Girdwood lrg@slimlogic.co.uk
Thanks
Liam
On Mon, 2009-11-16 at 16:19 +0200, Mike Rapoport wrote:
Liam Girdwood wrote:
On Mon, 2009-11-16 at 15:53 +0200, Mike Rapoport wrote:
Signed-off-by: Mike Rapoport mike@compulab.co.il
sound/soc/omap/Kconfig | 7 ++++--- sound/soc/omap/overo.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index 653a362..bb42681 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig @@ -43,12 +43,13 @@ config SND_OMAP_SOC_OSK5912 Say Y if you want to add support for SoC audio on osk5912.
config SND_OMAP_SOC_OVERO
- tristate "SoC Audio support for Gumstix Overo"
- depends on TWL4030_CORE && SND_OMAP_SOC && MACH_OVERO
- tristate "SoC Audio support for Gumstix Overo and CompuLab CM-T35"
- depends on TWL4030_CORE && SND_OMAP_SOC && (MACH_OVERO || MACH_CM_T35) select SND_OMAP_SOC_MCBSP select SND_SOC_TWL4030 help
Say Y if you want to add support for SoC audio on the Gumstix Overo.
Say Y if you want to add support for SoC audio on theGumstix Overo or CompuLab CM-T35config SND_OMAP_SOC_OMAP2EVM tristate "SoC Audio support for OMAP2EVM board" diff --git a/sound/soc/omap/overo.c b/sound/soc/omap/overo.c index 624f40e..1bf440b 100644 --- a/sound/soc/omap/overo.c +++ b/sound/soc/omap/overo.c @@ -107,7 +107,7 @@ static int __init overo_soc_init(void) { int ret;
- if (!machine_is_overo()) {
- if (!(machine_is_overo() || machine_is_cm_t35())) { pr_debug("Not Overo!\n");
Its probably best to update the pr_debug message too.
I'm ok if it'll say "Not Overo!" :) Anyway, here's the update:
From 4f3628ff75bdeb57e751622f2a92e223f68e81e3 Mon Sep 17 00:00:00 2001 In-Reply-To: 1258380019.3570.113.camel@odin References: 1258380019.3570.113.camel@odin From: Mike Rapoport mike@compulab.co.il Date: Mon, 16 Nov 2009 15:35:00 +0200 Subject: [PATCH] ASoC: OMAP: enable Overo driver for CM-T35
Signed-off-by: Mike Rapoport mike@compulab.co.il
sound/soc/omap/Kconfig | 7 ++++--- sound/soc/omap/overo.c | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index 653a362..bb42681 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig @@ -43,12 +43,13 @@ config SND_OMAP_SOC_OSK5912 Say Y if you want to add support for SoC audio on osk5912.
config SND_OMAP_SOC_OVERO
- tristate "SoC Audio support for Gumstix Overo"
- depends on TWL4030_CORE && SND_OMAP_SOC && MACH_OVERO
- tristate "SoC Audio support for Gumstix Overo and CompuLab CM-T35"
- depends on TWL4030_CORE && SND_OMAP_SOC && (MACH_OVERO || MACH_CM_T35) select SND_OMAP_SOC_MCBSP select SND_SOC_TWL4030 help
Say Y if you want to add support for SoC audio on the Gumstix Overo.
Say Y if you want to add support for SoC audio on theGumstix Overo or CompuLab CM-T35config SND_OMAP_SOC_OMAP2EVM tristate "SoC Audio support for OMAP2EVM board" diff --git a/sound/soc/omap/overo.c b/sound/soc/omap/overo.c index 624f40e..c25f527 100644 --- a/sound/soc/omap/overo.c +++ b/sound/soc/omap/overo.c @@ -107,8 +107,8 @@ static int __init overo_soc_init(void) { int ret;
- if (!machine_is_overo()) {
pr_debug("Not Overo!\n");
- if (!(machine_is_overo() || machine_is_cm_t35())) {
pr_debug("Incomatible machine!\n");-- 1.6.4.4
Acked-by: Steve Sakoman steve@sakoman.com
Regards,
Steve
On Mon, Nov 16, 2009 at 6:05 PM, Mark Brown broonie@opensource.wolfsonmicro.com wrote:
On Mon, Nov 16, 2009 at 04:19:25PM +0200, Mike Rapoport wrote:
I'm ok if it'll say "Not Overo!" :) Anyway, here's the update:
Applied, thanks (with manual hacking to remove the reply chain from the commit log).
Sorry, was too much in a hurry...
-- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
participants (5)
-
Liam Girdwood -
Mark Brown -
Mike Rapoport -
Mike Rapoport -
Steve Sakoman