From patchwork Thu Aug 25 03:47:42 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 1095152 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p7P3jbAF013366 for ; Thu, 25 Aug 2011 03:47:45 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751458Ab1HYDro (ORCPT ); Wed, 24 Aug 2011 23:47:44 -0400 Received: from mail-gx0-f174.google.com ([209.85.161.174]:41578 "EHLO mail-gx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750952Ab1HYDro (ORCPT ); Wed, 24 Aug 2011 23:47:44 -0400 Received: by gxk21 with SMTP id 21so1414081gxk.19 for ; Wed, 24 Aug 2011 20:47:43 -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:in-reply-to:references:subject :user-agent:mime-version:content-type; bh=E+RhEHPRD7wMPBZCCY4Jwkj5xv4YW9/NFRKgSyWFhEs=; b=MqFRVByRsz/iCsHXRWUQRJEhgBGkgkeM+ikKHjRBUP0UlG0LX1tT8jzaKxaynv5ZXg MXd/MTPjpWMr10zrLNcqE+TrEsWFiCWyUwXEOrXBRUXA5tVW6ki7HDXflSgiaMG48UT9 NYSbSN1AXCjM+hKRCrVaKlHyrFP4IP1ehOh3o= Received: by 10.231.41.19 with SMTP id m19mr11048640ibe.71.1314244063469; Wed, 24 Aug 2011 20:47:43 -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 p4sm172714icj.5.2011.08.24.20.47.40 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 24 Aug 2011 20:47:42 -0700 (PDT) Date: Wed, 24 Aug 2011 20:47:42 -0700 (PDT) Message-ID: <874o16up7v.wl%kuninori.morimoto.gx@renesas.com> From: kuninori.morimoto.gx@renesas.com To: Magnus Damm , Paul Mundt Cc: Linux-SH , kuninori.morimoto.gx@renesas.com In-Reply-To: References: <87fwkrh6kx.wl%kuninori.morimoto.gx@renesas.com> Subject: [PATCH v2] 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 (demeter2.kernel.org [140.211.167.43]); Thu, 25 Aug 2011 03:47:45 +0000 (UTC) USB-DMAC1 needs SMSTPCR4/MSTP407 controls, not MSTP214 this patch tested on mackerel board Reported-by: Magnus Damm Signed-off-by: Kuninori Morimoto --- v1 -> v2 - tested on mackerel board - fix comment - fix MSTPxxx order 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 d407ca7..725caf1 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), /* USB-DMAC1 */ [MSTP406] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR4, 6, 0), /* USB1 */ [MSTP403] = MSTP(&r_clk, SMSTPCR4, 3, 0), /* KEYSC */ }; @@ -631,7 +632,6 @@ 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-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 */ @@ -653,6 +653,7 @@ static struct clk_lookup lookups[] = { CLKDEV_DEV_ID("sh-mobile-hdmi", &mstp_clks[MSTP413]), /* HDMI */ CLKDEV_DEV_ID("i2c-sh_mobile.3", &mstp_clks[MSTP411]), /* IIC3 */ CLKDEV_DEV_ID("i2c-sh_mobile.4", &mstp_clks[MSTP410]), /* IIC4 */ + CLKDEV_DEV_ID("sh-dma-engine.4", &mstp_clks[MSTP407]), /* USB-DMAC1 */ CLKDEV_DEV_ID("r8a66597_hcd.1", &mstp_clks[MSTP406]), /* USB1 */ CLKDEV_DEV_ID("r8a66597_udc.1", &mstp_clks[MSTP406]), /* USB1 */ CLKDEV_DEV_ID("renesas_usbhs.1", &mstp_clks[MSTP406]), /* USB1 */