From patchwork Tue Sep 1 10:48:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Griffin X-Patchwork-Id: 52923 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by patches.linaro.org (Postfix) with ESMTPS id 808A42157D for ; Tue, 1 Sep 2015 10:49:20 +0000 (UTC) Received: by laboe4 with SMTP id oe4sf36945657lab.3 for ; Tue, 01 Sep 2015 03:49:19 -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=FqCyH+Csw+WPXE4KZ+Ty/DmDeYpsac/1XjaK/bD1JE8=; b=i9pa4wYQ7XEpQ6BJ85m1iEmlnXGX6D5dj9PhOGZYO1V+M3rfN4NLWBSxYUG4ZJY8LJ +dbslvo/kj/9HwInuMFQwFkNFPk6z7ceHLmg8mPDqf7nZYSTeS/6UJHq4MVAyi44C7Hd 0Yi7TeGSUWOAL39OG6/XOOsKFhtrM/hkuEombAy3A3tSRYpIK8+dDrknJNYnn7F7c1kZ K5wqJzxTvZaGLol6grUSRG9sEUiQOYROqNvs08p84bMNg8NZbAAuqokkSQs5z4c0h7Rt oafPgXU1IXdvsDjSc/r2dZvIUJl36Za61Gf09B2PHPpb8AiZXZacPIhTwB+X66q/RHCh 6JDQ== X-Gm-Message-State: ALoCoQmqhgro7OVzivdBLi5Uetj+l/4Y6qYlt0hpfEX57obpxZQ877YmELv4U9gUIrASRqKEGwQr X-Received: by 10.112.135.104 with SMTP id pr8mr7535616lbb.4.1441104559491; Tue, 01 Sep 2015 03:49:19 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.1.101 with SMTP id 5ls647142lal.59.gmail; Tue, 01 Sep 2015 03:49:19 -0700 (PDT) X-Received: by 10.152.22.99 with SMTP id c3mr13513967laf.32.1441104559326; Tue, 01 Sep 2015 03:49:19 -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 pk1si16064422lac.126.2015.09.01.03.49.19 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 Sep 2015 03:49:19 -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 lbcbn3 with SMTP id bn3so76153613lbc.2 for ; Tue, 01 Sep 2015 03:49:19 -0700 (PDT) X-Received: by 10.152.43.198 with SMTP id y6mr4685934lal.41.1441104559221; Tue, 01 Sep 2015 03:49:19 -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 yn10csp442891lbb; Tue, 1 Sep 2015 03:49:18 -0700 (PDT) X-Received: by 10.66.241.37 with SMTP id wf5mr45704043pac.51.1441104558176; Tue, 01 Sep 2015 03:49:18 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id xl5si29208212pab.188.2015.09.01.03.49.16; Tue, 01 Sep 2015 03:49:18 -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 S1755859AbbIAKtN (ORCPT + 28 others); Tue, 1 Sep 2015 06:49:13 -0400 Received: from mail-wi0-f173.google.com ([209.85.212.173]:37756 "EHLO mail-wi0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755517AbbIAKs2 (ORCPT ); Tue, 1 Sep 2015 06:48:28 -0400 Received: by wicfx3 with SMTP id fx3so7804880wic.0 for ; Tue, 01 Sep 2015 03:48:27 -0700 (PDT) X-Received: by 10.180.84.65 with SMTP id w1mr2597605wiy.62.1441104507326; Tue, 01 Sep 2015 03:48:27 -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 gt10sm2093822wib.20.2015.09.01.03.48.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 01 Sep 2015 03:48:26 -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 v4 4/6] [media] c8sectpfe: Update binding to reset-gpio Date: Tue, 1 Sep 2015 11:48:12 +0100 Message-Id: <1441104494-10468-5-git-send-email-peter.griffin@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1441104494-10468-1-git-send-email-peter.griffin@linaro.org> References: <1441104494-10468-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: , reset-gpio 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..84ae9d1 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-gpio : 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-gpio = <&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-gpio = <&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..b940934 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-gpio = <&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..e19c6b4 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-gpio", 0); ret = gpio_is_valid(tsin->rst_gpio); if (!ret) {