Merge tag 'v3.5-rc4' into for-3.6

Linux 3.5-rc4 contains some bug fixes which overlap with new features.

1 files changed, 1 insertions, 53 deletions

diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index c8a8fde777bb..10ddfaf17f3d 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -594,43 +594,12 @@ static void ux500_uart0_reset(void)
         udelay(1);
 }
 
-/* This needs to be referenced by callbacks */
-struct pinctrl *u0_p;
-struct pinctrl_state *u0_def;
-struct pinctrl_state *u0_sleep;
-
-static void ux500_uart0_init(void)
-{
-        int ret;
-
-        if (IS_ERR(u0_p) || IS_ERR(u0_def))
-                return;
-
-        ret = pinctrl_select_state(u0_p, u0_def);
-        if (ret)
-                pr_err("could not set UART0 defstate\n");
-}
-
-static void ux500_uart0_exit(void)
-{
-        int ret;
-
-        if (IS_ERR(u0_p) || IS_ERR(u0_sleep))
-                return;
-
-        ret = pinctrl_select_state(u0_p, u0_sleep);
-        if (ret)
-                pr_err("could not set UART0 idlestate\n");
-}
-
 static struct amba_pl011_data uart0_plat = {
 #ifdef CONFIG_STE_DMA40
         .dma_filter = stedma40_filter,
         .dma_rx_param = &uart0_dma_cfg_rx,
         .dma_tx_param = &uart0_dma_cfg_tx,
 #endif
-        .init = ux500_uart0_init,
-        .exit = ux500_uart0_exit,
         .reset = ux500_uart0_reset,
 };
 
@@ -652,28 +621,7 @@ static struct amba_pl011_data uart2_plat = {
 
 static void __init mop500_uart_init(struct device *parent)
 {
-        struct amba_device *uart0_device;
-
-        uart0_device = db8500_add_uart0(parent, &uart0_plat);
-        if (uart0_device) {
-                u0_p = pinctrl_get(&uart0_device->dev);
-                if (IS_ERR(u0_p))
-                        dev_err(&uart0_device->dev,
-                                "could not get UART0 pinctrl\n");
-                else {
-                        u0_def = pinctrl_lookup_state(u0_p,
-                                                      PINCTRL_STATE_DEFAULT);
-                        if (IS_ERR(u0_def)) {
-                                dev_err(&uart0_device->dev,
-                                        "could not get UART0 defstate\n");
-                        }
-                        u0_sleep = pinctrl_lookup_state(u0_p,
-                                                        PINCTRL_STATE_SLEEP);
-                        if (IS_ERR(u0_sleep))
-                                dev_err(&uart0_device->dev,
-                                        "could not get UART0 idlestate\n");
-                }
-        }
+        db8500_add_uart0(parent, &uart0_plat);
         db8500_add_uart1(parent, &uart1_plat);
         db8500_add_uart2(parent, &uart2_plat);
 }