From 46e8bc5a6eeb1e3f895f42062a63d2e18a0033af Mon Sep 17 00:00:00 2001 From: rgoyal Date: Thu, 22 Jul 2010 11:37:49 +0530 Subject: [arm/tegra] ODM: adding csr and broadcom GUID Added GUID for broadcom and csr to identify which BT chip is present. Change-Id: Ib4163d2aacd97700047be4f20b66fc40d7aa1a35 Reviewed-on: http://git-master/r/4238 Reviewed-by: Rakesh Goyal Tested-by: Rakesh Goyal Reviewed-by: Udaykumar Rameshchan Raval Reviewed-by: Janne Hellsten --- .../query/harmony/subboards/nvodm_query_discovery_e1162_peripherals.h | 2 +- .../query/ventana/subboards/nvodm_query_discovery_pm275_addresses.h | 1 + .../query/ventana/subboards/nvodm_query_discovery_pm275_peripherals.h | 4 ++-- .../query/whistler/subboards/nvodm_query_discovery_e951_peripherals.h | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) mode change 100644 => 100755 arch/arm/mach-tegra/odm_kit/query/harmony/subboards/nvodm_query_discovery_e1162_peripherals.h mode change 100644 => 100755 arch/arm/mach-tegra/odm_kit/query/ventana/subboards/nvodm_query_discovery_pm275_peripherals.h mode change 100644 => 100755 arch/arm/mach-tegra/odm_kit/query/whistler/subboards/nvodm_query_discovery_e951_peripherals.h diff --git a/arch/arm/mach-tegra/odm_kit/query/harmony/subboards/nvodm_query_discovery_e1162_peripherals.h b/arch/arm/mach-tegra/odm_kit/query/harmony/subboards/nvodm_query_discovery_e1162_peripherals.h old mode 100644 new mode 100755 index d983325afbe4..72eac8a2de35 --- a/arch/arm/mach-tegra/odm_kit/query/harmony/subboards/nvodm_query_discovery_e1162_peripherals.h +++ b/arch/arm/mach-tegra/odm_kit/query/harmony/subboards/nvodm_query_discovery_e1162_peripherals.h @@ -443,7 +443,7 @@ // Bluetooth { - NV_ODM_GUID('b','l','u','t','o','o','t','h'), + NV_ODM_GUID('l','b','e','e','9','q','m','b'), s_p1162BluetoothAddresses, NV_ARRAY_SIZE(s_p1162BluetoothAddresses), NvOdmPeripheralClass_Other diff --git a/arch/arm/mach-tegra/odm_kit/query/ventana/subboards/nvodm_query_discovery_pm275_addresses.h b/arch/arm/mach-tegra/odm_kit/query/ventana/subboards/nvodm_query_discovery_pm275_addresses.h index f4301fc55e4a..d658ba9f3fd5 100755 --- a/arch/arm/mach-tegra/odm_kit/query/ventana/subboards/nvodm_query_discovery_pm275_addresses.h +++ b/arch/arm/mach-tegra/odm_kit/query/ventana/subboards/nvodm_query_discovery_pm275_addresses.h @@ -357,6 +357,7 @@ static const NvOdmIoAddress s_p1162BluetoothAddresses[] = { { NvOdmIoModule_Uart, 0x2, 0x0, 0 }, // FIXME: Is this used? { NvOdmIoModule_Gpio, (NvU32)'u'-'a', 0, 0 }, /* BT_RST#: GPIO Port U and Pin 0 */ + { NvOdmIoModule_Gpio, (NvU32)'k'-'a', 2, 1 }, /* BT_SHUTDOWN#: GPIO Port K and Pin 2 */ { NvOdmIoModule_Vdd, 0x00, TPS6586xPmuSupply_LDO4, 0 } /* VDDHOSTIF_BT -> LDO4 (AON:VDD_1V8) */ }; diff --git a/arch/arm/mach-tegra/odm_kit/query/ventana/subboards/nvodm_query_discovery_pm275_peripherals.h b/arch/arm/mach-tegra/odm_kit/query/ventana/subboards/nvodm_query_discovery_pm275_peripherals.h old mode 100644 new mode 100755 index 0c52dc1fd5c7..f9269aa70b29 --- a/arch/arm/mach-tegra/odm_kit/query/ventana/subboards/nvodm_query_discovery_pm275_peripherals.h +++ b/arch/arm/mach-tegra/odm_kit/query/ventana/subboards/nvodm_query_discovery_pm275_peripherals.h @@ -402,9 +402,9 @@ NvOdmPeripheralClass_Other }, -// Bluetooth +// Broadcom Bluetooth bcm4329 { - NV_ODM_GUID('b','l','u','t','o','o','t','h'), + NV_ODM_GUID('b','c','m','_','4','3','2','9'), s_p1162BluetoothAddresses, NV_ARRAY_SIZE(s_p1162BluetoothAddresses), NvOdmPeripheralClass_Other diff --git a/arch/arm/mach-tegra/odm_kit/query/whistler/subboards/nvodm_query_discovery_e951_peripherals.h b/arch/arm/mach-tegra/odm_kit/query/whistler/subboards/nvodm_query_discovery_e951_peripherals.h old mode 100644 new mode 100755 index 69b364f11689..9479da177dac --- a/arch/arm/mach-tegra/odm_kit/query/whistler/subboards/nvodm_query_discovery_e951_peripherals.h +++ b/arch/arm/mach-tegra/odm_kit/query/whistler/subboards/nvodm_query_discovery_e951_peripherals.h @@ -41,7 +41,7 @@ */ // Bluetooth on COMMs Module { - NV_ODM_GUID('b','l','u','t','o','o','t','h'), + NV_ODM_GUID('l','b','e','e','9','q','m','b'), ffaBluetoothAddresses, NV_ARRAY_SIZE(ffaBluetoothAddresses), NvOdmPeripheralClass_Other -- cgit v1.2.3