Merge branch 'next/devel-samsung-pd' of git://git.kernel.org/pub/scm/linux/kernel...

* 'next/devel-samsung-pd' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: EXYNOS: Hook up JPEG PD to generic PD infrastructure
  ARM: EXYNOS: Hook up G2D PD to generic PD infrastructure
  (plus two dependent branches from linux-pm)

diff --combined arch/arm/mach-exynos/Kconfig
index 5e0a45605a22cf275d0ea46a561bf9e7605a8ba7,dfad6538b2737f5acdc4c2644342627d2d6010f2..0fe9e5a62109e0e86fc903b83937007eb655d6c9
--- 1/arch/arm/mach-exynos/Kconfig
--- 2/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@@ -34,6 -34,7 +34,7 @@@ config CPU_EXYNOS421
        select ARM_CPU_SUSPEND if PM
        select S5P_PM if PM
        select S5P_SLEEP if PM
+       select PM_GENERIC_DOMAINS
        help
          Enable EXYNOS4210 CPU support
  
@@@ -41,7 -42,6 +42,7 @@@ config SOC_EXYNOS421
        bool "SAMSUNG EXYNOS4212"
        default y
        depends on ARCH_EXYNOS4
 +      select SAMSUNG_DMADEV
        select S5P_PM if PM
        select S5P_SLEEP if PM
        help
@@@ -51,7 -51,6 +52,7 @@@ config SOC_EXYNOS441
        bool "SAMSUNG EXYNOS4412"
        default y
        depends on ARCH_EXYNOS4
 +      select SAMSUNG_DMADEV
        help
          Enable EXYNOS4412 SoC support
  
@@@ -76,11 -75,6 +77,6 @@@ config EXYNOS4_SETUP_FIMD
        help
          Common setup code for FIMD0.
  
- config EXYNOS4_DEV_PD
-       bool
-       help
-         Compile in platform device definitions for Power Domain
- 
  config EXYNOS4_DEV_SYSMMU
        bool
        help
@@@ -197,7 -191,6 +193,6 @@@ config MACH_SMDKV31
        select EXYNOS4_DEV_AHCI
        select SAMSUNG_DEV_KEYPAD
        select EXYNOS4_DEV_DMA
-       select EXYNOS4_DEV_PD
        select SAMSUNG_DEV_PWM
        select EXYNOS4_DEV_USB_OHCI
        select EXYNOS4_DEV_SYSMMU
@@@ -245,7 -238,6 +240,6 @@@ config MACH_UNIVERSAL_C21
        select S5P_DEV_ONENAND
        select S5P_DEV_TV
        select EXYNOS4_DEV_DMA
-       select EXYNOS4_DEV_PD
        select EXYNOS4_SETUP_FIMD0
        select EXYNOS4_SETUP_I2C1
        select EXYNOS4_SETUP_I2C3
@@@ -279,7 -271,6 +273,6 @@@ config MACH_NUR
        select S5P_DEV_USB_EHCI
        select S5P_SETUP_MIPIPHY
        select EXYNOS4_DEV_DMA
-       select EXYNOS4_DEV_PD
        select EXYNOS4_SETUP_FIMC
        select EXYNOS4_SETUP_FIMD0
        select EXYNOS4_SETUP_I2C1
@@@ -312,7 -303,6 +305,6 @@@ config MACH_ORIGE
        select SAMSUNG_DEV_BACKLIGHT
        select SAMSUNG_DEV_PWM
        select EXYNOS4_DEV_DMA
-       select EXYNOS4_DEV_PD
        select EXYNOS4_DEV_USB_OHCI
        select EXYNOS4_SETUP_FIMD0
        select EXYNOS4_SETUP_SDHCI
@@@ -335,7 -325,6 +327,7 @@@ config MACH_SMDK421
        select SAMSUNG_DEV_BACKLIGHT
        select SAMSUNG_DEV_KEYPAD
        select SAMSUNG_DEV_PWM
 +      select EXYNOS4_DEV_DMA
        select EXYNOS4_SETUP_I2C1
        select EXYNOS4_SETUP_I2C3
        select EXYNOS4_SETUP_I2C7

