diff mbox series

[v2,3/5] arm64: dts: qcom: Add PM6125 PMIC

Message ID 20220805135729.1037079-4-marijn.suijten@somainline.org
State Superseded
Headers show
Series Add Qcom PM6125 PMIC, and use in Sony Xperia Seine PDX201 | expand

Commit Message

Marijn Suijten Aug. 5, 2022, 1:57 p.m. UTC
This PMIC is commonly used on boards with an SM6125 SoC and looks very
similar in layout to the PM6150.

Downstream declares more nodes to be available, but these have been
omitted from this patch: the pwm/lpg block is unused on my reference
device making it impossible to test/validate, and the spmi-clkdiv does
not have a single device-tree binding using this driver yet, hence
inclusion is better postponed until ie. audio which uses these clocks is
brought up.

Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@somainline.org>
Reviewed-by: Konrad Dybcio <konrad.dybcio@somainline.org>
---
 arch/arm64/boot/dts/qcom/pm6125.dtsi | 154 +++++++++++++++++++++++++++
 1 file changed, 154 insertions(+)
 create mode 100644 arch/arm64/boot/dts/qcom/pm6125.dtsi

Comments

Krzysztof Kozlowski Aug. 8, 2022, 9:17 a.m. UTC | #1
On 05/08/2022 16:57, Marijn Suijten wrote:
> This PMIC is commonly used on boards with an SM6125 SoC and looks very
> similar in layout to the PM6150.
> 
> Downstream declares more nodes to be available, but these have been
> omitted from this patch: the pwm/lpg block is unused on my reference
> device making it impossible to test/validate, and the spmi-clkdiv does
> not have a single device-tree binding using this driver yet, hence
> inclusion is better postponed until ie. audio which uses these clocks is
> brought up.
> 

Thank you for your patch. There is something to discuss/improve.

> +
> +			xo-therm@4c {
> +				reg = <ADC5_XO_THERM_100K_PU>;
> +				qcom,pre-scaling = <1 1>;
> +				qcom,hw-settle-time = <200>;
> +				qcom,ratiometric;
> +			};
> +		};
> +
> +		pm6125_adc_tm: adc-tm@3500 {

Generic node names, so either this is adc or thermal-sensor. Looks like
thermal-sensor.

> +			compatible = "qcom,spmi-adc-tm5";
> +			reg = <0x3500>;
> +			interrupts = <0x0 0x35 0x0 IRQ_TYPE_EDGE_RISING>;
> +			#address-cells = <1>;
> +			#size-cells = <0>;
> +			#thermal-sensor-cells = <1>;
> +			status = "disabled";
> +		};
> +
> +		pm6125_rtc: rtc@6000 {
> +			compatible = "qcom,pm8941-rtc";
> +			reg = <0x6000>, <0x6100>;
> +			reg-names = "rtc", "alarm";
> +			interrupts = <0x0 0x61 0x1 IRQ_TYPE_EDGE_RISING>;
> +			status = "disabled";
> +		};
> +
> +		pm6125_gpio: gpios@c000 {

s/gpios/gpio/

> +			compatible = "qcom,pm6125-gpio", "qcom,spmi-gpio";
> +			reg = <0xc000>;
> +			gpio-controller;
> +			gpio-ranges = <&pm6125_gpio 0 0 9>;
> +			#gpio-cells = <2>;
> +			interrupt-controller;
> +			#interrupt-cells = <2>;
> +		};
> +	};
> +
> +	pmic@1 {
> +		compatible = "qcom,pm6125", "qcom,spmi-pmic";
> +		reg = <0x1 SPMI_USID>;
> +	};
> +};


Best regards,
Krzysztof
Marijn Suijten Sept. 7, 2022, 9:27 p.m. UTC | #2
On 2022-08-08 12:17:06, Krzysztof Kozlowski wrote:
> On 05/08/2022 16:57, Marijn Suijten wrote:
> > This PMIC is commonly used on boards with an SM6125 SoC and looks very
> > similar in layout to the PM6150.
> > 
> > Downstream declares more nodes to be available, but these have been
> > omitted from this patch: the pwm/lpg block is unused on my reference
> > device making it impossible to test/validate, and the spmi-clkdiv does
> > not have a single device-tree binding using this driver yet, hence
> > inclusion is better postponed until ie. audio which uses these clocks is
> > brought up.
> > 
> 
> Thank you for your patch. There is something to discuss/improve.

I can respin the series with the suggested changes (and the iio patch
removed as that has now been applied), but note that all other PMIC dtsi
files as of -next today still carry the "wrong" adc-tm or gpios node
names.  Are there plans to patch those up too (if not already in a
series that I missed)?

- Marijn

