at91: switch to CLKDEV_LOOKUP

we do not change the clock naming convention so does not need to switch
the AVR32 yet

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Patrice Vilchez <patrice.vilchez@atmel.com>

1 files changed, 3 insertions, 17 deletions

diff --git a/arch/arm/mach-at91/at91rm9200_devices.c b/arch/arm/mach-at91/at91rm9200_devices.c
index 761559e589a3..a0ba475be04c 100644
--- a/arch/arm/mach-at91/at91rm9200_devices.c
+++ b/arch/arm/mach-at91/at91rm9200_devices.c
@@ -644,15 +644,7 @@ static struct platform_device at91rm9200_tcb1_device = {
 
 static void __init at91_add_device_tc(void)
 {
-        /* this chip has a separate clock and irq for each TC channel */
-        at91_clock_associate("tc0_clk", &at91rm9200_tcb0_device.dev, "t0_clk");
-        at91_clock_associate("tc1_clk", &at91rm9200_tcb0_device.dev, "t1_clk");
-        at91_clock_associate("tc2_clk", &at91rm9200_tcb0_device.dev, "t2_clk");
         platform_device_register(&at91rm9200_tcb0_device);
-
-        at91_clock_associate("tc3_clk", &at91rm9200_tcb1_device.dev, "t0_clk");
-        at91_clock_associate("tc4_clk", &at91rm9200_tcb1_device.dev, "t1_clk");
-        at91_clock_associate("tc5_clk", &at91rm9200_tcb1_device.dev, "t2_clk");
         platform_device_register(&at91rm9200_tcb1_device);
 }
 #else
@@ -849,17 +841,14 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins)
         case AT91RM9200_ID_SSC0:
                 pdev = &at91rm9200_ssc0_device;
                 configure_ssc0_pins(pins);
-                at91_clock_associate("ssc0_clk", &pdev->dev, "ssc");
                 break;
         case AT91RM9200_ID_SSC1:
                 pdev = &at91rm9200_ssc1_device;
                 configure_ssc1_pins(pins);
-                at91_clock_associate("ssc1_clk", &pdev->dev, "ssc");
                 break;
         case AT91RM9200_ID_SSC2:
                 pdev = &at91rm9200_ssc2_device;
                 configure_ssc2_pins(pins);
-                at91_clock_associate("ssc2_clk", &pdev->dev, "ssc");
                 break;
         default:
                 return;
@@ -1115,27 +1104,22 @@ void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins)
                 case 0:         /* DBGU */
                         pdev = &at91rm9200_dbgu_device;
                         configure_dbgu_pins();
-                        at91_clock_associate("mck", &pdev->dev, "usart");
                         break;
                 case AT91RM9200_ID_US0:
                         pdev = &at91rm9200_uart0_device;
                         configure_usart0_pins(pins);
-                        at91_clock_associate("usart0_clk", &pdev->dev, "usart");
                         break;
                 case AT91RM9200_ID_US1:
                         pdev = &at91rm9200_uart1_device;
                         configure_usart1_pins(pins);
-                        at91_clock_associate("usart1_clk", &pdev->dev, "usart");
                         break;
                 case AT91RM9200_ID_US2:
                         pdev = &at91rm9200_uart2_device;
                         configure_usart2_pins(pins);
-                        at91_clock_associate("usart2_clk", &pdev->dev, "usart");
                         break;
                 case AT91RM9200_ID_US3:
                         pdev = &at91rm9200_uart3_device;
                         configure_usart3_pins(pins);
-                        at91_clock_associate("usart3_clk", &pdev->dev, "usart");
                         break;
                 default:
                         return;
@@ -1149,8 +1133,10 @@ void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins)
 
 void __init at91_set_serial_console(unsigned portnr)
 {
-        if (portnr < ATMEL_MAX_UART)
+        if (portnr < ATMEL_MAX_UART) {
                 atmel_default_console_device = at91_uarts[portnr];
+                at91rm9200_set_console_clock(portnr);
+        }
 }
 
 void __init at91_add_device_serial(void)