Skip to content

Commit

Permalink
ARM: OMAP2+: powerdomain: fix whitespace, improve flag comments
Browse files Browse the repository at this point in the history 
Fix some whitespace problems introduced by commit
da03ce6 ("OMAP3: powerdomain data:
add voltage domains").  Also, improve the documentation for the struct
powerdomain.flags field.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
  • Loading branch information
Paul Walmsley committed Jan 29, 2013
1 parent 9249387 commit 562e54d
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 40 deletions.
26 changes: 14 additions & 12 deletions arch/arm/mach-omap2/powerdomain.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,20 @@
#define PWRSTS_OFF_RET_ON (PWRSTS_OFF_RET | PWRSTS_ON)


/* Powerdomain flags */
#define PWRDM_HAS_HDWR_SAR (1 << 0) /* hardware save-and-restore support */
#define PWRDM_HAS_MPU_QUIRK (1 << 1) /* MPU pwr domain has MEM bank 0 bits
* in MEM bank 1 position. This is
* true for OMAP3430
*/
#define PWRDM_HAS_LOWPOWERSTATECHANGE (1 << 2) /*
* support to transition from a
* sleep state to a lower sleep
* state without waking up the
* powerdomain
*/
/*
* Powerdomain flags (struct powerdomain.flags)
*
* PWRDM_HAS_HDWR_SAR - powerdomain has hardware save-and-restore support
*
* PWRDM_HAS_MPU_QUIRK - MPU pwr domain has MEM bank 0 bits in MEM
* bank 1 position. This is true for OMAP3430
*
* PWRDM_HAS_LOWPOWERSTATECHANGE - can transition from a sleep state
* to a lower sleep state without waking up the powerdomain
*/
#define PWRDM_HAS_HDWR_SAR BIT(0)
#define PWRDM_HAS_MPU_QUIRK BIT(1)
#define PWRDM_HAS_LOWPOWERSTATECHANGE BIT(2)

/*
* Number of memory banks that are power-controllable. On OMAP4430, the
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-omap2/powerdomains2xxx_3xxx_data.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@ struct powerdomain gfx_omap2_pwrdm = {
.pwrsts_mem_on = {
[0] = PWRSTS_ON, /* MEMONSTATE */
},
.voltdm = { .name = "core" },
.voltdm = { .name = "core" },
};

struct powerdomain wkup_omap2_pwrdm = {
.name = "wkup_pwrdm",
.prcm_offs = WKUP_MOD,
.pwrsts = PWRSTS_ON,
.voltdm = { .name = "wakeup" },
.voltdm = { .name = "wakeup" },
};
8 changes: 4 additions & 4 deletions arch/arm/mach-omap2/powerdomains2xxx_data.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ static struct powerdomain dsp_pwrdm = {
.pwrsts_mem_on = {
[0] = PWRSTS_ON,
},
.voltdm = { .name = "core" },
.voltdm = { .name = "core" },
};

static struct powerdomain mpu_24xx_pwrdm = {
Expand All @@ -53,7 +53,7 @@ static struct powerdomain mpu_24xx_pwrdm = {
.pwrsts_mem_on = {
[0] = PWRSTS_ON,
},
.voltdm = { .name = "core" },
.voltdm = { .name = "core" },
};

static struct powerdomain core_24xx_pwrdm = {
Expand All @@ -72,7 +72,7 @@ static struct powerdomain core_24xx_pwrdm = {
[1] = PWRSTS_OFF_RET_ON, /* MEM2ONSTATE */
[2] = PWRSTS_OFF_RET_ON, /* MEM3ONSTATE */
},
.voltdm = { .name = "core" },
.voltdm = { .name = "core" },
};


Expand All @@ -94,7 +94,7 @@ static struct powerdomain mdm_pwrdm = {
.pwrsts_mem_on = {
[0] = PWRSTS_ON, /* MEMONSTATE */
},
.voltdm = { .name = "core" },
.voltdm = { .name = "core" },
};

/*
Expand Down
44 changes: 22 additions & 22 deletions arch/arm/mach-omap2/powerdomains3xxx_data.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ static struct powerdomain iva2_pwrdm = {
[2] = PWRSTS_OFF_ON,
[3] = PWRSTS_ON,
},
.voltdm = { .name = "mpu_iva" },
.voltdm = { .name = "mpu_iva" },
};

static struct powerdomain mpu_3xxx_pwrdm = {
Expand All @@ -66,7 +66,7 @@ static struct powerdomain mpu_3xxx_pwrdm = {
.pwrsts_mem_on = {
[0] = PWRSTS_OFF_ON,
},
.voltdm = { .name = "mpu_iva" },
.voltdm = { .name = "mpu_iva" },
};

static struct powerdomain mpu_am35x_pwrdm = {
Expand All @@ -82,7 +82,7 @@ static struct powerdomain mpu_am35x_pwrdm = {
.pwrsts_mem_on = {
[0] = PWRSTS_ON,
},
.voltdm = { .name = "mpu_iva" },
.voltdm = { .name = "mpu_iva" },
};

/*
Expand All @@ -109,7 +109,7 @@ static struct powerdomain core_3xxx_pre_es3_1_pwrdm = {
[0] = PWRSTS_OFF_RET_ON, /* MEM1ONSTATE */
[1] = PWRSTS_OFF_RET_ON, /* MEM2ONSTATE */
},
.voltdm = { .name = "core" },
.voltdm = { .name = "core" },
};

