diff options
Diffstat (limited to 'arch/avr32')
-rw-r--r-- | arch/avr32/mach-at32ap/at32ap700x.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c index 0f24b4f85c17..892e27e0d583 100644 --- a/arch/avr32/mach-at32ap/at32ap700x.c +++ b/arch/avr32/mach-at32ap/at32ap700x.c | |||
@@ -7,6 +7,7 @@ | |||
7 | */ | 7 | */ |
8 | #include <linux/clk.h> | 8 | #include <linux/clk.h> |
9 | #include <linux/delay.h> | 9 | #include <linux/delay.h> |
10 | #include <linux/dw_dmac.h> | ||
10 | #include <linux/fb.h> | 11 | #include <linux/fb.h> |
11 | #include <linux/init.h> | 12 | #include <linux/init.h> |
12 | #include <linux/platform_device.h> | 13 | #include <linux/platform_device.h> |
@@ -599,6 +600,17 @@ static void __init genclk_init_parent(struct clk *clk) | |||
599 | clk->parent = parent; | 600 | clk->parent = parent; |
600 | } | 601 | } |
601 | 602 | ||
603 | static struct dw_dma_platform_data dw_dmac0_data = { | ||
604 | .nr_channels = 3, | ||
605 | }; | ||
606 | |||
607 | static struct resource dw_dmac0_resource[] = { | ||
608 | PBMEM(0xff200000), | ||
609 | IRQ(2), | ||
610 | }; | ||
611 | DEFINE_DEV_DATA(dw_dmac, 0); | ||
612 | DEV_CLK(hclk, dw_dmac0, hsb, 10); | ||
613 | |||
602 | /* -------------------------------------------------------------------- | 614 | /* -------------------------------------------------------------------- |
603 | * System peripherals | 615 | * System peripherals |
604 | * -------------------------------------------------------------------- */ | 616 | * -------------------------------------------------------------------- */ |
@@ -705,17 +717,6 @@ static struct clk pico_clk = { | |||
705 | .users = 1, | 717 | .users = 1, |
706 | }; | 718 | }; |
707 | 719 | ||
708 | static struct resource dmaca0_resource[] = { | ||
709 | { | ||
710 | .start = 0xff200000, | ||
711 | .end = 0xff20ffff, | ||
712 | .flags = IORESOURCE_MEM, | ||
713 | }, | ||
714 | IRQ(2), | ||
715 | }; | ||
716 | DEFINE_DEV(dmaca, 0); | ||
717 | DEV_CLK(hclk, dmaca0, hsb, 10); | ||
718 | |||
719 | /* -------------------------------------------------------------------- | 720 | /* -------------------------------------------------------------------- |
720 | * HMATRIX | 721 | * HMATRIX |
721 | * -------------------------------------------------------------------- */ | 722 | * -------------------------------------------------------------------- */ |
@@ -828,7 +829,7 @@ void __init at32_add_system_devices(void) | |||
828 | platform_device_register(&at32_eic0_device); | 829 | platform_device_register(&at32_eic0_device); |
829 | platform_device_register(&smc0_device); | 830 | platform_device_register(&smc0_device); |
830 | platform_device_register(&pdc_device); | 831 | platform_device_register(&pdc_device); |
831 | platform_device_register(&dmaca0_device); | 832 | platform_device_register(&dw_dmac0_device); |
832 | 833 | ||
833 | platform_device_register(&at32_tcb0_device); | 834 | platform_device_register(&at32_tcb0_device); |
834 | platform_device_register(&at32_tcb1_device); | 835 | platform_device_register(&at32_tcb1_device); |
@@ -1891,7 +1892,7 @@ struct clk *at32_clock_list[] = { | |||
1891 | &smc0_mck, | 1892 | &smc0_mck, |
1892 | &pdc_hclk, | 1893 | &pdc_hclk, |
1893 | &pdc_pclk, | 1894 | &pdc_pclk, |
1894 | &dmaca0_hclk, | 1895 | &dw_dmac0_hclk, |
1895 | &pico_clk, | 1896 | &pico_clk, |
1896 | &pio0_mck, | 1897 | &pio0_mck, |
1897 | &pio1_mck, | 1898 | &pio1_mck, |