diff options
author | Varun Wadekar <vwadekar@nvidia.com> | 2011-12-15 11:51:03 +0530 |
---|---|---|
committer | Varun Wadekar <vwadekar@nvidia.com> | 2011-12-15 11:51:03 +0530 |
commit | 0396dc3981cefdf9c980674194ef9bfb9b26a441 (patch) | |
tree | 367b8059859d11437db8f8cd6ecc18c61f621853 /arch/arm/mach-tegra/board-whistler.c | |
parent | 95c407fe0fc62de80cf15d7a68112ded47593a13 (diff) |
ARM: tegra: whistler: remove baseband init when there is no modem
When personnality/odmdata is not set to 0x2 (no i450 baseband) baseband init
is called. Side effect is loss of console on UARTA and LP0 failure.
Bug 912378
Bug 913070
Bug 907350
Signed-off-by: Martin Chabot <mchabot@nvidia.com>
Reviewed-on: http://git-master/r/68980
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>
Conflicts:
arch/arm/mach-tegra/board-whistler.c
Change-Id: Iab96d89b3741ae4535ce3d3eccb8ba31d13a85ff
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-whistler.c')
-rw-r--r-- | arch/arm/mach-tegra/board-whistler.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/board-whistler.c b/arch/arm/mach-tegra/board-whistler.c index 220c04bed3ed..6558a5e06b8d 100644 --- a/arch/arm/mach-tegra/board-whistler.c +++ b/arch/arm/mach-tegra/board-whistler.c @@ -551,8 +551,7 @@ static void whistler_usb_init(void) static void __init tegra_whistler_init(void) { - char serial[20]; - + int modem_id = tegra_get_modem_id(); tegra_clk_init_from_table(whistler_clk_init_table); whistler_pinmux_init(); whistler_i2c_init(); @@ -570,7 +569,8 @@ static void __init tegra_whistler_init(void) whistler_scroll_init(); whistler_power_off_init(); whistler_emc_init(); - whistler_baseband_init(); + if (modem_id == 0x1) + whistler_baseband_init(); whistler_setup_bluesleep(); tegra_release_bootloader_fb(); } |