From patchwork Mon Jul 6 08:58:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 50701 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1A545229FC for ; Mon, 6 Jul 2015 09:00:54 +0000 (UTC) Received: by laar3 with SMTP id r3sf45176847laa.1 for ; Mon, 06 Jul 2015 02:00:53 -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=VgteL5Uk7Z8tYqN6aE73bQkoSY12cAY7XQp4rzZkJnX21M7xcKpRVsWzuVhgYlM3P6 jT8oIGsoYb15hGxT0N4QGevFi28kKMcpY42tayCdka4CmoT3zjM8vF1gSuQkddkZGoHr 15e9YKaK6K6y0hUFie0tYEmdnJWB9p5nNjjhR73BMVZYgBqHUsMxgGz2heg00KZ+nwI6 uk7MKRlCejHywgU6wYXtYdL8DV2bgRCjjy80z8YbgUBQsI/XaLPqA+LNvd059mdc7csj rLIny7jtsw6BOa67fhtMxsOIHPiyA+kXkn0W9ZGbjPC9BCU2mqbO7/VVf0FaEF8ULbIL 0fuw== X-Gm-Message-State: ALoCoQnKhVA/L5At/pY5IGGpENNr5LeNRP+Jkrg5iSFBQ0fQtR332TXfKC+6ehzixIQvvH6XVklr X-Received: by 10.180.106.10 with SMTP id gq10mr27884459wib.0.1436173253072; Mon, 06 Jul 2015 02:00:53 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.37.196 with SMTP id a4ls570996lak.27.gmail; Mon, 06 Jul 2015 02:00:52 -0700 (PDT) X-Received: by 10.112.145.132 with SMTP id su4mr46773830lbb.85.1436173252684; Mon, 06 Jul 2015 02:00:52 -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 gk6si14689954lbc.173.2015.07.06.02.00.52 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Jul 2015 02:00:52 -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 lagx9 with SMTP id x9so146221562lag.1 for ; Mon, 06 Jul 2015 02:00:52 -0700 (PDT) X-Received: by 10.112.131.98 with SMTP id ol2mr48975693lbb.56.1436173252558; Mon, 06 Jul 2015 02:00:52 -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 hn6csp1582741lbb; Mon, 6 Jul 2015 02:00:51 -0700 (PDT) X-Received: by 10.70.130.79 with SMTP id oc15mr21249592pdb.55.1436173250632; Mon, 06 Jul 2015 02:00:50 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ub8si27931830pbc.64.2015.07.06.02.00.49; Mon, 06 Jul 2015 02:00:50 -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 S1755206AbbGFJAq (ORCPT + 29 others); Mon, 6 Jul 2015 05:00:46 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:33455 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754632AbbGFI6o (ORCPT ); Mon, 6 Jul 2015 04:58:44 -0400 Received: by wiwl6 with SMTP id l6so277933936wiw.0 for ; Mon, 06 Jul 2015 01:58:43 -0700 (PDT) X-Received: by 10.194.62.228 with SMTP id b4mr47899112wjs.2.1436173123551; Mon, 06 Jul 2015 01:58:43 -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 d7sm18085910wij.0.2015.07.06.01.58.42 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 06 Jul 2015 01:58:42 -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: [RESEND 04/10] ARM: STi: STiH407: Move PWM nodes STiH407 => STiH407-family Date: Mon, 6 Jul 2015 09:58:26 +0100 Message-Id: <1436173112-21397-5-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1436173112-21397-1-git-send-email-lee.jones@linaro.org> References: <1436173112-21397-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>; - }; }; };