> > +
> > +			xo-therm@4c {
> > +				reg = <ADC5_XO_THERM_100K_PU>;
> > +				qcom,pre-scaling = <1 1>;
> > +				qcom,hw-settle-time = <200>;
> > +				qcom,ratiometric;
> > +			};
> > +		};
> > +
> > +		pm6125_adc_tm: adc-tm@3500 {
> 
> Generic node names, so either this is adc or thermal-sensor. Looks like
> thermal-sensor.
> 
> > +			compatible = "qcom,spmi-adc-tm5";
> > +			reg = <0x3500>;
> > +			interrupts = <0x0 0x35 0x0 IRQ_TYPE_EDGE_RISING>;
> > +			#address-cells = <1>;
> > +			#size-cells = <0>;
> > +			#thermal-sensor-cells = <1>;
> > +			status = "disabled";
> > +		};
> > +
> > +		pm6125_rtc: rtc@6000 {
> > +			compatible = "qcom,pm8941-rtc";
> > +			reg = <0x6000>, <0x6100>;
> > +			reg-names = "rtc", "alarm";
> > +			interrupts = <0x0 0x61 0x1 IRQ_TYPE_EDGE_RISING>;
> > +			status = "disabled";
> > +		};
> > +
> > +		pm6125_gpio: gpios@c000 {
> 
> s/gpios/gpio/
> 
> > +			compatible = "qcom,pm6125-gpio", "qcom,spmi-gpio";
> > +			reg = <0xc000>;
> > +			gpio-controller;
> > +			gpio-ranges = <&pm6125_gpio 0 0 9>;
> > +			#gpio-cells = <2>;
> > +			interrupt-controller;
> > +			#interrupt-cells = <2>;
> > +		};
> > +	};
> > +
> > +	pmic@1 {
> > +		compatible = "qcom,pm6125", "qcom,spmi-pmic";
> > +		reg = <0x1 SPMI_USID>;
> > +	};
> > +};
> 
> 
> Best regards,
> Krzysztof
Krzysztof Kozlowski Sept. 8, 2022, 7:26 a.m. UTC | #3
On 07/09/2022 23:27, Marijn Suijten wrote:
> On 2022-08-08 12:17:06, Krzysztof Kozlowski wrote:
>> On 05/08/2022 16:57, Marijn Suijten wrote:
>>> This PMIC is commonly used on boards with an SM6125 SoC and looks very
>>> similar in layout to the PM6150.
>>>
>>> Downstream declares more nodes to be available, but these have been
>>> omitted from this patch: the pwm/lpg block is unused on my reference
>>> device making it impossible to test/validate, and the spmi-clkdiv does
>>> not have a single device-tree binding using this driver yet, hence
>>> inclusion is better postponed until ie. audio which uses these clocks is
>>> brought up.
>>>
>>
>> Thank you for your patch. There is something to discuss/improve.
> 
> I can respin the series with the suggested changes (and the iio patch
> removed as that has now been applied), but note that all other PMIC dtsi
> files as of -next today still carry the "wrong" adc-tm or gpios node
> names.  Are there plans to patch those up too (if not already in a
> series that I missed)?

See below

