Merge branch 'next'

From 3d1a9b44b9dcd2c0f5d54c09596c96c0524d8340 Mon Sep 17 00:00:00 2001

From: Gregory Hermant <gregory.hermant@calao-systems.com>

Date: Tue, 13 Nov 2012 11:47:41 +0100

Subject: [PATCH] trace-debug[stm]: Fix for BT/WLAN instability

Pins under mop500_ske_pins array are used for different

functionalities in snowball. Ex: GPIO161 pin configured

for keypad here must stay configured as GPIO alternate

function for operating PMU_EN pin of BT/WLAN chip in snowball.

So forbid configuring these pins, for snowball

Signed-off-by: Rajanikanth H.V <rajanikanth.hv@stericsson.com>

Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>

---

 arch/arm/mach-ux500/board-mop500-stm.c |    7 +++++--

 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-ux500/board-mop500-stm.c b/arch/arm/mach-ux500/board-mop500-stm.c

index 1bef2a0..532fb9e 100644

--- a/arch/arm/mach-ux500/board-mop500-stm.c

+++ b/arch/arm/mach-ux500/board-mop500-stm.c

@@ -121,7 +121,9 @@ static int stm_ste_disable_ape_on_mipi60(void)

 	if (retval)

 		STM_ERR("Failed to disable MIPI60\n");

 	else {

-		retval = nmk_config_pins(ARRAY_AND_SIZE(mop500_ske_pins));

+		if (!machine_is_snowball())

+			retval = nmk_config_pins(

+				ARRAY_AND_SIZE(mop500_ske_pins));

 		if (retval)

 			STM_ERR("Failed to enable SKE gpio\n");

 	}

@@ -314,7 +316,8 @@ static int stm_ste_connection(enum stm_connection_type con_type)

 		/* Enable altC3 on GPIO70-74 (STMMOD) and GPIO75-76 (UARTMOD) */

 		prcmu_enable_stm_mod_uart();

 		/* Enable APE on MIPI60 */

-		retval = nmk_config_pins_sleep(ARRAY_AND_SIZE(mop500_ske_pins));

+		if (!machine_is_snowball())

