Skip to contentSkip to conversation

ARM: OMAP: N8x0: Add retu-headset platform data

PATCH New Jarkko Nikula 2 participants 4 messages Mar 25, 2009

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 ARM: OMAP: N8x0: Add retu-headset platform data

This was earlier in board-n800-audio.c but got removed by the commit c65c733e1af5eac5681233309fed38538c9e06d2.

---
 arch/arm/mach-omap2/board-n800.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/board-n800.c +10 -0
index 60a414c..b90d153 100644
@@ -568,10 +568,20 @@ static struct omap_gpio_switch n800_gpio_switches[] __initdata = {
 	},
 };
 
+#if defined(CONFIG_CBUS_RETU_HEADSET)
+static struct platform_device retu_headset_device = {
+	.name	= "retu-headset",
+	.id	= -1,
+};
+#endif
+
 static struct platform_device *n800_devices[] __initdata = {
 #if defined(CONFIG_CBUS_RETU) && defined(CONFIG_LEDS_OMAP_PWM)
 	&n800_keypad_led_device,
 #endif
+#if defined(CONFIG_CBUS_RETU_HEADSET)
+	&retu_headset_device,
+#endif
 };
 
 #ifdef CONFIG_MENELAUS
Signature · 1 line
1.6.2
#1 lore raw

PATCH 2/2 ARM: OMAP: N8x0: Remove board-n800-audio.c

This file is needless since there is no anymore omap specific sound drivers. Drivers got removed by the commit 9fa298dc5f0b3e343337848b63c850e1a89d2d59.

---
 arch/arm/mach-omap2/Makefile           |    2 +-
 arch/arm/mach-omap2/board-n800-audio.c |   88 --------------------------------
 arch/arm/mach-omap2/board-n800.c       |    1 -
 3 files changed, 1 insertions(+), 90 deletions(-)
 delete mode 100644 arch/arm/mach-omap2/board-n800-audio.c
arch/arm/mach-omap2/Makefile +1 -1
index b44bb78..9b270d8 100644
@@ -63,7 +63,7 @@ obj-$(CONFIG_MACH_OMAP_APOLLON)		+= board-apollon.o \
 					   board-apollon-keys.o
 obj-$(CONFIG_MACH_NOKIA_N800)		+= board-n800.o board-n800-flash.o \
 					   board-n800-mmc.o board-n800-bt.o \
-					   board-n800-audio.o board-n800-usb.o \
+					   board-n800-usb.o \
 					   board-n800-dsp.o \
 					   board-n800-camera.o
 obj-$(CONFIG_MACH_NOKIA_N810)		+= board-n810.o
arch/arm/mach-omap2/board-n800-audio.c deleted +0 -88

88 lines not on this page · raw message

arch/arm/mach-omap2/board-n800.c +0 -1
index b90d153..cb32b61 100644
@@ -722,7 +722,6 @@ static void __init nokia_n800_init(void)
 {
 	nokia_n800_common_init();
 
-	n800_audio_init(&tsc2301_config);
 	n800_ts_set_config();
 	tsc2301_dev_init();
 	tea5761_dev_init();
Signature · 1 line
1.6.2