From patchwork Fri Aug 28 17:52:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Griffin X-Patchwork-Id: 52804 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by patches.linaro.org (Postfix) with ESMTPS id E5CDA22EBF for ; Fri, 28 Aug 2015 17:54:21 +0000 (UTC) Received: by wicne3 with SMTP id ne3sf10324631wic.1 for ; Fri, 28 Aug 2015 10:54:21 -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=Y/Ba+RCcd2nkySOb6lm45gZ6h1jHMlortc2h40urNpU=; b=gt3JiWxQlOXD3L2O3rvk6RCekuGFuA3t3qDyGjN63gcZvyxtHvc1D92HoTrHAAkl+a NFZxRB+N796Htlg7+23Iqom4V/2p/IYNAdbujraBC3QOOnqC5Z7AwkX428dvtk7O0OzG x4rvp1RdkFEBA61NNish8WZbpFlbkTPJgak16PMVBfNQxttjkLgPee/xs00UpYJaN4v0 NKKjO2l4f+8u7OHnI2Ng9sAOt6suRs/mAyiLjWjbF0cQsyBtU3duoX5cFJYCZMyfaaBP FlZyw94p/lasBvI1DoN68+EFS5jgt8fiRj6DJ1z+i/en3dmKe8s8Q716X4NVmoLyL0pg Y30Q== X-Gm-Message-State: ALoCoQnyO00U533vyq/VLMF35PP+jruK9x1LW8Vea30OsIgiikSXea0b0REOlj/O51e3SUd/16bx X-Received: by 10.152.5.164 with SMTP id t4mr3076641lat.0.1440784461206; Fri, 28 Aug 2015 10:54:21 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.29.170 with SMTP id l10ls244001lah.82.gmail; Fri, 28 Aug 2015 10:54:21 -0700 (PDT) X-Received: by 10.112.52.2 with SMTP id p2mr5699168lbo.8.1440784461041; Fri, 28 Aug 2015 10:54:21 -0700 (PDT) Received: from mail-lb0-f175.google.com (mail-lb0-f175.google.com. [209.85.217.175]) by mx.google.com with ESMTPS id s2si6430366lbo.86.2015.08.28.10.54.20 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 28 Aug 2015 10:54:20 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.175 as permitted sender) client-ip=209.85.217.175; Received: by lbbpu9 with SMTP id pu9so34401575lbb.3 for ; Fri, 28 Aug 2015 10:54:20 -0700 (PDT) X-Received: by 10.152.37.104 with SMTP id x8mr5264624laj.29.1440784460766; Fri, 28 Aug 2015 10:54:20 -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.151.194 with SMTP id us2csp32019lbb; Fri, 28 Aug 2015 10:54:19 -0700 (PDT) X-Received: by 10.66.249.101 with SMTP id yt5mr17150943pac.116.1440784456927; Fri, 28 Aug 2015 10:54:16 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id dn2si11068518pbb.210.2015.08.28.10.54.16; Fri, 28 Aug 2015 10:54:16 -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 S1753486AbbH1RyD (ORCPT + 28 others); Fri, 28 Aug 2015 13:54:03 -0400 Received: from mail-wi0-f172.google.com ([209.85.212.172]:36326 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753385AbbH1RxC (ORCPT ); Fri, 28 Aug 2015 13:53:02 -0400 Received: by wicfv10 with SMTP id fv10so14044113wic.1 for ; Fri, 28 Aug 2015 10:53:00 -0700 (PDT) X-Received: by 10.180.9.75 with SMTP id x11mr5584327wia.80.1440784380703; Fri, 28 Aug 2015 10:53:00 -0700 (PDT) Received: from localhost.localdomain (cpc14-aztw22-2-0-cust189.18-1.cable.virginm.net. [82.45.1.190]) by smtp.gmail.com with ESMTPSA id d7sm4781243wiz.22.2015.08.28.10.52.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 28 Aug 2015 10:53:00 -0700 (PDT) From: Peter Griffin To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, srinivas.kandagatla@gmail.com, maxime.coquelin@st.com, patrice.chotard@st.com, mchehab@osg.samsung.com Cc: peter.griffin@linaro.org, lee.jones@linaro.org, linux-media@vger.kernel.org, devicetree@vger.kernel.org, valentinrothberg@gmail.com, hugues.fruchet@st.com Subject: [PATCH v3 4/6] [media] c8sectpfe: Update binding to reset-gpios Date: Fri, 28 Aug 2015 18:52:40 +0100 Message-Id: <1440784362-31217-5-git-send-email-peter.griffin@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1440784362-31217-1-git-send-email-peter.griffin@linaro.org> References: <1440784362-31217-1-git-send-email-peter.griffin@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: peter.griffin@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.175 as permitted sender) smtp.mailfrom=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: , gpio.txt documents that GPIO properties should be named "[-]gpios", with being the purpose of this GPIO for the device. This change has been done as one atomic commit. Signed-off-by: Peter Griffin Acked-by: Lee Jones --- Documentation/devicetree/bindings/media/stih407-c8sectpfe.txt | 6 +++--- arch/arm/boot/dts/stihxxx-b2120.dtsi | 4 ++-- drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Documentation/devicetree/bindings/media/stih407-c8sectpfe.txt b/Documentation/devicetree/bindings/media/stih407-c8sectpfe.txt index d4def76..e70d840 100644 --- a/Documentation/devicetree/bindings/media/stih407-c8sectpfe.txt +++ b/Documentation/devicetree/bindings/media/stih407-c8sectpfe.txt @@ -35,7 +35,7 @@ Required properties (tsin (child) node): - tsin-num : tsin id of the InputBlock (must be between 0 to 6) - i2c-bus : phandle to the I2C bus DT node which the demodulators & tuners on this tsin channel are connected. -- rst-gpio : reset gpio for this tsin channel. +- reset-gpios : reset gpio for this tsin channel. Optional properties (tsin (child) node): @@ -75,7 +75,7 @@ Example: tsin-num = <0>; serial-not-parallel; i2c-bus = <&ssc2>; - rst-gpio = <&pio15 4 0>; + reset-gpios = <&pio15 4 GPIO_ACTIVE_HIGH>; dvb-card = ; }; @@ -83,7 +83,7 @@ Example: tsin-num = <3>; serial-not-parallel; i2c-bus = <&ssc3>; - rst-gpio = <&pio15 7 0>; + reset-gpios = <&pio15 7 GPIO_ACTIVE_HIGH>; dvb-card = ; }; }; diff --git a/arch/arm/boot/dts/stihxxx-b2120.dtsi b/arch/arm/boot/dts/stihxxx-b2120.dtsi index f9fca10..0b7592e 100644 --- a/arch/arm/boot/dts/stihxxx-b2120.dtsi +++ b/arch/arm/boot/dts/stihxxx-b2120.dtsi @@ -6,8 +6,8 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - #include +#include #include / { soc { @@ -116,7 +116,7 @@ tsin-num = <0>; serial-not-parallel; i2c-bus = <&ssc2>; - rst-gpio = <&pio15 4 GPIO_ACTIVE_HIGH>; + reset-gpios = <&pio15 4 GPIO_ACTIVE_HIGH>; dvb-card = ; }; }; diff --git a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c b/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c index 3a91093..c691e13 100644 --- a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c +++ b/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c @@ -822,7 +822,7 @@ static int c8sectpfe_probe(struct platform_device *pdev) } of_node_put(i2c_bus); - tsin->rst_gpio = of_get_named_gpio(child, "rst-gpio", 0); + tsin->rst_gpio = of_get_named_gpio(child, "reset-gpios", 0); ret = gpio_is_valid(tsin->rst_gpio); if (!ret) {