+			retval = nmk_config_pins_sleep(ARRAY_AND_SIZE(mop500_ske_pins));

 		if (retval)

 			STM_ERR("Failed to disable SKE GPIO\n");

 		else {

-- 

1.7.9.5

BR2_arm=y

BR2_cortex_a9=y

BR2_GCC_VERSION_4_7_X=y

# BR2_SOFT_FLOAT is not set

BR2_TOOLCHAIN_BUILDROOT_WCHAR=y

BR2_TOOLCHAIN_BUILDROOT_CXX=y

BR2_VFP_FLOAT=y

BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y

BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA2"

BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y

BR2_PACKAGE_SNOWBALL_HDMISERVICE=y

BR2_PACKAGE_LIBNL=y

BR2_PACKAGE_SNOWBALL_INIT=y

BR2_PACKAGE_WPA_SUPPLICANT=y

BR2_TARGET_ROOTFS_TAR_GZIP=y

BR2_TARGET_UBOOT=y

BR2_TARGET_UBOOT_BOARDNAME="snowball"

BR2_LINUX_KERNEL=y

BR2_LINUX_KERNEL_CUSTOM_GIT=y

BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://igloocommunity.org/git/kernel/igloo-kernel.git"

BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="stable-linux-ux500-3.4"

BR2_LINUX_KERNEL_PATCH="board/calao/snowball/"

BR2_LINUX_KERNEL_DEFCONFIG="u8500"

BR2_LINUX_KERNEL_INSTALL_TARGET=y

source "package/sdparm/Config.in"

source "package/setserial/Config.in"

source "package/smartmontools/Config.in"

source "package/snowball-hdmiservice/Config.in"

source "package/sredird/Config.in"

source "package/statserial/Config.in"

source "package/sysstat/Config.in"

source "package/usb_modeswitch_data/Config.in"

source "package/usbmount/Config.in"

source "package/usbutils/Config.in"

source "package/ux500-firmware/Config.in"

source "package/wipe/Config.in"

endmenu

source "package/fltk/Config.in"

source "package/fontconfig/Config.in"

source "package/freetype/Config.in"

source "package/gd/Config.in"

source "package/giblib/Config.in"

source "package/gtk2-engines/Config.in"

source "package/gtk2-themes/Config.in"

menu "Multimedia"

source "package/libdvdread/Config.in"

source "package/libdvdnav/Config.in"

source "package/libebml/Config.in"

source "package/libmatroska/Config.in"

source "package/libmms/Config.in"

source "package/libmpeg2/Config.in"

source "package/libogg/Config.in"

source "package/googlefontdirectory/Config.in"

source "package/mobile-broadband-provider-info/Config.in"

source "package/shared-mime-info/Config.in"

source "package/snowball-init/Config.in"

source "package/sound-theme-borealis/Config.in"

source "package/sound-theme-freedesktop/Config.in"

endmenu

From ac7992081abba87627c9e91735b3309584b48585 Mon Sep 17 00:00:00 2001

From: Gregory Hermant <gregory.hermant@calao-systems.com>

Date: Wed, 14 Nov 2012 14:27:02 +0100

Subject: [PATCH] add support for the ST-Ericsson CG2900 GPS FM Bluetooth

 combo controller

Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>

---

 tools/hciattach.c |   22 +++++++++++++++-------

 tools/hciattach.h |    1 +

 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/tools/hciattach.c b/tools/hciattach.c

index e4d5aa1..7f08243 100644

--- a/tools/hciattach.c

+++ b/tools/hciattach.c

@@ -1066,6 +1066,11 @@ struct uart_t uart[] = {

 	{ "texasalt",   0x0000, 0x0000, HCI_UART_LL,   115200, 115200,

 				FLOW_CTL, DISABLE_PM, NULL, texasalt, NULL   },

+	/* ST-Ericsson CG2900 GPS FM Bluetooth combo controller */

+	{ "cg2900",     0x0000, 0x0000, HCI_UART_STE,  115200, 115200,

+				FLOW_CTL, DISABLE_PM, NULL, NULL     },

+

+

 	/* ST Microelectronics minikits based on STLC2410/STLC2415 */

 	{ "st",         0x0000, 0x0000, HCI_UART_H4,    57600, 115200,

 				FLOW_CTL, DISABLE_PM,  NULL, st       },

@@ -1157,10 +1162,10 @@ static struct uart_t * get_by_type(char *type)

 }

 /* Initialize UART driver */

-static int init_uart(char *dev, struct uart_t *u, int send_break, int raw)

+static int init_uart(char *dev, struct uart_t *u, int send_break, int raw, int line_disc)

 {

 	struct termios ti;

-	int fd, i;

+	int fd;

 	unsigned long flags = 0;

 	if (raw)

@@ -1217,8 +1222,7 @@ static int init_uart(char *dev, struct uart_t *u, int send_break, int raw)

 	}

 	/* Set TTY to N_HCI line discipline */

-	i = N_HCI;

-	if (ioctl(fd, TIOCSETD, &i) < 0) {

+	if (ioctl(fd, TIOCSETD, &line_disc) < 0) {

 		perror("Can't set line discipline");

 		return -1;

 	}

@@ -1243,7 +1247,7 @@ static void usage(void)

 {

 	printf("hciattach - HCI UART driver initialization utility\n");

 	printf("Usage:\n");

-	printf("\thciattach [-n] [-p] [-b] [-r] [-t timeout] [-s initial_speed] <tty> <type | id> [speed] [flow|noflow] [bdaddr]\n");

+	printf("\thciattach [-n] [-p] [-a line_disc_nr] [-b] [-r] [-t timeout] [-s initial_speed] <tty> <type | id> [speed] [flow|noflow] [bdaddr]\n");

 	printf("\thciattach -l\n");

 }

@@ -1252,6 +1256,7 @@ int main(int argc, char *argv[])

 	struct uart_t *u = NULL;

 	int detach, printpid, raw, opt, i, n, ld, err;

 	int to = 10;

+	int line_disc = N_HCI;

 	int init_speed = 0;

 	int send_break = 0;

 	pid_t pid;

@@ -1264,8 +1269,11 @@ int main(int argc, char *argv[])

 	printpid = 0;

 	raw = 0;

-	while ((opt=getopt(argc, argv, "bnpt:s:lr")) != EOF) {

+	while ((opt=getopt(argc, argv, "bnpt:s:lra:")) != EOF) {

 		switch(opt) {

+		case 'a':

+                        line_disc = atoi(optarg);

+                        break;

 		case 'b':

 			send_break = 1;

 			break;

@@ -1381,7 +1389,7 @@ int main(int argc, char *argv[])

 	alarm(to);

 	bcsp_max_retries = to;

-	n = init_uart(dev, u, send_break, raw);

+	n = init_uart(dev, u, send_break, raw, line_disc);

 	if (n < 0) {

 		perror("Can't initialize device");

 		exit(1);

diff --git a/tools/hciattach.h b/tools/hciattach.h

index fed0d11..09b534d 100644

--- a/tools/hciattach.h

+++ b/tools/hciattach.h

@@ -39,6 +39,7 @@

 #define HCI_UART_H4DS	3

 #define HCI_UART_LL	4

 #define HCI_UART_ATH3K  5

+#define HCI_UART_STE	6

 #define HCI_UART_RAW_DEVICE	0

-- 

1.7.9.5

#

#############################################################

CCACHE_VERSION = 3.1.7

CCACHE_VERSION = 3.1.8

CCACHE_SITE    = http://samba.org/ftp/ccache

CCACHE_SOURCE  = ccache-$(CCACHE_VERSION).tar.bz2