From: Tony Lindgren <tony@atomide.com> To: linux-arm-kernel@lists.infradead.org Cc: alsa-devel@alsa-project.org, Mark Brown <broonie@opensource.wolfsonmicro.com>, Peter Ujfalusi <peter.ujfalusi@ti.com>, linux-omap@vger.kernel.org, Liam Girdwood <lrg@ti.com>, Jarkko Nikula <jarkko.nikula@bitmer.com> Subject: [PATCH 08/29] ARM: OMAP2+: Make board-zoom.h local Date: Wed, 19 Sep 2012 14:05:54 -0700 [thread overview] Message-ID: <20120919210554.28074.2280.stgit@muffinssi> (raw) In-Reply-To: <20120919205732.28074.43697.stgit@muffinssi> This can be local to mach-omap2 after we rip out the messed up extmute stuff from board-zoom-peripherals.c that's all over the place and probably does not even work because of all the hardcoded GPIO numbers. I also suggest ASoC gusy remove all extmute handling from sound/soc/codecs/twl4030.c unless it's been tested to work and implemented in a saner way. Cc: Peter Ujfalusi <peter.ujfalusi@ti.com> Cc: Jarkko Nikula <jarkko.nikula@bitmer.com> Cc: Liam Girdwood <lrg@ti.com> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: alsa-devel@alsa-project.org Signed-off-by: Tony Lindgren <tony@atomide.com> --- arch/arm/mach-omap2/board-3630sdp.c | 2 +- arch/arm/mach-omap2/board-ldp.c | 2 +- arch/arm/mach-omap2/board-zoom-debugboard.c | 2 +- arch/arm/mach-omap2/board-zoom-display.c | 2 +- arch/arm/mach-omap2/board-zoom-peripherals.c | 16 +--------------- arch/arm/mach-omap2/board-zoom.c | 2 +- arch/arm/mach-omap2/board-zoom.h | 0 sound/soc/omap/zoom2.c | 2 +- 8 files changed, 7 insertions(+), 21 deletions(-) rename arch/arm/mach-omap2/{include/mach/board-zoom.h => board-zoom.h} (100%) diff --git a/arch/arm/mach-omap2/board-3630sdp.c b/arch/arm/mach-omap2/board-3630sdp.c index 8518b13..c7d6ea2 100644 --- a/arch/arm/mach-omap2/board-3630sdp.c +++ b/arch/arm/mach-omap2/board-3630sdp.c @@ -20,7 +20,7 @@ #include <plat/gpmc-smc91x.h> #include <plat/usb.h> -#include <mach/board-zoom.h> +#include "board-zoom.h" #include "board-flash.h" #include "mux.h" diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c index 3f3a552..d0372a6 100644 --- a/arch/arm/mach-omap2/board-ldp.c +++ b/arch/arm/mach-omap2/board-ldp.c @@ -36,7 +36,7 @@ #include <plat/mcspi.h> #include "common.h" #include <plat/gpmc.h> -#include <mach/board-zoom.h> +#include "board-zoom.h" #include <plat/usb.h> #include <plat/gpmc-smsc911x.h> diff --git a/arch/arm/mach-omap2/board-zoom-debugboard.c b/arch/arm/mach-omap2/board-zoom-debugboard.c index 0d8d919..42c97c2 100644 --- a/arch/arm/mach-omap2/board-zoom-debugboard.c +++ b/arch/arm/mach-omap2/board-zoom-debugboard.c @@ -20,7 +20,7 @@ #include <plat/gpmc.h> #include <plat/gpmc-smsc911x.h> -#include <mach/board-zoom.h> +#include "board-zoom.h" #include "soc.h" #include "common.h" diff --git a/arch/arm/mach-omap2/board-zoom-display.c b/arch/arm/mach-omap2/board-zoom-display.c index ea79bc2..6a162fb 100644 --- a/arch/arm/mach-omap2/board-zoom-display.c +++ b/arch/arm/mach-omap2/board-zoom-display.c @@ -16,7 +16,7 @@ #include <linux/spi/spi.h> #include <plat/mcspi.h> #include <video/omapdss.h> -#include <mach/board-zoom.h> +#include "board-zoom.h" #include "common.h" diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c index 6bcc107..c8377b71 100644 --- a/arch/arm/mach-omap2/board-zoom-peripherals.c +++ b/arch/arm/mach-omap2/board-zoom-peripherals.c @@ -28,7 +28,7 @@ #include "common.h" #include <plat/usb.h> -#include <mach/board-zoom.h> +#include "board-zoom.h" #include "mux.h" #include "hsmmc.h" @@ -245,12 +245,6 @@ static int zoom_twl_gpio_setup(struct device *dev, return ret; } -/* EXTMUTE callback function */ -static void zoom2_set_hs_extmute(int mute) -{ - gpio_set_value(ZOOM2_HEADSET_EXTMUTE_GPIO, mute); -} - static struct twl4030_gpio_platform_data zoom_gpio_data = { .setup = zoom_twl_gpio_setup, }; @@ -271,14 +265,6 @@ static int __init omap_i2c_init(void) TWL_COMMON_PDATA_MADC | TWL_COMMON_PDATA_AUDIO, TWL_COMMON_REGULATOR_VDAC | TWL_COMMON_REGULATOR_VPLL2); - if (machine_is_omap_zoom2()) { - struct twl4030_codec_data *codec_data; - codec_data = zoom_twldata.audio->codec; - - codec_data->ramp_delay_value = 3; /* 161 ms */ - codec_data->hs_extmute = 1; - codec_data->set_hs_extmute = zoom2_set_hs_extmute; - } omap_pmic_init(1, 2400, "twl5030", 7 + OMAP_INTC_START, &zoom_twldata); omap_register_i2c_bus(2, 400, NULL, 0); omap_register_i2c_bus(3, 400, NULL, 0); diff --git a/arch/arm/mach-omap2/board-zoom.c b/arch/arm/mach-omap2/board-zoom.c index 4994438..cbfd9df 100644 --- a/arch/arm/mach-omap2/board-zoom.c +++ b/arch/arm/mach-omap2/board-zoom.c @@ -24,7 +24,7 @@ #include "common.h" #include <plat/usb.h> -#include <mach/board-zoom.h> +#include "board-zoom.h" #include "board-flash.h" #include "mux.h" diff --git a/arch/arm/mach-omap2/include/mach/board-zoom.h b/arch/arm/mach-omap2/board-zoom.h similarity index 100% rename from arch/arm/mach-omap2/include/mach/board-zoom.h rename to arch/arm/mach-omap2/board-zoom.h diff --git a/sound/soc/omap/zoom2.c b/sound/soc/omap/zoom2.c index 920e0d9..187cb0c 100644 --- a/sound/soc/omap/zoom2.c +++ b/sound/soc/omap/zoom2.c @@ -28,7 +28,6 @@ #include <asm/mach-types.h> #include <mach/hardware.h> #include <mach/gpio.h> -#include <mach/board-zoom.h> #include <plat/mcbsp.h> /* Register descriptions for twl4030 codec part */ @@ -39,6 +38,7 @@ #include "omap-pcm.h" #define ZOOM2_HEADSET_MUX_GPIO (OMAP_MAX_GPIO_LINES + 15) +#define ZOOM2_HEADSET_EXTMUTE_GPIO 153 static int zoom2_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params)
WARNING: multiple messages have this Message-ID (diff)
From: tony@atomide.com (Tony Lindgren) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 08/29] ARM: OMAP2+: Make board-zoom.h local Date: Wed, 19 Sep 2012 14:05:54 -0700 [thread overview] Message-ID: <20120919210554.28074.2280.stgit@muffinssi> (raw) In-Reply-To: <20120919205732.28074.43697.stgit@muffinssi> This can be local to mach-omap2 after we rip out the messed up extmute stuff from board-zoom-peripherals.c that's all over the place and probably does not even work because of all the hardcoded GPIO numbers. I also suggest ASoC gusy remove all extmute handling from sound/soc/codecs/twl4030.c unless it's been tested to work and implemented in a saner way. Cc: Peter Ujfalusi <peter.ujfalusi@ti.com> Cc: Jarkko Nikula <jarkko.nikula@bitmer.com> Cc: Liam Girdwood <lrg@ti.com> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: alsa-devel at alsa-project.org Signed-off-by: Tony Lindgren <tony@atomide.com> --- arch/arm/mach-omap2/board-3630sdp.c | 2 +- arch/arm/mach-omap2/board-ldp.c | 2 +- arch/arm/mach-omap2/board-zoom-debugboard.c | 2 +- arch/arm/mach-omap2/board-zoom-display.c | 2 +- arch/arm/mach-omap2/board-zoom-peripherals.c | 16 +--------------- arch/arm/mach-omap2/board-zoom.c | 2 +- arch/arm/mach-omap2/board-zoom.h | 0 sound/soc/omap/zoom2.c | 2 +- 8 files changed, 7 insertions(+), 21 deletions(-) rename arch/arm/mach-omap2/{include/mach/board-zoom.h => board-zoom.h} (100%) diff --git a/arch/arm/mach-omap2/board-3630sdp.c b/arch/arm/mach-omap2/board-3630sdp.c index 8518b13..c7d6ea2 100644 --- a/arch/arm/mach-omap2/board-3630sdp.c +++ b/arch/arm/mach-omap2/board-3630sdp.c @@ -20,7 +20,7 @@ #include <plat/gpmc-smc91x.h> #include <plat/usb.h> -#include <mach/board-zoom.h> +#include "board-zoom.h" #include "board-flash.h" #include "mux.h" diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c index 3f3a552..d0372a6 100644 --- a/arch/arm/mach-omap2/board-ldp.c +++ b/arch/arm/mach-omap2/board-ldp.c @@ -36,7 +36,7 @@ #include <plat/mcspi.h> #include "common.h" #include <plat/gpmc.h> -#include <mach/board-zoom.h> +#include "board-zoom.h" #include <plat/usb.h> #include <plat/gpmc-smsc911x.h> diff --git a/arch/arm/mach-omap2/board-zoom-debugboard.c b/arch/arm/mach-omap2/board-zoom-debugboard.c index 0d8d919..42c97c2 100644 --- a/arch/arm/mach-omap2/board-zoom-debugboard.c +++ b/arch/arm/mach-omap2/board-zoom-debugboard.c @@ -20,7 +20,7 @@ #include <plat/gpmc.h> #include <plat/gpmc-smsc911x.h> -#include <mach/board-zoom.h> +#include "board-zoom.h" #include "soc.h" #include "common.h" diff --git a/arch/arm/mach-omap2/board-zoom-display.c b/arch/arm/mach-omap2/board-zoom-display.c index ea79bc2..6a162fb 100644 --- a/arch/arm/mach-omap2/board-zoom-display.c +++ b/arch/arm/mach-omap2/board-zoom-display.c @@ -16,7 +16,7 @@ #include <linux/spi/spi.h> #include <plat/mcspi.h> #include <video/omapdss.h> -#include <mach/board-zoom.h> +#include "board-zoom.h" #include "common.h" diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c index 6bcc107..c8377b71 100644 --- a/arch/arm/mach-omap2/board-zoom-peripherals.c +++ b/arch/arm/mach-omap2/board-zoom-peripherals.c @@ -28,7 +28,7 @@ #include "common.h" #include <plat/usb.h> -#include <mach/board-zoom.h> +#include "board-zoom.h" #include "mux.h" #include "hsmmc.h" @@ -245,12 +245,6 @@ static int zoom_twl_gpio_setup(struct device *dev, return ret; } -/* EXTMUTE callback function */ -static void zoom2_set_hs_extmute(int mute) -{ - gpio_set_value(ZOOM2_HEADSET_EXTMUTE_GPIO, mute); -} - static struct twl4030_gpio_platform_data zoom_gpio_data = { .setup = zoom_twl_gpio_setup, }; @@ -271,14 +265,6 @@ static int __init omap_i2c_init(void) TWL_COMMON_PDATA_MADC | TWL_COMMON_PDATA_AUDIO, TWL_COMMON_REGULATOR_VDAC | TWL_COMMON_REGULATOR_VPLL2); - if (machine_is_omap_zoom2()) { - struct twl4030_codec_data *codec_data; - codec_data = zoom_twldata.audio->codec; - - codec_data->ramp_delay_value = 3; /* 161 ms */ - codec_data->hs_extmute = 1; - codec_data->set_hs_extmute = zoom2_set_hs_extmute; - } omap_pmic_init(1, 2400, "twl5030", 7 + OMAP_INTC_START, &zoom_twldata); omap_register_i2c_bus(2, 400, NULL, 0); omap_register_i2c_bus(3, 400, NULL, 0); diff --git a/arch/arm/mach-omap2/board-zoom.c b/arch/arm/mach-omap2/board-zoom.c index 4994438..cbfd9df 100644 --- a/arch/arm/mach-omap2/board-zoom.c +++ b/arch/arm/mach-omap2/board-zoom.c @@ -24,7 +24,7 @@ #include "common.h" #include <plat/usb.h> -#include <mach/board-zoom.h> +#include "board-zoom.h" #include "board-flash.h" #include "mux.h" diff --git a/arch/arm/mach-omap2/include/mach/board-zoom.h b/arch/arm/mach-omap2/board-zoom.h similarity index 100% rename from arch/arm/mach-omap2/include/mach/board-zoom.h rename to arch/arm/mach-omap2/board-zoom.h diff --git a/sound/soc/omap/zoom2.c b/sound/soc/omap/zoom2.c index 920e0d9..187cb0c 100644 --- a/sound/soc/omap/zoom2.c +++ b/sound/soc/omap/zoom2.c @@ -28,7 +28,6 @@ #include <asm/mach-types.h> #include <mach/hardware.h> #include <mach/gpio.h> -#include <mach/board-zoom.h> #include <plat/mcbsp.h> /* Register descriptions for twl4030 codec part */ @@ -39,6 +38,7 @@ #include "omap-pcm.h" #define ZOOM2_HEADSET_MUX_GPIO (OMAP_MAX_GPIO_LINES + 15) +#define ZOOM2_HEADSET_EXTMUTE_GPIO 153 static int zoom2_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params)
next prev parent reply other threads:[~2012-09-19 21:05 UTC|newest] Thread overview: 92+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-09-19 21:05 [PATCH 00/29] More omap header moves for common zImage support Tony Lindgren 2012-09-19 21:05 ` Tony Lindgren 2012-09-19 21:05 ` [PATCH 01/29] ARM: OMAP: Remove unused param.h Tony Lindgren 2012-09-19 21:05 ` Tony Lindgren 2012-09-19 21:05 ` [PATCH 02/29] ARM: OMAP: Remove smp.h Tony Lindgren 2012-09-19 21:05 ` Tony Lindgren 2012-09-19 21:05 ` [PATCH 03/29] ARM: OMAP1: Make plat/mux.h omap1 only Tony Lindgren 2012-09-19 21:05 ` Tony Lindgren 2012-09-20 19:26 ` Felipe Balbi 2012-09-20 19:26 ` Felipe Balbi 2012-09-19 21:05 ` [PATCH 04/29] ARM: OMAP1: Move board-ams-delta.h from plat to mach Tony Lindgren 2012-09-19 21:05 ` Tony Lindgren 2012-09-19 21:05 ` Tony Lindgren 2012-09-19 21:05 ` Tony Lindgren 2012-09-20 1:16 ` Mark Brown 2012-09-20 1:16 ` Mark Brown 2012-09-20 1:16 ` Mark Brown 2012-09-20 1:16 ` Mark Brown 2012-09-20 17:12 ` Tony Lindgren 2012-09-20 17:12 ` Tony Lindgren 2012-09-20 17:12 ` Tony Lindgren 2012-09-20 17:12 ` Tony Lindgren 2012-09-20 13:41 ` Janusz Krzysztofik 2012-09-20 13:41 ` Janusz Krzysztofik 2012-09-20 13:41 ` Janusz Krzysztofik 2012-09-20 13:41 ` Janusz Krzysztofik 2012-09-20 17:10 ` Tony Lindgren 2012-09-20 17:10 ` Tony Lindgren 2012-09-20 17:10 ` Tony Lindgren 2012-09-20 17:10 ` Tony Lindgren 2012-09-19 21:05 ` [PATCH 05/29] ARM: OMAP2+: Make id.h local Tony Lindgren 2012-09-19 21:05 ` Tony Lindgren 2012-09-19 21:05 ` [PATCH 06/29] ARM: OMAP1: Move keypad.h from plat to mach Tony Lindgren 2012-09-19 21:05 ` Tony Lindgren 2012-09-20 18:14 ` Tony Lindgren 2012-09-20 18:14 ` Tony Lindgren 2012-09-19 21:05 ` [PATCH 07/29] ARM: OMAP1: Move lcd_mipid.h " Tony Lindgren 2012-09-19 21:05 ` Tony Lindgren 2012-09-19 21:05 ` Tony Lindgren 2012-09-20 18:17 ` Tony Lindgren 2012-09-20 18:17 ` Tony Lindgren 2012-09-20 18:17 ` Tony Lindgren 2012-09-19 21:05 ` Tony Lindgren [this message] 2012-09-19 21:05 ` [PATCH 08/29] ARM: OMAP2+: Make board-zoom.h local Tony Lindgren 2012-09-20 1:24 ` Mark Brown 2012-09-20 1:24 ` Mark Brown 2012-09-20 7:29 ` Peter Ujfalusi 2012-09-20 7:29 ` Peter Ujfalusi 2012-09-20 17:15 ` Tony Lindgren 2012-09-20 17:15 ` Tony Lindgren 2012-09-19 21:05 ` [PATCH 09/29] ARM: OMAP2+: Make am35xx.h local Tony Lindgren 2012-09-19 21:05 ` Tony Lindgren 2012-09-19 21:06 ` [PATCH 10/29] ARM: OMAP2+: Make board-rx51.h local Tony Lindgren 2012-09-19 21:06 ` Tony Lindgren 2012-09-19 21:06 ` [PATCH 11/29] ARM: OMAP2+: Make ctrl_module_core_44xx.h local Tony Lindgren 2012-09-19 21:06 ` Tony Lindgren 2012-09-19 21:06 ` [PATCH 12/29] ARM: OMAP2+: Make ctrl_module_pad_core_44xx.h local Tony Lindgren 2012-09-19 21:06 ` Tony Lindgren 2012-09-19 21:06 ` [PATCH 13/29] ARM: OMAP2+: Make ctrl_module_pad_wkup_44xx.h local Tony Lindgren 2012-09-19 21:06 ` Tony Lindgren 2012-09-19 21:06 ` [PATCH 14/29] ARM: OMAP2+: Make ctrl_module_wkup_44xx.h local Tony Lindgren 2012-09-19 21:06 ` Tony Lindgren 2012-09-19 21:06 ` [PATCH 15/29] ARM: OMAP2+: Make omap-secure.h local Tony Lindgren 2012-09-19 21:06 ` Tony Lindgren 2012-09-19 21:06 ` [PATCH 16/29] ARM: OMAP2+: Make omap-wakeupgen.h local Tony Lindgren 2012-09-19 21:06 ` Tony Lindgren 2012-09-19 21:06 ` [PATCH 17/29] ARM: OMAP1: Move board-sx1.h from plat to mach Tony Lindgren 2012-09-19 21:06 ` Tony Lindgren 2012-09-19 21:06 ` [PATCH 18/29] ARM: OMAP1: Move board-voiceblue.h " Tony Lindgren 2012-09-19 21:06 ` Tony Lindgren 2012-09-19 21:06 ` [PATCH 19/29] ARM: OMAP2+: Make debug-devices.h local Tony Lindgren 2012-09-19 21:06 ` Tony Lindgren 2012-09-19 21:06 ` [PATCH 20/29] ARM: OMAP1: Move flash.h from plat to mach Tony Lindgren 2012-09-19 21:06 ` Tony Lindgren 2012-09-19 21:06 ` [PATCH 21/29] ARM: OMAP2+: Make gpmc-smc91x.h local Tony Lindgren 2012-09-19 21:06 ` Tony Lindgren 2012-09-19 21:06 ` [PATCH 22/29] ARM: OMAP2+: Make gpmc-smsc911x.h local Tony Lindgren 2012-09-19 21:06 ` Tony Lindgren 2012-09-19 21:06 ` [PATCH 23/29] ARM: OMAP2+: Make hdq1w.h local Tony Lindgren 2012-09-19 21:06 ` Tony Lindgren 2012-09-19 21:06 ` [PATCH 24/29] ARM: OMAP1: Move irda.h from plat to mach Tony Lindgren 2012-09-19 21:06 ` Tony Lindgren 2012-09-19 21:06 ` [PATCH 25/29] ARM: OMAP2+: Make l3_2xxx.h local Tony Lindgren 2012-09-19 21:06 ` Tony Lindgren 2012-09-19 21:06 ` [PATCH 26/29] ARM: OMAP2+: Make l3_3xxx.h local Tony Lindgren 2012-09-19 21:06 ` Tony Lindgren 2012-09-19 21:06 ` [PATCH 27/29] ARM: OMAP2+: Make l4_2xxx.h local Tony Lindgren 2012-09-19 21:06 ` Tony Lindgren 2012-09-19 21:06 ` [PATCH 28/29] ARM: OMAP2+: Make l4_3xxx.h local Tony Lindgren 2012-09-19 21:06 ` Tony Lindgren 2012-09-19 21:06 ` [PATCH 29/29] ARM: OMAP2+: Make omap4-keypad.h local Tony Lindgren 2012-09-19 21:06 ` Tony Lindgren
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20120919210554.28074.2280.stgit@muffinssi \ --to=tony@atomide.com \ --cc=alsa-devel@alsa-project.org \ --cc=broonie@opensource.wolfsonmicro.com \ --cc=jarkko.nikula@bitmer.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-omap@vger.kernel.org \ --cc=lrg@ti.com \ --cc=peter.ujfalusi@ti.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.