From c1d300f36572f20b0eced5fb939815e6382dc8d8 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Sun, 1 Apr 2012 18:46:09 -0700 Subject: [PATCH] --- yaml --- r: 303263 b: refs/heads/master c: 7ee8948d158946e52ea21562f2ceef268439f36e h: refs/heads/master i: 303261: 633398e606ea0e3448fa57d9c84e452b5bd2d7cc 303259: 587c7faff13cff2fe0d619df7eef5c94032f1763 303255: 05e9f0d478047c73f208974ff82f9034ff380eaf 303247: d129770a867210435648255f937264dee9858a4c 303231: 3f8fc7f0b30637d00b4e8b7a2c4939b7a2a1d2c5 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-shmobile/clock-r8a7740.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0cbc09eab790..ba357696f5b5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4228716c87f7915410721952bad3e568fb5f2431 +refs/heads/master: 7ee8948d158946e52ea21562f2ceef268439f36e diff --git a/trunk/arch/arm/mach-shmobile/clock-r8a7740.c b/trunk/arch/arm/mach-shmobile/clock-r8a7740.c index 99c4d743a99c..b6fa1b77a15b 100644 --- a/trunk/arch/arm/mach-shmobile/clock-r8a7740.c +++ b/trunk/arch/arm/mach-shmobile/clock-r8a7740.c @@ -257,7 +257,7 @@ enum { MSTP222, MSTP207, MSTP206, MSTP204, MSTP203, MSTP202, MSTP201, MSTP200, - MSTP329, MSTP323, + MSTP329, MSTP328, MSTP323, MSTP_NR }; @@ -280,6 +280,7 @@ static struct clk mstp_clks[MSTP_NR] = { [MSTP200] = SH_CLK_MSTP32(&div6_clks[DIV6_SUB], SMSTPCR2, 0, 0), /* SCIFA4 */ [MSTP329] = SH_CLK_MSTP32(&r_clk, SMSTPCR3, 29, 0), /* CMT10 */ + [MSTP328] = SH_CLK_MSTP32(&div4_clks[DIV4_HP], SMSTPCR3, 28, 0), /* FSI */ [MSTP323] = SH_CLK_MSTP32(&div6_clks[DIV6_SUB], SMSTPCR3, 23, 0), /* IIC1 */ }; @@ -334,6 +335,7 @@ static struct clk_lookup lookups[] = { CLKDEV_DEV_ID("sh-sci.6", &mstp_clks[MSTP230]), CLKDEV_DEV_ID("sh_cmt.10", &mstp_clks[MSTP329]), + CLKDEV_DEV_ID("sh_fsi2", &mstp_clks[MSTP328]), CLKDEV_DEV_ID("i2c-sh_mobile.1", &mstp_clks[MSTP323]), };