diff options
Diffstat (limited to 'arch/arm/mach-omap2/powerdomains54xx_data.c')
-rw-r--r-- | arch/arm/mach-omap2/powerdomains54xx_data.c | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/arch/arm/mach-omap2/powerdomains54xx_data.c b/arch/arm/mach-omap2/powerdomains54xx_data.c index 335937d89b01..2576e55d1ba2 100644 --- a/arch/arm/mach-omap2/powerdomains54xx_data.c +++ b/arch/arm/mach-omap2/powerdomains54xx_data.c @@ -33,9 +33,9 @@ /* core_54xx_pwrdm: CORE power domain */ static struct powerdomain core_54xx_pwrdm = { .name = "core_pwrdm", + .voltdm = { .name = "core" }, .prcm_offs = OMAP54XX_PRM_CORE_INST, .prcm_partition = OMAP54XX_PRM_PARTITION, - .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP54XX), .pwrsts = PWRSTS_RET_ON, .pwrsts_logic_ret = PWRSTS_OFF_RET, .banks = 5, @@ -59,9 +59,9 @@ static struct powerdomain core_54xx_pwrdm = { /* abe_54xx_pwrdm: Audio back end power domain */ static struct powerdomain abe_54xx_pwrdm = { .name = "abe_pwrdm", + .voltdm = { .name = "iva" }, .prcm_offs = OMAP54XX_PRM_ABE_INST, .prcm_partition = OMAP54XX_PRM_PARTITION, - .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP54XX), .pwrsts = PWRSTS_OFF_RET_ON, .pwrsts_logic_ret = PWRSTS_OFF, .banks = 2, @@ -79,18 +79,18 @@ static struct powerdomain abe_54xx_pwrdm = { /* coreaon_54xx_pwrdm: Always ON logic that sits in VDD_CORE voltage domain */ static struct powerdomain coreaon_54xx_pwrdm = { .name = "coreaon_pwrdm", + .voltdm = { .name = "core" }, .prcm_offs = OMAP54XX_PRM_COREAON_INST, .prcm_partition = OMAP54XX_PRM_PARTITION, - .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP54XX), .pwrsts = PWRSTS_ON, }; /* dss_54xx_pwrdm: Display subsystem power domain */ static struct powerdomain dss_54xx_pwrdm = { .name = "dss_pwrdm", + .voltdm = { .name = "core" }, .prcm_offs = OMAP54XX_PRM_DSS_INST, .prcm_partition = OMAP54XX_PRM_PARTITION, - .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP54XX), .pwrsts = PWRSTS_OFF_RET_ON, .pwrsts_logic_ret = PWRSTS_OFF, .banks = 1, @@ -106,9 +106,9 @@ static struct powerdomain dss_54xx_pwrdm = { /* cpu0_54xx_pwrdm: MPU0 processor and Neon coprocessor power domain */ static struct powerdomain cpu0_54xx_pwrdm = { .name = "cpu0_pwrdm", + .voltdm = { .name = "mpu" }, .prcm_offs = OMAP54XX_PRCM_MPU_PRM_C0_INST, .prcm_partition = OMAP54XX_PRCM_MPU_PARTITION, - .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP54XX), .pwrsts = PWRSTS_OFF_RET_ON, .pwrsts_logic_ret = PWRSTS_OFF_RET, .banks = 1, @@ -123,9 +123,9 @@ static struct powerdomain cpu0_54xx_pwrdm = { /* cpu1_54xx_pwrdm: MPU1 processor and Neon coprocessor power domain */ static struct powerdomain cpu1_54xx_pwrdm = { .name = "cpu1_pwrdm", + .voltdm = { .name = "mpu" }, .prcm_offs = OMAP54XX_PRCM_MPU_PRM_C1_INST, .prcm_partition = OMAP54XX_PRCM_MPU_PARTITION, - .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP54XX), .pwrsts = PWRSTS_OFF_RET_ON, .pwrsts_logic_ret = PWRSTS_OFF_RET, .banks = 1, @@ -141,9 +141,9 @@ static struct powerdomain cpu1_54xx_pwrdm = { /* emu_54xx_pwrdm: Emulation power domain */ static struct powerdomain emu_54xx_pwrdm = { .name = "emu_pwrdm", + .voltdm = { .name = "wakeup" }, .prcm_offs = OMAP54XX_PRM_EMU_INST, .prcm_partition = OMAP54XX_PRM_PARTITION, - .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP54XX), .pwrsts = PWRSTS_OFF_ON, .banks = 1, .pwrsts_mem_ret = { @@ -157,9 +157,9 @@ static struct powerdomain emu_54xx_pwrdm = { /* mpu_54xx_pwrdm: Modena processor and the Neon coprocessor power domain */ static struct powerdomain mpu_54xx_pwrdm = { .name = "mpu_pwrdm", + .voltdm = { .name = "mpu" }, .prcm_offs = OMAP54XX_PRM_MPU_INST, .prcm_partition = OMAP54XX_PRM_PARTITION, - .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP54XX), .pwrsts = PWRSTS_RET_ON, .pwrsts_logic_ret = PWRSTS_OFF_RET, .banks = 2, @@ -176,9 +176,9 @@ static struct powerdomain mpu_54xx_pwrdm = { /* custefuse_54xx_pwrdm: Customer efuse controller power domain */ static struct powerdomain custefuse_54xx_pwrdm = { .name = "custefuse_pwrdm", + .voltdm = { .name = "core" }, .prcm_offs = OMAP54XX_PRM_CUSTEFUSE_INST, .prcm_partition = OMAP54XX_PRM_PARTITION, - .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP54XX), .pwrsts = PWRSTS_OFF_ON, .flags = PWRDM_HAS_LOWPOWERSTATECHANGE, }; @@ -186,9 +186,9 @@ static struct powerdomain custefuse_54xx_pwrdm = { /* dsp_54xx_pwrdm: Tesla processor power domain */ static struct powerdomain dsp_54xx_pwrdm = { .name = "dsp_pwrdm", + .voltdm = { .name = "iva" }, .prcm_offs = OMAP54XX_PRM_DSP_INST, .prcm_partition = OMAP54XX_PRM_PARTITION, - .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP54XX), .pwrsts = PWRSTS_OFF_RET_ON, .pwrsts_logic_ret = PWRSTS_OFF_RET, .banks = 3, @@ -208,9 +208,9 @@ static struct powerdomain dsp_54xx_pwrdm = { /* cam_54xx_pwrdm: Camera subsystem power domain */ static struct powerdomain cam_54xx_pwrdm = { .name = "cam_pwrdm", + .voltdm = { .name = "iva" }, .prcm_offs = OMAP54XX_PRM_CAM_INST, .prcm_partition = OMAP54XX_PRM_PARTITION, - .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP54XX), .pwrsts = PWRSTS_OFF_ON, .banks = 1, .pwrsts_mem_ret = { @@ -225,9 +225,9 @@ static struct powerdomain cam_54xx_pwrdm = { /* l3init_54xx_pwrdm: L3 initators pheripherals power domain */ static struct powerdomain l3init_54xx_pwrdm = { .name = "l3init_pwrdm", + .voltdm = { .name = "core" }, .prcm_offs = OMAP54XX_PRM_L3INIT_INST, .prcm_partition = OMAP54XX_PRM_PARTITION, - .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP54XX), .pwrsts = PWRSTS_RET_ON, .pwrsts_logic_ret = PWRSTS_OFF_RET, .banks = 2, @@ -245,9 +245,9 @@ static struct powerdomain l3init_54xx_pwrdm = { /* l4per_54xx_pwrdm: Target peripherals power domain */ static struct powerdomain l4per_54xx_pwrdm = { .name = "l4per_pwrdm", + .voltdm = { .name = "core" }, .prcm_offs = OMAP54XX_PRM_L4PER_INST, .prcm_partition = OMAP54XX_PRM_PARTITION, - .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP54XX), .pwrsts = PWRSTS_RET_ON, .pwrsts_logic_ret = PWRSTS_OFF_RET, .banks = 2, @@ -265,9 +265,9 @@ static struct powerdomain l4per_54xx_pwrdm = { /* gpu_54xx_pwrdm: 3D accelerator power domain */ static struct powerdomain gpu_54xx_pwrdm = { .name = "gpu_pwrdm", + .voltdm = { .name = "core" }, .prcm_offs = OMAP54XX_PRM_GPU_INST, .prcm_partition = OMAP54XX_PRM_PARTITION, - .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP54XX), .pwrsts = PWRSTS_OFF_ON, .banks = 1, .pwrsts_mem_ret = { @@ -282,9 +282,9 @@ static struct powerdomain gpu_54xx_pwrdm = { /* wkupaon_54xx_pwrdm: Wake-up power domain */ static struct powerdomain wkupaon_54xx_pwrdm = { .name = "wkupaon_pwrdm", + .voltdm = { .name = "wakeup" }, .prcm_offs = OMAP54XX_PRM_WKUPAON_INST, .prcm_partition = OMAP54XX_PRM_PARTITION, - .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP54XX), .pwrsts = PWRSTS_ON, .banks = 1, .pwrsts_mem_ret = { @@ -297,9 +297,9 @@ static struct powerdomain wkupaon_54xx_pwrdm = { /* iva_54xx_pwrdm: IVA-HD power domain */ static struct powerdomain iva_54xx_pwrdm = { .name = "iva_pwrdm", + .voltdm = { .name = "iva" }, .prcm_offs = OMAP54XX_PRM_IVA_INST, .prcm_partition = OMAP54XX_PRM_PARTITION, - .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP54XX), .pwrsts = PWRSTS_OFF_RET_ON, .pwrsts_logic_ret = PWRSTS_OFF, .banks = 4, @@ -348,5 +348,7 @@ static struct powerdomain *powerdomains_omap54xx[] __initdata = { void __init omap54xx_powerdomains_init(void) { - pwrdm_init(powerdomains_omap54xx, &omap5_pwrdm_operations); + pwrdm_register_platform_funcs(&omap5_pwrdm_operations); + pwrdm_register_pwrdms(powerdomains_omap54xx); + pwrdm_complete_init(); } |