ARM: Orion: UART: Get the clock rate via clk_get_rate().

Let the machine pass to the platform which clock is used by the uart.
Enable the clock and use clk_get_rate() to determine its rate.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Jamie Lentin <jm@lentin.co.uk>
Signed-off-by: Mike Turquette <mturquette@linaro.org>

2 files changed, 20 insertions, 14 deletions

diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
index d349998f72e..61fd837624a 100644
--- a/arch/arm/plat-orion/common.c
+++ b/arch/arm/plat-orion/common.c
@@ -75,6 +75,12 @@ static void fill_resources(struct platform_device *device,
 /*****************************************************************************
  * UART
  ****************************************************************************/
+static unsigned long __init uart_get_clk_rate(struct clk *clk)
+{
+        clk_prepare_enable(clk);
+        return clk_get_rate(clk);
+}
+
 static void __init uart_complete(
         struct platform_device *orion_uart,
         struct plat_serial8250_port *data,
@@ -82,12 +88,12 @@ static void __init uart_complete(
         unsigned int membase,
         resource_size_t mapbase,
         unsigned int irq,
-        unsigned int uartclk)
+        struct clk *clk)
 {
         data->mapbase = mapbase;
         data->membase = (void __iomem *)membase;
         data->irq = irq;
-        data->uartclk = uartclk;
+        data->uartclk = uart_get_clk_rate(clk);
         orion_uart->dev.platform_data = data;
 
         fill_resources(orion_uart, resources, mapbase, 0xff, irq);
@@ -116,10 +122,10 @@ static struct platform_device orion_uart0 = {
 void __init orion_uart0_init(unsigned int membase,
                              resource_size_t mapbase,
                              unsigned int irq,
-                             unsigned int uartclk)
+                             struct clk *clk)
 {
         uart_complete(&orion_uart0, orion_uart0_data, orion_uart0_resources,
-                      membase, mapbase, irq, uartclk);
+                      membase, mapbase, irq, clk);
 }
 
 /*****************************************************************************
@@ -144,10 +150,10 @@ static struct platform_device orion_uart1 = {
 void __init orion_uart1_init(unsigned int membase,
                              resource_size_t mapbase,
                              unsigned int irq,
-                             unsigned int uartclk)
+                             struct clk *clk)
 {
         uart_complete(&orion_uart1, orion_uart1_data, orion_uart1_resources,
-                      membase, mapbase, irq, uartclk);
+                      membase, mapbase, irq, clk);
 }
 
 /*****************************************************************************
@@ -172,10 +178,10 @@ static struct platform_device orion_uart2 = {
 void __init orion_uart2_init(unsigned int membase,
                              resource_size_t mapbase,
                              unsigned int irq,
-                             unsigned int uartclk)
+                             struct clk *clk)
 {
         uart_complete(&orion_uart2, orion_uart2_data, orion_uart2_resources,
-                      membase, mapbase, irq, uartclk);
+                      membase, mapbase, irq, clk);
 }
 
 /*****************************************************************************
@@ -200,10 +206,10 @@ static struct platform_device orion_uart3 = {
 void __init orion_uart3_init(unsigned int membase,
                              resource_size_t mapbase,
                              unsigned int irq,
-                             unsigned int uartclk)
+                             struct clk *clk)
 {
         uart_complete(&orion_uart3, orion_uart3_data, orion_uart3_resources,
-                      membase, mapbase, irq, uartclk);
+                      membase, mapbase, irq, clk);
 }
 
 /*****************************************************************************
diff --git a/arch/arm/plat-orion/include/plat/common.h b/arch/arm/plat-orion/include/plat/common.h
index c3bfa91bfaa..e00fdb21360 100644
--- a/arch/arm/plat-orion/include/plat/common.h
+++ b/arch/arm/plat-orion/include/plat/common.h
@@ -16,22 +16,22 @@ struct dsa_platform_data;
 void __init orion_uart0_init(unsigned int membase,
                              resource_size_t mapbase,
                              unsigned int irq,
-                             unsigned int uartclk);
+                             struct clk *clk);
 
 void __init orion_uart1_init(unsigned int membase,
                              resource_size_t mapbase,
                              unsigned int irq,
-                             unsigned int uartclk);
+                             struct clk *clk);
 
 void __init orion_uart2_init(unsigned int membase,
                              resource_size_t mapbase,
                              unsigned int irq,
-                             unsigned int uartclk);
+                             struct clk *clk);
 
 void __init orion_uart3_init(unsigned int membase,
                              resource_size_t mapbase,
                              unsigned int irq,
-                             unsigned int uartclk);
+                             struct clk *clk);
 
 void __init orion_rtc_init(unsigned long mapbase,
                            unsigned long irq);