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: 6656841 Return-Path: X-Original-To: patchwork-linux-pm@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 415059F399 for ; Mon, 22 Jun 2015 15:45:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A0445205EA for ; Mon, 22 Jun 2015 15:45:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D81E1204E0 for ; Mon, 22 Jun 2015 15:45:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932094AbbFVPod (ORCPT ); Mon, 22 Jun 2015 11:44:33 -0400 Received: from mail-wg0-f46.google.com ([74.125.82.46]:32953 "EHLO mail-wg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754173AbbFVPoM (ORCPT ); Mon, 22 Jun 2015 11:44:12 -0400 Received: by wgck11 with SMTP id k11so17798604wgc.0 for ; Mon, 22 Jun 2015 08:44:11 -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=tbC5hVxaWlrqC6S++kaFoq2cwg2B4Q8/+R3yq9guA48=; b=DZzTOO/9LfVc+MeBMWrjdGGBAUJZY31WkLK0e1qJAcN82A+qgNQsgix9o4Pwob5f99 YlZCLN8HtVaTMaVGmpGrquytRexGU17T0rWi10VcZroypu5uWNB2YTDmSQiM0vOsOBY0 /S908bJcpkTRGYIgyv17Aj8VPCunbuSShRF/px8Hba/VNbmz3nJ7emUcDPghCVkSlvW2 WZS08bK8tKKbLhti8xyAtdqgFxxQ0B2aCMhHo4iLVhCEZ74idQGJhOkONeEl4d3yERHi PHhfmaYMVuqAY9QXtlQLAsflGBcPyIRx/SCJNTo+Pisi0mHP1IV6FwJ47VdYlHRG0C5i sk7A== X-Gm-Message-State: ALoCoQl3zDjvfQNIRGX08vfX9WlHzNWjIy7lGu59ngwzfTvgTrYOmZzUZzCh+yzylXVsoYgo2Xqa 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: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-8.3 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 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>; - }; }; };