[v4,3/3] ARM: dts: rockchip: Add the OTP gpio pinctrl
diff mbox

Message ID 1445599528-18825-4-git-send-email-wxt@rock-chips.com
State New
Headers show

Commit Message

Caesar Wang Oct. 23, 2015, 11:25 a.m. UTC
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(-)

Comments

Doug Anderson Oct. 23, 2015, 3:25 p.m. UTC | #1
Hi,

On Fri, Oct 23, 2015 at 4:25 AM, Caesar Wang <wxt@rock-chips.com> wrote:
> 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(-)

I realized that the subject of this patch should probably contain the
word rk3288, but I presume Heiko would rather add that himself than
for you to spin this again.  ;)


-Doug
Heiko Stuebner Oct. 25, 2015, 7:55 a.m. UTC | #2
Am Freitag, 23. Oktober 2015, 08:25:08 schrieb Doug Anderson:
> On Fri, Oct 23, 2015 at 4:25 AM, Caesar Wang <wxt@rock-chips.com> wrote:
> > 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(-)
> 
> I realized that the subject of this patch should probably contain the
> word rk3288, but I presume Heiko would rather add that himself than
> for you to spin this again.  ;)

yep :-) ... no need to respin for such an easy change.
Caesar Wang Nov. 19, 2015, 2:44 a.m. UTC | #3
Hi Heiko,

? 2015?10?25? 15:55, Heiko Stübner ??:
> Am Freitag, 23. Oktober 2015, 08:25:08 schrieb Doug Anderson:
>> On Fri, Oct 23, 2015 at 4:25 AM, Caesar Wang <wxt@rock-chips.com> wrote:
>>> 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(-)
>> I realized that the subject of this patch should probably contain the
>> word rk3288, but I presume Heiko would rather add that himself than
>> for you to spin this again.  ;)
> yep :-) ... no need to respin for such an easy change

That's seem this patch didn't merge into your v4.5-armsoc/soc branch.:-)

I guess this patch should merge into  kernel-4.4 since the Patch[1/3] / 
[2/3] have been merged into 4.4-rc1.:-P

>
> _______________________________________________
> Linux-rockchip mailing list
> Linux-rockchip@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-rockchip
Heiko Stuebner Nov. 19, 2015, 4:57 a.m. UTC | #4
Hi Caesar,

Am Donnerstag, 19. November 2015, 10:44:02 schrieb Caesar Wang:
> ? 2015?10?25? 15:55, Heiko Stübner ??:
> > Am Freitag, 23. Oktober 2015, 08:25:08 schrieb Doug Anderson:
> >> On Fri, Oct 23, 2015 at 4:25 AM, Caesar Wang <wxt@rock-chips.com> wrote:
> >>> 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(-)
> >> I realized that the subject of this patch should probably contain the
> >> word rk3288, but I presume Heiko would rather add that himself than
> >> for you to spin this again.  ;)
> > yep :-) ... no need to respin for such an easy change
> 
> That's seem this patch didn't merge into your v4.5-armsoc/soc branch.:-)
> 
> I guess this patch should merge into  kernel-4.4 since the Patch[1/3] / 
> [2/3] have been merged into 4.4-rc1.:-P

thanks for the reminder :-)

It seems I didn't get a notice when the core thermal changes were merged, so 
this patch seems to have dropped of my radar. It is clearly a fix for a real 
issue, so I've added it to my fixes branch for 4.4.


Heiko

Patch
diff mbox

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>;
 			};