From patchwork Tue Mar 8 01:23:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Franklin Cooper X-Patchwork-Id: 8528301 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 DFB14C0553 for ; Tue, 8 Mar 2016 01:25:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 048022017E for ; Tue, 8 Mar 2016 01:25:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 06F3020148 for ; Tue, 8 Mar 2016 01:25:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753916AbcCHBYR (ORCPT ); Mon, 7 Mar 2016 20:24:17 -0500 Received: from mail-pf0-f194.google.com ([209.85.192.194]:33101 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753594AbcCHBYE (ORCPT ); Mon, 7 Mar 2016 20:24:04 -0500 Received: by mail-pf0-f194.google.com with SMTP id 63so86465pfe.0; Mon, 07 Mar 2016 17:24:03 -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=0QGjBhQRatP8AmuDAMm0+malTN9mcC2klPTAezO5J3o=; b=dqNFXxQPYWLdjH48GthILGsui6z/QvvUg7JMnRwFrgPLNo7nEQGyY9kmDVAi5TKK62 vTWDht1T7BCW7db3K9FYKJRdh0T8E9hivw3OFlKJFcCE0W1aI5p06wwM8Aw4fZfiyBPC UcMhXT1QRFYxRonwWwc1f1IuIXWEkRkYjKgjjGeHPsPMbnLEMgPpuYEfnu30r2Z7tZWM rCJZ5CD3m1UTyY+Ozq6NfIXQ42GBXR3S7b5XJHUbkU3H/5KLjMezhj1qjQjE5hwN6wjX ssrjEC3M+sk1d4V3aVj4TdjDeIxOKo9evQ6BTxiS3DH7Y7yMnQvtF0VeqcsQarOrigLs iWAg== X-Gm-Message-State: AD7BkJI3XRasOUeevoBvM7aT8U5BhKQJVAATUiudHmRo954FEYmiy6IlNKDgV8spJQWHcQ== X-Received: by 10.98.73.142 with SMTP id r14mr38097507pfi.140.1457400243389; Mon, 07 Mar 2016 17:24:03 -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 82sm294823pfi.78.2016.03.07.17.24.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 07 Mar 2016 17:24:02 -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, paul@pwsan.com, 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, vigneshr@ti.com Cc: Franklin S Cooper Jr Subject: [PATCH v5 2/6] ARM: dts: am437x/am33xx: Remove eCAP and ePWM hwmod properties Date: Mon, 7 Mar 2016 19:23:40 -0600 Message-Id: <1457400224-24797-3-git-send-email-fcooper@ti.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1457400224-24797-1-git-send-email-fcooper@ti.com> References: <1457400224-24797-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 ECAP and ePWM do not have OCP integration registers, have L3/L4 ports, etc. Therefore, they shouldn't be using hwmod at all. Remove their hwmod properties. For ePWM add the tbclk to the node rather than depending on hwmod to do so. Signed-off-by: Franklin S Cooper Jr --- arch/arm/boot/dts/am33xx.dtsi | 12 ++++++------ arch/arm/boot/dts/am4372.dtsi | 21 ++++++++++++--------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi index 82c0976..1dd6c78 100644 --- a/arch/arm/boot/dts/am33xx.dtsi +++ b/arch/arm/boot/dts/am33xx.dtsi @@ -682,7 +682,6 @@ reg = <0x48300100 0x80>; interrupts = <31>; interrupt-names = "ecap0"; - ti,hwmods = "ecap0"; status = "disabled"; }; @@ -690,7 +689,8 @@ compatible = "ti,am33xx-ehrpwm"; #pwm-cells = <3>; reg = <0x48300200 0x80>; - ti,hwmods = "ehrpwm0"; + clocks = <&ehrpwm0_tbclk>; + clock-names = "tbclk"; status = "disabled"; }; }; @@ -710,7 +710,6 @@ reg = <0x48302100 0x80>; interrupts = <47>; interrupt-names = "ecap1"; - ti,hwmods = "ecap1"; status = "disabled"; }; @@ -718,7 +717,8 @@ compatible = "ti,am33xx-ehrpwm"; #pwm-cells = <3>; reg = <0x48302200 0x80>; - ti,hwmods = "ehrpwm1"; + clocks = <&ehrpwm1_tbclk>; + clock-names = "tbclk"; status = "disabled"; }; }; @@ -738,7 +738,6 @@ reg = <0x48304100 0x80>; interrupts = <61>; interrupt-names = "ecap2"; - ti,hwmods = "ecap2"; status = "disabled"; }; @@ -746,7 +745,8 @@ compatible = "ti,am33xx-ehrpwm"; #pwm-cells = <3>; reg = <0x48304200 0x80>; - ti,hwmods = "ehrpwm2"; + clocks = <&ehrpwm2_tbclk>; + clock-names = "tbclk"; status = "disabled"; }; }; diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi index 33f417c..685c8db 100644 --- a/arch/arm/boot/dts/am4372.dtsi +++ b/arch/arm/boot/dts/am4372.dtsi @@ -675,7 +675,6 @@ compatible = "ti,am4372-ecap","ti,am33xx-ecap"; #pwm-cells = <3>; reg = <0x48300100 0x80>; - ti,hwmods = "ecap0"; status = "disabled"; }; @@ -683,7 +682,8 @@ compatible = "ti,am4372-ehrpwm","ti,am33xx-ehrpwm"; #pwm-cells = <3>; reg = <0x48300200 0x80>; - ti,hwmods = "ehrpwm0"; + clocks = <&ehrpwm0_tbclk>; + clock-names = "tbclk"; status = "disabled"; }; }; @@ -701,7 +701,6 @@ compatible = "ti,am4372-ecap","ti,am33xx-ecap"; #pwm-cells = <3>; reg = <0x48302100 0x80>; - ti,hwmods = "ecap1"; status = "disabled"; }; @@ -709,7 +708,8 @@ compatible = "ti,am4372-ehrpwm","ti,am33xx-ehrpwm"; #pwm-cells = <3>; reg = <0x48302200 0x80>; - ti,hwmods = "ehrpwm1"; + clocks = <&ehrpwm1_tbclk>; + clock-names = "tbclk"; status = "disabled"; }; }; @@ -727,7 +727,6 @@ compatible = "ti,am4372-ecap","ti,am33xx-ecap"; #pwm-cells = <3>; reg = <0x48304100 0x80>; - ti,hwmods = "ecap2"; status = "disabled"; }; @@ -735,7 +734,8 @@ compatible = "ti,am4372-ehrpwm","ti,am33xx-ehrpwm"; #pwm-cells = <3>; reg = <0x48304200 0x80>; - ti,hwmods = "ehrpwm2"; + clocks = <&ehrpwm2_tbclk>; + clock-names = "tbclk"; status = "disabled"; }; }; @@ -753,7 +753,8 @@ compatible = "ti,am4372-ehrpwm","ti,am33xx-ehrpwm"; #pwm-cells = <3>; reg = <0x48306200 0x80>; - ti,hwmods = "ehrpwm3"; + clocks = <&ehrpwm3_tbclk>; + clock-names = "tbclk"; status = "disabled"; }; }; @@ -771,7 +772,8 @@ compatible = "ti,am4372-ehrpwm","ti,am33xx-ehrpwm"; #pwm-cells = <3>; reg = <0x48308200 0x80>; - ti,hwmods = "ehrpwm4"; + clocks = <&ehrpwm4_tbclk>; + clock-names = "tbclk"; status = "disabled"; }; }; @@ -789,7 +791,8 @@ compatible = "ti,am4372-ehrpwm","ti,am33xx-ehrpwm"; #pwm-cells = <3>; reg = <0x4830a200 0x80>; - ti,hwmods = "ehrpwm5"; + clocks = <&ehrpwm5_tbclk>; + clock-names = "tbclk"; status = "disabled"; }; };