From: Stephen Rothwell Date: Tue, 26 Jul 2011 01:56:38 +0000 (+1000) Subject: Merge remote-tracking branch 'rmobile/rmobile-latest' X-Git-Tag: next-20110726~71 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1ecc81ab94b3af1fd05e971bb3baf1e6609f988e;p=karo-tx-linux.git Merge remote-tracking branch 'rmobile/rmobile-latest' --- 1ecc81ab94b3af1fd05e971bb3baf1e6609f988e diff --cc arch/arm/mach-shmobile/clock-sh7372.c index 6b1619a65dba,59a8f4cde108..dc8c899aa5eb --- a/arch/arm/mach-shmobile/clock-sh7372.c +++ b/arch/arm/mach-shmobile/clock-sh7372.c @@@ -559,8 -558,13 +558,9 @@@ static struct clk mstp_clks[MSTP_NR] = [MSTP410] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR4, 10, 0), /* IIC4 */ [MSTP406] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR4, 6, 0), /* USB1 */ [MSTP403] = MSTP(&r_clk, SMSTPCR4, 3, 0), /* KEYSC */ + [MSTP400] = MSTP(&r_clk, SMSTPCR4, 0, 0), /* CMT2 */ }; -#define CLKDEV_CON_ID(_id, _clk) { .con_id = _id, .clk = _clk } -#define CLKDEV_DEV_ID(_id, _clk) { .dev_id = _id, .clk = _clk } -#define CLKDEV_ICK_ID(_cid, _did, _clk) { .con_id = _cid, .dev_id = _did, .clk = _clk } - static struct clk_lookup lookups[] = { /* main clocks */ CLKDEV_CON_ID("dv_clki_div2_clk", &sh7372_dv_clki_div2_clk),