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, 13 deletions

diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c
index 47a9f965bbb5..ffe081b77ed0 100644
--- a/arch/arm/mach-at91/at91sam9263_devices.c
+++ b/arch/arm/mach-at91/at91sam9263_devices.c
@@ -308,7 +308,6 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data)
                 }
 
                 mmc0_data = *data;
-                at91_clock_associate("mci0_clk", &at91sam9263_mmc0_device.dev, "mci_clk");
                 platform_device_register(&at91sam9263_mmc0_device);
         } else {                        /* MCI1 */
                 /* CLK */
@@ -339,7 +338,6 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data)
                 }
 
                 mmc1_data = *data;
-                at91_clock_associate("mci1_clk", &at91sam9263_mmc1_device.dev, "mci_clk");
                 platform_device_register(&at91sam9263_mmc1_device);
         }
 }
@@ -686,7 +684,6 @@ void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices)
                 at91_set_B_periph(AT91_PIN_PA1, 0);     /* SPI0_MOSI */
                 at91_set_B_periph(AT91_PIN_PA2, 0);     /* SPI0_SPCK */
 
-                at91_clock_associate("spi0_clk", &at91sam9263_spi0_device.dev, "spi_clk");
                 platform_device_register(&at91sam9263_spi0_device);
         }
         if (enable_spi1) {
@@ -694,7 +691,6 @@ void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices)
                 at91_set_A_periph(AT91_PIN_PB13, 0);    /* SPI1_MOSI */
                 at91_set_A_periph(AT91_PIN_PB14, 0);    /* SPI1_SPCK */
 
-                at91_clock_associate("spi1_clk", &at91sam9263_spi1_device.dev, "spi_clk");
                 platform_device_register(&at91sam9263_spi1_device);
         }
 }
@@ -941,8 +937,6 @@ static struct platform_device at91sam9263_tcb_device = {
 
 static void __init at91_add_device_tc(void)
 {
-        /* this chip has one clock and irq for all three TC channels */
-        at91_clock_associate("tcb_clk", &at91sam9263_tcb_device.dev, "t0_clk");
         platform_device_register(&at91sam9263_tcb_device);
 }
 #else
@@ -1171,12 +1165,10 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins)
         case AT91SAM9263_ID_SSC0:
                 pdev = &at91sam9263_ssc0_device;
                 configure_ssc0_pins(pins);
-                at91_clock_associate("ssc0_clk", &pdev->dev, "pclk");
                 break;
         case AT91SAM9263_ID_SSC1:
                 pdev = &at91sam9263_ssc1_device;
                 configure_ssc1_pins(pins);
-                at91_clock_associate("ssc1_clk", &pdev->dev, "pclk");
                 break;
         default:
                 return;
@@ -1376,22 +1368,18 @@ void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins)
                 case 0:         /* DBGU */
                         pdev = &at91sam9263_dbgu_device;
                         configure_dbgu_pins();
-                        at91_clock_associate("mck", &pdev->dev, "usart");
                         break;
                 case AT91SAM9263_ID_US0:
                         pdev = &at91sam9263_uart0_device;
                         configure_usart0_pins(pins);
-                        at91_clock_associate("usart0_clk", &pdev->dev, "usart");
                         break;
                 case AT91SAM9263_ID_US1:
                         pdev = &at91sam9263_uart1_device;
                         configure_usart1_pins(pins);
-                        at91_clock_associate("usart1_clk", &pdev->dev, "usart");
                         break;
                 case AT91SAM9263_ID_US2:
                         pdev = &at91sam9263_uart2_device;
                         configure_usart2_pins(pins);
-                        at91_clock_associate("usart2_clk", &pdev->dev, "usart");
                         break;
                 default:
                         return;
@@ -1405,8 +1393,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];
+                at91sam9263_set_console_clock(portnr);
+        }
 }
 
 void __init at91_add_device_serial(void)