Merge branch 'disintegrate-asm-generic' of git://git.infradead.org/users/dhowells/linux-headers into asm-generic

Patches from David Howells <dhowells@redhat.com>:

This is to complete part of the UAPI disintegration for which the
preparatory patches were pulled recently.

Note that there are some fixup patches which are at the base of the
branch aimed at you, plus all arches get the asm-generic branch merged in too.

* 'disintegrate-asm-generic' of git://git.infradead.org/users/dhowells/linux-headers:
  UAPI: (Scripted) Disintegrate include/asm-generic
  UAPI: Fix conditional header installation handling (notably kvm_para.h on m68k)
  c6x: remove c6x signal.h
  UAPI: Split compound conditionals containing __KERNEL__ in Arm64
  UAPI: Fix the guards on various asm/unistd.h files

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 30 insertions, 39 deletions

diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c
index 838a87be1d5c..a07954fbcd22 100644
--- a/arch/arm/mach-shmobile/setup-sh7372.c
+++ b/arch/arm/mach-shmobile/setup-sh7372.c
@@ -1001,21 +1001,34 @@ static struct platform_device *sh7372_late_devices[] __initdata = {
 
 void __init sh7372_add_standard_devices(void)
 {
-        rmobile_init_pm_domain(&sh7372_pd_a4lc);
-        rmobile_init_pm_domain(&sh7372_pd_a4mp);
-        rmobile_init_pm_domain(&sh7372_pd_d4);
-        rmobile_init_pm_domain(&sh7372_pd_a4r);
-        rmobile_init_pm_domain(&sh7372_pd_a3rv);
-        rmobile_init_pm_domain(&sh7372_pd_a3ri);
-        rmobile_init_pm_domain(&sh7372_pd_a4s);
-        rmobile_init_pm_domain(&sh7372_pd_a3sp);
-        rmobile_init_pm_domain(&sh7372_pd_a3sg);
-
-        rmobile_pm_add_subdomain(&sh7372_pd_a4lc, &sh7372_pd_a3rv);
-        rmobile_pm_add_subdomain(&sh7372_pd_a4r, &sh7372_pd_a4lc);
-
-        rmobile_pm_add_subdomain(&sh7372_pd_a4s, &sh7372_pd_a3sg);
-        rmobile_pm_add_subdomain(&sh7372_pd_a4s, &sh7372_pd_a3sp);
+        struct pm_domain_device domain_devices[] = {
+                { "A3RV", &vpu_device, },
+                { "A4MP", &spu0_device, },
+                { "A4MP", &spu1_device, },
+                { "A3SP", &scif0_device, },
+                { "A3SP", &scif1_device, },
+                { "A3SP", &scif2_device, },
+                { "A3SP", &scif3_device, },
+                { "A3SP", &scif4_device, },
+                { "A3SP", &scif5_device, },
+                { "A3SP", &scif6_device, },
+                { "A3SP", &iic1_device, },
+                { "A3SP", &dma0_device, },
+                { "A3SP", &dma1_device, },
+                { "A3SP", &dma2_device, },
+                { "A3SP", &usb_dma0_device, },
+                { "A3SP", &usb_dma1_device, },
+                { "A4R", &iic0_device, },
+                { "A4R", &veu0_device, },
+                { "A4R", &veu1_device, },
+                { "A4R", &veu2_device, },
+                { "A4R", &veu3_device, },
+                { "A4R", &jpu_device, },
+                { "A4R", &tmu00_device, },
+                { "A4R", &tmu01_device, },
+        };
+
+        sh7372_init_pm_domains();
 
         platform_add_devices(sh7372_early_devices,
                             ARRAY_SIZE(sh7372_early_devices));
@@ -1023,30 +1036,8 @@ void __init sh7372_add_standard_devices(void)
         platform_add_devices(sh7372_late_devices,
                             ARRAY_SIZE(sh7372_late_devices));
 
-        rmobile_add_device_to_domain(&sh7372_pd_a3rv, &vpu_device);
-        rmobile_add_device_to_domain(&sh7372_pd_a4mp, &spu0_device);
-        rmobile_add_device_to_domain(&sh7372_pd_a4mp, &spu1_device);
-        rmobile_add_device_to_domain(&sh7372_pd_a3sp, &scif0_device);
-        rmobile_add_device_to_domain(&sh7372_pd_a3sp, &scif1_device);
-        rmobile_add_device_to_domain(&sh7372_pd_a3sp, &scif2_device);
-        rmobile_add_device_to_domain(&sh7372_pd_a3sp, &scif3_device);
-        rmobile_add_device_to_domain(&sh7372_pd_a3sp, &scif4_device);
-        rmobile_add_device_to_domain(&sh7372_pd_a3sp, &scif5_device);
-        rmobile_add_device_to_domain(&sh7372_pd_a3sp, &scif6_device);
-        rmobile_add_device_to_domain(&sh7372_pd_a3sp, &iic1_device);
-        rmobile_add_device_to_domain(&sh7372_pd_a3sp, &dma0_device);
-        rmobile_add_device_to_domain(&sh7372_pd_a3sp, &dma1_device);
-        rmobile_add_device_to_domain(&sh7372_pd_a3sp, &dma2_device);
-        rmobile_add_device_to_domain(&sh7372_pd_a3sp, &usb_dma0_device);
-        rmobile_add_device_to_domain(&sh7372_pd_a3sp, &usb_dma1_device);
-        rmobile_add_device_to_domain(&sh7372_pd_a4r, &iic0_device);
-        rmobile_add_device_to_domain(&sh7372_pd_a4r, &veu0_device);
-        rmobile_add_device_to_domain(&sh7372_pd_a4r, &veu1_device);
-        rmobile_add_device_to_domain(&sh7372_pd_a4r, &veu2_device);
-        rmobile_add_device_to_domain(&sh7372_pd_a4r, &veu3_device);
-        rmobile_add_device_to_domain(&sh7372_pd_a4r, &jpu_device);
-        rmobile_add_device_to_domain(&sh7372_pd_a4r, &tmu00_device);
-        rmobile_add_device_to_domain(&sh7372_pd_a4r, &tmu01_device);
+        rmobile_add_devices_to_domains(domain_devices,
+                                       ARRAY_SIZE(domain_devices));
 }
 
 static void __init sh7372_earlytimer_init(void)