From patchwork Tue Jul 7 15:06:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 50823 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B5356229FC for ; Tue, 7 Jul 2015 15:07:25 +0000 (UTC) Received: by wipp2 with SMTP id p2sf43499215wip.2 for ; Tue, 07 Jul 2015 08:07:25 -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=6esedox6qn2w61S8BcIGNXeL6x0nw0F4wQdHLAdip4Y=; b=NW4OxNyKtoHiSSBCsLWPgJ/Cg3nriXXBvy/DzpmODEsnvrwMhLLbgQKJsDfLiIZsVa Y1gO+d6Oidp97vJKhMSNbbZaYEE4ke+NZ+v96qRE7rqfTfvpoiVUg4v7K82VPEHs8U/d LWBORcwsioPqR3ZvJBiDrFmf3J3mUK9YdfQZ6jj1PmHivvQUOJCg/eaj50Akg0p9MzNV osqj+8F+i0RGi+bf5FWj/ADugmPIJevRzBKIdzrK51yVb/SIORIBMk0rAwIyKaq+ijpJ 4fuveiRm0uILalvNc9y51ythxyYrS4l6MzUMv7im9M8wvRpOQB4fDJMFwLlEziVMCz4B OHEg== X-Gm-Message-State: ALoCoQlxMgW80Y55eHQdJumL51jbooz4252XV+RXDcn0RrRc8y0ZV8q7R1NDuOEex1ak2yc2vySA X-Received: by 10.194.90.6 with SMTP id bs6mr2364582wjb.4.1436281645077; Tue, 07 Jul 2015 08:07:25 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.21.168 with SMTP id w8ls860625lae.41.gmail; Tue, 07 Jul 2015 08:07:24 -0700 (PDT) X-Received: by 10.152.2.38 with SMTP id 6mr4543653lar.80.1436281644880; Tue, 07 Jul 2015 08:07:24 -0700 (PDT) Received: from mail-la0-f52.google.com (mail-la0-f52.google.com. [209.85.215.52]) by mx.google.com with ESMTPS id lh9si18345244lab.51.2015.07.07.08.07.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Jul 2015 08:07:24 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.52 as permitted sender) client-ip=209.85.215.52; Received: by laar3 with SMTP id r3so199916904laa.0 for ; Tue, 07 Jul 2015 08:07:24 -0700 (PDT) X-Received: by 10.152.5.197 with SMTP id u5mr4145534lau.76.1436281644741; Tue, 07 Jul 2015 08:07:24 -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 hn6csp2452390lbb; Tue, 7 Jul 2015 08:07:23 -0700 (PDT) X-Received: by 10.68.135.136 with SMTP id ps8mr10047102pbb.78.1436281642343; Tue, 07 Jul 2015 08:07:22 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ov6si35081810pbb.2.2015.07.07.08.07.21; Tue, 07 Jul 2015 08:07:22 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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 S932435AbbGGPHS (ORCPT + 29 others); Tue, 7 Jul 2015 11:07:18 -0400 Received: from mail-wi0-f182.google.com ([209.85.212.182]:36858 "EHLO mail-wi0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932417AbbGGPHF (ORCPT ); Tue, 7 Jul 2015 11:07:05 -0400 Received: by widjy10 with SMTP id jy10so191663257wid.1 for ; Tue, 07 Jul 2015 08:07:04 -0700 (PDT) X-Received: by 10.180.218.195 with SMTP id pi3mr64456262wic.71.1436281624503; Tue, 07 Jul 2015 08:07:04 -0700 (PDT) Received: from localhost.localdomain (host86-178-207-130.range86-178.btcentralplus.com. [86.178.207.130]) by mx.google.com with ESMTPSA id x5sm1360101wif.21.2015.07.07.08.07.02 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 07 Jul 2015 08:07:03 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: kernel@stlinux.com, broonie@kernel.org, lgirdwood@gmail.com, Lee Jones Subject: [PATCH v2 4/9] ARM: STi: STiH407: Move PWM nodes STiH407 => STiH407-family Date: Tue, 7 Jul 2015 16:06:48 +0100 Message-Id: <1436281613-899-5-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1436281613-899-1-git-send-email-lee.jones@linaro.org> References: <1436281613-899-1-git-send-email-lee.jones@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@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.52 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 | 30 ++++++++++++++++++++++++++++++ arch/arm/boot/dts/stih407.dtsi | 28 ---------------------------- 2 files changed, 30 insertions(+), 28 deletions(-) diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi index 838b812..64a1a26 100644 --- a/arch/arm/boot/dts/stih407-family.dtsi +++ b/arch/arm/boot/dts/stih407-family.dtsi @@ -539,6 +539,7 @@ status = "disabled"; }; + st_dwc3: dwc3@8f94000 { compatible = "st,stih407-dwc3"; reg = <0x08f94000 0x1000>, <0x110 0x4>; @@ -565,5 +566,34 @@ <&phy_port2 PHY_TYPE_USB3>; }; }; + + /* 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>; - }; }; };