From patchwork Wed Nov 7 15:47:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alban Bedel X-Patchwork-Id: 1711341 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 56443DFB7A for ; Wed, 7 Nov 2012 15:49:23 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TW7ql-0003n8-CR; Wed, 07 Nov 2012 15:47:31 +0000 Received: from moutng.kundenserver.de ([212.227.126.171]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TW7qe-0003l5-IG for linux-arm-kernel@lists.infradead.org; Wed, 07 Nov 2012 15:47:25 +0000 Received: from mailbox.adnet.avionic-design.de (mailbox.avionic-design.de [109.75.18.3]) by mrelayeu.kundenserver.de (node=mrbap3) with ESMTP (Nemesis) id 0MAuhQ-1Tg40y498m-009yg1; Wed, 07 Nov 2012 16:47:21 +0100 Received: from localhost (localhost [127.0.0.1]) by mailbox.adnet.avionic-design.de (Postfix) with ESMTP id 6ABED2A28304; Wed, 7 Nov 2012 16:47:20 +0100 (CET) X-Virus-Scanned: amavisd-new at avionic-design.de Received: from mailbox.adnet.avionic-design.de ([127.0.0.1]) by localhost (mailbox.avionic-design.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KgFUNBRCM0um; Wed, 7 Nov 2012 16:47:19 +0100 (CET) Received: from localhost.localdomain (avionic-0020.adnet.avionic-design.de [172.20.31.243]) (Authenticated sender: alban.bedel) by mailbox.adnet.avionic-design.de (Postfix) with ESMTPA id 892C82A282E5; Wed, 7 Nov 2012 16:47:19 +0100 (CET) From: Alban Bedel To: Russell King Subject: [PATCH] lpc32xx: Add the motor PWM clock Date: Wed, 7 Nov 2012 16:47:17 +0100 Message-Id: <1352303237-16052-1-git-send-email-alban.bedel@avionic-design.de> X-Mailer: git-send-email 1.7.0.4 X-Provags-ID: V02:K0:G2eq4xK6mCxbNfkqFj4GFUevvUylkXegLlB5sSpcIaL hznzFMpwEoAKk0QeEUp3Z3cOIpf4DiuGmKKYwsqIk0mg97HTdD QrV8bmBbT63M9cOFy5dOIMQZYGLwCGswUqWOgIYGFSb8kPNiJY GxA106c4dQyUFCCRM46I8jD93Blh3PcxfLOBz1c73b8xNqoGGu Ma7uJl4dT0271UFe4UEyOSCeXw6iDUIBdWrfjLFcZFWEDWjgGL 45wY9Z/rEk4nUasV+M4CKr8I4gBZ6HUJsdrKfiVrZUqZsY28db 0W21cjvRTPmuPWDYV8tPmvniE3HrNBKK991avwmmMJaFzkPYER auWcWkQWK8X8cY6eUMS+67fN566fvpCx/jXJ5jPOmwOyCYXEqd myNQukG/I7O1No0Yg6zLQbVi6MTFUa7NnFBnCU8hDmWLTvq6d0 0Uy7v X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121107_104724_976172_724B9D79 X-CRM114-Status: GOOD ( 10.38 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.126.171 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Roland Stigge , Alban Bedel , linux-arm-kernel@lists.infradead.org, Alexandre Pereira da Silva X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Signed-off-by: Alban Bedel Acked-by: Alexandre Pereira da Silva Acked-by: Roland Stigge --- arch/arm/mach-lpc32xx/clock.c | 8 ++++++++ arch/arm/mach-lpc32xx/include/mach/platform.h | 1 + 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-lpc32xx/clock.c b/arch/arm/mach-lpc32xx/clock.c index f48c2e9..dd5d6f5 100644 --- a/arch/arm/mach-lpc32xx/clock.c +++ b/arch/arm/mach-lpc32xx/clock.c @@ -585,6 +585,13 @@ static struct clk clk_timer3 = { .enable_mask = LPC32XX_CLKPWR_TMRPWMCLK_TIMER3_EN, .get_rate = local_return_parent_rate, }; +static struct clk clk_mpwm = { + .parent = &clk_pclk, + .enable = local_onoff_enable, + .enable_reg = LPC32XX_CLKPWR_TIMERS_PWMS_CLK_CTRL_1, + .enable_mask = LPC32XX_CLKPWR_TMRPWMCLK_MPWM_EN, + .get_rate = local_return_parent_rate, +}; static struct clk clk_wdt = { .parent = &clk_pclk, .enable = local_onoff_enable, @@ -1202,6 +1209,7 @@ static struct clk_lookup lookups[] = { CLKDEV_INIT("pl08xdmac", NULL, &clk_dma), CLKDEV_INIT("4003c000.watchdog", NULL, &clk_wdt), CLKDEV_INIT("4005c000.pwm", NULL, &clk_pwm), + CLKDEV_INIT("400e8000.mpwm", NULL, &clk_mpwm), CLKDEV_INIT(NULL, "uart3_ck", &clk_uart3), CLKDEV_INIT(NULL, "uart4_ck", &clk_uart4), CLKDEV_INIT(NULL, "uart5_ck", &clk_uart5), diff --git a/arch/arm/mach-lpc32xx/include/mach/platform.h b/arch/arm/mach-lpc32xx/include/mach/platform.h index acc4aab..b5612a1 100644 --- a/arch/arm/mach-lpc32xx/include/mach/platform.h +++ b/arch/arm/mach-lpc32xx/include/mach/platform.h @@ -515,6 +515,7 @@ /* * clkpwr_timers_pwms_clk_ctrl_1 register definitions */ +#define LPC32XX_CLKPWR_TMRPWMCLK_MPWM_EN 0x40 #define LPC32XX_CLKPWR_TMRPWMCLK_TIMER3_EN 0x20 #define LPC32XX_CLKPWR_TMRPWMCLK_TIMER2_EN 0x10 #define LPC32XX_CLKPWR_TMRPWMCLK_TIMER1_EN 0x08