From patchwork Wed Oct 21 02:43:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caesar Wang X-Patchwork-Id: 7454161 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B06E49F302 for ; Wed, 21 Oct 2015 02:45:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DBAAF20913 for ; Wed, 21 Oct 2015 02:45:33 +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 DFA0820902 for ; Wed, 21 Oct 2015 02:45:32 +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 1ZojNi-0002kb-Lk; Wed, 21 Oct 2015 02:44:02 +0000 Received: from mail-pa0-f65.google.com ([209.85.220.65]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZojNU-0002bP-Ue; Wed, 21 Oct 2015 02:43:49 +0000 Received: by padda3 with SMTP id da3so4087200pad.1; Tue, 20 Oct 2015 19:43:29 -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=hHIVOfcDgEsm0ZJnJ9/HBMkO+FmNsCPeNE0XAewmTPE=; b=RJQjky9kEUPCh3wn3jv/Go3lXZz41m6d5GMGU4pzwJklqG6Sp/2VVOkeIqZm6BLTmJ l5N2HuINnI7bYHF1dg002nb/bfHjuXxUQqGKHGCQmzUwJt34CYXkEwe4eDLl075RFFF6 jOXlNi7060Zv8EzQIc5pHaQAqSPyByE8eOmEukvmqxxkRZRhkg164pwLGCPlEEDNhltU 6cGMdSM4YqkrvAssIpElwKQHdlN3nfEUqROyDBpKhFl1MyIDR+Xxq8ZQcO4Qk9HSE2FV aYzsmSrWjb34Cju3mqErOYNElEcrXVEsS1nfBIObGZ6c4R/Rs69N3AcVdVHNTZ2TrZju RgUg== X-Received: by 10.69.8.129 with SMTP id dk1mr7759288pbd.72.1445395409558; Tue, 20 Oct 2015 19:43:29 -0700 (PDT) Received: from localhost.localdomain ([43.226.228.195]) by smtp.gmail.com with ESMTPSA id hq8sm6184944pad.35.2015.10.20.19.43.24 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 20 Oct 2015 19:43:28 -0700 (PDT) From: Caesar Wang To: Heiko Stuebner Subject: [PATCH v1 2/2] ARM: dts: rockchip: Add the OTP gpio pinctrl Date: Wed, 21 Oct 2015 10:43:00 +0800 Message-Id: <1445395380-5365-3-git-send-email-wxt@rock-chips.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1445395380-5365-1-git-send-email-wxt@rock-chips.com> References: <1445395380-5365-1-git-send-email-wxt@rock-chips.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151020_194349_149803_662A9A3A X-CRM114-Status: GOOD ( 14.15 ) 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 We need the OTP pin is gpio state before resetting the TSADC controller, since the tshut polarity will generate a high signal. Signed-off-by: Caesar Wang Reviewed-by: Douglas Anderson --- 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>; };