From patchwork Mon Mar 7 19:51:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Franklin Cooper X-Patchwork-Id: 8522731 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5E2A39F2B4 for ; Mon, 7 Mar 2016 19:53:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 74CB1202B8 for ; Mon, 7 Mar 2016 19:53:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 92E152015E for ; Mon, 7 Mar 2016 19:53:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932081AbcCGTx3 (ORCPT ); Mon, 7 Mar 2016 14:53:29 -0500 Received: from mail-pa0-f65.google.com ([209.85.220.65]:36392 "EHLO mail-pa0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753307AbcCGTwL (ORCPT ); Mon, 7 Mar 2016 14:52:11 -0500 Received: by mail-pa0-f65.google.com with SMTP id 1so2599473pal.3; Mon, 07 Mar 2016 11:52:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=FFrH7fQCnKK2cgHcEs4VXSxjzM+EmAvRvQlEs5PsiQ8=; b=B8/giiBA7rs+llacNYLXPHbgwTERAC8wWO/skyeGCwM6aRqrjdndYsPD4PQN5MtqQy cXa5/yT+gOu/GsWMZ7Lh4erdVnrl1ZKKun9WNTR33X4U7AKl0oH4JA6VoS+Z+ClVTgSQ AllBPdORyQLXfFBP7mtRE5SNLuoCYVl6GR5Ab59bhZ86r1FjArioN02JLzTZC4M+3MFZ 9jTyisOMl87lsrF7tv9D59+aOS5wGWH2hZJtlv2v4tAkYKi/TxNgIOCcnTpIiin9KMt5 7xFNZZzmPIHxEismMLBwNqUqwZbI0tb+Iphm+lOUkkyj83mwsYdraoA4FN3y9E5Jkya0 FJtw== X-Gm-Message-State: AD7BkJL2CahNRrLo7VyNUUzD0r8yskhSdABXCLeVnrwe+OTydTGvmnOLoKKudFDtuZqYQQ== X-Received: by 10.66.146.196 with SMTP id te4mr35931252pab.125.1457380330833; Mon, 07 Mar 2016 11:52:10 -0800 (PST) Received: from beast-server.fios-router.home (pool-173-57-21-86.dllstx.fios.verizon.net. [173.57.21.86]) by smtp.gmail.com with ESMTPSA id wq3sm5833033pac.44.2016.03.07.11.52.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 07 Mar 2016 11:52:10 -0800 (PST) From: Franklin S Cooper Jr To: thierry.reding@gmail.com, robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com, ijc+devicetree@hellion.org.uk, galak@codeaurora.org, bcousson@baylibre.com, tony@atomide.com, linux@arm.linux.org.uk, t-kristo@ti.com, mturquette@baylibre.com, sboyd@codeaurora.org, linux-pwm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org Cc: Franklin S Cooper Jr Subject: [PATCH 1/5] clk: ti: am335x/am4372: Add tbclk to pwm node Date: Mon, 7 Mar 2016 13:51:54 -0600 Message-Id: <1457380318-15452-2-git-send-email-fcooper@ti.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1457380318-15452-1-git-send-email-fcooper@ti.com> References: <1457380318-15452-1-git-send-email-fcooper@ti.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add tblck to the pwm nodes. This insures that the ehrpwm driver has access to the time-based clk. Do not remove similar entries for ehrpwm node. Later patches will switch from using ehrpwm node name to pwm. But to maintain ABI compatibility we shouldn't remove the old entries. Signed-off-by: Franklin S Cooper Jr Acked-by: Stephen Boyd --- drivers/clk/ti/clk-33xx.c | 3 +++ drivers/clk/ti/clk-43xx.c | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/drivers/clk/ti/clk-33xx.c b/drivers/clk/ti/clk-33xx.c index ef2ec64..0e47d95 100644 --- a/drivers/clk/ti/clk-33xx.c +++ b/drivers/clk/ti/clk-33xx.c @@ -108,6 +108,9 @@ static struct ti_dt_clk am33xx_clks[] = { DT_CLK("48300200.ehrpwm", "tbclk", "ehrpwm0_tbclk"), DT_CLK("48302200.ehrpwm", "tbclk", "ehrpwm1_tbclk"), DT_CLK("48304200.ehrpwm", "tbclk", "ehrpwm2_tbclk"), + DT_CLK("48300200.pwm", "tbclk", "ehrpwm0_tbclk"), + DT_CLK("48302200.pwm", "tbclk", "ehrpwm1_tbclk"), + DT_CLK("48304200.pwm", "tbclk", "ehrpwm2_tbclk"), { .node_name = NULL }, }; diff --git a/drivers/clk/ti/clk-43xx.c b/drivers/clk/ti/clk-43xx.c index 097fc90..7255aa8 100644 --- a/drivers/clk/ti/clk-43xx.c +++ b/drivers/clk/ti/clk-43xx.c @@ -115,6 +115,12 @@ static struct ti_dt_clk am43xx_clks[] = { DT_CLK("48306200.ehrpwm", "tbclk", "ehrpwm3_tbclk"), DT_CLK("48308200.ehrpwm", "tbclk", "ehrpwm4_tbclk"), DT_CLK("4830a200.ehrpwm", "tbclk", "ehrpwm5_tbclk"), + DT_CLK("48300200.pwm", "tbclk", "ehrpwm0_tbclk"), + DT_CLK("48302200.pwm", "tbclk", "ehrpwm1_tbclk"), + DT_CLK("48304200.pwm", "tbclk", "ehrpwm2_tbclk"), + DT_CLK("48306200.pwm", "tbclk", "ehrpwm3_tbclk"), + DT_CLK("48308200.pwm", "tbclk", "ehrpwm4_tbclk"), + DT_CLK("4830a200.pwm", "tbclk", "ehrpwm5_tbclk"), { .node_name = NULL }, };