[10/22] arm64: dts: qcom: pm8150b: Add pon and adc nodes
diff mbox series

Message ID 20190814125012.8700-11-vkoul@kernel.org
State New
Headers show
Series
  • arm64: dts: qcom: sm8150: Add SM8150 DTS
Related show

Commit Message

Vinod Koul Aug. 14, 2019, 12:50 p.m. UTC
Add the pon and adc nodes found in pm8150b PMIC.

Signed-off-by: Vinod Koul <vkoul@kernel.org>
---
 arch/arm64/boot/dts/qcom/pm8150b.dtsi | 54 +++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

Comments

Stephen Boyd Aug. 14, 2019, 5:08 p.m. UTC | #1
Quoting Vinod Koul (2019-08-14 05:50:00)
> Add the pon and adc nodes found in pm8150b PMIC.
> 
> Signed-off-by: Vinod Koul <vkoul@kernel.org>
> ---
>  arch/arm64/boot/dts/qcom/pm8150b.dtsi | 54 +++++++++++++++++++++++++++
>  1 file changed, 54 insertions(+)

Squash?

> 
> diff --git a/arch/arm64/boot/dts/qcom/pm8150b.dtsi b/arch/arm64/boot/dts/qcom/pm8150b.dtsi
> index c0a678b0f159..846197bd65cd 100644
> --- a/arch/arm64/boot/dts/qcom/pm8150b.dtsi
> +++ b/arch/arm64/boot/dts/qcom/pm8150b.dtsi
> @@ -2,6 +2,7 @@
>  // Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.
>  // Copyright (c) 2019, Linaro Limited
>  
> +#include <dt-bindings/iio/qcom,spmi-vadc.h>
>  #include <dt-bindings/interrupt-controller/irq.h>
>  #include <dt-bindings/spmi/spmi.h>
>  
> @@ -11,6 +12,59 @@
>                 reg = <0x2 SPMI_USID>;
>                 #address-cells = <1>;
>                 #size-cells = <0>;
> +
> +               pon@800 {

Maybe pon node name should be 'key' or 'power-on'?

> +                       compatible = "qcom,pm8916-pon";
> +                       reg = <0x0800>;
> +               };
> +
> +               adc@3100 {
> +                       compatible = "qcom,spmi-adc5";
> +                       reg = <0x3100>;
> +                       #address-cells = <1>;
> +                       #size-cells = <0>;
> +                       #io-channel-cells = <1>;
> +                       interrupts = <0x2 0x31 0x0 IRQ_TYPE_EDGE_RISING>;
> +
> +                       ref-gnd@0 {
> +                               reg = <ADC5_REF_GND>;
> +                               qcom,pre-scaling = <1 1>;
> +                               label = "ref_gnd";
> +                       };
> +
> +                       vref-1p25@1 {
> +                               reg = <ADC5_1P25VREF>;
> +                               qcom,pre-scaling = <1 1>;
> +                               label = "vref_1p25";
> +                       };
> +
> +                       die-temp@6 {
> +                               reg = <ADC5_DIE_TEMP>;
> +                               qcom,pre-scaling = <1 1>;
> +                               label = "die_temp";
> +                       };
> +
> +                       chg-temp@9 {
> +                               reg = <ADC5_CHG_TEMP>;
> +                               qcom,pre-scaling = <1 1>;
> +                               label = "chg_temp";
> +                       };
> +
> +                       smb1390-therm@14 {
> +                               reg = <ADC5_AMUX_THM2>;
> +                               qcom,hw-settle-time = <200>;
> +                               qcom,pre-scaling = <1 1>;
> +                               label = "smb1390_therm";
> +                       };
> +
> +                       smb1355-therm@78 {
> +                               reg = <ADC5_AMUX_THM2_100K_PU>;
> +                               qcom,ratiometric;
> +                               qcom,hw-settle-time = <200>;
> +                               qcom,pre-scaling = <1 1>;
> +                               label = "smb1355_therm";
> +                       };

Again, are these board level details? Maybe should be provided here with
status = "disabled" and then added by the boards that use these ADCs.

> +               };
>         };
Bjorn Andersson Aug. 14, 2019, 6 p.m. UTC | #2
On Wed 14 Aug 05:50 PDT 2019, Vinod Koul wrote:

