aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDariusz Szymczak <dariusz.xd.szymczak@stericsson.com>2010-06-11 12:33:08 +0200
committerJohn Rigby <john.rigby@linaro.org>2010-09-02 22:45:41 -0600
commit6393ee3ef34f7be13d703370cba2273bc634d0f3 (patch)
tree3a2baba35d4597e7400505ab3758bc23e832af5c
parent2ca6919f214dbda0a172a74554622f7b6fb09126 (diff)
downloadlinux-2.6.34-ux500-6393ee3ef34f7be13d703370cba2273bc634d0f3.tar.gz
Bluetooth: Enable the PAN profile.
Enables CONFIG_BT_BNEP and related flags for mop500. Also changes the default bd address which is also the MAC for bnep0 device so that it doesn't have the group bit set. ST-Ericsson ID: WP 256274 Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> Change-Id: I99a8b035057fc0b79b4db8cb3581423ccc5d4e22 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/2534 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
-rwxr-xr-xarch/arm/configs/mop500_defconfig4
-rwxr-xr-xarch/arm/configs/mop500_ed_defconfig4
-rwxr-xr-xarch/arm/configs/mop500_power_defconfig4
-rw-r--r--drivers/mfd/ste_conn/ste_conn_ccd.c2
4 files changed, 10 insertions, 4 deletions
diff --git a/arch/arm/configs/mop500_defconfig b/arch/arm/configs/mop500_defconfig
index f9a81d48943..c9d5240032e 100755
--- a/arch/arm/configs/mop500_defconfig
+++ b/arch/arm/configs/mop500_defconfig
@@ -616,7 +616,9 @@ CONFIG_BT_L2CAP=y
CONFIG_BT_SCO=y
CONFIG_BT_RFCOMM=y
CONFIG_BT_RFCOMM_TTY=y
-# CONFIG_BT_BNEP is not set
+CONFIG_BT_BNEP=y
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
CONFIG_BT_HIDP=y
#
diff --git a/arch/arm/configs/mop500_ed_defconfig b/arch/arm/configs/mop500_ed_defconfig
index d3b034cd34f..5960cb283a6 100755
--- a/arch/arm/configs/mop500_ed_defconfig
+++ b/arch/arm/configs/mop500_ed_defconfig
@@ -597,7 +597,9 @@ CONFIG_BT_L2CAP=y
CONFIG_BT_SCO=y
CONFIG_BT_RFCOMM=y
CONFIG_BT_RFCOMM_TTY=y
-# CONFIG_BT_BNEP is not set
+CONFIG_BT_BNEP=y
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
CONFIG_BT_HIDP=y
#
diff --git a/arch/arm/configs/mop500_power_defconfig b/arch/arm/configs/mop500_power_defconfig
index 5be7a7f3721..f98e650934f 100755
--- a/arch/arm/configs/mop500_power_defconfig
+++ b/arch/arm/configs/mop500_power_defconfig
@@ -620,7 +620,9 @@ CONFIG_BT_L2CAP=y
CONFIG_BT_SCO=y
CONFIG_BT_RFCOMM=y
CONFIG_BT_RFCOMM_TTY=y
-# CONFIG_BT_BNEP is not set
+CONFIG_BT_BNEP=y
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
CONFIG_BT_HIDP=y
#
diff --git a/drivers/mfd/ste_conn/ste_conn_ccd.c b/drivers/mfd/ste_conn/ste_conn_ccd.c
index ba4530488a6..5418cb444bd 100644
--- a/drivers/mfd/ste_conn/ste_conn_ccd.c
+++ b/drivers/mfd/ste_conn/ste_conn_ccd.c
@@ -289,7 +289,7 @@ static int uart_default_baud = CCD_DEFAULT_BAUD_RATE;
static int uart_high_baud = CCD_HIGH_BAUD_RATE;
int ste_debug_level = STE_CONN_DEFAULT_DEBUG_LEVEL;
EXPORT_SYMBOL(ste_debug_level);
-uint8_t ste_conn_bd_address[] = {0x00, 0x80, 0xDE, 0xAD, 0xBE, 0xEF};
+uint8_t ste_conn_bd_address[] = {0x00, 0x80, 0xDE, 0xAD, 0xBE, 0x00};
EXPORT_SYMBOL(ste_conn_bd_address);
int bd_addr_count = BT_BDADDR_SIZE;