From patchwork Thu Oct 22 01:25:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caesar Wang X-Patchwork-Id: 7461841 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 710E5BEEA4 for ; Thu, 22 Oct 2015 01:29:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9EEB82078C for ; Thu, 22 Oct 2015 01:29:27 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AE051204EB for ; Thu, 22 Oct 2015 01:29:26 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Zp4fg-0004Ux-2N; Thu, 22 Oct 2015 01:28:00 +0000 Received: from mail-pa0-f67.google.com ([209.85.220.67]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Zp4eL-0003FB-Dp; Thu, 22 Oct 2015 01:26:40 +0000 Received: by padfb7 with SMTP id fb7so7468155pad.0; Wed, 21 Oct 2015 18:26:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1IF70w0LBFwsnkSGqBvQR96HtDxR2Wosv9ovZ8WbNww=; b=S02LlCeEFikRfP8nSfL2f7jwPwJQJt8Cp/4gVLjCWP9XX+kMs6Ln2d30WHZRYlLG0y MynSQv2JnpspreoN/sLR3bJwx4UoKeDm0uRqQ0nGrUejVC/zELvp8rP02sAdhHL+jMFc Gp8gJn1F2+j3aMb5oxrhreXnzkSYoI3w8u2XnF64ZuiHTIlmJQ0yTu1mirKTfOsi4Jzo VDDlToqqsUa1DDLpPrFKBMUL1ZIaH0R1YuCuqqsBuH4chwNe78UtOKJNuMFaOfKtp7Fy /gvUguIrb2c2GxU8lojVUXDe2DlyM6hrUHJA8WEauFypnD6AW0CUyAVIPdvXDUUOqnyd 6XQg== X-Received: by 10.66.252.35 with SMTP id zp3mr13848090pac.43.1445477176476; Wed, 21 Oct 2015 18:26:16 -0700 (PDT) Received: from localhost.localdomain ([103.47.144.30]) by smtp.gmail.com with ESMTPSA id kw10sm11337311pbc.25.2015.10.21.18.26.05 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 21 Oct 2015 18:26:15 -0700 (PDT) From: Caesar Wang To: Heiko Stuebner Subject: [PATCH v2 2/2] ARM: dts: rockchip: Add the OTP gpio pinctrl Date: Thu, 22 Oct 2015 09:25:30 +0800 Message-Id: <1445477130-17065-3-git-send-email-wxt@rock-chips.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1445477130-17065-1-git-send-email-wxt@rock-chips.com> References: <1445477130-17065-1-git-send-email-wxt@rock-chips.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151021_182637_733777_8731085E X-CRM114-Status: GOOD ( 13.99 ) X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Russell King , Pawel Moll , Ian Campbell , Dmitry Torokhov , dianders@chromium.org, linux-kernel@vger.kernel.org, Eduardo Valentin , linux-rockchip@lists.infradead.org, Rob Herring , Kumar Gala , linux-arm-kernel@lists.infradead.org, Caesar Wang MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add the "init" pinctrl as the OTP gpio state. We need the OTP pin is gpio state before resetting the TSADC controller, since the tshut polarity will generate a high signal. "init" pinctrl property is defined by Doug's Patch[0]. Patch[0]: https://patchwork.kernel.org/patch/7454311/ Signed-off-by: Caesar Wang Reviewed-by: Douglas Anderson --- Changes in v2: - Add some commits for more obvious in PATCH[2/2] Changes in v1: - As the Doug comments, drop the thermal driver patchs since we can with pinctrl changing to work. - As the Doug's patch to add the 'init' property. arch/arm/boot/dts/rk3288.dtsi | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi index 906e938..6ea89aa 100644 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -447,8 +447,9 @@ clock-names = "tsadc", "apb_pclk"; resets = <&cru SRST_TSADC>; reset-names = "tsadc-apb"; - pinctrl-names = "default"; - pinctrl-0 = <&otp_out>; + pinctrl-names = "init", "default"; + pinctrl-0 = <&otp_gpio>; + pinctrl-1 = <&otp_out>; #thermal-sensor-cells = <1>; rockchip,hw-tshut-temp = <95000>; status = "disabled"; @@ -1273,6 +1274,10 @@ }; tsadc { + otp_gpio: otp-gpio { + rockchip,pins = <0 10 RK_FUNC_GPIO &pcfg_pull_none>; + }; + otp_out: otp-out { rockchip,pins = <0 10 RK_FUNC_1 &pcfg_pull_none>; };