diff options
| -rw-r--r-- | arch/arm/mach-mxs/clock.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mxs/include/mach/clock.h | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-mxs/clock.c b/arch/arm/mach-mxs/clock.c index e7d2269cf70..a7093c88e6a 100644 --- a/arch/arm/mach-mxs/clock.c +++ b/arch/arm/mach-mxs/clock.c | |||
| @@ -57,7 +57,6 @@ static void __clk_disable(struct clk *clk) | |||
| 57 | if (clk->disable) | 57 | if (clk->disable) |
| 58 | clk->disable(clk); | 58 | clk->disable(clk); |
| 59 | __clk_disable(clk->parent); | 59 | __clk_disable(clk->parent); |
| 60 | __clk_disable(clk->secondary); | ||
| 61 | } | 60 | } |
| 62 | } | 61 | } |
| 63 | 62 | ||
| @@ -68,7 +67,6 @@ static int __clk_enable(struct clk *clk) | |||
| 68 | 67 | ||
| 69 | if (clk->usecount++ == 0) { | 68 | if (clk->usecount++ == 0) { |
| 70 | __clk_enable(clk->parent); | 69 | __clk_enable(clk->parent); |
| 71 | __clk_enable(clk->secondary); | ||
| 72 | 70 | ||
| 73 | if (clk->enable) | 71 | if (clk->enable) |
| 74 | clk->enable(clk); | 72 | clk->enable(clk); |
diff --git a/arch/arm/mach-mxs/include/mach/clock.h b/arch/arm/mach-mxs/include/mach/clock.h index 041e276d8a3..592c9ab5d76 100644 --- a/arch/arm/mach-mxs/include/mach/clock.h +++ b/arch/arm/mach-mxs/include/mach/clock.h | |||
| @@ -29,8 +29,6 @@ struct clk { | |||
| 29 | int id; | 29 | int id; |
| 30 | /* Source clock this clk depends on */ | 30 | /* Source clock this clk depends on */ |
| 31 | struct clk *parent; | 31 | struct clk *parent; |
| 32 | /* Secondary clock to enable/disable with this clock */ | ||
| 33 | struct clk *secondary; | ||
| 34 | /* Reference count of clock enable/disable */ | 32 | /* Reference count of clock enable/disable */ |
| 35 | __s8 usecount; | 33 | __s8 usecount; |
| 36 | /* Register bit position for clock's enable/disable control. */ | 34 | /* Register bit position for clock's enable/disable control. */ |