9 files changed, 10 insertions, 32 deletions

diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c
index a3ffd527dbe5..111613bc62b7 100644
--- a/arch/arm/mach-davinci/da830.c
+++ b/arch/arm/mach-davinci/da830.c
@@ -1199,7 +1199,6 @@ static struct davinci_soc_info davinci_soc_info_da830 = {
         .gpio_base              = DA8XX_GPIO_BASE,
         .gpio_num               = 128,
         .gpio_irq               = IRQ_DA8XX_GPIO0,
-        .serial_dev             = da8xx_serial_device,
         .emac_pdata             = &da8xx_emac_pdata,
 };
 
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
index d4274ab5e742..5ef37f9d5984 100644
--- a/arch/arm/mach-davinci/da850.c
+++ b/arch/arm/mach-davinci/da850.c
@@ -1301,7 +1301,6 @@ static struct davinci_soc_info davinci_soc_info_da850 = {
         .gpio_base              = DA8XX_GPIO_BASE,
         .gpio_num               = 144,
         .gpio_irq               = IRQ_DA8XX_GPIO0,
-        .serial_dev             = da8xx_serial_device,
         .emac_pdata             = &da8xx_emac_pdata,
         .sram_dma               = DA8XX_SHARED_RAM_BASE,
         .sram_len               = SZ_128K,
diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index 85367350e3d9..0f3cb486f561 100644
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -1009,7 +1009,6 @@ static struct davinci_soc_info davinci_soc_info_dm355 = {
         .gpio_base              = DAVINCI_GPIO_BASE,
         .gpio_num               = 104,
         .gpio_irq               = IRQ_DM355_GPIOBNK0,
-        .serial_dev             = dm355_serial_device,
         .sram_dma               = 0x00010000,
         .sram_len               = SZ_32K,
 };
diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
index fa5c693cf16b..3a039bcf5337 100644
--- a/arch/arm/mach-davinci/dm365.c
+++ b/arch/arm/mach-davinci/dm365.c
@@ -1109,7 +1109,6 @@ static struct davinci_soc_info davinci_soc_info_dm365 = {
         .gpio_num               = 104,
         .gpio_irq               = IRQ_DM365_GPIO0,
         .gpio_unbanked          = 8,    /* really 16 ... skip muxed GPIOs */
-        .serial_dev             = dm365_serial_device,
         .emac_pdata             = &dm365_emac_pdata,
         .sram_dma               = 0x00010000,
         .sram_len               = SZ_32K,
diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index 3969289416a5..23de0dea9884 100644
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -900,7 +900,6 @@ static struct davinci_soc_info davinci_soc_info_dm644x = {
         .gpio_base              = DAVINCI_GPIO_BASE,
         .gpio_num               = 71,
         .gpio_irq               = IRQ_GPIOBNK0,
-        .serial_dev             = dm644x_serial_device,
         .emac_pdata             = &dm644x_emac_pdata,
         .sram_dma               = 0x00008000,
         .sram_len               = SZ_16K,
diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c
index 331a9ec8e7f2..4b258042dff9 100644
--- a/arch/arm/mach-davinci/dm646x.c
+++ b/arch/arm/mach-davinci/dm646x.c
@@ -877,7 +877,6 @@ static struct davinci_soc_info davinci_soc_info_dm646x = {
         .gpio_base              = DAVINCI_GPIO_BASE,
         .gpio_num               = 43, /* Only 33 usable */
         .gpio_irq               = IRQ_DM646X_GPIOBNK0,
-        .serial_dev             = dm646x_serial_device,
         .emac_pdata             = &dm646x_emac_pdata,
         .sram_dma               = 0x10010000,
         .sram_len               = SZ_32K,
diff --git a/arch/arm/mach-davinci/include/mach/common.h b/arch/arm/mach-davinci/include/mach/common.h
index cce316b92c06..0b3c169758ed 100644
--- a/arch/arm/mach-davinci/include/mach/common.h
+++ b/arch/arm/mach-davinci/include/mach/common.h
@@ -72,7 +72,6 @@ struct davinci_soc_info {
         unsigned                        gpio_unbanked;
         struct davinci_gpio_controller  *gpio_ctlrs;
         int                             gpio_ctlrs_num;
-        struct platform_device          *serial_dev;
         struct emac_platform_data       *emac_pdata;
         dma_addr_t                      sram_dma;
         unsigned                        sram_len;
diff --git a/arch/arm/mach-davinci/include/mach/serial.h b/arch/arm/mach-davinci/include/mach/serial.h
index 36bf59155f4b..52b8571b2e70 100644
--- a/arch/arm/mach-davinci/include/mach/serial.h
+++ b/arch/arm/mach-davinci/include/mach/serial.h
@@ -40,7 +40,6 @@
 
 #ifndef __ASSEMBLY__
 extern int davinci_serial_init(struct platform_device *);
-extern int davinci_serial_setup_clk(unsigned instance, unsigned int *rate);
 #endif
 
 #endif /* __ASM_ARCH_SERIAL_H */
diff --git a/arch/arm/mach-davinci/serial.c b/arch/arm/mach-davinci/serial.c
index 45bd41a924db..5e93a734c858 100644
--- a/arch/arm/mach-davinci/serial.c
+++ b/arch/arm/mach-davinci/serial.c
@@ -70,33 +70,12 @@ static void __init davinci_serial_reset(struct plat_serial8250_port *p)
                                  UART_DM646X_SCR_TX_WATERMARK);
 }
 
-/* Enable UART clock and obtain its rate */
-int __init davinci_serial_setup_clk(unsigned instance, unsigned int *rate)
-{
-        struct clk *clk;
-        struct davinci_soc_info *soc_info = &davinci_soc_info;
-        struct device *dev = &soc_info->serial_dev[instance].dev;
-
-        clk = clk_get(dev, NULL);
-        if (IS_ERR(clk)) {
-                pr_err("%s:%d: failed to get UART%d clock\n",
-                                        __func__, __LINE__, instance);
-                return PTR_ERR(clk);
-        }
-
-        clk_prepare_enable(clk);
-
-        if (rate)
-                *rate = clk_get_rate(clk);
-
-        return 0;
-}
-
 int __init davinci_serial_init(struct platform_device *serial_dev)
 {
         int i, ret = 0;
         struct device *dev;
         struct plat_serial8250_port *p;
+        struct clk *clk;
 
         /*
          * Make sure the serial ports are muxed on at this point.
@@ -110,9 +89,16 @@ int __init davinci_serial_init(struct platform_device *serial_dev)
                 if (ret)
                         continue;
 
-                ret = davinci_serial_setup_clk(i, &p->uartclk);
-                if (ret)
+                clk = clk_get(dev, NULL);
+                if (IS_ERR(clk)) {
+                        pr_err("%s:%d: failed to get UART%d clock\n",
+                               __func__, __LINE__, i);
                         continue;
+                }
+
+                clk_prepare_enable(clk);
+
+                p->uartclk = clk_get_rate(clk);
 
                 if (!p->membase && p->mapbase) {
                         p->membase = ioremap(p->mapbase, SZ_4K);