From patchwork Wed Aug 24 02:44:02 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 1090612 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p7O2i5FV025686 for ; Wed, 24 Aug 2011 02:44:06 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755850Ab1HXCoF (ORCPT ); Tue, 23 Aug 2011 22:44:05 -0400 Received: from mail-gx0-f174.google.com ([209.85.161.174]:47485 "EHLO mail-gx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754738Ab1HXCoD (ORCPT ); Tue, 23 Aug 2011 22:44:03 -0400 Received: by gxk21 with SMTP id 21so580005gxk.19 for ; Tue, 23 Aug 2011 19:44:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=date:sender:message-id:from:to:cc:subject:user-agent:mime-version :content-type; bh=/T2EmjxX5cWtyHjWfmgXXd9NsMo8LZmb0+og2BKoayc=; b=lLnmxXWZEQxltqXOGLNGrwejfiP22ey6lAgtJbuq27RJAViX6D6eeohKSgt82eeefm DKbY1uWFiL+Oy0Pcr9gIbGHHL2d1GcnyukRJWMFDZ35joCChuFTMLEbGbrMAaJ07pvNk GzP8bnZnB4T0fF4mPZlzpjKSgZnQoVB+v+OvQ= Received: by 10.150.238.1 with SMTP id l1mr4333026ybh.314.1314153843136; Tue, 23 Aug 2011 19:44:03 -0700 (PDT) Received: from morimoto-Dell-XPS420.gmail.com (49.14.32.202.bf.2iij.net [202.32.14.49]) by mx.google.com with ESMTPS id x42sm776666yhm.65.2011.08.23.19.44.01 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 23 Aug 2011 19:44:02 -0700 (PDT) Date: Tue, 23 Aug 2011 19:44:02 -0700 (PDT) Message-ID: <87fwkrh6kx.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Paul Mundt Cc: Morimoto , Magnus , Linux-SH Subject: [PATCH] ARM: mach-shmobile: clock-sh7372: fixup USB-DMAC1 settings User-Agent: SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?ISO-2022-JP-2?B?R29q?= =?ISO-2022-JP-2?B?GyQoRCtXGyhC?=) APEL/10.8 Emacs/23.2 (i686-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 24 Aug 2011 02:44:06 +0000 (UTC) USB-DMAC1 needs SMSTPCR4/MSTP407 controls, not MSTP214 Reported-by: Magnus Damm Signed-off-by: Kuninori Morimoto --- Paul It is based on paul/rmobile/dma branch arch/arm/mach-shmobile/clock-sh7372.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-shmobile/clock-sh7372.c b/arch/arm/mach-shmobile/clock-sh7372.c index c239ab1..3f8de2c 100644 --- a/arch/arm/mach-shmobile/clock-sh7372.c +++ b/arch/arm/mach-shmobile/clock-sh7372.c @@ -512,7 +512,7 @@ enum { MSTP001, MSTP214, MSTP218, MSTP217, MSTP216, MSTP207, MSTP206, MSTP204, MSTP203, MSTP202, MSTP201, MSTP200, MSTP329, MSTP328, MSTP323, MSTP322, MSTP314, MSTP313, MSTP312, - MSTP423, MSTP415, MSTP413, MSTP411, MSTP410, MSTP406, MSTP403, + MSTP423, MSTP415, MSTP413, MSTP411, MSTP410, MSTP407, MSTP406, MSTP403, MSTP_NR }; #define MSTP(_parent, _reg, _bit, _flags) \ @@ -558,6 +558,7 @@ static struct clk mstp_clks[MSTP_NR] = { [MSTP413] = MSTP(&pllc1_div2_clk, SMSTPCR4, 13, 0), /* HDMI */ [MSTP411] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR4, 11, 0), /* IIC3 */ [MSTP410] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR4, 10, 0), /* IIC4 */ + [MSTP407] = MSTP(&div4_clks[DIV4_HP], SMSTPCR4, 7, 0), /* USBDMAC */ [MSTP406] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR4, 6, 0), /* USB1 */ [MSTP403] = MSTP(&r_clk, SMSTPCR4, 3, 0), /* KEYSC */ }; @@ -635,7 +636,7 @@ static struct clk_lookup lookups[] = { CLKDEV_DEV_ID("sh-dma-engine.1", &mstp_clks[MSTP217]), /* DMAC2 */ CLKDEV_DEV_ID("sh-dma-engine.2", &mstp_clks[MSTP216]), /* DMAC3 */ CLKDEV_DEV_ID("sh-dma-engine.3", &mstp_clks[MSTP214]), /* USB-DMAC0 */ - CLKDEV_DEV_ID("sh-dma-engine.4", &mstp_clks[MSTP214]), /* USB-DMAC1 */ + CLKDEV_DEV_ID("sh-dma-engine.4", &mstp_clks[MSTP407]), /* USB-DMAC1 */ CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP207]), /* SCIFA5 */ CLKDEV_DEV_ID("sh-sci.6", &mstp_clks[MSTP206]), /* SCIFB */ CLKDEV_DEV_ID("sh-sci.0", &mstp_clks[MSTP204]), /* SCIFA0 */