From patchwork Mon Jun 22 15:43:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 50165 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f72.google.com (mail-la0-f72.google.com [209.85.215.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 81FAE21575 for ; Mon, 22 Jun 2015 15:44:41 +0000 (UTC) Received: by laer2 with SMTP id r2sf20199466lae.3 for ; Mon, 22 Jun 2015 08:44:40 -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=S4WeqfsxcC6+Z0Lb9tsZ3VXyZOZ7g1qz6TR7Axflyis=; b=IVoPCwXrWPG4fKlf/rJu3D2P9Ljmo2jbGSc9h1toTLbbOd+ABEkoUyA8m0EXMnLrwr I14AfPuytWDGKsxHGUPtyRFY8UVLRy54jV90yzhexgiAbR3f1YE2c0S213iaDE1vwnv5 kOarVHZxQGwkx6M5JgSp4FLF+x0jUxZOfRSwf/kCunwnD3SooWwD5QP43Owb5CKHh7AP BpFU8zYcl+8r2okueKaJDCiodejTtTtqRcrea1EXtVZIRT59mJLIJpPtT69eKG8ism5F BPXthObPMUTsSayfm4+0pDqtlIPK320UI5bw/MlUx+wpmuJWEvEXX03RD8uJUAc/xq+R 8bQg== X-Gm-Message-State: ALoCoQk28lpUDJSBhNyyXZ7r/hFwIATP0MI8zzrirphxntE//+gzyhvYSUqsZFhiZzOdBonFSyZG X-Received: by 10.152.19.161 with SMTP id g1mr28395875lae.8.1434987880458; Mon, 22 Jun 2015 08:44:40 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.23.103 with SMTP id l7ls941016laf.35.gmail; Mon, 22 Jun 2015 08:44:40 -0700 (PDT) X-Received: by 10.112.155.197 with SMTP id vy5mr30337413lbb.29.1434987880308; Mon, 22 Jun 2015 08:44:40 -0700 (PDT) Received: from mail-lb0-f179.google.com (mail-lb0-f179.google.com. [209.85.217.179]) by mx.google.com with ESMTPS id et6si16823706lac.38.2015.06.22.08.44.40 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Jun 2015 08:44:40 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 as permitted sender) client-ip=209.85.217.179; Received: by lbbpo10 with SMTP id po10so11747388lbb.3 for ; Mon, 22 Jun 2015 08:44:40 -0700 (PDT) X-Received: by 10.152.206.75 with SMTP id lm11mr30068849lac.41.1434987880216; Mon, 22 Jun 2015 08:44:40 -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 hn6csp2471258lbb; Mon, 22 Jun 2015 08:44:39 -0700 (PDT) X-Received: by 10.70.127.203 with SMTP id ni11mr2916593pdb.74.1434987878529; Mon, 22 Jun 2015 08:44:38 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ht7si30147630pdb.204.2015.06.22.08.44.37; Mon, 22 Jun 2015 08:44:38 -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 S932085AbbFVPoc (ORCPT + 7 others); Mon, 22 Jun 2015 11:44:32 -0400 Received: from mail-wi0-f177.google.com ([209.85.212.177]:35033 "EHLO mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754176AbbFVPoM (ORCPT ); Mon, 22 Jun 2015 11:44:12 -0400 Received: by wiga1 with SMTP id a1so80880057wig.0 for ; Mon, 22 Jun 2015 08:44:11 -0700 (PDT) X-Received: by 10.180.92.65 with SMTP id ck1mr33058239wib.88.1434987851180; Mon, 22 Jun 2015 08:44:11 -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 a9sm17801733wiv.13.2015.06.22.08.44.09 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 22 Jun 2015 08:44:10 -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 5/8] ARM: STi: STiH407: Move PWM nodes STiH407 => STiH407-family Date: Mon, 22 Jun 2015 16:43:54 +0100 Message-Id: <1434987837-24212-6-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1434987837-24212-1-git-send-email-lee.jones@linaro.org> References: <1434987837-24212-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.217.179 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 f57fd83..a673386 100644 --- a/arch/arm/boot/dts/stih407-family.dtsi +++ b/arch/arm/boot/dts/stih407-family.dtsi @@ -569,5 +569,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>; - }; }; };