> Add the pon and adc nodes found in pm8150b PMIC.
> 
> Signed-off-by: Vinod Koul <vkoul@kernel.org>
> ---
>  arch/arm64/boot/dts/qcom/pm8150b.dtsi | 54 +++++++++++++++++++++++++++
>  1 file changed, 54 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/qcom/pm8150b.dtsi b/arch/arm64/boot/dts/qcom/pm8150b.dtsi
> index c0a678b0f159..846197bd65cd 100644
> --- a/arch/arm64/boot/dts/qcom/pm8150b.dtsi
> +++ b/arch/arm64/boot/dts/qcom/pm8150b.dtsi
> @@ -2,6 +2,7 @@
>  // Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.
>  // Copyright (c) 2019, Linaro Limited
>  
> +#include <dt-bindings/iio/qcom,spmi-vadc.h>
>  #include <dt-bindings/interrupt-controller/irq.h>
>  #include <dt-bindings/spmi/spmi.h>
>  
> @@ -11,6 +12,59 @@
>  		reg = <0x2 SPMI_USID>;
>  		#address-cells = <1>;
>  		#size-cells = <0>;
> +
> +		pon@800 {
> +			compatible = "qcom,pm8916-pon";
> +			reg = <0x0800>;
> +		};
> +
> +		adc@3100 {
> +			compatible = "qcom,spmi-adc5";
> +			reg = <0x3100>;
> +			#address-cells = <1>;
> +			#size-cells = <0>;
> +			#io-channel-cells = <1>;
> +			interrupts = <0x2 0x31 0x0 IRQ_TYPE_EDGE_RISING>;
> +
> +			ref-gnd@0 {
> +				reg = <ADC5_REF_GND>;
> +				qcom,pre-scaling = <1 1>;
> +				label = "ref_gnd";
> +			};
> +
> +			vref-1p25@1 {
> +				reg = <ADC5_1P25VREF>;
> +				qcom,pre-scaling = <1 1>;
> +				label = "vref_1p25";
> +			};
> +
> +			die-temp@6 {
> +				reg = <ADC5_DIE_TEMP>;
> +				qcom,pre-scaling = <1 1>;
> +				label = "die_temp";
> +			};
> +
> +			chg-temp@9 {
> +				reg = <ADC5_CHG_TEMP>;
> +				qcom,pre-scaling = <1 1>;
> +				label = "chg_temp";
> +			};
> +

I believe the above items are internal, so it makes sense to keep them
here, the below amux ones relates to board configuration so I think
those should go in the board file.

Regards,
Bjorn

> +			smb1390-therm@14 {
> +				reg = <ADC5_AMUX_THM2>;
> +				qcom,hw-settle-time = <200>;
> +				qcom,pre-scaling = <1 1>;
> +				label = "smb1390_therm";
> +			};
> +
> +			smb1355-therm@78 {
> +				reg = <ADC5_AMUX_THM2_100K_PU>;
> +				qcom,ratiometric;
> +				qcom,hw-settle-time = <200>;
> +				qcom,pre-scaling = <1 1>;
> +				label = "smb1355_therm";
> +			};
> +		};
>  	};
>  
>  	qcom,pm8150@3 {
> -- 
> 2.20.1
>
Vinod Koul Aug. 19, 2019, 5:43 p.m. UTC | #3
On 14-08-19, 10:08, Stephen Boyd wrote:
> Quoting Vinod Koul (2019-08-14 05:50:00)
> > Add the pon and adc nodes found in pm8150b PMIC.
> > 
> > Signed-off-by: Vinod Koul <vkoul@kernel.org>
> > ---
> >  arch/arm64/boot/dts/qcom/pm8150b.dtsi | 54 +++++++++++++++++++++++++++
> >  1 file changed, 54 insertions(+)
> 
> Squash?

Ok

> 
> > 
> > diff --git a/arch/arm64/boot/dts/qcom/pm8150b.dtsi b/arch/arm64/boot/dts/qcom/pm8150b.dtsi
> > index c0a678b0f159..846197bd65cd 100644
> > --- a/arch/arm64/boot/dts/qcom/pm8150b.dtsi
> > +++ b/arch/arm64/boot/dts/qcom/pm8150b.dtsi
> > @@ -2,6 +2,7 @@
> >  // Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.
> >  // Copyright (c) 2019, Linaro Limited
> >  
> > +#include <dt-bindings/iio/qcom,spmi-vadc.h>
> >  #include <dt-bindings/interrupt-controller/irq.h>
> >  #include <dt-bindings/spmi/spmi.h>
> >  
> > @@ -11,6 +12,59 @@
> >                 reg = <0x2 SPMI_USID>;
> >                 #address-cells = <1>;
> >                 #size-cells = <0>;
> > +
> > +               pon@800 {
> 
> Maybe pon node name should be 'key' or 'power-on'?

pon stands for power on device. See Documentation/devicetree/bindings/power/reset/qcom,pon.txt

> 
> > +                       compatible = "qcom,pm8916-pon";
> > +                       reg = <0x0800>;
> > +               };
> > +
> > +               adc@3100 {
> > +                       compatible = "qcom,spmi-adc5";
> > +                       reg = <0x3100>;
> > +                       #address-cells = <1>;
> > +                       #size-cells = <0>;
> > +                       #io-channel-cells = <1>;
> > +                       interrupts = <0x2 0x31 0x0 IRQ_TYPE_EDGE_RISING>;
> > +
> > +                       ref-gnd@0 {
> > +                               reg = <ADC5_REF_GND>;
> > +                               qcom,pre-scaling = <1 1>;
> > +                               label = "ref_gnd";
> > +                       };
> > +
> > +                       vref-1p25@1 {
> > +                               reg = <ADC5_1P25VREF>;
> > +                               qcom,pre-scaling = <1 1>;
> > +                               label = "vref_1p25";
> > +                       };
> > +
> > +                       die-temp@6 {
> > +                               reg = <ADC5_DIE_TEMP>;
> > +                               qcom,pre-scaling = <1 1>;
> > +                               label = "die_temp";
> > +                       };
> > +
> > +                       chg-temp@9 {
> > +                               reg = <ADC5_CHG_TEMP>;
> > +                               qcom,pre-scaling = <1 1>;
> > +                               label = "chg_temp";
> > +                       };
> > +
> > +                       smb1390-therm@14 {
> > +                               reg = <ADC5_AMUX_THM2>;
> > +                               qcom,hw-settle-time = <200>;
> > +                               qcom,pre-scaling = <1 1>;
> > +                               label = "smb1390_therm";
> > +                       };
> > +
> > +                       smb1355-therm@78 {
> > +                               reg = <ADC5_AMUX_THM2_100K_PU>;
> > +                               qcom,ratiometric;
> > +                               qcom,hw-settle-time = <200>;
> > +                               qcom,pre-scaling = <1 1>;
> > +                               label = "smb1355_therm";
> > +                       };
> 
> Again, are these board level details? Maybe should be provided here with
> status = "disabled" and then added by the boards that use these ADCs.

Sure I will update these
Stephen Boyd Aug. 19, 2019, 5:56 p.m. UTC | #4
Quoting Vinod Koul (2019-08-19 10:43:31)
> On 14-08-19, 10:08, Stephen Boyd wrote:
> > 
> > > 
> > > diff --git a/arch/arm64/boot/dts/qcom/pm8150b.dtsi b/arch/arm64/boot/dts/qcom/pm8150b.dtsi
> > > index c0a678b0f159..846197bd65cd 100644
> > > --- a/arch/arm64/boot/dts/qcom/pm8150b.dtsi
> > > +++ b/arch/arm64/boot/dts/qcom/pm8150b.dtsi
> > > @@ -2,6 +2,7 @@
> > >  // Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.
> > >  // Copyright (c) 2019, Linaro Limited
> > >  
> > > +#include <dt-bindings/iio/qcom,spmi-vadc.h>
> > >  #include <dt-bindings/interrupt-controller/irq.h>
> > >  #include <dt-bindings/spmi/spmi.h>
> > >  
> > > @@ -11,6 +12,59 @@
> > >                 reg = <0x2 SPMI_USID>;
> > >                 #address-cells = <1>;
> > >                 #size-cells = <0>;
> > > +
> > > +               pon@800 {
> > 
> > Maybe pon node name should be 'key' or 'power-on'?
> 
> pon stands for power on device. See Documentation/devicetree/bindings/power/reset/qcom,pon.txt
> 

Right. I was hoping for a more standard node name vs. an acronym that's
SoC specific.
Vinod Koul Aug. 20, 2019, 3:46 a.m. UTC | #5
On 19-08-19, 10:56, Stephen Boyd wrote:
> Quoting Vinod Koul (2019-08-19 10:43:31)
> > On 14-08-19, 10:08, Stephen Boyd wrote:
> > > 
> > > > 
> > > > diff --git a/arch/arm64/boot/dts/qcom/pm8150b.dtsi b/arch/arm64/boot/dts/qcom/pm8150b.dtsi
> > > > index c0a678b0f159..846197bd65cd 100644
> > > > --- a/arch/arm64/boot/dts/qcom/pm8150b.dtsi
> > > > +++ b/arch/arm64/boot/dts/qcom/pm8150b.dtsi
> > > > @@ -2,6 +2,7 @@
> > > >  // Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.
> > > >  // Copyright (c) 2019, Linaro Limited
> > > >  
> > > > +#include <dt-bindings/iio/qcom,spmi-vadc.h>
> > > >  #include <dt-bindings/interrupt-controller/irq.h>
> > > >  #include <dt-bindings/spmi/spmi.h>
> > > >  
> > > > @@ -11,6 +12,59 @@
> > > >                 reg = <0x2 SPMI_USID>;
> > > >                 #address-cells = <1>;
> > > >                 #size-cells = <0>;
> > > > +
> > > > +               pon@800 {
> > > 
> > > Maybe pon node name should be 'key' or 'power-on'?
> > 
> > pon stands for power on device. See Documentation/devicetree/bindings/power/reset/qcom,pon.txt
> 
> Right. I was hoping for a more standard node name vs. an acronym that's
> SoC specific.

Sure that sounds better to me, I will make it "power-on"

Patch
diff mbox series

diff --git a/arch/arm64/boot/dts/qcom/pm8150b.dtsi b/arch/arm64/boot/dts/qcom/pm8150b.dtsi
index c0a678b0f159..846197bd65cd 100644
--- a/arch/arm64/boot/dts/qcom/pm8150b.dtsi
+++ b/arch/arm64/boot/dts/qcom/pm8150b.dtsi
@@ -2,6 +2,7 @@ 
 // Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.
 // Copyright (c) 2019, Linaro Limited
 
+#include <dt-bindings/iio/qcom,spmi-vadc.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/spmi/spmi.h>
 
@@ -11,6 +12,59 @@ 
 		reg = <0x2 SPMI_USID>;
 		#address-cells = <1>;
 		#size-cells = <0>;
+
+		pon@800 {
+			compatible = "qcom,pm8916-pon";
+			reg = <0x0800>;
+		};
+
+		adc@3100 {
+			compatible = "qcom,spmi-adc5";
+			reg = <0x3100>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			#io-channel-cells = <1>;
+			interrupts = <0x2 0x31 0x0 IRQ_TYPE_EDGE_RISING>;
+
+			ref-gnd@0 {
+				reg = <ADC5_REF_GND>;
+				qcom,pre-scaling = <1 1>;
+				label = "ref_gnd";
+			};
+
+			vref-1p25@1 {
+				reg = <ADC5_1P25VREF>;
+				qcom,pre-scaling = <1 1>;
+				label = "vref_1p25";
+			};
+
+			die-temp@6 {
+				reg = <ADC5_DIE_TEMP>;
+				qcom,pre-scaling = <1 1>;
+				label = "die_temp";
+			};
+
+			chg-temp@9 {
+				reg = <ADC5_CHG_TEMP>;
+				qcom,pre-scaling = <1 1>;
+				label = "chg_temp";
+			};
+
+			smb1390-therm@14 {
+				reg = <ADC5_AMUX_THM2>;
+				qcom,hw-settle-time = <200>;
+				qcom,pre-scaling = <1 1>;
+				label = "smb1390_therm";
+			};
+
+			smb1355-therm@78 {
+				reg = <ADC5_AMUX_THM2_100K_PU>;
+				qcom,ratiometric;
+				qcom,hw-settle-time = <200>;
+				qcom,pre-scaling = <1 1>;
+				label = "smb1355_therm";
+			};
+		};
 	};
 
 	qcom,pm8150@3 {