Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

[~andy/linux] / arch / arm / mach-shmobile / setup-sh7372.c

diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c
index 83dc940a21b793a3194742e8943494ea0e692c04..6fcf304d3cdf53869f4d7b64d701e4d5e92345ce 100644 (file)
--- a/arch/arm/mach-shmobile/setup-sh7372.c
+++ b/arch/arm/mach-shmobile/setup-sh7372.c
@@ -513,7 +513,7 @@ static struct resource sh7372_dmae0_resources[] = {
                .flags  = IORESOURCE_MEM,
        },
        {
-               /* DMA error IRQ */
+               .name   = "error_irq",
                .start  = evt2irq(0x20c0),
                .end    = evt2irq(0x20c0),
                .flags  = IORESOURCE_IRQ,
@@ -541,7 +541,7 @@ static struct resource sh7372_dmae1_resources[] = {
                .flags  = IORESOURCE_MEM,
        },
        {
-               /* DMA error IRQ */
+               .name   = "error_irq",
                .start  = evt2irq(0x21c0),
                .end    = evt2irq(0x21c0),
                .flags  = IORESOURCE_IRQ,
@@ -569,7 +569,7 @@ static struct resource sh7372_dmae2_resources[] = {
                .flags  = IORESOURCE_MEM,
        },
        {
-               /* DMA error IRQ */
+               .name   = "error_irq",
                .start  = evt2irq(0x22c0),
                .end    = evt2irq(0x22c0),
                .flags  = IORESOURCE_IRQ,
@@ -1003,12 +1003,16 @@ void __init sh7372_add_standard_devices(void)
        sh7372_init_pm_domain(&sh7372_a4r);
        sh7372_init_pm_domain(&sh7372_a3rv);
        sh7372_init_pm_domain(&sh7372_a3ri);
-       sh7372_init_pm_domain(&sh7372_a3sg);
+       sh7372_init_pm_domain(&sh7372_a4s);
        sh7372_init_pm_domain(&sh7372_a3sp);
+       sh7372_init_pm_domain(&sh7372_a3sg);
 
        sh7372_pm_add_subdomain(&sh7372_a4lc, &sh7372_a3rv);
        sh7372_pm_add_subdomain(&sh7372_a4r, &sh7372_a4lc);
 
+       sh7372_pm_add_subdomain(&sh7372_a4s, &sh7372_a3sg);
+       sh7372_pm_add_subdomain(&sh7372_a4s, &sh7372_a3sp);
+
        platform_add_devices(sh7372_early_devices,
                            ARRAY_SIZE(sh7372_early_devices));