From patchwork Thu Sep 3 17:59:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Griffin X-Patchwork-Id: 53039 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by patches.linaro.org (Postfix) with ESMTPS id ECFD522E3F for ; Thu, 3 Sep 2015 18:10:47 +0000 (UTC) Received: by lbcao8 with SMTP id ao8sf17405690lbc.1 for ; Thu, 03 Sep 2015 11:10:46 -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=lkRsb4CN2hoEdIgXD8+wsNARWA4uDEUHQ79GEn4avHU=; b=eUr5RWF/M0Bg+z0ydBrOFuaZfmf6rjs5JoM74jhWBiXiEFyY2/OX4XbWgHb8qXd1QT 47B+Z/mlrkWE91CW8GH9NAzeIdWnEflr9I8FhGEvXvcRArCDOqnHyUrM752kzurdnwjW vTERfPXFzuKsUWSuM56Z4hCiejlRcCV4akdVtbPIvGyMf6AlgKKmn58ffb5eJhTNpJz/ 8Xt8Y3wjhsD0flhuvLmqrr3fzbTAzdamhEfHLcricg4Reto8ramqiYasEaw+rDs0luIV Jmwmd33RU54c2Wji79s1N3kaDvZD9M1Oz+SE3ey+MfowA56dWQZh2FzTHjJCOlub+RDK FqEA== X-Gm-Message-State: ALoCoQm9CZD2p95yp5PU7CJSJ0jIXEkYgA3nTN7MOcKXAuhYFOmKJsHCmOD46H05ovwlCqy4n7zq X-Received: by 10.152.1.164 with SMTP id 4mr538654lan.2.1441303846804; Thu, 03 Sep 2015 11:10:46 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.5.168 with SMTP id t8ls232336lat.84.gmail; Thu, 03 Sep 2015 11:10:46 -0700 (PDT) X-Received: by 10.112.205.6 with SMTP id lc6mr22289793lbc.95.1441303846623; Thu, 03 Sep 2015 11:10:46 -0700 (PDT) Received: from mail-la0-f51.google.com (mail-la0-f51.google.com. [209.85.215.51]) by mx.google.com with ESMTPS id qb5si23815438lbb.28.2015.09.03.11.10.46 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 03 Sep 2015 11:10:46 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) client-ip=209.85.215.51; Received: by lagj9 with SMTP id j9so34717114lag.2 for ; Thu, 03 Sep 2015 11:10:46 -0700 (PDT) X-Received: by 10.152.9.200 with SMTP id c8mr15492156lab.76.1441303846354; Thu, 03 Sep 2015 11:10:46 -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.164.42 with SMTP id yn10csp1439279lbb; Thu, 3 Sep 2015 11:10:44 -0700 (PDT) X-Received: by 10.67.14.6 with SMTP id fc6mr71470878pad.9.1441303844092; Thu, 03 Sep 2015 11:10:44 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id yn4si9022543pbb.20.2015.09.03.11.10.43; Thu, 03 Sep 2015 11:10:44 -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 S1758133AbbICSKg (ORCPT + 28 others); Thu, 3 Sep 2015 14:10:36 -0400 Received: from mail-wi0-f177.google.com ([209.85.212.177]:38258 "EHLO mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758096AbbICSKd (ORCPT ); Thu, 3 Sep 2015 14:10:33 -0400 Received: by wiclk2 with SMTP id lk2so16907412wic.1 for ; Thu, 03 Sep 2015 11:10:32 -0700 (PDT) X-Received: by 10.194.116.67 with SMTP id ju3mr51668526wjb.143.1441303832206; Thu, 03 Sep 2015 11:10:32 -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 lk16sm301526wic.6.2015.09.03.11.10.30 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 03 Sep 2015 11:10:31 -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, hugues.fruchet@st.com Subject: [PATCH v5 4/6] [media] c8sectpfe: Update binding to reset-gpios Date: Thu, 3 Sep 2015 18:59:52 +0100 Message-Id: <1441303194-28211-5-git-send-email-peter.griffin@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1441303194-28211-1-git-send-email-peter.griffin@linaro.org> References: <1441303194-28211-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.215.51 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: , reset-gpios is more clear than rst-gpio. This change has been done as one atomic commit but it does breaks compatability with older dtbs. 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) {