diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2009-10-22 08:50:33 -0400 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-11-14 04:30:19 -0500 |
commit | 23291df423fd6d656ce9d1189c4a477216d17f7c (patch) | |
tree | 483980444981b148773aed29a4a7684340e54196 /arch | |
parent | 4f43c2ed21d5902f29c41aeb22728193a8617192 (diff) |
i.MX2: Add sound (ssi) resources
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-mx2/clock_imx27.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-mx2/devices.c | 78 | ||||
-rw-r--r-- | arch/arm/mach-mx2/devices.h | 3 |
3 files changed, 82 insertions, 3 deletions
diff --git a/arch/arm/mach-mx2/clock_imx27.c b/arch/arm/mach-mx2/clock_imx27.c index ff5e33298914..aa640b4876c9 100644 --- a/arch/arm/mach-mx2/clock_imx27.c +++ b/arch/arm/mach-mx2/clock_imx27.c | |||
@@ -651,8 +651,8 @@ static struct clk_lookup lookups[] = { | |||
651 | _REGISTER_CLOCK("mxc-ehci.1", "usb_ahb", usb_clk1) | 651 | _REGISTER_CLOCK("mxc-ehci.1", "usb_ahb", usb_clk1) |
652 | _REGISTER_CLOCK("mxc-ehci.2", "usb", usb_clk) | 652 | _REGISTER_CLOCK("mxc-ehci.2", "usb", usb_clk) |
653 | _REGISTER_CLOCK("mxc-ehci.2", "usb_ahb", usb_clk1) | 653 | _REGISTER_CLOCK("mxc-ehci.2", "usb_ahb", usb_clk1) |
654 | _REGISTER_CLOCK(NULL, "ssi1", ssi1_clk) | 654 | _REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk) |
655 | _REGISTER_CLOCK(NULL, "ssi2", ssi2_clk) | 655 | _REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk) |
656 | _REGISTER_CLOCK("mxc_nand.0", NULL, nfc_clk) | 656 | _REGISTER_CLOCK("mxc_nand.0", NULL, nfc_clk) |
657 | _REGISTER_CLOCK(NULL, "vpu", vpu_clk) | 657 | _REGISTER_CLOCK(NULL, "vpu", vpu_clk) |
658 | _REGISTER_CLOCK(NULL, "dma", dma_clk) | 658 | _REGISTER_CLOCK(NULL, "dma", dma_clk) |
diff --git a/arch/arm/mach-mx2/devices.c b/arch/arm/mach-mx2/devices.c index 50199aff0143..3d398ce09b31 100644 --- a/arch/arm/mach-mx2/devices.c +++ b/arch/arm/mach-mx2/devices.c | |||
@@ -530,6 +530,84 @@ struct platform_device mxc_usbh2 = { | |||
530 | }; | 530 | }; |
531 | #endif | 531 | #endif |
532 | 532 | ||
533 | static struct resource imx_ssi_resources0[] = { | ||
534 | { | ||
535 | .start = SSI1_BASE_ADDR, | ||
536 | .end = SSI1_BASE_ADDR + 0x6F, | ||
537 | .flags = IORESOURCE_MEM, | ||
538 | }, { | ||
539 | .start = MXC_INT_SSI1, | ||
540 | .end = MXC_INT_SSI1, | ||
541 | .flags = IORESOURCE_IRQ, | ||
542 | }, { | ||
543 | .name = "tx0", | ||
544 | .start = DMA_REQ_SSI1_TX0, | ||
545 | .end = DMA_REQ_SSI1_TX0, | ||
546 | .flags = IORESOURCE_DMA, | ||
547 | }, { | ||
548 | .name = "rx0", | ||
549 | .start = DMA_REQ_SSI1_RX0, | ||
550 | .end = DMA_REQ_SSI1_RX0, | ||
551 | .flags = IORESOURCE_DMA, | ||
552 | }, { | ||
553 | .name = "tx1", | ||
554 | .start = DMA_REQ_SSI1_TX1, | ||
555 | .end = DMA_REQ_SSI1_TX1, | ||
556 | .flags = IORESOURCE_DMA, | ||
557 | }, { | ||
558 | .name = "rx1", | ||
559 | .start = DMA_REQ_SSI1_RX1, | ||
560 | .end = DMA_REQ_SSI1_RX1, | ||
561 | .flags = IORESOURCE_DMA, | ||
562 | }, | ||
563 | }; | ||
564 | |||
565 | static struct resource imx_ssi_resources1[] = { | ||
566 | { | ||
567 | .start = SSI2_BASE_ADDR, | ||
568 | .end = SSI2_BASE_ADDR + 0x6F, | ||
569 | .flags = IORESOURCE_MEM, | ||
570 | }, { | ||
571 | .start = MXC_INT_SSI2, | ||
572 | .end = MXC_INT_SSI2, | ||
573 | .flags = IORESOURCE_IRQ, | ||
574 | }, { | ||
575 | .name = "tx0", | ||
576 | .start = DMA_REQ_SSI2_TX0, | ||
577 | .end = DMA_REQ_SSI2_TX0, | ||
578 | .flags = IORESOURCE_DMA, | ||
579 | }, { | ||
580 | .name = "rx0", | ||
581 | .start = DMA_REQ_SSI2_RX0, | ||
582 | .end = DMA_REQ_SSI2_RX0, | ||
583 | .flags = IORESOURCE_DMA, | ||
584 | }, { | ||
585 | .name = "tx1", | ||
586 | .start = DMA_REQ_SSI2_TX1, | ||
587 | .end = DMA_REQ_SSI2_TX1, | ||
588 | .flags = IORESOURCE_DMA, | ||
589 | }, { | ||
590 | .name = "rx1", | ||
591 | .start = DMA_REQ_SSI2_RX1, | ||
592 | .end = DMA_REQ_SSI2_RX1, | ||
593 | .flags = IORESOURCE_DMA, | ||
594 | }, | ||
595 | }; | ||
596 | |||
597 | struct platform_device imx_ssi_device0 = { | ||
598 | .name = "imx-ssi", | ||
599 | .id = 0, | ||
600 | .num_resources = ARRAY_SIZE(imx_ssi_resources0), | ||
601 | .resource = imx_ssi_resources0, | ||
602 | }; | ||
603 | |||
604 | struct platform_device imx_ssi_device1 = { | ||
605 | .name = "imx-ssi", | ||
606 | .id = 1, | ||
607 | .num_resources = ARRAY_SIZE(imx_ssi_resources1), | ||
608 | .resource = imx_ssi_resources1, | ||
609 | }; | ||
610 | |||
533 | /* GPIO port description */ | 611 | /* GPIO port description */ |
534 | static struct mxc_gpio_port imx_gpio_ports[] = { | 612 | static struct mxc_gpio_port imx_gpio_ports[] = { |
535 | { | 613 | { |
diff --git a/arch/arm/mach-mx2/devices.h b/arch/arm/mach-mx2/devices.h index d315406d6725..97306aa18f1c 100644 --- a/arch/arm/mach-mx2/devices.h +++ b/arch/arm/mach-mx2/devices.h | |||
@@ -26,4 +26,5 @@ extern struct platform_device mxc_usbh2; | |||
26 | extern struct platform_device mxc_spi_device0; | 26 | extern struct platform_device mxc_spi_device0; |
27 | extern struct platform_device mxc_spi_device1; | 27 | extern struct platform_device mxc_spi_device1; |
28 | extern struct platform_device mxc_spi_device2; | 28 | extern struct platform_device mxc_spi_device2; |
29 | 29 | extern struct platform_device imx_ssi_device0; | |
30 | extern struct platform_device imx_ssi_device1; | ||