diff --combined arch/arm/mach-exynos/Makefile
index 995e7cc02bec441bf775927a059781fc8afc04ce,d9191f9a7af8560c69d60f39a703e687cd9bfca6..9a4c09896509dec9407d74350dac9a426eb41de9
--- 1/arch/arm/mach-exynos/Makefile
--- 2/arch/arm/mach-exynos/Makefile
+++ b/arch/arm/mach-exynos/Makefile
@@@ -12,12 -12,12 +12,13 @@@ obj-                               :
  
  # Core
  
 -obj-$(CONFIG_ARCH_EXYNOS4)    += common.o clock.o
 +obj-$(CONFIG_ARCH_EXYNOS)     += common.o
 +obj-$(CONFIG_ARCH_EXYNOS4)    += clock-exynos4.o
  obj-$(CONFIG_CPU_EXYNOS4210)  += clock-exynos4210.o
  obj-$(CONFIG_SOC_EXYNOS4212)  += clock-exynos4212.o
  
  obj-$(CONFIG_PM)              += pm.o
+ obj-$(CONFIG_PM_GENERIC_DOMAINS) += pm_domains.o
  obj-$(CONFIG_CPU_IDLE)                += cpuidle.o
  
  obj-$(CONFIG_ARCH_EXYNOS4)    += pmu.o
@@@ -46,7 -46,6 +47,6 @@@ obj-$(CONFIG_MACH_EXYNOS4_DT)         += mach-
  
  obj-$(CONFIG_ARCH_EXYNOS4)            += dev-audio.o
  obj-$(CONFIG_EXYNOS4_DEV_AHCI)                += dev-ahci.o
- obj-$(CONFIG_EXYNOS4_DEV_PD)          += dev-pd.o
  obj-$(CONFIG_EXYNOS4_DEV_SYSMMU)      += dev-sysmmu.o
  obj-$(CONFIG_EXYNOS4_DEV_DWMCI)               += dev-dwmci.o
  obj-$(CONFIG_EXYNOS4_DEV_DMA)         += dma.o

diff --combined arch/arm/mach-exynos/mach-nuri.c
index 685372f38bf1fbdcacf75d6d098135c091d08c91,df705db08b0666561066297599cc3d9c75204e11..7bc296b795fa6f32c4036f82375bf3762edeff0f
--- 1/arch/arm/mach-exynos/mach-nuri.c
--- 2/arch/arm/mach-exynos/mach-nuri.c
+++ b/arch/arm/mach-exynos/mach-nuri.c
@@@ -115,7 -115,7 +115,7 @@@ static struct s3c_sdhci_platdata nuri_h
  };
  
  static struct regulator_consumer_supply emmc_supplies[] = {
 -      REGULATOR_SUPPLY("vmmc", "s3c-sdhci.0"),
 +      REGULATOR_SUPPLY("vmmc", "exynos4-sdhci.0"),
        REGULATOR_SUPPLY("vmmc", "dw_mmc"),
  };
  