> 
> - Marijn
> 
>>> +
>>> +			xo-therm@4c {
>>> +				reg = <ADC5_XO_THERM_100K_PU>;
>>> +				qcom,pre-scaling = <1 1>;
>>> +				qcom,hw-settle-time = <200>;
>>> +				qcom,ratiometric;
>>> +			};
>>> +		};
>>> +
>>> +		pm6125_adc_tm: adc-tm@3500 {
>>
>> Generic node names, so either this is adc or thermal-sensor. Looks like
>> thermal-sensor.

My comment was here not correct. The schema indeed expects this to be
adc-tm. I did not plan to change it, so let's keep adc-tm also here.

>>
>>> +			compatible = "qcom,spmi-adc-tm5";
>>> +			reg = <0x3500>;
>>> +			interrupts = <0x0 0x35 0x0 IRQ_TYPE_EDGE_RISING>;
>>> +			#address-cells = <1>;
>>> +			#size-cells = <0>;
>>> +			#thermal-sensor-cells = <1>;
>>> +			status = "disabled";
>>> +		};
>>> +
>>> +		pm6125_rtc: rtc@6000 {
>>> +			compatible = "qcom,pm8941-rtc";
>>> +			reg = <0x6000>, <0x6100>;
>>> +			reg-names = "rtc", "alarm";
>>> +			interrupts = <0x0 0x61 0x1 IRQ_TYPE_EDGE_RISING>;
>>> +			status = "disabled";
>>> +		};
>>> +
>>> +		pm6125_gpio: gpios@c000 {
>>
>> s/gpios/gpio/

Both are allowed by schema, but convention in all other cases is "gpio",
so let's change it. I'll send a patch for other files.

Best regards,
Krzysztof
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/qcom/pm6125.dtsi b/arch/arm64/boot/dts/qcom/pm6125.dtsi
new file mode 100644
index 000000000000..25ef15fbfda7
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/pm6125.dtsi
@@ -0,0 +1,154 @@ 
+// SPDX-License-Identifier: BSD-3-Clause
+
+#include <dt-bindings/iio/qcom,spmi-vadc.h>
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/input/linux-event-codes.h>
+#include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/spmi/spmi.h>
+
+/ {
+	thermal-zones {
+		pm6125-thermal {
+			polling-delay-passive = <100>;
+			polling-delay = <0>;
+
+			thermal-sensors = <&pm6125_temp>;
+
+			trips {
+				trip0 {
+					temperature = <95000>;
+					hysteresis = <0>;
+					type = "passive";
+				};
+
+				trip1 {
+					temperature = <115000>;
+					hysteresis = <0>;
+					type = "hot";
+				};
+
+				trip2 {
+					temperature = <145000>;
+					hysteresis = <0>;
+					type = "critical";
+				};
+			};
+		};
+	};
+};
+
+&spmi_bus {
+	pmic@0 {
+		compatible = "qcom,pm6125", "qcom,spmi-pmic";
+		reg = <0x0 SPMI_USID>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		pm6125_pon: pon@800 {
+			compatible = "qcom,pm8998-pon";
+			reg = <0x800>;
+			mode-bootloader = <0x2>;
+			mode-recovery = <0x1>;
+
+			pon_pwrkey: pwrkey {
+				compatible = "qcom,pm8941-pwrkey";
+				interrupts = <0x0 0x8 0x0 IRQ_TYPE_EDGE_BOTH>;
+				debounce = <15625>;
+				linux,code = <KEY_POWER>;
+				bias-pull-up;
+				status = "disabled";
+			};
+
+			pon_resin: resin {
+				compatible = "qcom,pm8941-resin";
+				interrupts = <0x0 0x8 0x1 IRQ_TYPE_EDGE_BOTH>;
+				debounce = <15625>;
+				bias-pull-up;
+				status = "disabled";
+			};
+		};
+
+		pm6125_temp: temp-alarm@2400 {
+			compatible = "qcom,spmi-temp-alarm";
+			reg = <0x2400>;
+			interrupts = <0x0 0x24 0x0 IRQ_TYPE_EDGE_RISING>;
+			io-channels = <&pm6125_adc ADC5_DIE_TEMP>;
+			io-channel-names = "thermal";
+			#thermal-sensor-cells = <0>;
+		};
+
+		pm6125_adc: adc@3100 {
+			compatible = "qcom,spmi-adc5";
+			reg = <0x3100>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			interrupts = <0x0 0x31 0x0 IRQ_TYPE_EDGE_RISING>;
+			#io-channel-cells = <1>;
+
+			ref-gnd@0 {
+				reg = <ADC5_REF_GND>;
+				qcom,pre-scaling = <1 1>;
+			};
+
+			vref-1p25@1 {
+				reg = <ADC5_1P25VREF>;
+				qcom,pre-scaling = <1 1>;
+			};
+
+			die-temp@6 {
+				reg = <ADC5_DIE_TEMP>;
+				qcom,pre-scaling = <1 1>;
+			};
+
+			vph-pwr@83 {
+				reg = <ADC5_VPH_PWR>;
+				qcom,pre-scaling = <1 3>;
+			};
+
+			vcoin@85 {
+				reg = <ADC5_VCOIN>;
+				qcom,pre-scaling = <1 3>;
+			};
+
+			xo-therm@4c {
+				reg = <ADC5_XO_THERM_100K_PU>;
+				qcom,pre-scaling = <1 1>;
+				qcom,hw-settle-time = <200>;
+				qcom,ratiometric;
+			};
+		};
+
+		pm6125_adc_tm: adc-tm@3500 {
+			compatible = "qcom,spmi-adc-tm5";
+			reg = <0x3500>;
+			interrupts = <0x0 0x35 0x0 IRQ_TYPE_EDGE_RISING>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			#thermal-sensor-cells = <1>;
+			status = "disabled";
+		};
+
+		pm6125_rtc: rtc@6000 {
+			compatible = "qcom,pm8941-rtc";
+			reg = <0x6000>, <0x6100>;
+			reg-names = "rtc", "alarm";
+			interrupts = <0x0 0x61 0x1 IRQ_TYPE_EDGE_RISING>;
+			status = "disabled";
+		};
+
+		pm6125_gpio: gpios@c000 {
+			compatible = "qcom,pm6125-gpio", "qcom,spmi-gpio";
+			reg = <0xc000>;
+			gpio-controller;
+			gpio-ranges = <&pm6125_gpio 0 0 9>;
+			#gpio-cells = <2>;
+			interrupt-controller;
+			#interrupt-cells = <2>;
+		};
+	};
+
+	pmic@1 {
+		compatible = "qcom,pm6125", "qcom,spmi-pmic";
+		reg = <0x1 SPMI_USID>;
+	};
+};