From 58be40f7937b691a2c901c16122396ee3a9e21df Mon Sep 17 00:00:00 2001
From: Sebastian Reichel <sre@ring0.de>
Date: Fri, 26 Jul 2013 14:48:24 +0200
Subject: update rx51 board file

---
 arch/arm/mach-omap2/board-rx51-peripherals.c | 34 ++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
index 71354d58fd13..e6a838d1a02f 100644
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -23,6 +23,7 @@
 #include <linux/regulator/machine.h>
 #include <linux/gpio.h>
 #include <linux/gpio_keys.h>
+#include <linux/cmt.h>
 #include <linux/mmc/host.h>
 #include <linux/power/isp1704_charger.h>
 #include <linux/hsi/hsi.h>
@@ -269,6 +270,33 @@ static struct spi_board_info rx51_peripherals_spi_board_info[] __initdata = {
 	},
 };
 
+#if defined(CONFIG_CMT) || defined(CONFIG_CMT_MODULE)
+static struct cmt_platform_data rx51_cmt_pdata = {
+	.cmt_rst_ind_gpio = 72,
+};
+
+static struct platform_device rx51_cmt_device = {
+	.name = "cmt",
+	.id = -1,
+	.dev =  {
+		.platform_data = &rx51_cmt_pdata,
+	},
+};
+
+static void __init rx51_init_cmt(void)
+{
+	int err;
+
+	err = platform_device_register(&rx51_cmt_device);
+	if (err < 0)
+		pr_err("Could not register CMT device\n");
+}
+#else
+static void __init rx51_init_cmt(void)
+{
+}
+#endif
+
 static struct omap_ssi_board_config ssi_board_config = {
 	.num_ports = 1,
 	.cawake_gpio = { RX51_CAWAKE_GPIO },
@@ -295,13 +323,11 @@ static struct hsi_board_info rx51_hsi_board_info[] __initdata = {
 			.channels	= 4,
 		},
 	},
-#if 0 // not yet supported
 	[2] = {
 		.name			= "cmt_speech",
 		.hsi_id			= 0,
 		.port			= 0,
 	},
-#endif
 };
 
 static struct platform_device rx51_battery_device = {
@@ -1327,6 +1353,7 @@ void __init rx51_peripherals_init(void)
 	rx51_init_tsc2005();
 	rx51_init_si4713();
 	rx51_init_lirc();
+	rx51_init_cmt();
 	spi_register_board_info(rx51_peripherals_spi_board_info,
 				ARRAY_SIZE(rx51_peripherals_spi_board_info));
 
@@ -1334,9 +1361,8 @@ void __init rx51_peripherals_init(void)
 	if (partition)
 		omap_hsmmc_init(mmc);
 
-	omap_ssi_config(&ssi_board_config);
 	hsi_register_board_info(&rx51_hsi_board_info, ARRAY_SIZE(rx51_hsi_board_info));
+	omap_ssi_config(&ssi_board_config);
 	rx51_charger_init();
 	rx51_init_twl4030_hwmon();
 }
-
-- 
cgit v1.2.3