Skip to content

Commit

Permalink
OMAP4 clock: drop the ALWAYS_ENABLED clock flag
Browse files Browse the repository at this point in the history
Get rid of the ALWAYS_ENABLED clock flag - it doesn't actually do anything.
(The OMAP4 clock autogeneration scripts have been updated accordingly.)

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Rajendra Nayak <rnayak@ti.com>
Cc: Benoît Cousson <b-cousson@ti.com>
  • Loading branch information
Paul Walmsley committed Feb 24, 2010
1 parent 51c1954 commit 53c92d8
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 12 deletions.
11 changes: 0 additions & 11 deletions arch/arm/mach-omap2/clock44xx_data.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,42 +39,36 @@ static struct clk extalt_clkin_ck = {
.name = "extalt_clkin_ck",
.rate = 59000000,
.ops = &clkops_null,
.flags = ALWAYS_ENABLED,
};

static struct clk pad_clks_ck = {
.name = "pad_clks_ck",
.rate = 12000000,
.ops = &clkops_null,
.flags = ALWAYS_ENABLED,
};

static struct clk pad_slimbus_core_clks_ck = {
.name = "pad_slimbus_core_clks_ck",
.rate = 12000000,
.ops = &clkops_null,
.flags = ALWAYS_ENABLED,
};

static struct clk secure_32k_clk_src_ck = {
.name = "secure_32k_clk_src_ck",
.rate = 32768,
.ops = &clkops_null,
.flags = ALWAYS_ENABLED,
};

static struct clk slimbus_clk = {
.name = "slimbus_clk",
.rate = 12000000,
.ops = &clkops_null,
.flags = ALWAYS_ENABLED,
};

static struct clk sys_32k_ck = {
.name = "sys_32k_ck",
.rate = 32768,
.ops = &clkops_null,
.flags = ALWAYS_ENABLED,
};

static struct clk virt_12000000_ck = {
Expand Down Expand Up @@ -179,35 +173,30 @@ static struct clk sys_clkin_ck = {
.clksel_mask = OMAP4430_SYS_CLKSEL_MASK,
.ops = &clkops_null,
.recalc = &omap2_clksel_recalc,
.flags = ALWAYS_ENABLED,
};

static struct clk utmi_phy_clkout_ck = {
.name = "utmi_phy_clkout_ck",
.rate = 12000000,
.ops = &clkops_null,
.flags = ALWAYS_ENABLED,
};

static struct clk xclk60mhsp1_ck = {
.name = "xclk60mhsp1_ck",
.rate = 12000000,
.ops = &clkops_null,
.flags = ALWAYS_ENABLED,
};

static struct clk xclk60mhsp2_ck = {
.name = "xclk60mhsp2_ck",
.rate = 12000000,
.ops = &clkops_null,
.flags = ALWAYS_ENABLED,
};

static struct clk xclk60motg_ck = {
.name = "xclk60motg_ck",
.rate = 60000000,
.ops = &clkops_null,
.flags = ALWAYS_ENABLED,
};

/* Module clocks and DPLL outputs */
Expand Down
1 change: 0 additions & 1 deletion arch/arm/plat-omap/include/plat/clock.h
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,6 @@ extern const struct clkops clkops_null;
#define CLOCK_NO_IDLE_PARENT (1 << 2)
#define ENABLE_ON_INIT (1 << 3) /* Enable upon framework init */
#define INVERT_ENABLE (1 << 4) /* 0 enables, 1 disables */
#define ALWAYS_ENABLED (1 << 5)

/* Clksel_rate flags */
#define DEFAULT_RATE (1 << 0)
Expand Down

0 comments on commit 53c92d8

Please sign in to comment.