From patchwork Fri Apr 22 16:40:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Franklin Cooper X-Patchwork-Id: 8914101 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id F0FCFBF29F for ; Fri, 22 Apr 2016 16:42:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1B6BA20270 for ; Fri, 22 Apr 2016 16:42:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 307EE202BE for ; Fri, 22 Apr 2016 16:42:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932107AbcDVQmi (ORCPT ); Fri, 22 Apr 2016 12:42:38 -0400 Received: from mail-io0-f194.google.com ([209.85.223.194]:33126 "EHLO mail-io0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753915AbcDVQkq (ORCPT ); Fri, 22 Apr 2016 12:40:46 -0400 Received: by mail-io0-f194.google.com with SMTP id x35so3984325ioi.0; Fri, 22 Apr 2016 09:40:46 -0700 (PDT) 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=I+IzWANhpnJKd6nnTbGEBq+p2VlHxXV+4xx7oX6xz0E=; b=bv1ebj+WImvLXie5NKbgjDH9Uh65kD2Dlpi6ePnJhWVo2HVMPTgdEM8k60tokEnaPe Chi0H2ee1g1j1cpmqOgnoLFdivZYvFrY+OI/doY+GdvR98aQ1H0ZeHNV0H8ARhDGBv4l UL0uiWr1UZBsXbjm/TE/6fUYSIKaXGGeFzJIgNU8KxgPKujoqK6mZJPUjJQ/3Ez21Pk4 zaX/4YSnulLnq4TJ24JTupNNnxSBjl+PqJx8fCgNSUTdjEX3+O0c10VI8niRtt9SUAJ/ q14ONTzsJ31TOPNh39YqMqfzFC+84cKO0ge7YeXrGWvCY6gJZTSGUzeb7qaSpYMCwVc7 hBOg== X-Gm-Message-State: AOPr4FXDXkJKCCdfT/eXZhvXTFqLuvPO+4K5orGA6dPYfab6AglhvIrPWejIfloNFr7kzg== X-Received: by 10.107.29.132 with SMTP id d126mr25081481iod.14.1461343245610; Fri, 22 Apr 2016 09:40:45 -0700 (PDT) Received: from beast-server.fios-router.home ([173.64.219.161]) by smtp.gmail.com with ESMTPSA id e130sm4365781iof.17.2016.04.22.09.40.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 22 Apr 2016 09:40:44 -0700 (PDT) From: Franklin S Cooper Jr To: thierry.reding@gmail.com, tony@atomide.com, paul@pwsan.com, t-kristo@ti.com, linux-pwm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org, robh+dt@kernel.org, devicetree@vger.kernel.org, vigneshr@ti.com, nsekhar@ti.com Cc: Franklin S Cooper Jr Subject: [PATCH v6 1/7] clk: ti: am335x/am4372: Add tbclk to pwm node Date: Fri, 22 Apr 2016 11:40:32 -0500 Message-Id: <1461343238-29274-2-git-send-email-fcooper@ti.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1461343238-29274-1-git-send-email-fcooper@ti.com> References: <1461343238-29274-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=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 }, };