diff options
Diffstat (limited to 'arch/arm/mach-at91/at572d940hf_devices.c')
| -rw-r--r-- | arch/arm/mach-at91/at572d940hf_devices.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/arch/arm/mach-at91/at572d940hf_devices.c b/arch/arm/mach-at91/at572d940hf_devices.c index e52c8e078b0f..14863b8e7e6a 100644 --- a/arch/arm/mach-at91/at572d940hf_devices.c +++ b/arch/arm/mach-at91/at572d940hf_devices.c @@ -532,7 +532,6 @@ void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices) at91_set_A_periph(AT91_PIN_PA1, 0); /* SPI0_MOSI */ at91_set_A_periph(AT91_PIN_PA2, 0); /* SPI0_SPCK */ - at91_clock_associate("spi0_clk", &at572d940hf_spi0_device.dev, "spi_clk"); platform_device_register(&at572d940hf_spi0_device); } if (enable_spi1) { @@ -540,7 +539,6 @@ void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices) at91_set_A_periph(AT91_PIN_PC1, 0); /* SPI1_MOSI */ at91_set_A_periph(AT91_PIN_PC2, 0); /* SPI1_SPCK */ - at91_clock_associate("spi1_clk", &at572d940hf_spi1_device.dev, "spi_clk"); platform_device_register(&at572d940hf_spi1_device); } } @@ -587,10 +585,6 @@ static struct platform_device at572d940hf_tcb_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", &at572d940hf_tcb_device.dev, "t0_clk"); - at91_clock_associate("tc1_clk", &at572d940hf_tcb_device.dev, "t1_clk"); - at91_clock_associate("tc2_clk", &at572d940hf_tcb_device.dev, "t2_clk"); platform_device_register(&at572d940hf_tcb_device); } #else @@ -828,22 +822,18 @@ void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins) case 0: /* DBGU */ pdev = &at572d940hf_dbgu_device; configure_dbgu_pins(); - at91_clock_associate("mck", &pdev->dev, "usart"); break; case AT572D940HF_ID_US0: pdev = &at572d940hf_uart0_device; configure_usart0_pins(pins); - at91_clock_associate("usart0_clk", &pdev->dev, "usart"); break; case AT572D940HF_ID_US1: pdev = &at572d940hf_uart1_device; configure_usart1_pins(pins); - at91_clock_associate("usart1_clk", &pdev->dev, "usart"); break; case AT572D940HF_ID_US2: pdev = &at572d940hf_uart2_device; configure_usart2_pins(pins); - at91_clock_associate("usart2_clk", &pdev->dev, "usart"); break; default: return; @@ -857,8 +847,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]; + at572d940hf_set_console_clock(portnr); + } } void __init at91_add_device_serial(void) |