From: Caesar Wang <wxt@rock-chips.com> To: Heiko Stuebner <heiko@sntech.de> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>, dianders@chromium.org, Eduardo Valentin <edubezval@gmail.com>, Caesar Wang <wxt@rock-chips.com>, Russell King <linux@arm.linux.org.uk>, devicetree@vger.kernel.org, Kumar Gala <galak@codeaurora.org>, linux-kernel@vger.kernel.org, Ian Campbell <ijc+devicetree@hellion.org.uk>, linux-rockchip@lists.infradead.org, Rob Herring <robh+dt@kernel.org>, Pawel Moll <pawel.moll@arm.com>, Mark Rutland <mark.rutland@arm.com>, linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 3/3] ARM: dts: rockchip: Add the OTP gpio pinctrl Date: Fri, 23 Oct 2015 19:25:28 +0800 [thread overview] Message-ID: <1445599528-18825-4-git-send-email-wxt@rock-chips.com> (raw) In-Reply-To: <1445599528-18825-1-git-send-email-wxt@rock-chips.com> Add the "init" anf "sleep" 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 <wxt@rock-chips.com> Reviewed-by: Douglas Anderson <dianders@chromium.org> --- Changes in v4: None Changes in v3: - Add the "sleep" pinctrl as the gpio state in PATCH[3/3] 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 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi index 906e938..13ff09a 100644 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -447,8 +447,10 @@ clock-names = "tsadc", "apb_pclk"; resets = <&cru SRST_TSADC>; reset-names = "tsadc-apb"; - pinctrl-names = "default"; - pinctrl-0 = <&otp_out>; + pinctrl-names = "init", "default", "sleep"; + pinctrl-0 = <&otp_gpio>; + pinctrl-1 = <&otp_out>; + pinctrl-2 = <&otp_gpio>; #thermal-sensor-cells = <1>; rockchip,hw-tshut-temp = <95000>; status = "disabled"; @@ -1273,6 +1275,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>; }; -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: wxt@rock-chips.com (Caesar Wang) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 3/3] ARM: dts: rockchip: Add the OTP gpio pinctrl Date: Fri, 23 Oct 2015 19:25:28 +0800 [thread overview] Message-ID: <1445599528-18825-4-git-send-email-wxt@rock-chips.com> (raw) In-Reply-To: <1445599528-18825-1-git-send-email-wxt@rock-chips.com> Add the "init" anf "sleep" 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 <wxt@rock-chips.com> Reviewed-by: Douglas Anderson <dianders@chromium.org> --- Changes in v4: None Changes in v3: - Add the "sleep" pinctrl as the gpio state in PATCH[3/3] 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 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi index 906e938..13ff09a 100644 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -447,8 +447,10 @@ clock-names = "tsadc", "apb_pclk"; resets = <&cru SRST_TSADC>; reset-names = "tsadc-apb"; - pinctrl-names = "default"; - pinctrl-0 = <&otp_out>; + pinctrl-names = "init", "default", "sleep"; + pinctrl-0 = <&otp_gpio>; + pinctrl-1 = <&otp_out>; + pinctrl-2 = <&otp_gpio>; #thermal-sensor-cells = <1>; rockchip,hw-tshut-temp = <95000>; status = "disabled"; @@ -1273,6 +1275,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>; }; -- 1.9.1
next prev parent reply other threads:[~2015-10-23 11:26 UTC|newest] Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-10-23 11:25 [PATCH v4 0/3] fix the TSHUT issue on rockchip thermal Caesar Wang 2015-10-23 11:25 ` Caesar Wang 2015-10-23 11:25 ` [PATCH v4 1/3] dt-bindings: rockchip-thermal: Add the pinctrl states in this document Caesar Wang 2015-10-23 11:25 ` Caesar Wang 2015-10-23 13:29 ` Rob Herring 2015-10-23 13:29 ` Rob Herring 2015-10-23 13:29 ` Rob Herring 2015-10-23 11:25 ` [PATCH v4 2/3] thermal: rockchip: support the sleep pinctrl state to avoid glitches in s2r Caesar Wang 2015-10-23 11:25 ` Caesar Wang 2015-10-23 11:25 ` Caesar Wang 2015-10-23 15:25 ` Doug Anderson 2015-10-23 15:25 ` Doug Anderson 2015-10-23 15:25 ` Doug Anderson 2015-10-23 11:25 ` Caesar Wang [this message] 2015-10-23 11:25 ` [PATCH v4 3/3] ARM: dts: rockchip: Add the OTP gpio pinctrl Caesar Wang 2015-10-23 15:25 ` Doug Anderson 2015-10-23 15:25 ` Doug Anderson 2015-10-23 15:25 ` Doug Anderson 2015-10-25 7:55 ` Heiko Stübner 2015-10-25 7:55 ` Heiko Stübner 2015-10-25 7:55 ` Heiko Stübner 2015-11-19 2:44 ` Caesar Wang 2015-11-19 2:44 ` Caesar Wang 2015-11-19 2:44 ` Caesar Wang 2015-11-19 4:57 ` Heiko Stuebner 2015-11-19 4:57 ` Heiko Stuebner 2015-11-19 4:57 ` Heiko Stuebner
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1445599528-18825-4-git-send-email-wxt@rock-chips.com \ --to=wxt@rock-chips.com \ --cc=devicetree@vger.kernel.org \ --cc=dianders@chromium.org \ --cc=dmitry.torokhov@gmail.com \ --cc=edubezval@gmail.com \ --cc=galak@codeaurora.org \ --cc=heiko@sntech.de \ --cc=ijc+devicetree@hellion.org.uk \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-rockchip@lists.infradead.org \ --cc=linux@arm.linux.org.uk \ --cc=mark.rutland@arm.com \ --cc=pawel.moll@arm.com \ --cc=robh+dt@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.