160 lines
5.1 KiB
Diff
160 lines
5.1 KiB
Diff
For modules/IPs/hwmods which do not have
|
|
-1- sys->class->reset()
|
|
and
|
|
-2- hardreset lines
|
|
and
|
|
-3- No way to do an ocp reset (no sysc control)
|
|
the flag 'HWMOD_INIT_NO_RESET' is not much useful.
|
|
|
|
Cleanup all such instances across various hwmod data files.
|
|
|
|
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
|
|
|
|
---
|
|
arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 18 +++++++++---------
|
|
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 6 +++---
|
|
arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 6 +++---
|
|
3 files changed, 15 insertions(+), 15 deletions(-)
|
|
|
|
--- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
|
|
+++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
|
|
@@ -52,7 +52,7 @@ static struct omap_hwmod am33xx_emif_hwm
|
|
.name = "emif",
|
|
.class = &am33xx_emif_hwmod_class,
|
|
.clkdm_name = "l3_clkdm",
|
|
- .flags = (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET),
|
|
+ .flags = HWMOD_INIT_NO_IDLE,
|
|
.main_clk = "dpll_ddr_m2_div2_ck",
|
|
.prcm = {
|
|
.omap4 = {
|
|
@@ -74,7 +74,7 @@ static struct omap_hwmod am33xx_l3_main_
|
|
.name = "l3_main",
|
|
.class = &am33xx_l3_hwmod_class,
|
|
.clkdm_name = "l3_clkdm",
|
|
- .flags = (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET),
|
|
+ .flags = HWMOD_INIT_NO_IDLE,
|
|
.main_clk = "l3_gclk",
|
|
.prcm = {
|
|
.omap4 = {
|
|
@@ -96,7 +96,7 @@ static struct omap_hwmod am33xx_l3_instr
|
|
.name = "l3_instr",
|
|
.class = &am33xx_l3_hwmod_class,
|
|
.clkdm_name = "l3_clkdm",
|
|
- .flags = (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET),
|
|
+ .flags = HWMOD_INIT_NO_IDLE,
|
|
.main_clk = "l3_gclk",
|
|
.prcm = {
|
|
.omap4 = {
|
|
@@ -119,7 +119,7 @@ static struct omap_hwmod am33xx_l4_ls_hw
|
|
.name = "l4_ls",
|
|
.class = &am33xx_l4_hwmod_class,
|
|
.clkdm_name = "l4ls_clkdm",
|
|
- .flags = (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET),
|
|
+ .flags = HWMOD_INIT_NO_IDLE,
|
|
.main_clk = "l4ls_gclk",
|
|
.prcm = {
|
|
.omap4 = {
|
|
@@ -134,7 +134,7 @@ static struct omap_hwmod am33xx_l4_hs_hw
|
|
.name = "l4_hs",
|
|
.class = &am33xx_l4_hwmod_class,
|
|
.clkdm_name = "l4hs_clkdm",
|
|
- .flags = (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET),
|
|
+ .flags = HWMOD_INIT_NO_IDLE,
|
|
.main_clk = "l4hs_gclk",
|
|
.prcm = {
|
|
.omap4 = {
|
|
@@ -150,7 +150,7 @@ static struct omap_hwmod am33xx_l4_wkup_
|
|
.name = "l4_wkup",
|
|
.class = &am33xx_l4_hwmod_class,
|
|
.clkdm_name = "l4_wkup_clkdm",
|
|
- .flags = (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET),
|
|
+ .flags = HWMOD_INIT_NO_IDLE,
|
|
.prcm = {
|
|
.omap4 = {
|
|
.clkctrl_offs = AM33XX_CM_WKUP_L4WKUP_CLKCTRL_OFFSET,
|
|
@@ -170,7 +170,7 @@ static struct omap_hwmod am33xx_mpu_hwmo
|
|
.name = "mpu",
|
|
.class = &am33xx_mpu_hwmod_class,
|
|
.clkdm_name = "mpu_clkdm",
|
|
- .flags = (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET),
|
|
+ .flags = HWMOD_INIT_NO_IDLE,
|
|
.main_clk = "dpll_mpu_m2_ck",
|
|
.prcm = {
|
|
.omap4 = {
|
|
@@ -450,7 +450,7 @@ static struct omap_hwmod am33xx_ocmcram_
|
|
.name = "ocmcram",
|
|
.class = &am33xx_ocmcram_hwmod_class,
|
|
.clkdm_name = "l3_clkdm",
|
|
- .flags = (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET),
|
|
+ .flags = HWMOD_INIT_NO_IDLE,
|
|
.main_clk = "l3_gclk",
|
|
.prcm = {
|
|
.omap4 = {
|
|
@@ -532,7 +532,7 @@ static struct omap_hwmod am33xx_control_
|
|
.name = "control",
|
|
.class = &am33xx_control_hwmod_class,
|
|
.clkdm_name = "l4_wkup_clkdm",
|
|
- .flags = (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET),
|
|
+ .flags = HWMOD_INIT_NO_IDLE,
|
|
.main_clk = "dpll_core_m4_div2_ck",
|
|
.prcm = {
|
|
.omap4 = {
|
|
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
|
|
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
|
|
@@ -914,7 +914,7 @@ static struct omap_hwmod omap44xx_emif1_
|
|
.name = "emif1",
|
|
.class = &omap44xx_emif_hwmod_class,
|
|
.clkdm_name = "l3_emif_clkdm",
|
|
- .flags = HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET,
|
|
+ .flags = HWMOD_INIT_NO_IDLE,
|
|
.main_clk = "ddrphy_ck",
|
|
.prcm = {
|
|
.omap4 = {
|
|
@@ -930,7 +930,7 @@ static struct omap_hwmod omap44xx_emif2_
|
|
.name = "emif2",
|
|
.class = &omap44xx_emif_hwmod_class,
|
|
.clkdm_name = "l3_emif_clkdm",
|
|
- .flags = HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET,
|
|
+ .flags = HWMOD_INIT_NO_IDLE,
|
|
.main_clk = "ddrphy_ck",
|
|
.prcm = {
|
|
.omap4 = {
|
|
@@ -2193,7 +2193,7 @@ static struct omap_hwmod omap44xx_mpu_hw
|
|
.name = "mpu",
|
|
.class = &omap44xx_mpu_hwmod_class,
|
|
.clkdm_name = "mpuss_clkdm",
|
|
- .flags = HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET,
|
|
+ .flags = HWMOD_INIT_NO_IDLE,
|
|
.main_clk = "dpll_mpu_m2_ck",
|
|
.prcm = {
|
|
.omap4 = {
|
|
--- a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
|
|
+++ b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
|
|
@@ -352,7 +352,7 @@ static struct omap_hwmod omap54xx_emif1_
|
|
.name = "emif1",
|
|
.class = &omap54xx_emif_hwmod_class,
|
|
.clkdm_name = "emif_clkdm",
|
|
- .flags = HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET,
|
|
+ .flags = HWMOD_INIT_NO_IDLE,
|
|
.main_clk = "dpll_core_h11x2_ck",
|
|
.prcm = {
|
|
.omap4 = {
|
|
@@ -368,7 +368,7 @@ static struct omap_hwmod omap54xx_emif2_
|
|
.name = "emif2",
|
|
.class = &omap54xx_emif_hwmod_class,
|
|
.clkdm_name = "emif_clkdm",
|
|
- .flags = HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET,
|
|
+ .flags = HWMOD_INIT_NO_IDLE,
|
|
.main_clk = "dpll_core_h11x2_ck",
|
|
.prcm = {
|
|
.omap4 = {
|
|
@@ -1135,7 +1135,7 @@ static struct omap_hwmod omap54xx_mpu_hw
|
|
.name = "mpu",
|
|
.class = &omap54xx_mpu_hwmod_class,
|
|
.clkdm_name = "mpu_clkdm",
|
|
- .flags = HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET,
|
|
+ .flags = HWMOD_INIT_NO_IDLE,
|
|
.main_clk = "dpll_mpu_m2_ck",
|
|
.prcm = {
|
|
.omap4 = {
|