summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/p852
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2013-03-03 00:51:24 +0100
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2013-03-03 00:51:24 +0100
commitd6fa4ec20db6bd0b403d2d99fd9423e6c0f3f845 (patch)
treee9ddb16309d2b546a400593afc07846ce9ed6746 /arch/arm/mach-tegra/p852
parentdc1cfc34b2a07c5441d68ca21ae4296822ee4df6 (diff)
parent1ff6b9489fbc737e3e2bc7660b92cebbfaea5247 (diff)
Conflicts:
arch/arm/mach-tegra/common.c drivers/ata/ahci-tegra.c
Diffstat (limited to 'arch/arm/mach-tegra/p852')
-rw-r--r--arch/arm/mach-tegra/p852/board-p852-power.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/p852/board-p852-power.c b/arch/arm/mach-tegra/p852/board-p852-power.c
index 949537ed5d94..e69f98c8cba9 100644
--- a/arch/arm/mach-tegra/p852/board-p852-power.c
+++ b/arch/arm/mach-tegra/p852/board-p852-power.c
@@ -173,11 +173,12 @@ static void __init tps6586x_rtc_preinit(void)
system_rev == P852_SKU5_C01) {
for (i = 0; i < tps_platform.num_subdevs; ++i)
if (!strcmp(tps_platform.subdevs[i].name,
- "tps6586x-rtc"))
+ "tps6586x-rtc")) {
rtc_pdata =
(struct tps6586x_rtc_platform_data *)
(tps_platform.subdevs[i].platform_data);
rtc_pdata->cl_sel = TPS6586X_RTC_CL_SEL_1_5PF;
+ }
}
}