| Message ID | 1409710239-19941-4-git-send-email-caesar.wang@rock-chips.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Am Mittwoch, 3. September 2014, 10:10:38 schrieb Caesar Wang: > Signed-off-by: Caesar Wang <caesar.wang@rock-chips.com> > --- > arch/arm/boot/dts/rk3288.dtsi | 18 ++++++++++++++++++ > 1 file changed, 18 insertions(+) > > diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi > index 36be7bb..3d672e3 100644 > --- a/arch/arm/boot/dts/rk3288.dtsi > +++ b/arch/arm/boot/dts/rk3288.dtsi > @@ -224,6 +224,17 @@ > status = "disabled"; > }; > > + tsadc: tsadc@ff280000 { please keep the list of nodes sorted by register address. So when looking at my v3.18-next/dts branch, it should be after uart4: serial@ff1c0000 and before usb_host0_ehci: usb@ff500000 . > + compatible = "rockchip,rk3288-tsadc"; > + reg = <0xff280000 0x100>; > + interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&cru SCLK_TSADC>, <&cru PCLK_TSADC>; > + clock-names = "tsadc", "apb_pclk"; > + pinctrl-names = "default"; > + pinctrl-1 = <&tsadc_int>; > + status = "disabled"; > + }; > + > /* NOTE: ohci@ff520000 doesn't actually work on hardware */ > > usb_hsic: usb@ff5c0000 { > @@ -611,5 +622,12 @@ > rockchip,pins = <5 15 3 &pcfg_pull_none>; > }; > }; > + > + tsadc { > + tsadc_int: tsadc-int { > + rockchip,pins = <0 10 RK_FUNC_1 &pcfg_pull_up>; > + }; > + }; After looking this up in the schematics I see that this is the overtemperature-protection output pin ... labeled OTP_OUT. So I'd think the pinconfig should reflect this pin-name, especially as tsadc-int suggests, that this would be an interrupt leading into the tsadc, while in fact it is an output to a separate circuit. Heiko
Hi Heiko, ? 2014?09?09? 19:37, Heiko Stübner ??: > Am Mittwoch, 3. September 2014, 10:10:38 schrieb Caesar Wang: >> Signed-off-by: Caesar Wang <caesar.wang@rock-chips.com> >> --- >> arch/arm/boot/dts/rk3288.dtsi | 18 ++++++++++++++++++ >> 1 file changed, 18 insertions(+) >> >> diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi >> index 36be7bb..3d672e3 100644 >> --- a/arch/arm/boot/dts/rk3288.dtsi >> +++ b/arch/arm/boot/dts/rk3288.dtsi >> @@ -224,6 +224,17 @@ >> status = "disabled"; >> }; >> >> + tsadc: tsadc@ff280000 { > please keep the list of nodes sorted by register address. So when looking at > my v3.18-next/dts branch, it should be after uart4: serial@ff1c0000 and before > usb_host0_ehci: usb@ff500000 . > oh...,I will fix it. >> + compatible = "rockchip,rk3288-tsadc"; >> + reg = <0xff280000 0x100>; >> + interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>; >> + clocks = <&cru SCLK_TSADC>, <&cru PCLK_TSADC>; >> + clock-names = "tsadc", "apb_pclk"; >> + pinctrl-names = "default"; >> + pinctrl-1 = <&tsadc_int>; >> + status = "disabled"; >> + }; >> + >> /* NOTE: ohci@ff520000 doesn't actually work on hardware */ >> >> usb_hsic: usb@ff5c0000 { >> @@ -611,5 +622,12 @@ >> rockchip,pins = <5 15 3 &pcfg_pull_none>; >> }; >> }; >> + >> + tsadc { >> + tsadc_int: tsadc-int { >> + rockchip,pins = <0 10 RK_FUNC_1 &pcfg_pull_up>; >> + }; >> + }; > After looking this up in the schematics I see that this is the > overtemperature-protection output pin ... labeled OTP_OUT. > So I'd think the pinconfig should reflect this pin-name, especially as tsadc-int > suggests, that this would be an interrupt leading into the tsadc, while in > fact it is an output to a separate circuit. > Maybe,I guess your mean as the follows . Please correct it and Laugh out if I got it wrong. tsadc { otp_out: otp-out { rockchip,pins = <0 10 RK_FUNC_GPIO &pcfg_pull_none>; }; tsadc_int: tsadc-int { rockchip,pins = <0 10 RK_FUNC_1 &pcfg_pull_none>; }; }; Then,I deal with the otp_out in thermal driver. I believe The "otp_out" will restart board if it's a high active. tsadc_int: tsadc-int { + rockchip,pins = <0 10 RK_FUNC_1 &pcfg_pull_up>; + }; But,I think the about will be implemented in thermal driver. > Heiko > > >
Hi Caesar, Am Mittwoch, 10. September 2014, 10:49:05 schrieb Caesar Wang: > Hi Heiko, > > ? 2014?09?09? 19:37, Heiko Stübner ??: > > Am Mittwoch, 3. September 2014, 10:10:38 schrieb Caesar Wang: > >> Signed-off-by: Caesar Wang <caesar.wang@rock-chips.com> > >> --- > >> > >> arch/arm/boot/dts/rk3288.dtsi | 18 ++++++++++++++++++ > >> 1 file changed, 18 insertions(+) > >> > >> diff --git a/arch/arm/boot/dts/rk3288.dtsi > >> b/arch/arm/boot/dts/rk3288.dtsi > >> index 36be7bb..3d672e3 100644 > >> --- a/arch/arm/boot/dts/rk3288.dtsi > >> +++ b/arch/arm/boot/dts/rk3288.dtsi [...] > >> @@ -611,5 +622,12 @@ > >> > >> rockchip,pins = <5 15 3 &pcfg_pull_none>; > >> > >> }; > >> > >> }; > >> > >> + > >> + tsadc { > >> + tsadc_int: tsadc-int { > >> + rockchip,pins = <0 10 RK_FUNC_1 &pcfg_pull_up>; > >> + }; > >> + }; > > > > After looking this up in the schematics I see that this is the > > overtemperature-protection output pin ... labeled OTP_OUT. > > So I'd think the pinconfig should reflect this pin-name, especially as > > tsadc-int suggests, that this would be an interrupt leading into the > > tsadc, while in fact it is an output to a separate circuit. > > Maybe,I guess your mean as the follows . > Please correct it and Laugh out if I got it wrong. I'll never laugh ... just try get the best solution / trying to understand backgrounds. > > tsadc { > otp_out: otp-out { > rockchip,pins = <0 10 RK_FUNC_GPIO &pcfg_pull_none>; > }; > > tsadc_int: tsadc-int { > rockchip,pins = <0 10 RK_FUNC_1 &pcfg_pull_none>; > }; > }; > Then,I deal with the otp_out in thermal driver. > I believe The "otp_out" will restart board if it's a high active. > > tsadc_int: tsadc-int { > + rockchip,pins = <0 10 RK_FUNC_1 &pcfg_pull_up>; > + }; > > But,I think the about will be implemented in thermal driver. I only meant the pin name (tsadc-int -> otp-out). In the schmatics the pin (controlled by the tsadc) is labeled otp_out and leads to the overtemperature protection circuit as expected. And as it's controlled by the tsadc, it should of course stay as the desired func_1. Heiko
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi index 36be7bb..3d672e3 100644 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -224,6 +224,17 @@ status = "disabled"; }; + tsadc: tsadc@ff280000 { + compatible = "rockchip,rk3288-tsadc"; + reg = <0xff280000 0x100>; + interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cru SCLK_TSADC>, <&cru PCLK_TSADC>; + clock-names = "tsadc", "apb_pclk"; + pinctrl-names = "default"; + pinctrl-1 = <&tsadc_int>; + status = "disabled"; + }; + /* NOTE: ohci@ff520000 doesn't actually work on hardware */ usb_hsic: usb@ff5c0000 { @@ -611,5 +622,12 @@ rockchip,pins = <5 15 3 &pcfg_pull_none>; }; }; + + tsadc { + tsadc_int: tsadc-int { + rockchip,pins = <0 10 RK_FUNC_1 &pcfg_pull_up>; + }; + }; + }; };
Signed-off-by: Caesar Wang <caesar.wang@rock-chips.com> --- arch/arm/boot/dts/rk3288.dtsi | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)