ARM: tegra: clock src initialisation for debug port in common place

Moving clock source rate initialisation of  debug ports in
common place from board files.
In this way, it does not need to call the same function from
all board files and so avoid duplicating.

Change-Id: I4e0292c7760488125c0dd8ee5fa23f50faca3436
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: http://git-master/r/85174
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>

6 files changed, 4 insertions, 17 deletions

diff --git a/arch/arm/mach-tegra/board-cardhu.c b/arch/arm/mach-tegra/board-cardhu.c
index d10fb6ffc5eb..8834c3e3c9d8 100644
--- a/arch/arm/mach-tegra/board-cardhu.c
+++ b/arch/arm/mach-tegra/board-cardhu.c
@@ -364,7 +364,6 @@ static void __init uart_debug_init(void)
 				debug_port_id = 1;
 	}
 
-	tegra_init_debug_uart_rate();
 	switch (debug_port_id) {
 	case 0:
 		/* UARTA is the debug port. */
diff --git a/arch/arm/mach-tegra/board-enterprise.c b/arch/arm/mach-tegra/board-enterprise.c
index 6b876cea8741..e5b6acad58ac 100644
--- a/arch/arm/mach-tegra/board-enterprise.c
+++ b/arch/arm/mach-tegra/board-enterprise.c
@@ -395,8 +395,6 @@ static void __init uart_debug_init(void)
 	unsigned long rate;
 	struct clk *c;
 
-	tegra_init_debug_uart_rate();
-
 	/* UARTD is the debug port. */
 	pr_info("Selecting UARTD as the debug console\n");
 	enterprise_uart_devices[3] = &debug_uartd_device;
diff --git a/arch/arm/mach-tegra/board-kai.c b/arch/arm/mach-tegra/board-kai.c
index 9c88ef0badda..6e4be94d184b 100644
--- a/arch/arm/mach-tegra/board-kai.c
+++ b/arch/arm/mach-tegra/board-kai.c
@@ -332,7 +332,6 @@ static void __init uart_debug_init(void)
 	if (debug_port_id < 0)
 		debug_port_id = 3;
 
-	tegra_init_debug_uart_rate();
 	switch (debug_port_id) {
 	case 0:
 		/* UARTA is the debug port. */
diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c
index 4c685fd8f097..cf4ad3ae3515 100644
--- a/arch/arm/mach-tegra/common.c
+++ b/arch/arm/mach-tegra/common.c
@@ -45,6 +45,7 @@
 #include "fuse.h"
 #include "pm.h"
 #include "reset.h"
+#include "devices.h"
 
 #define MC_SECURITY_CFG2	0x7c
 
@@ -444,6 +445,7 @@ void __init tegra_init_early(void)
 	tegra_init_power();
 	tegra_init_cache(true);
 	tegra_init_ahb_gizmo_settings();
+	tegra_init_debug_uart_rate();
 }
 
 static int __init tegra_lp0_vec_arg(char *options)
diff --git a/arch/arm/mach-tegra/devices.c b/arch/arm/mach-tegra/devices.c
index 39bc04bd2e39..65a5fadefad5 100644
--- a/arch/arm/mach-tegra/devices.c
+++ b/arch/arm/mach-tegra/devices.c
@@ -38,12 +38,6 @@
 #include "gpio-names.h"
 #include "devices.h"
 
-#if !defined(CONFIG_ARCH_TEGRA_2x_SOC)
-#define UART_SOURCE_RATE 408000000
-#else
-#define UART_SOURCE_RATE 216000000
-#endif
-
 static struct resource i2c_resource1[] = {
 	[0] = {
 		.start	= INT_I2C,
@@ -806,7 +800,6 @@ static struct plat_serial8250_port debug_uarta_platform_data[] = {
 		.type           = PORT_TEGRA,
 		.iotype         = UPIO_MEM,
 		.regshift       = 2,
-		.uartclk        = UART_SOURCE_RATE,
 	},
 	{
 		.flags          = 0,
@@ -822,7 +815,6 @@ static struct plat_serial8250_port debug_uartb_platform_data[] = {
 		.type           = PORT_TEGRA,
 		.iotype         = UPIO_MEM,
 		.regshift       = 2,
-		.uartclk        = UART_SOURCE_RATE,
 	},
 	{
 		.flags          = 0,
@@ -838,7 +830,6 @@ static struct plat_serial8250_port debug_uartc_platform_data[] = {
 		.type           = PORT_TEGRA,
 		.iotype         = UPIO_MEM,
 		.regshift       = 2,
-		.uartclk        = UART_SOURCE_RATE,
 	},
 	{
 		.flags          = 0,
@@ -854,7 +845,6 @@ static struct plat_serial8250_port debug_uartd_platform_data[] = {
 		.type           = PORT_TEGRA,
 		.iotype         = UPIO_MEM,
 		.regshift       = 2,
-		.uartclk        = UART_SOURCE_RATE,
 	},
 	{
 		.flags          = 0,
@@ -871,7 +861,6 @@ static struct plat_serial8250_port debug_uarte_platform_data[] = {
 		.type           = PORT_TEGRA,
 		.iotype         = UPIO_MEM,
 		.regshift       = 2,
-		.uartclk        = UART_SOURCE_RATE,
 	},
 	{
 		.flags          = 0,
@@ -1735,7 +1724,7 @@ struct platform_device tegra_nvmap_device = {
 	.id	= -1,
 };
 
-void tegra_init_debug_uart_rate(void)
+void __init tegra_init_debug_uart_rate(void)
 {
 	unsigned int uartclk;
 	struct clk *debug_uart_parent = clk_get_sys(NULL, "pll_p");
diff --git a/arch/arm/mach-tegra/devices.h b/arch/arm/mach-tegra/devices.h
index ff93216ce292..5aa554ffe8df 100644
--- a/arch/arm/mach-tegra/devices.h
+++ b/arch/arm/mach-tegra/devices.h
@@ -127,6 +127,6 @@ extern struct platform_device debug_uarte_device;
 extern struct nvhost_device tegra_disp1_device;
 extern struct platform_device tegra_nvmap_device;
 
-void tegra_init_debug_uart_rate(void);
+void __init tegra_init_debug_uart_rate(void);
 
 #endif