From patchwork Wed Jun 24 13:59:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 50274 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5E94521575 for ; Wed, 24 Jun 2015 14:00:57 +0000 (UTC) Received: by laer2 with SMTP id r2sf11353440lae.3 for ; Wed, 24 Jun 2015 07:00:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=C+ne/r0cIsyypC6TLZ7js8aGYjkCXpkHa7mj9pN0xDQ=; b=ahBX2cK76kQ08SggFQjT62vNTP3Gyr1hAK65TIpXjc1M1aozM5/wEIDPFh6F1mn/wG 9GWDcCUsctw/7OjMXu0eNLj2b78NqoDnuzwsOnAYLwb0eDjGRaYyAkS33alSmf97rt9N SBpWfJqgtbPAWSK9tqy22KypShJchfK+z3Da+6pvpQlFP43ebsY90bqjeTYbARhmWyyP HAuifHBKMep+OcxCXgoXqmcfP/c4c3YR93st8Uy6NhgQngNohdCPaku13Tybt26F1gpS H3S4FCg9OTnbwmm7RRW40v9LmFL1JGkHAmyHNmOSzoJO54S0uNTENuo01qzBsNbqf26R x1MA== X-Gm-Message-State: ALoCoQnL0WHVOQcqBgAmbNqGoHe0V0PvK4/kq/1/qIbIxHxkWktDK/K5PD4Aq9kzGFXBRt5+ByhV X-Received: by 10.194.5.229 with SMTP id v5mr27871983wjv.0.1435154456081; Wed, 24 Jun 2015 07:00:56 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.203.197 with SMTP id ks5ls190428lac.64.gmail; Wed, 24 Jun 2015 07:00:55 -0700 (PDT) X-Received: by 10.153.5.38 with SMTP id cj6mr10094893lad.36.1435154455854; Wed, 24 Jun 2015 07:00:55 -0700 (PDT) Received: from mail-la0-f47.google.com (mail-la0-f47.google.com. [209.85.215.47]) by mx.google.com with ESMTPS id px4si22099430lac.63.2015.06.24.07.00.55 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Jun 2015 07:00:55 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) client-ip=209.85.215.47; Received: by lacny3 with SMTP id ny3so26563846lac.3 for ; Wed, 24 Jun 2015 07:00:55 -0700 (PDT) X-Received: by 10.112.155.197 with SMTP id vy5mr39773969lbb.29.1435154455739; Wed, 24 Jun 2015 07:00:55 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp3810084lbb; Wed, 24 Jun 2015 07:00:54 -0700 (PDT) X-Received: by 10.68.113.194 with SMTP id ja2mr79164809pbb.163.1435154441859; Wed, 24 Jun 2015 07:00:41 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x7si13153938pdl.233.2015.06.24.07.00.40; Wed, 24 Jun 2015 07:00:41 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752895AbbFXOAc (ORCPT + 8 others); Wed, 24 Jun 2015 10:00:32 -0400 Received: from mail-wi0-f175.google.com ([209.85.212.175]:34178 "EHLO mail-wi0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752816AbbFXN71 (ORCPT ); Wed, 24 Jun 2015 09:59:27 -0400 Received: by wicnd19 with SMTP id nd19so135720924wic.1 for ; Wed, 24 Jun 2015 06:59:26 -0700 (PDT) X-Received: by 10.194.60.226 with SMTP id k2mr62316729wjr.10.1435154366061; Wed, 24 Jun 2015 06:59:26 -0700 (PDT) Received: from localhost.localdomain (host81-129-169-163.range81-129.btcentralplus.com. [81.129.169.163]) by mx.google.com with ESMTPSA id q2sm40833925wjz.15.2015.06.24.06.59.24 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 24 Jun 2015 06:59:25 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: kernel@stlinux.com, rjw@rjwysocki.net, viresh.kumar@linaro.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, ajitpal.singh@st.com, Lee Jones Subject: [PATCH v2 6/9] ARM: STi: STiH407: Move PWM nodes STiH407 => STiH407-family Date: Wed, 24 Jun 2015 14:59:05 +0100 Message-Id: <1435154348-28840-7-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1435154348-28840-1-git-send-email-lee.jones@linaro.org> References: <1435154348-28840-1-git-send-email-lee.jones@linaro.org> Sender: devicetree-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: devicetree@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This also incorporates the STiH410. Signed-off-by: Lee Jones --- arch/arm/boot/dts/stih407-family.dtsi | 29 +++++++++++++++++++++++++++++ arch/arm/boot/dts/stih407.dtsi | 28 ---------------------------- 2 files changed, 29 insertions(+), 28 deletions(-) diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi index 838f1c3..477e92a 100644 --- a/arch/arm/boot/dts/stih407-family.dtsi +++ b/arch/arm/boot/dts/stih407-family.dtsi @@ -565,5 +565,34 @@ status = "disabled"; }; + + /* COMMS PWM Module */ + pwm0: pwm@9810000 { + compatible = "st,sti-pwm"; + status = "okay"; + #pwm-cells = <2>; + reg = <0x9810000 0x68>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pwm0_chan0_default>; + clock-names = "pwm"; + clocks = <&clk_sysin>; + st,pwm-num-chan = <1>; + }; + + /* SBC PWM Module */ + pwm1: pwm@9510000 { + compatible = "st,sti-pwm"; + status = "okay"; + #pwm-cells = <2>; + reg = <0x9510000 0x68>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pwm1_chan0_default + &pinctrl_pwm1_chan1_default + &pinctrl_pwm1_chan2_default + &pinctrl_pwm1_chan3_default>; + clock-names = "pwm"; + clocks = <&clk_sysin>; + st,pwm-num-chan = <4>; + }; }; }; diff --git a/arch/arm/boot/dts/stih407.dtsi b/arch/arm/boot/dts/stih407.dtsi index 2c560fc3..3efa3b2 100644 --- a/arch/arm/boot/dts/stih407.dtsi +++ b/arch/arm/boot/dts/stih407.dtsi @@ -147,33 +147,5 @@ }; }; }; - - /* COMMS PWM Module */ - pwm0: pwm@9810000 { - compatible = "st,sti-pwm"; - status = "disabled"; - #pwm-cells = <2>; - reg = <0x9810000 0x68>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_pwm0_chan0_default>; - clock-names = "pwm"; - clocks = <&clk_sysin>; - }; - - /* SBC PWM Module */ - pwm1: pwm@9510000 { - compatible = "st,sti-pwm"; - status = "disabled"; - #pwm-cells = <2>; - reg = <0x9510000 0x68>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_pwm1_chan0_default - &pinctrl_pwm1_chan1_default - &pinctrl_pwm1_chan2_default - &pinctrl_pwm1_chan3_default>; - clock-names = "pwm"; - clocks = <&clk_sysin>; - st,pwm-num-chan = <4>; - }; }; };