static struct powerdomain core_3xxx_es3_1_pwrdm = {
Expand All @@ -131,7 +131,7 @@ static struct powerdomain core_3xxx_es3_1_pwrdm = {
[0] = PWRSTS_OFF_RET_ON, /* MEM1ONSTATE */
[1] = PWRSTS_OFF_RET_ON, /* MEM2ONSTATE */
},
.voltdm = { .name = "core" },
.voltdm = { .name = "core" },
};

static struct powerdomain core_am35x_pwrdm = {
Expand All @@ -148,7 +148,7 @@ static struct powerdomain core_am35x_pwrdm = {
[0] = PWRSTS_ON, /* MEM1ONSTATE */
[1] = PWRSTS_ON, /* MEM2ONSTATE */
},
.voltdm = { .name = "core" },
.voltdm = { .name = "core" },
};

static struct powerdomain dss_pwrdm = {
Expand All @@ -163,7 +163,7 @@ static struct powerdomain dss_pwrdm = {
.pwrsts_mem_on = {
[0] = PWRSTS_ON, /* MEMONSTATE */
},
.voltdm = { .name = "core" },
.voltdm = { .name = "core" },
};

static struct powerdomain dss_am35x_pwrdm = {
Expand All @@ -178,7 +178,7 @@ static struct powerdomain dss_am35x_pwrdm = {
.pwrsts_mem_on = {
[0] = PWRSTS_ON, /* MEMONSTATE */
},
.voltdm = { .name = "core" },
.voltdm = { .name = "core" },
};

/*
Expand All @@ -199,7 +199,7 @@ static struct powerdomain sgx_pwrdm = {
.pwrsts_mem_on = {
[0] = PWRSTS_ON, /* MEMONSTATE */
},
.voltdm = { .name = "core" },
.voltdm = { .name = "core" },
};

static struct powerdomain sgx_am35x_pwrdm = {
Expand All @@ -214,7 +214,7 @@ static struct powerdomain sgx_am35x_pwrdm = {
.pwrsts_mem_on = {
[0] = PWRSTS_ON, /* MEMONSTATE */
},
.voltdm = { .name = "core" },
.voltdm = { .name = "core" },
};

static struct powerdomain cam_pwrdm = {
Expand All @@ -229,7 +229,7 @@ static struct powerdomain cam_pwrdm = {
.pwrsts_mem_on = {
[0] = PWRSTS_ON, /* MEMONSTATE */
},
.voltdm = { .name = "core" },
.voltdm = { .name = "core" },
};

static struct powerdomain per_pwrdm = {
Expand All @@ -244,7 +244,7 @@ static struct powerdomain per_pwrdm = {
.pwrsts_mem_on = {
[0] = PWRSTS_ON, /* MEMONSTATE */
},
.voltdm = { .name = "core" },
.voltdm = { .name = "core" },
};

static struct powerdomain per_am35x_pwrdm = {
Expand All @@ -259,29 +259,29 @@ static struct powerdomain per_am35x_pwrdm = {
.pwrsts_mem_on = {
[0] = PWRSTS_ON, /* MEMONSTATE */
},
.voltdm = { .name = "core" },
.voltdm = { .name = "core" },
};

static struct powerdomain emu_pwrdm = {
.name = "emu_pwrdm",
.prcm_offs = OMAP3430_EMU_MOD,
.voltdm = { .name = "core" },
.voltdm = { .name = "core" },
};

static struct powerdomain neon_pwrdm = {
.name = "neon_pwrdm",
.prcm_offs = OMAP3430_NEON_MOD,
.pwrsts = PWRSTS_OFF_RET_ON,
.pwrsts_logic_ret = PWRSTS_RET,
.voltdm = { .name = "mpu_iva" },
.voltdm = { .name = "mpu_iva" },
};

static struct powerdomain neon_am35x_pwrdm = {
.name = "neon_pwrdm",
.prcm_offs = OMAP3430_NEON_MOD,
.pwrsts = PWRSTS_ON,
.pwrsts_logic_ret = PWRSTS_ON,
.voltdm = { .name = "mpu_iva" },
.voltdm = { .name = "mpu_iva" },
};

static struct powerdomain usbhost_pwrdm = {
Expand All @@ -303,37 +303,37 @@ static struct powerdomain usbhost_pwrdm = {
.pwrsts_mem_on = {
[0] = PWRSTS_ON, /* MEMONSTATE */
},
.voltdm = { .name = "core" },
.voltdm = { .name = "core" },
};

static struct powerdomain dpll1_pwrdm = {
.name = "dpll1_pwrdm",
.prcm_offs = MPU_MOD,
.voltdm = { .name = "mpu_iva" },
.voltdm = { .name = "mpu_iva" },
};

static struct powerdomain dpll2_pwrdm = {
.name = "dpll2_pwrdm",
.prcm_offs = OMAP3430_IVA2_MOD,
.voltdm = { .name = "mpu_iva" },
.voltdm = { .name = "mpu_iva" },
};

static struct powerdomain dpll3_pwrdm = {
.name = "dpll3_pwrdm",
.prcm_offs = PLL_MOD,
.voltdm = { .name = "core" },
.voltdm = { .name = "core" },
};

static struct powerdomain dpll4_pwrdm = {
.name = "dpll4_pwrdm",
.prcm_offs = PLL_MOD,
.voltdm = { .name = "core" },
.voltdm = { .name = "core" },
};

static struct powerdomain dpll5_pwrdm = {
.name = "dpll5_pwrdm",
.prcm_offs = PLL_MOD,
.voltdm = { .name = "core" },
.voltdm = { .name = "core" },
};

/* As powerdomains are added or removed above, this list must also be changed */
Expand Down

0 comments on commit 562e54d

Please sign in to comment.