Skip to content

L
linux
Commit 562e54d1 authored by Paul Walmsley's avatar Paul Walmsley
Browse files
Options

ARM: OMAP2+: powerdomain: fix whitespace, improve flag comments 

Fix some whitespace problems introduced by commit
da03ce65 ("OMAP3: powerdomain data:
add voltage domains").  Also, improve the documentation for the struct
powerdomain.flags field.
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
parent 92493870
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 40 deletions
arch/arm/mach-omap2/powerdomain.h
View file @ 562e54d1
...@@ -43,18 +43,20 @@ ...@@ -43,18 +43,20 @@
#define PWRSTS_OFF_RET_ON (PWRSTS_OFF_RET | PWRSTS_ON) #define PWRSTS_OFF_RET_ON (PWRSTS_OFF_RET | PWRSTS_ON)
/* Powerdomain flags */ /*
#define PWRDM_HAS_HDWR_SAR (1 << 0) /* hardware save-and-restore support */ * Powerdomain flags (struct powerdomain.flags)
#define PWRDM_HAS_MPU_QUIRK (1 << 1) /* MPU pwr domain has MEM bank 0 bits *
* in MEM bank 1 position. This is * PWRDM_HAS_HDWR_SAR - powerdomain has hardware save-and-restore support
* true for OMAP3430 *
*/ * PWRDM_HAS_MPU_QUIRK - MPU pwr domain has MEM bank 0 bits in MEM
#define PWRDM_HAS_LOWPOWERSTATECHANGE (1 << 2) /* * bank 1 position. This is true for OMAP3430
* support to transition from a *
* sleep state to a lower sleep * PWRDM_HAS_LOWPOWERSTATECHANGE - can transition from a sleep state
* state without waking up the * to a lower sleep state without waking up the powerdomain
* 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 * Number of memory banks that are power-controllable. On OMAP4430, the
......
arch/arm/mach-omap2/powerdomains2xxx_3xxx_data.c
View file @ 562e54d1
...@@ -54,12 +54,12 @@ struct powerdomain gfx_omap2_pwrdm = { ...@@ -54,12 +54,12 @@ struct powerdomain gfx_omap2_pwrdm = {
.pwrsts_mem_on = { .pwrsts_mem_on = {
[0] = PWRSTS_ON, /* MEMONSTATE */ [0] = PWRSTS_ON, /* MEMONSTATE */
}, },
.voltdm = { .name = "core" }, .voltdm = { .name = "core" },
}; };
struct powerdomain wkup_omap2_pwrdm = { struct powerdomain wkup_omap2_pwrdm = {
.name = "wkup_pwrdm", .name = "wkup_pwrdm",
.prcm_offs = WKUP_MOD, .prcm_offs = WKUP_MOD,
.pwrsts = PWRSTS_ON, .pwrsts = PWRSTS_ON,
.voltdm = { .name = "wakeup" }, .voltdm = { .name = "wakeup" },
}; };
arch/arm/mach-omap2/powerdomains2xxx_data.c
View file @ 562e54d1
...@@ -38,7 +38,7 @@ static struct powerdomain dsp_pwrdm = { ...@@ -38,7 +38,7 @@ static struct powerdomain dsp_pwrdm = {
.pwrsts_mem_on = { .pwrsts_mem_on = {
[0] = PWRSTS_ON, [0] = PWRSTS_ON,
}, },
.voltdm = { .name = "core" }, .voltdm = { .name = "core" },
}; };
static struct powerdomain mpu_24xx_pwrdm = { static struct powerdomain mpu_24xx_pwrdm = {
...@@ -53,7 +53,7 @@ static struct powerdomain mpu_24xx_pwrdm = { ...@@ -53,7 +53,7 @@ static struct powerdomain mpu_24xx_pwrdm = {
.pwrsts_mem_on = { .pwrsts_mem_on = {
[0] = PWRSTS_ON, [0] = PWRSTS_ON,
}, },
.voltdm = { .name = "core" }, .voltdm = { .name = "core" },
}; };
static struct powerdomain core_24xx_pwrdm = { static struct powerdomain core_24xx_pwrdm = {
...@@ -72,7 +72,7 @@ static struct powerdomain core_24xx_pwrdm = { ...@@ -72,7 +72,7 @@ static struct powerdomain core_24xx_pwrdm = {
[1] = PWRSTS_OFF_RET_ON, /* MEM2ONSTATE */ [1] = PWRSTS_OFF_RET_ON, /* MEM2ONSTATE */
[2] = PWRSTS_OFF_RET_ON, /* MEM3ONSTATE */ [2] = PWRSTS_OFF_RET_ON, /* MEM3ONSTATE */
}, },
.voltdm = { .name = "core" }, .voltdm = { .name = "core" },
}; };
...@@ -94,7 +94,7 @@ static struct powerdomain mdm_pwrdm = { ...@@ -94,7 +94,7 @@ static struct powerdomain mdm_pwrdm = {
.pwrsts_mem_on = { .pwrsts_mem_on = {
[0] = PWRSTS_ON, /* MEMONSTATE */ [0] = PWRSTS_ON, /* MEMONSTATE */
}, },
.voltdm = { .name = "core" }, .voltdm = { .name = "core" },
}; };
/* /*
......
arch/arm/mach-omap2/powerdomains3xxx_data.c
View file @ 562e54d1
...@@ -50,7 +50,7 @@ static struct powerdomain iva2_pwrdm = { ...@@ -50,7 +50,7 @@ static struct powerdomain iva2_pwrdm = {
[2] = PWRSTS_OFF_ON, [2] = PWRSTS_OFF_ON,
[3] = PWRSTS_ON, [3] = PWRSTS_ON,
}, },
.voltdm = { .name = "mpu_iva" }, .voltdm = { .name = "mpu_iva" },
}; };
static struct powerdomain mpu_3xxx_pwrdm = { static struct powerdomain mpu_3xxx_pwrdm = {
...@@ -66,7 +66,7 @@ static struct powerdomain mpu_3xxx_pwrdm = { ...@@ -66,7 +66,7 @@ static struct powerdomain mpu_3xxx_pwrdm = {
.pwrsts_mem_on = { .pwrsts_mem_on = {
[0] = PWRSTS_OFF_ON, [0] = PWRSTS_OFF_ON,
}, },
.voltdm = { .name = "mpu_iva" }, .voltdm = { .name = "mpu_iva" },
}; };
static struct powerdomain mpu_am35x_pwrdm = { static struct powerdomain mpu_am35x_pwrdm = {
...@@ -82,7 +82,7 @@ static struct powerdomain mpu_am35x_pwrdm = { ...@@ -82,7 +82,7 @@ static struct powerdomain mpu_am35x_pwrdm = {
.pwrsts_mem_on = { .pwrsts_mem_on = {
[0] = PWRSTS_ON, [0] = PWRSTS_ON,
}, },
.voltdm = { .name = "mpu_iva" }, .voltdm = { .name = "mpu_iva" },
}; };
/* /*
...@@ -109,7 +109,7 @@ static struct powerdomain core_3xxx_pre_es3_1_pwrdm = { ...@@ -109,7 +109,7 @@ static struct powerdomain core_3xxx_pre_es3_1_pwrdm = {
[0] = PWRSTS_OFF_RET_ON, /* MEM1ONSTATE */ [0] = PWRSTS_OFF_RET_ON, /* MEM1ONSTATE */
[1] = PWRSTS_OFF_RET_ON, /* MEM2ONSTATE */ [1] = PWRSTS_OFF_RET_ON, /* MEM2ONSTATE */
}, },
.voltdm = { .name = "core" }, .voltdm = { .name = "core" },
}; };
static struct powerdomain core_3xxx_es3_1_pwrdm = { static struct powerdomain core_3xxx_es3_1_pwrdm = {
...@@ -131,7 +131,7 @@ static struct powerdomain core_3xxx_es3_1_pwrdm = { ...@@ -131,7 +131,7 @@ static struct powerdomain core_3xxx_es3_1_pwrdm = {
[0] = PWRSTS_OFF_RET_ON, /* MEM1ONSTATE */ [0] = PWRSTS_OFF_RET_ON, /* MEM1ONSTATE */
[1] = PWRSTS_OFF_RET_ON, /* MEM2ONSTATE */ [1] = PWRSTS_OFF_RET_ON, /* MEM2ONSTATE */
}, },
.voltdm = { .name = "core" }, .voltdm = { .name = "core" },
}; };
static struct powerdomain core_am35x_pwrdm = { static struct powerdomain core_am35x_pwrdm = {
...@@ -148,7 +148,7 @@ static struct powerdomain core_am35x_pwrdm = { ...@@ -148,7 +148,7 @@ static struct powerdomain core_am35x_pwrdm = {
[0] = PWRSTS_ON, /* MEM1ONSTATE */ [0] = PWRSTS_ON, /* MEM1ONSTATE */
[1] = PWRSTS_ON, /* MEM2ONSTATE */ [1] = PWRSTS_ON, /* MEM2ONSTATE */
}, },
.voltdm = { .name = "core" }, .voltdm = { .name = "core" },
}; };
static struct powerdomain dss_pwrdm = { static struct powerdomain dss_pwrdm = {
...@@ -163,7 +163,7 @@ static struct powerdomain dss_pwrdm = { ...@@ -163,7 +163,7 @@ static struct powerdomain dss_pwrdm = {
.pwrsts_mem_on = { .pwrsts_mem_on = {
[0] = PWRSTS_ON, /* MEMONSTATE */ [0] = PWRSTS_ON, /* MEMONSTATE */
}, },
.voltdm = { .name = "core" }, .voltdm = { .name = "core" },
}; };
static struct powerdomain dss_am35x_pwrdm = { static struct powerdomain dss_am35x_pwrdm = {
...@@ -178,7 +178,7 @@ static struct powerdomain dss_am35x_pwrdm = { ...@@ -178,7 +178,7 @@ static struct powerdomain dss_am35x_pwrdm = {
.pwrsts_mem_on = { .pwrsts_mem_on = {
[0] = PWRSTS_ON, /* MEMONSTATE */ [0] = PWRSTS_ON, /* MEMONSTATE */
}, },
.voltdm = { .name = "core" }, .voltdm = { .name = "core" },
}; };
/* /*
...@@ -199,7 +199,7 @@ static struct powerdomain sgx_pwrdm = { ...@@ -199,7 +199,7 @@ static struct powerdomain sgx_pwrdm = {
.pwrsts_mem_on = { .pwrsts_mem_on = {
[0] = PWRSTS_ON, /* MEMONSTATE */ [0] = PWRSTS_ON, /* MEMONSTATE */
}, },
.voltdm = { .name = "core" }, .voltdm = { .name = "core" },
}; };
static struct powerdomain sgx_am35x_pwrdm = { static struct powerdomain sgx_am35x_pwrdm = {
...@@ -214,7 +214,7 @@ static struct powerdomain sgx_am35x_pwrdm = { ...@@ -214,7 +214,7 @@ static struct powerdomain sgx_am35x_pwrdm = {
.pwrsts_mem_on = { .pwrsts_mem_on = {
[0] = PWRSTS_ON, /* MEMONSTATE */ [0] = PWRSTS_ON, /* MEMONSTATE */
}, },
.voltdm = { .name = "core" }, .voltdm = { .name = "core" },
}; };
static struct powerdomain cam_pwrdm = { static struct powerdomain cam_pwrdm = {
...@@ -229,7 +229,7 @@ static struct powerdomain cam_pwrdm = { ...@@ -229,7 +229,7 @@ static struct powerdomain cam_pwrdm = {
.pwrsts_mem_on = { .pwrsts_mem_on = {
[0] = PWRSTS_ON, /* MEMONSTATE */ [0] = PWRSTS_ON, /* MEMONSTATE */
}, },
.voltdm = { .name = "core" }, .voltdm = { .name = "core" },
}; };
static struct powerdomain per_pwrdm = { static struct powerdomain per_pwrdm = {
...@@ -244,7 +244,7 @@ static struct powerdomain per_pwrdm = { ...@@ -244,7 +244,7 @@ static struct powerdomain per_pwrdm = {
.pwrsts_mem_on = { .pwrsts_mem_on = {
[0] = PWRSTS_ON, /* MEMONSTATE */ [0] = PWRSTS_ON, /* MEMONSTATE */
}, },
.voltdm = { .name = "core" }, .voltdm = { .name = "core" },
}; };
static struct powerdomain per_am35x_pwrdm = { static struct powerdomain per_am35x_pwrdm = {
...@@ -259,13 +259,13 @@ static struct powerdomain per_am35x_pwrdm = { ...@@ -259,13 +259,13 @@ static struct powerdomain per_am35x_pwrdm = {
.pwrsts_mem_on = { .pwrsts_mem_on = {
[0] = PWRSTS_ON, /* MEMONSTATE */ [0] = PWRSTS_ON, /* MEMONSTATE */
}, },
.voltdm = { .name = "core" }, .voltdm = { .name = "core" },
}; };
static struct powerdomain emu_pwrdm = { static struct powerdomain emu_pwrdm = {
.name = "emu_pwrdm", .name = "emu_pwrdm",
.prcm_offs = OMAP3430_EMU_MOD, .prcm_offs = OMAP3430_EMU_MOD,
.voltdm = { .name = "core" }, .voltdm = { .name = "core" },
}; };
static struct powerdomain neon_pwrdm = { static struct powerdomain neon_pwrdm = {
...@@ -273,7 +273,7 @@ static struct powerdomain neon_pwrdm = { ...@@ -273,7 +273,7 @@ static struct powerdomain neon_pwrdm = {
.prcm_offs = OMAP3430_NEON_MOD, .prcm_offs = OMAP3430_NEON_MOD,
.pwrsts = PWRSTS_OFF_RET_ON, .pwrsts = PWRSTS_OFF_RET_ON,
.pwrsts_logic_ret = PWRSTS_RET, .pwrsts_logic_ret = PWRSTS_RET,
.voltdm = { .name = "mpu_iva" }, .voltdm = { .name = "mpu_iva" },
}; };
static struct powerdomain neon_am35x_pwrdm = { static struct powerdomain neon_am35x_pwrdm = {
...@@ -281,7 +281,7 @@ static struct powerdomain neon_am35x_pwrdm = { ...@@ -281,7 +281,7 @@ static struct powerdomain neon_am35x_pwrdm = {
.prcm_offs = OMAP3430_NEON_MOD, .prcm_offs = OMAP3430_NEON_MOD,
.pwrsts = PWRSTS_ON, .pwrsts = PWRSTS_ON,
.pwrsts_logic_ret = PWRSTS_ON, .pwrsts_logic_ret = PWRSTS_ON,
.voltdm = { .name = "mpu_iva" }, .voltdm = { .name = "mpu_iva" },
}; };
static struct powerdomain usbhost_pwrdm = { static struct powerdomain usbhost_pwrdm = {
...@@ -303,37 +303,37 @@ static struct powerdomain usbhost_pwrdm = { ...@@ -303,37 +303,37 @@ static struct powerdomain usbhost_pwrdm = {
.pwrsts_mem_on = { .pwrsts_mem_on = {
[0] = PWRSTS_ON, /* MEMONSTATE */ [0] = PWRSTS_ON, /* MEMONSTATE */
}, },
.voltdm = { .name = "core" }, .voltdm = { .name = "core" },
}; };
static struct powerdomain dpll1_pwrdm = { static struct powerdomain dpll1_pwrdm = {
.name = "dpll1_pwrdm", .name = "dpll1_pwrdm",
.prcm_offs = MPU_MOD, .prcm_offs = MPU_MOD,
.voltdm = { .name = "mpu_iva" }, .voltdm = { .name = "mpu_iva" },
}; };
static struct powerdomain dpll2_pwrdm = { static struct powerdomain dpll2_pwrdm = {
.name = "dpll2_pwrdm", .name = "dpll2_pwrdm",
.prcm_offs = OMAP3430_IVA2_MOD, .prcm_offs = OMAP3430_IVA2_MOD,
.voltdm = { .name = "mpu_iva" }, .voltdm = { .name = "mpu_iva" },
}; };
static struct powerdomain dpll3_pwrdm = { static struct powerdomain dpll3_pwrdm = {
.name = "dpll3_pwrdm", .name = "dpll3_pwrdm",
.prcm_offs = PLL_MOD, .prcm_offs = PLL_MOD,
.voltdm = { .name = "core" }, .voltdm = { .name = "core" },
}; };
static struct powerdomain dpll4_pwrdm = { static struct powerdomain dpll4_pwrdm = {
.name = "dpll4_pwrdm", .name = "dpll4_pwrdm",
.prcm_offs = PLL_MOD, .prcm_offs = PLL_MOD,
.voltdm = { .name = "core" }, .voltdm = { .name = "core" },
}; };
static struct powerdomain dpll5_pwrdm = { static struct powerdomain dpll5_pwrdm = {
.name = "dpll5_pwrdm", .name = "dpll5_pwrdm",
.prcm_offs = PLL_MOD, .prcm_offs = PLL_MOD,
.voltdm = { .name = "core" }, .voltdm = { .name = "core" },
}; };
/* As powerdomains are added or removed above, this list must also be changed */ /* As powerdomains are added or removed above, this list must also be changed */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7