From patchwork Wed Oct 13 07:29:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 249821 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9D7RVx0006615 for ; Wed, 13 Oct 2010 07:27:31 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753198Ab0JMH1R (ORCPT ); Wed, 13 Oct 2010 03:27:17 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:48259 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753207Ab0JMH1O (ORCPT ); Wed, 13 Oct 2010 03:27:14 -0400 Received: by pzk34 with SMTP id 34so1425053pzk.19 for ; Wed, 13 Oct 2010 00:27:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:date:message-id :subject; bh=v97sCL+f0Eh7mXMa2uaTTt2M/fDVs+lsbcnUdDijiyw=; b=FUcxpjI9bP1YXoKrnhTbmnc9Veyw0wuygV6oC0c51xA/NylvOaTEZGV5M7b/NUCawB q10f+jkQnPLKwxFKTVbFFvAqQ2PapMjZTeIozIoQmDFmPsF083CBZjD5f/OYQBeeYqLJ 4/GNvqwPRqnh6zD6lDYcbk+iWDMgt/JO70zGI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:date:message-id:subject; b=LfdMga5WpFIDB+j44tCIWjR1vc0AdVB/cM/KVDSixZp/7trL5Ce/j/SXQkZ5APN6Vs V+dYJ+zhCSjz5dk3OIq0OkSnEf6Xu6VdtFulSuMtKYZCPJ61BzcQNyd2rYcNtiixEfaW xjIkERwLO5x7gGwVXVMXMpPwo1MYEq+tJVbIo= Received: by 10.142.72.16 with SMTP id u16mr4981858wfa.389.1286954833589; Wed, 13 Oct 2010 00:27:13 -0700 (PDT) Received: from [127.0.0.1] (49.14.32.202.bf.2iij.net [202.32.14.49]) by mx.google.com with ESMTPS id y42sm4756658wfd.22.2010.10.13.00.27.12 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 13 Oct 2010 00:27:12 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: Magnus Damm , lethal@linux-sh.org Date: Wed, 13 Oct 2010 16:29:31 +0900 Message-Id: <20101013072931.19736.93158.sendpatchset@t400s> Subject: [PATCH] ARM: shmobile: use device name for timer clocks 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.3 (demeter1.kernel.org [140.211.167.41]); Wed, 13 Oct 2010 07:27:31 +0000 (UTC) --- 0001/arch/arm/mach-shmobile/clock-sh7367.c +++ work/arch/arm/mach-shmobile/clock-sh7367.c 2010-10-13 15:40:25.000000000 +0900 @@ -321,7 +321,7 @@ static struct clk_lookup lookups[] = { CLKDEV_DEV_ID("sh-sci.3", &mstp_clks[SYMSTP001]), /* SCIFA3 */ CLKDEV_DEV_ID("sh-sci.4", &mstp_clks[SYMSTP000]), /* SCIFA4 */ CLKDEV_DEV_ID("sh_siu", &mstp_clks[SYMSTP231]), /* SIU */ - CLKDEV_CON_ID("cmt1", &mstp_clks[SYMSTP229]), /* CMT10 */ + CLKDEV_DEV_ID("sh_cmt.10", &mstp_clks[SYMSTP229]), /* CMT10 */ CLKDEV_DEV_ID("sh_irda", &mstp_clks[SYMSTP225]), /* IRDA */ CLKDEV_DEV_ID("i2c-sh_mobile.1", &mstp_clks[SYMSTP223]), /* IIC1 */ CLKDEV_DEV_ID("r8a66597_hcd.0", &mstp_clks[SYMSTP222]), /* USBHS */ --- 0001/arch/arm/mach-shmobile/clock-sh7372.c +++ work/arch/arm/mach-shmobile/clock-sh7372.c 2010-10-13 15:40:00.000000000 +0900 @@ -516,7 +516,7 @@ static struct clk_lookup lookups[] = { CLKDEV_DEV_ID("sh-sci.2", &mstp_clks[MSTP202]), /* SCIFA2 */ CLKDEV_DEV_ID("sh-sci.3", &mstp_clks[MSTP201]), /* SCIFA3 */ CLKDEV_DEV_ID("sh-sci.4", &mstp_clks[MSTP200]), /* SCIFA4 */ - CLKDEV_CON_ID("cmt1", &mstp_clks[MSTP329]), /* CMT10 */ + CLKDEV_DEV_ID("sh_cmt.10", &mstp_clks[MSTP329]), /* CMT10 */ CLKDEV_DEV_ID("sh_fsi2", &mstp_clks[MSTP328]), /* FSI2 */ CLKDEV_DEV_ID("i2c-sh_mobile.1", &mstp_clks[MSTP323]), /* IIC1 */ CLKDEV_DEV_ID("r8a66597_hcd.0", &mstp_clks[MSTP323]), /* USB0 */ --- 0001/arch/arm/mach-shmobile/clock-sh7377.c +++ work/arch/arm/mach-shmobile/clock-sh7377.c 2010-10-13 15:40:45.000000000 +0900 @@ -333,7 +333,7 @@ static struct clk_lookup lookups[] = { CLKDEV_DEV_ID("sh-sci.3", &mstp_clks[MSTP201]), /* SCIFA3 */ CLKDEV_DEV_ID("sh-sci.4", &mstp_clks[MSTP200]), /* SCIFA4 */ CLKDEV_DEV_ID("sh-sci.6", &mstp_clks[MSTP331]), /* SCIFA6 */ - CLKDEV_CON_ID("cmt1", &mstp_clks[MSTP329]), /* CMT10 */ + CLKDEV_DEV_ID("sh_cmt.10", &mstp_clks[MSTP329]), /* CMT10 */ CLKDEV_DEV_ID("sh_irda", &mstp_clks[MSTP325]), /* IRDA */ CLKDEV_DEV_ID("i2c-sh_mobile.1", &mstp_clks[MSTP323]), /* IIC1 */ CLKDEV_DEV_ID("r8a66597_hcd.0", &mstp_clks[MSTP322]), /* USBHS */ --- 0001/arch/arm/mach-shmobile/setup-sh7367.c +++ work/arch/arm/mach-shmobile/setup-sh7367.c 2010-10-13 15:41:04.000000000 +0900 @@ -154,7 +154,6 @@ static struct sh_timer_config cmt10_plat .name = "CMT10", .channel_offset = 0x10, .timer_bit = 0, - .clk = "r_clk", .clockevent_rating = 125, .clocksource_rating = 125, }; --- 0008/arch/arm/mach-shmobile/setup-sh7372.c +++ work/arch/arm/mach-shmobile/setup-sh7372.c 2010-10-13 15:41:29.000000000 +0900 @@ -159,7 +159,6 @@ static struct sh_timer_config cmt10_plat .name = "CMT10", .channel_offset = 0x10, .timer_bit = 0, - .clk = "cmt1", .clockevent_rating = 125, .clocksource_rating = 125, }; --- 0001/arch/arm/mach-shmobile/setup-sh7377.c +++ work/arch/arm/mach-shmobile/setup-sh7377.c 2010-10-13 15:41:10.000000000 +0900 @@ -172,7 +172,6 @@ static struct sh_timer_config cmt10_plat .name = "CMT10", .channel_offset = 0x10, .timer_bit = 0, - .clk = "r_clk", .clockevent_rating = 125, .clocksource_rating = 125, };