From patchwork Thu Aug 27 12:29:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Griffin X-Patchwork-Id: 52761 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 patches.linaro.org (Postfix) with ESMTPS id 32FAC22DC4 for ; Thu, 27 Aug 2015 12:31:53 +0000 (UTC) Received: by labd1 with SMTP id d1sf6498661lab.0 for ; Thu, 27 Aug 2015 05:31:52 -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=Ocu+GoTZObySNJtcDFICJsLJoFZX8TnnCV5z6ncFk/Q=; b=LbIMrkqjlWrB2Oh4gnuzqZ3CgGeHAbp3b0oy24l9Bv8o+32Y5T9tRNNJeTV5L9JSg7 qAKXXhbpSQBZfy4ldtkEVp7Aii7LaUJMKDm0lHWMcjO9Oza8IBnvT4bQM/pqSTfHRfXv A9kCPiV+7gsxHbu7Ny4xFyqBHHWXDkeuyPbWeLyHzTjkWIi6+wf8eg8bPnKZb6oKeUY7 RqwUhY9QaD3K2gq/qbOCUfweMp1HwFhP1XZVRsAqEDcaGJs3r+nMJyeZFYz4pt6bJnmp tuvuklmzaFhUh/3CGDh24rXYLCJprx6ZUxK/EqUnhib0iGYUghxxhRfcUUXMguHz2UqD BE9Q== X-Gm-Message-State: ALoCoQnshAm3dnJxdKCi/vlZ2DBqwUvVQbi7GZ4Bw4ADKNbDU3P4zumumHmeTpdy9AxPPi9iO4GZ X-Received: by 10.112.189.105 with SMTP id gh9mr1113738lbc.16.1440678711355; Thu, 27 Aug 2015 05:31:51 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.27.100 with SMTP id s4ls73036lag.83.gmail; Thu, 27 Aug 2015 05:31:51 -0700 (PDT) X-Received: by 10.112.125.194 with SMTP id ms2mr2188224lbb.58.1440678711193; Thu, 27 Aug 2015 05:31:51 -0700 (PDT) Received: from mail-lb0-f171.google.com (mail-lb0-f171.google.com. [209.85.217.171]) by mx.google.com with ESMTPS id ua1si2033394lbb.29.2015.08.27.05.31.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Aug 2015 05:31:50 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.171 as permitted sender) client-ip=209.85.217.171; Received: by lbbpu9 with SMTP id pu9so10324198lbb.3 for ; Thu, 27 Aug 2015 05:31:50 -0700 (PDT) X-Received: by 10.112.209.106 with SMTP id ml10mr2095651lbc.112.1440678710879; Thu, 27 Aug 2015 05:31:50 -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.162.200 with SMTP id yc8csp4611039lbb; Thu, 27 Aug 2015 05:31:49 -0700 (PDT) X-Received: by 10.66.232.102 with SMTP id tn6mr6249190pac.47.1440678707683; Thu, 27 Aug 2015 05:31:47 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h2si3467874pdo.67.2015.08.27.05.31.46; Thu, 27 Aug 2015 05:31:47 -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 S1754525AbbH0Mbm (ORCPT + 28 others); Thu, 27 Aug 2015 08:31:42 -0400 Received: from mail-wi0-f176.google.com ([209.85.212.176]:36624 "EHLO mail-wi0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754112AbbH0Mai (ORCPT ); Thu, 27 Aug 2015 08:30:38 -0400 Received: by wicgk12 with SMTP id gk12so7101825wic.1 for ; Thu, 27 Aug 2015 05:30:36 -0700 (PDT) X-Received: by 10.194.201.71 with SMTP id jy7mr4797169wjc.93.1440678636666; Thu, 27 Aug 2015 05:30:36 -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 eu2sm3418001wic.8.2015.08.27.05.30.32 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 27 Aug 2015 05:30:35 -0700 (PDT) From: Peter Griffin To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, maxime.coquelin@st.com, srinivas.kandagatla@gmail.com, patrice.chotard@st.com, mchehab@osg.samsung.com Cc: peter.griffin@linaro.org, lee.jones@linaro.org, devicetree@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v2 4/5] [media] c8sectpfe: Update binding to reset-gpios Date: Thu, 27 Aug 2015 13:29:34 +0100 Message-Id: <1440678575-21646-5-git-send-email-peter.griffin@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1440678575-21646-1-git-send-email-peter.griffin@linaro.org> References: <1440678575-21646-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.171 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 c014173..f932bfd 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 { @@ -115,7 +115,7 @@ tsin-num = <0>; serial-not-parallel; i2c-bus = <&ssc2>; - rst-gpio = <&pio15 4 0>; + 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) {