@@@ -220,14 -220,14 +220,14 @@@ static struct s3c_fb_pd_win nuri_fb_win
                .lower_margin   = 1,
                .hsync_len      = 48,
                .vsync_len      = 3,
 -              .xres           = 1280,
 -              .yres           = 800,
 +              .xres           = 1024,
 +              .yres           = 600,
                .refresh        = 60,
        },
        .max_bpp        = 24,
        .default_bpp    = 16,
 -      .virtual_x      = 1280,
 -      .virtual_y      = 800,
 +      .virtual_x      = 1024,
 +      .virtual_y      = 2 * 600,
  };
  
  static struct s3c_fb_platdata nuri_fb_pdata __initdata = {
@@@ -413,7 -413,7 +413,7 @@@ static struct regulator_consumer_suppl
        REGULATOR_SUPPLY("vddio", "6-003c"), /* HDC802 */
  };
  static struct regulator_consumer_supply __initdata max8997_ldo13_[] = {
 -      REGULATOR_SUPPLY("vmmc", "s3c-sdhci.2"), /* TFLASH */
 +      REGULATOR_SUPPLY("vmmc", "exynos4-sdhci.2"), /* TFLASH */
  };
  static struct regulator_consumer_supply __initdata max8997_ldo14_[] = {
        REGULATOR_SUPPLY("inmotor", "max8997-haptic"),
@@@ -1263,9 -1263,6 +1263,6 @@@ static struct platform_device *nuri_dev
        &s5p_device_mfc,
        &s5p_device_mfc_l,
        &s5p_device_mfc_r,
-       &exynos4_device_pd[PD_MFC],
-       &exynos4_device_pd[PD_LCD0],
-       &exynos4_device_pd[PD_CAM],
        &s5p_device_fimc_md,
  
        /* NURI Devices */
@@@ -1315,14 -1312,6 +1312,6 @@@ static void __init nuri_machine_init(vo
  
        /* Last */
        platform_add_devices(nuri_devices, ARRAY_SIZE(nuri_devices));
-       s5p_device_mfc.dev.parent = &exynos4_device_pd[PD_MFC].dev;
-       s5p_device_fimd0.dev.parent = &exynos4_device_pd[PD_LCD0].dev;
- 
-       s5p_device_fimc0.dev.parent = &exynos4_device_pd[PD_CAM].dev;
-       s5p_device_fimc1.dev.parent = &exynos4_device_pd[PD_CAM].dev;
-       s5p_device_fimc2.dev.parent = &exynos4_device_pd[PD_CAM].dev;
-       s5p_device_fimc3.dev.parent = &exynos4_device_pd[PD_CAM].dev;
-       s5p_device_mipi_csis0.dev.parent = &exynos4_device_pd[PD_CAM].dev;
  }
  
  MACHINE_START(NURI, "NURI")

diff --combined arch/arm/mach-exynos/mach-origen.c
index 3ec3ccf9f35c97ec2662abc2877e57308996db4f,fa5c4a59b0aadfcd3022c304c5d0cb49fe7fa5ad..b4d032d5c878354c25888348c4b9138192a6b82b
--- 1/arch/arm/mach-exynos/mach-origen.c
--- 2/arch/arm/mach-exynos/mach-origen.c
+++ b/arch/arm/mach-exynos/mach-origen.c
@@@ -412,7 -412,7 +412,7 @@@ static struct max8997_regulator_data __
        { MAX8997_BUCK7,        &max8997_buck7_data },
  };
  
 -struct max8997_platform_data __initdata origen_max8997_pdata = {
 +static struct max8997_platform_data __initdata origen_max8997_pdata = {
        .num_regulators = ARRAY_SIZE(origen_max8997_regulators),
        .regulators     = origen_max8997_regulators,
  
@@@ -621,13 -621,6 +621,6 @@@ static struct platform_device *origen_d
        &s5p_device_mfc_r,
        &s5p_device_mixer,
        &exynos4_device_ohci,
-       &exynos4_device_pd[PD_LCD0],
-       &exynos4_device_pd[PD_TV],
-       &exynos4_device_pd[PD_G3D],
-       &exynos4_device_pd[PD_LCD1],
-       &exynos4_device_pd[PD_CAM],
-       &exynos4_device_pd[PD_GPS],
-       &exynos4_device_pd[PD_MFC],
        &origen_device_gpiokeys,
        &origen_lcd_hv070wsa,
  };
@@@ -695,13 -688,6 +688,6 @@@ static void __init origen_machine_init(
  
        platform_add_devices(origen_devices, ARRAY_SIZE(origen_devices));
  
-       s5p_device_fimd0.dev.parent = &exynos4_device_pd[PD_LCD0].dev;
- 
-       s5p_device_hdmi.dev.parent = &exynos4_device_pd[PD_TV].dev;
-       s5p_device_mixer.dev.parent = &exynos4_device_pd[PD_TV].dev;
- 
-       s5p_device_mfc.dev.parent = &exynos4_device_pd[PD_MFC].dev;
- 
        samsung_bl_set(&origen_bl_gpio_info, &origen_bl_data);
  }
  

diff --combined arch/arm/mach-exynos/mach-universal_c210.c
index 44553933b144fa771b37eff75b87ab8aa09fbcd3,026241737919082c922d17f9f0ffeae4c71c64af..3485c75d2d31718b59cbb5768fcb785dc8babe61
--- 1/arch/arm/mach-exynos/mach-universal_c210.c
--- 2/arch/arm/mach-exynos/mach-universal_c210.c
+++ b/arch/arm/mach-exynos/mach-universal_c210.c
@@@ -741,7 -741,7 +741,7 @@@ static struct s3c_sdhci_platdata univer
  };
  
  static struct regulator_consumer_supply mmc0_supplies[] = {
 -      REGULATOR_SUPPLY("vmmc", "s3c-sdhci.0"),
 +      REGULATOR_SUPPLY("vmmc", "exynos4-sdhci.0"),
  };
  
  static struct regulator_init_data mmc0_fixed_voltage_init_data = {
@@@ -910,7 -910,7 +910,7 @@@ static struct s5p_fimc_isp_info univers
                .bus_type       = FIMC_MIPI_CSI2,
                .board_info     = &m5mols_board_info,
                .i2c_bus_num    = 0,
 -              .clk_frequency  = 21600000UL,
 +              .clk_frequency  = 24000000UL,
                .csi_data_align = 32,
        },
  };
