Commit-ID: 75a6d53b2b1b3f212ea0615ed3bb2d68a249af7b
Gitweb: http://git.kernel.org/tip/75a6d53b2b1b3f212ea0615ed3bb2d68a249af7b
Author: Jarkko Nikula <jhnikula@xxxxxxxxx>
AuthorDate: Tue, 17 Aug 2010 09:58:02 +0300
Committer: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
CommitDate: Tue, 17 Aug 2010 12:10:36 +0100
ASoC: multi-component - Drop board-n8x0.c changes
These will conflict with queued changes to board-n8x0.c coming from
linux-omap tree. Only side effect from this dropping is that the integrated
digital microphone on Nokia N810 will stop working when ASoC multi-component
is merged.
As currently the N810 is not very usable in mainline, I consider this as a
minor issue that can be fixed in linux-omap tree the after the
multi-component is merged.
Signed-off-by: Jarkko Nikula <jhnikula@xxxxxxxxx>
Acked-by: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
---
arch/arm/mach-omap2/board-n8x0.c | 15 ---------------
1 files changed, 0 insertions(+), 15 deletions(-)
diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
index 4543b87..a3e2b49 100644
--- a/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@ -20,7 +20,6 @@
#include <linux/i2c.h>
#include <linux/spi/spi.h>
#include <linux/usb/musb.h>
-#include <sound/tlv320aic3x.h>
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
@@ -615,25 +614,11 @@ static int n8x0_menelaus_late_init(struct device *dev)
return 0;
}
-static struct aic3x_setup_data n810_aic33_setup = {
- .gpio_func[0] = AIC3X_GPIO1_FUNC_DISABLED,
- .gpio_func[1] = AIC3X_GPIO2_FUNC_DIGITAL_MIC_INPUT,
-};
-
-static struct aic3x_pdata n810_aic33_data = {
- .setup = &n810_aic33_setup,
- .gpio_reset = -1,
-};
-
static struct i2c_board_info __initdata n8x0_i2c_board_info_1[] = {
{
I2C_BOARD_INFO("menelaus", 0x72),
.irq = INT_24XX_SYS_NIRQ,
},
- {
- I2C_BOARD_INFO("tlv320aic3x", 0x1b),
- .platform_data = &n810_aic33_data,
- },
};
static struct menelaus_platform_data n8x0_menelaus_platform_data = {
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|