--- zzzz-none-000/linux-3.10.107/arch/arm/mach-msm/board-trout.c	2017-06-27 09:49:32.000000000 +0000
+++ vr9-7490-729/linux-3.10.107/arch/arm/mach-msm/board-trout.c	2021-11-10 11:53:52.000000000 +0000
@@ -31,12 +31,10 @@
 
 #include "devices.h"
 #include "board-trout.h"
-#include "common.h"
 
 extern int trout_init_mmc(unsigned int);
 
 static struct platform_device *devices[] __initdata = {
-	&msm_device_gpio_7201,
 	&msm_device_uart3,
 	&msm_device_smd,
 	&msm_device_nand,
@@ -44,6 +42,8 @@
 	&msm_device_i2c,
 };
 
+extern struct sys_timer msm_timer;
+
 static void __init trout_init_early(void)
 {
 	arch_ioremap_caller = __msm_ioremap_caller;
@@ -111,5 +111,5 @@
 	.init_irq	= trout_init_irq,
 	.init_machine	= trout_init,
 	.init_late	= trout_init_late,
-	.init_time	= msm7x01_timer_init,
+	.timer		= &msm_timer,
 MACHINE_END