@@@ -969,7 -969,6 +969,6 @@@ static struct platform_device *universa
        &s3c_device_i2c5,
        &s5p_device_i2c_hdmiphy,
        &hdmi_fixed_voltage,
-       &exynos4_device_pd[PD_TV],
        &s5p_device_hdmi,
        &s5p_device_sdo,
        &s5p_device_mixer,
@@@ -982,9 -981,6 +981,6 @@@
        &s5p_device_mfc,
        &s5p_device_mfc_l,
        &s5p_device_mfc_r,
-       &exynos4_device_pd[PD_MFC],
-       &exynos4_device_pd[PD_LCD0],
-       &exynos4_device_pd[PD_CAM],
        &cam_i_core_fixed_reg_dev,
        &cam_s_if_fixed_reg_dev,
        &s5p_device_fimc_md,
@@@ -997,16 -993,12 +993,12 @@@ static void __init universal_map_io(voi
        s3c24xx_init_uarts(universal_uartcfgs, ARRAY_SIZE(universal_uartcfgs));
  }
  
 -void s5p_tv_setup(void)
 +static void s5p_tv_setup(void)
  {
        /* direct HPD to HDMI chip */
        gpio_request_one(EXYNOS4_GPX3(7), GPIOF_IN, "hpd-plug");
        s3c_gpio_cfgpin(EXYNOS4_GPX3(7), S3C_GPIO_SFN(0x3));
        s3c_gpio_setpull(EXYNOS4_GPX3(7), S3C_GPIO_PULL_NONE);
- 
-       /* setup dependencies between TV devices */
-       s5p_device_hdmi.dev.parent = &exynos4_device_pd[PD_TV].dev;
-       s5p_device_mixer.dev.parent = &exynos4_device_pd[PD_TV].dev;
  }
  
  static void __init universal_reserve(void)
@@@ -1040,15 -1032,6 +1032,6 @@@ static void __init universal_machine_in
  
        /* Last */
        platform_add_devices(universal_devices, ARRAY_SIZE(universal_devices));
- 
-       s5p_device_mfc.dev.parent = &exynos4_device_pd[PD_MFC].dev;
-       s5p_device_fimd0.dev.parent = &exynos4_device_pd[PD_LCD0].dev;
- 
-       s5p_device_fimc0.dev.parent = &exynos4_device_pd[PD_CAM].dev;
-       s5p_device_fimc1.dev.parent = &exynos4_device_pd[PD_CAM].dev;
-       s5p_device_fimc2.dev.parent = &exynos4_device_pd[PD_CAM].dev;
-       s5p_device_fimc3.dev.parent = &exynos4_device_pd[PD_CAM].dev;
-       s5p_device_mipi_csis0.dev.parent = &exynos4_device_pd[PD_CAM].dev;
  }
  
  MACHINE_START(UNIVERSAL_C210, "UNIVERSAL_C210")