From eaf8c9c19e8136fd1bc0bfcc0655865d81cd1d53 Mon Sep 17 00:00:00 2001 From: Magnus Damm Date: Tue, 11 May 2010 09:36:16 +0000 Subject: [PATCH] --- yaml --- r: 191687 b: refs/heads/master c: 2cf79bea43491722a23b63a6f4e54d3804c10ed6 h: refs/heads/master i: 191685: 71aa45a03a37fc7e4edc3d5d5ab693756eb52234 191683: 6660ab53430d0694f4e86087a7b9331dedbd214c 191679: 8ae52fa276fb804b581046b40ae2f8c554f24cc0 v: v3 --- [refs] | 2 +- trunk/arch/sh/kernel/cpu/sh4a/clock-sh7786.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 3a2293ca3cf2..f13a5e0acdeb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4a81fe625efc8b9122eb4473dab31fa90e07a381 +refs/heads/master: 2cf79bea43491722a23b63a6f4e54d3804c10ed6 diff --git a/trunk/arch/sh/kernel/cpu/sh4a/clock-sh7786.c b/trunk/arch/sh/kernel/cpu/sh4a/clock-sh7786.c index 3ce3b5a69525..105a6d41b569 100644 --- a/trunk/arch/sh/kernel/cpu/sh4a/clock-sh7786.c +++ b/trunk/arch/sh/kernel/cpu/sh4a/clock-sh7786.c @@ -23,8 +23,6 @@ * from the platform code. */ static struct clk extal_clk = { - .name = "extal", - .id = -1, .rate = 33333333, }; @@ -46,8 +44,6 @@ static struct clk_ops pll_clk_ops = { }; static struct clk pll_clk = { - .name = "pll_clk", - .id = -1, .ops = &pll_clk_ops, .parent = &extal_clk, .flags = CLK_ENABLE_ON_INIT, @@ -133,6 +129,10 @@ static struct clk mstp_clks[MSTP_NR] = { #define CLKDEV_CON_ID(_id, _clk) { .con_id = _id, .clk = _clk } static struct clk_lookup lookups[] = { + /* main clocks */ + CLKDEV_CON_ID("extal", &extal_clk), + CLKDEV_CON_ID("pll_clk", &pll_clk), + /* DIV4 clocks */ CLKDEV_CON_ID("peripheral_clk", &div4_clks[DIV4_P]), CLKDEV_CON_ID("du_clk", &div4_clks[DIV4_DU]),