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: 31187 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWj8A-0005lZ-Lt; Tue, 01 Sep 2015 12:49:34 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.76/mailfrontend-5) with esmtp id 1ZWj87-0001r2-9Z; Tue, 01 Sep 2015 12:49:34 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755535AbbIAKtM (ORCPT + 1 other); Tue, 1 Sep 2015 06:49:12 -0400 Received: from mail-wi0-f169.google.com ([209.85.212.169]:36635 "EHLO mail-wi0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755519AbbIAKs2 (ORCPT ); Tue, 1 Sep 2015 06:48:28 -0400 Received: by wibz8 with SMTP id z8so27571515wib.1 for ; Tue, 01 Sep 2015 03:48:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=UzmwUI5MasfYyldJ2nCNy7e/q4Q8wWGxInVHMmMSm4o=; b=GbxuEea7oTh2EZvkF5uyIHsXc0ye2zKaFRoVhfeB13l8+pAGI4xWNdyjKhGrQKWzqV SaZm4ETnHpDAdhU0g5xFyI3yqRedDsJDegB0mqsB8z4qhjSeBzZmEUq4gdA1nLKJlPMU EHS0RiNgiPnjapp9iB0+2aL3mSmb66wwO4aGixbo6zxcOvw118ixcz47NzvBwRKZ8L84 Uknd7R/1+0xvkEP/jL1rcr7xhvboVtq9/GRCizCnThPyfgyPBUJVN094UIcg5GfHUtHD cVtHRBvAU4nRFv08v4bi80JbcAuoMip9FC6LiqAjNyUwZi+rLNb60tv9Hkx5LJV0eFeP Cz9A== X-Gm-Message-State: ALoCoQk3B5ZyrxrqoNg07xe6xMEYfq4uszc1bT6n1YK0bBZzKE+phAj8dLto4MMrh8V0v2P53fEq 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-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2015.9.1.104216 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODY_SIZE_3000_3999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, ECARD_WORD 0, NO_URI_HTTPS 0, REFERENCES 0, SINGLE_URI_IN_BODY 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_NAME_BODY 0, __CP_URI_IN_BODY 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __MULTIPLE_RCPTS_TO_X5 0, __REFERENCES 0, __SANE_MSGID 0, __SINGLE_URI_TEXT 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_IN_BODY 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' 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) {