[Hackndev-commit] SF.net SVN: hackndev: [1122] linux4palm/linux/trunk

[<sle...@us...>]

Revision: 1122
          http://svn.sourceforge.net/hackndev/?rev=1122&view=rev
Author:   sleep_walker
Date:     2007-07-08 12:54:23 -0700 (Sun, 08 Jul 2007)

Log Message:
-----------
palmtt3: BT separation, TPS65010 can be module again

Modified Paths:
--------------
    linux4palm/linux/trunk/arch/arm/mach-pxa/palmtt3/Kconfig
    linux4palm/linux/trunk/arch/arm/mach-pxa/palmtt3/Makefile
    linux4palm/linux/trunk/arch/arm/mach-pxa/palmtt3/palmtt3.c
    linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmtt3-gpio.h

Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtt3/Kconfig
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtt3/Kconfig	2007-07-08 14:34:34 UTC (rev 1121)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtt3/Kconfig	2007-07-08 19:54:23 UTC (rev 1122)
@@ -16,6 +16,14 @@
 	help
 	  Adds battery driver support
 
+config PALMTT3_BLUETOOTH
+	tristate "Bluetooth support for Palm Tungsten|T3"
+	depends on MACH_T3XSCALE && BT && TPS65010 && BT_BCM2035UART
+	default m if TPS65010=m && BT_BCM2035UART=m
+	default y if TPS65010=y || BT_BCM2035UART=y
+	help
+	  Adds bluetooth support for Palm Tungsten|T3
+
 config PALMTT3_FBKEYBOARD
 	bool "On-screen keyboard (BROKEN)"
 	depends on PALMTT3_TSC2101

Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtt3/Makefile
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtt3/Makefile	2007-07-08 14:34:34 UTC (rev 1121)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtt3/Makefile	2007-07-08 19:54:23 UTC (rev 1122)
@@ -5,4 +5,5 @@
 obj-$(CONFIG_MACH_T3XSCALE)		+= palmtt3.o
 obj-$(CONFIG_PALMTT3_BUTTONS)		+= palmtt3_buttons.o
 obj-$(CONFIG_PALMTT3_BATTERY)		+= palmtt3_battery.o
+obj-$(CONFIG_PALMTT3_BLUETOOTH)		+= palmtt3_bt.o
 obj-$(CONFIG_PALMTT3_FBKEYBOARD)	+= palmtt3_fbkeyb.o
\ No newline at end of file

Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtt3/palmtt3.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtt3/palmtt3.c	2007-07-08 14:34:34 UTC (rev 1121)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtt3/palmtt3.c	2007-07-08 19:54:23 UTC (rev 1122)
@@ -42,11 +42,8 @@
 #include <asm/arch/palmtt3-gpio.h>
 #include <asm/arch/tps65010.h>
 
-
 #include "../generic.h"
 
-// FIXME move this to include/asm/arch/palmtt3.h some time
-
 #define DEBUG 1
 
 /*** FRAMEBUFFER ***/
@@ -345,29 +342,8 @@
 	.resume		= palmtt3_hwuart_resume,
 };
 
-/* Bluetooth */
-
-void bcm2035_bt_reset(int on)
-{
-        printk(KERN_NOTICE "Switch BT reset %d\n", on);
-        if (on)
-                SET_GPIO(GPIO_NR_PALMTT3_RESET, 1);
-        else
-                SET_GPIO(GPIO_NR_PALMTT3_RESET, 0 );
-}
-EXPORT_SYMBOL(bcm2035_bt_reset);
-
-void bcm2035_bt_power(int on)
-{
-        printk(KERN_NOTICE "Switch BT power %d\n", on);
-        if (on)
-		tps65010_set_gpio_out_value(GPIO_NR_PALMTT3_TPS65010_BT_POWER,1);
-        else
-		tps65010_set_gpio_out_value(GPIO_NR_PALMTT3_TPS65010_BT_POWER,0);
-}
-EXPORT_SYMBOL(bcm2035_bt_power);
-
-
+/*** Bluetooth ***/
+#ifdef CONFIGURE_PALMTT3_BLUETOOTH
 struct bcm2035_bt_funcs {
         void (*configure) ( int state );
 };
@@ -392,9 +368,8 @@
                 .platform_data = &bt_funcs,
         },
 };
+#endif //CONFIG_PALMTT3_BLUETOOTH
 
-
-
 /*** Suspend/Resume ***/
 #ifdef CONFIG_PM
 static long int _PM_backup[3];
@@ -461,7 +436,9 @@
 	&palmtt3_backlight_device,
 	&palmtt3_led_device,
 	&palmtt3_power_button,
+#ifdef CONFIGURE_PALMTT3_BLUETOOTH
 	&bcm2035_bt,
+#endif
 };
 
 
@@ -475,7 +452,9 @@
 	set_pxa_fb_info(&palmtt3_lcd_screen);
 	pxa_set_udc_info(&palmtt3_udc_mach_info);
 	pxa_set_hwuart_info(&palmtt3_hwuart);
+#ifdef CONFIGURE_PALMTT3_BLUETOOTH
 	pxa_set_btuart_info(&bcm2035_pxa_bt_funcs);
+#endif
 	platform_add_devices (devices, ARRAY_SIZE (devices));
 }
 

Modified: linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmtt3-gpio.h
===================================================================
--- linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmtt3-gpio.h	2007-07-08 14:34:34 UTC (rev 1121)
+++ linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmtt3-gpio.h	2007-07-08 19:54:23 UTC (rev 1122)
@@ -19,6 +19,8 @@
 #ifndef _INCLUDE_PALMTT3_GPIO_H_ 
 
 #define _INCLUDE_PALMTT3_GPIO_H_
+#include <asm/arch/pxa-regs.h>
+#include <asm/arch/gpio.h>
 
 
 #define T3_TPS65010_GPIO 14


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.