This series depends on https://patchwork.kernel.org/project/linux-arm-msm/list/?series=478225
which adds therml-zones node.
Changes in V2:
- As per Matthias comments:
- I've Split the patch into per-PMIC patches and one sc7280 patch
- Removed 2nd critical point, thermal-governer property
- s/pm8325_tz/pm7325_temp_alarm and s/pm7325_temp_alarm/pm7325_thermal
- Fixed few other minor errors.
- As per Bjorn's comments, replaced '_' with '-' in node names and moved
DT files inclusion to board dts.
Changes in V3:
- As per Matthias comments, changed commit text, modified critical interrupt
node name like <name>-crit for all pmics.
- Moved pmk8350_vadc channel nodes to idp dts, as it is not guaranteed that
a board with the pmk8350 will always have the other 3 PMICs
Changes in V4:
- PMR735A and PM8350C PMICS are used in sm8350 SoC. Added thermal_zones label
for thermal-zones node to avoid compilation error while using the phandle
in pmic dt files.
- As per Matthias comments:
- Changed commit text for pmk8350 pmic patch
- Moved the header files inclusion for the on die tempertures of PMICs from
pmk8350 dt file to sc7280-idp dts
- Changed commit text and made a dedicated patch to include pmic dt files
for sc7280-idp
- Made separate patches for on die temp channel nodes and for adding thermal-
zones node in sc7280 SoC dtsi
satya priya (11):
arm64: dts: qcom: sm8350: Add label for thermal-zones node
arm64: dts: qcom: pm7325: Add pm7325 base dts file
arm64: dts: qcom: pm8350c: Add temp-alarm support
arm64: dts: qcom: pm8350c: Correct the GPIO node
arm64: dts: qcom: pmr735a: Add temp-alarm support
arm64: dts: qcom: pmr735a: Correct the GPIO node
arm64: dts: qcom: pmk8350: Add peripherals for pmk8350
arm64: dts: qcom: pmk8350: Correct the GPIO node
arm64: dts: qcom: sc7280: Include PMIC DT files for sc7280-idp
arm64: dts: qcom: sc7280: Add ADC channel nodes for PMIC temperatures
to sc7280-idp
mfd: qcom-spmi-pmic: Add support for four variants
.../devicetree/bindings/mfd/qcom,spmi-pmic.txt | 4 ++
arch/arm64/boot/dts/qcom/pm7325.dtsi | 53 ++++++++++++++++++++++
arch/arm64/boot/dts/qcom/pm8350c.dtsi | 32 ++++++++++++-
arch/arm64/boot/dts/qcom/pmk8350.dtsi | 51 ++++++++++++++++++++-
arch/arm64/boot/dts/qcom/pmr735a.dtsi | 32 ++++++++++++-
arch/arm64/boot/dts/qcom/sc7280-idp.dts | 34 ++++++++++++++
arch/arm64/boot/dts/qcom/sm8350.dtsi | 2 +-
7 files changed, 204 insertions(+), 4 deletions(-)
create mode 100644 arch/arm64/boot/dts/qcom/pm7325.dtsi
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
Add gpio ranges and correct the compatible to add
"qcom,spmi-gpio" as this pmic is on spmi bus.
Signed-off-by: satya priya <[email protected]>
---
Changes in V5:
- This is split from patch [7/11] and added newly in V5.
arch/arm64/boot/dts/qcom/pmk8350.dtsi | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/qcom/pmk8350.dtsi b/arch/arm64/boot/dts/qcom/pmk8350.dtsi
index ecd5ccd..04fc263 100644
--- a/arch/arm64/boot/dts/qcom/pmk8350.dtsi
+++ b/arch/arm64/boot/dts/qcom/pmk8350.dtsi
@@ -62,9 +62,10 @@
};
pmk8350_gpios: gpio@b000 {
- compatible = "qcom,pmk8350-gpio";
+ compatible = "qcom,pmk8350-gpio", "qcom,spmi-gpio";
reg = <0xb000>;
gpio-controller;
+ gpio-ranges = <&pmk8350_gpios 0 0 4>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
Add base DTS file for pm7325 along with GPIOs and temp-alarm nodes.
Signed-off-by: satya priya <[email protected]>
Reviewed-by: Matthias Kaehlcke <[email protected]>
---
Changes in RESEND V4:
- No Changes.
Changes in V5:
- No Changes.
arch/arm64/boot/dts/qcom/pm7325.dtsi | 53 ++++++++++++++++++++++++++++++++++++
1 file changed, 53 insertions(+)
create mode 100644 arch/arm64/boot/dts/qcom/pm7325.dtsi
diff --git a/arch/arm64/boot/dts/qcom/pm7325.dtsi b/arch/arm64/boot/dts/qcom/pm7325.dtsi
new file mode 100644
index 0000000..e7f64a9
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/pm7325.dtsi
@@ -0,0 +1,53 @@
+// SPDX-License-Identifier: BSD-3-Clause
+// Copyright (c) 2021, The Linux Foundation. All rights reserved.
+
+#include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/spmi/spmi.h>
+
+&spmi_bus {
+ pm7325: pmic@1 {
+ compatible = "qcom,pm7325", "qcom,spmi-pmic";
+ reg = <0x1 SPMI_USID>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ pm7325_temp_alarm: temp-alarm@a00 {
+ compatible = "qcom,spmi-temp-alarm";
+ reg = <0xa00>;
+ interrupts = <0x1 0xa 0x0 IRQ_TYPE_EDGE_BOTH>;
+ #thermal-sensor-cells = <0>;
+ };
+
+ pm7325_gpios: gpios@8800 {
+ compatible = "qcom,pm7325-gpio", "qcom,spmi-gpio";
+ reg = <0x8800>;
+ gpio-controller;
+ gpio-ranges = <&pm7325_gpios 0 0 10>;
+ #gpio-cells = <2>;
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ };
+ };
+};
+
+&thermal_zones {
+ pm7325_thermal: pm7325-thermal {
+ polling-delay-passive = <100>;
+ polling-delay = <0>;
+ thermal-sensors = <&pm7325_temp_alarm>;
+
+ trips {
+ pm7325_trip0: trip0 {
+ temperature = <95000>;
+ hysteresis = <0>;
+ type = "passive";
+ };
+
+ pm7325_crit: pm7325-crit {
+ temperature = <115000>;
+ hysteresis = <0>;
+ type = "critical";
+ };
+ };
+ };
+};
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
Add label "thermal_zones" for thermal-zones node.
Signed-off-by: satya priya <[email protected]>
Reviewed-by: Matthias Kaehlcke <[email protected]>
---
Changes in RESEND V4:
- No Changes.
Changes in V5:
- No Changes.
arch/arm64/boot/dts/qcom/sm8350.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/qcom/sm8350.dtsi b/arch/arm64/boot/dts/qcom/sm8350.dtsi
index ed0b51b..47c6c0b 100644
--- a/arch/arm64/boot/dts/qcom/sm8350.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8350.dtsi
@@ -1317,7 +1317,7 @@
};
};
- thermal-zones {
+ thermal_zones: thermal-zones {
cpu0-thermal {
polling-delay-passive = <250>;
polling-delay = <1000>;
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
Add gpio ranges and correct the compatible to add
"qcom,spmi-gpio" as this pmic is on spmi bus.
Signed-off-by: satya priya <[email protected]>
---
Changes in V5:
- This is split from patch [5/11] and added newly in V5.
arch/arm64/boot/dts/qcom/pmr735a.dtsi | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/qcom/pmr735a.dtsi b/arch/arm64/boot/dts/qcom/pmr735a.dtsi
index b0a7cd6c0..b4b6ba24 100644
--- a/arch/arm64/boot/dts/qcom/pmr735a.dtsi
+++ b/arch/arm64/boot/dts/qcom/pmr735a.dtsi
@@ -21,9 +21,10 @@
};
pmr735a_gpios: gpio@8800 {
- compatible = "qcom,pmr735a-gpio";
+ compatible = "qcom,pmr735a-gpio", "qcom,spmi-gpio";
reg = <0x8800>;
gpio-controller;
+ gpio-ranges = <&pmr735a_gpios 0 0 4>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
Add channel nodes for the on die temperatures of PMICS
pmk8350, pm8350, pmr735a and pmr735b.
Signed-off-by: satya priya <[email protected]>
Reviewed-by: Matthias Kaehlcke <[email protected]>
---
Changes in RESEND V4:
- As per Matthias comments, changed the commit text.
Changes in V5:
- No Changes.
arch/arm64/boot/dts/qcom/sc7280-idp.dts | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dts b/arch/arm64/boot/dts/qcom/sc7280-idp.dts
index f295580..704fb9a 100644
--- a/arch/arm64/boot/dts/qcom/sc7280-idp.dts
+++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dts
@@ -7,6 +7,10 @@
/dts-v1/;
+#include <dt-bindings/iio/qcom,spmi-adc7-pmr735a.h>
+#include <dt-bindings/iio/qcom,spmi-adc7-pmr735b.h>
+#include <dt-bindings/iio/qcom,spmi-adc7-pm8350.h>
+#include <dt-bindings/iio/qcom,spmi-adc7-pmk8350.h>
#include "sc7280.dtsi"
#include "pm7325.dtsi"
#include "pmr735a.dtsi"
@@ -238,6 +242,32 @@
};
};
+&pmk8350_vadc {
+ pm8350_die_temp {
+ reg = <PM8350_ADC7_DIE_TEMP>;
+ label = "pm8350_die_temp";
+ qcom,pre-scaling = <1 1>;
+ };
+
+ pmk8350_die_temp {
+ reg = <PMK8350_ADC7_DIE_TEMP>;
+ label = "pmk8350_die_temp";
+ qcom,pre-scaling = <1 1>;
+ };
+
+ pmr735a_die_temp {
+ reg = <PMR735A_ADC7_DIE_TEMP>;
+ label = "pmr735a_die_temp";
+ qcom,pre-scaling = <1 1>;
+ };
+
+ pmr735b_die_temp {
+ reg = <PMR735B_ADC7_DIE_TEMP>;
+ label = "pmr735b_die_temp";
+ qcom,pre-scaling = <1 1>;
+ };
+};
+
&qupv3_id_0 {
status = "okay";
};
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
On Tue, May 25, 2021 at 03:41:03PM +0530, satya priya wrote:
> Add gpio ranges and correct the compatible to add
> "qcom,spmi-gpio" as this pmic is on spmi bus.
>
> Signed-off-by: satya priya <[email protected]>
> ---
> Changes in V5:
> - This is split from patch [7/11] and added newly in V5.
this should say 'patch [6/8]' I think.
https://patchwork.kernel.org/project/linux-arm-msm/patch/[email protected]/
> arch/arm64/boot/dts/qcom/pmk8350.dtsi | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/pmk8350.dtsi b/arch/arm64/boot/dts/qcom/pmk8350.dtsi
> index ecd5ccd..04fc263 100644
> --- a/arch/arm64/boot/dts/qcom/pmk8350.dtsi
> +++ b/arch/arm64/boot/dts/qcom/pmk8350.dtsi
> @@ -62,9 +62,10 @@
> };
>
> pmk8350_gpios: gpio@b000 {
> - compatible = "qcom,pmk8350-gpio";
> + compatible = "qcom,pmk8350-gpio", "qcom,spmi-gpio";
> reg = <0xb000>;
> gpio-controller;
> + gpio-ranges = <&pmk8350_gpios 0 0 4>;
> #gpio-cells = <2>;
> interrupt-controller;
> #interrupt-cells = <2>;
Reviewed-by: Matthias Kaehlcke <[email protected]>
On Tue, May 25, 2021 at 03:41:01PM +0530, satya priya wrote:
> Add gpio ranges and correct the compatible to add
> "qcom,spmi-gpio" as this pmic is on spmi bus.
>
> Signed-off-by: satya priya <[email protected]>
> ---
> Changes in V5:
> - This is split from patch [5/11] and added newly in V5.
actually it's a split from patch [5/8], right?
https://patchwork.kernel.org/project/linux-arm-msm/patch/[email protected]/
> arch/arm64/boot/dts/qcom/pmr735a.dtsi | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/pmr735a.dtsi b/arch/arm64/boot/dts/qcom/pmr735a.dtsi
> index b0a7cd6c0..b4b6ba24 100644
> --- a/arch/arm64/boot/dts/qcom/pmr735a.dtsi
> +++ b/arch/arm64/boot/dts/qcom/pmr735a.dtsi
> @@ -21,9 +21,10 @@
> };
>
> pmr735a_gpios: gpio@8800 {
> - compatible = "qcom,pmr735a-gpio";
> + compatible = "qcom,pmr735a-gpio", "qcom,spmi-gpio";
> reg = <0x8800>;
> gpio-controller;
> + gpio-ranges = <&pmr735a_gpios 0 0 4>;
> #gpio-cells = <2>;
> interrupt-controller;
> #interrupt-cells = <2>;
Reviewed-by: Matthias Kaehlcke <[email protected]>
On 2021-05-26 02:26, Matthias Kaehlcke wrote:
> On Tue, May 25, 2021 at 03:41:01PM +0530, satya priya wrote:
>> Add gpio ranges and correct the compatible to add
>> "qcom,spmi-gpio" as this pmic is on spmi bus.
>>
>> Signed-off-by: satya priya <[email protected]>
>> ---
>> Changes in V5:
>> - This is split from patch [5/11] and added newly in V5.
>
> actually it's a split from patch [5/8], right?
>
Right, my bad. I should have mentioned this way to be more clear.
Thank you for reviewing the patches!
> https://patchwork.kernel.org/project/linux-arm-msm/patch/[email protected]/
>
>> arch/arm64/boot/dts/qcom/pmr735a.dtsi | 3 ++-
>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/arch/arm64/boot/dts/qcom/pmr735a.dtsi
>> b/arch/arm64/boot/dts/qcom/pmr735a.dtsi
>> index b0a7cd6c0..b4b6ba24 100644
>> --- a/arch/arm64/boot/dts/qcom/pmr735a.dtsi
>> +++ b/arch/arm64/boot/dts/qcom/pmr735a.dtsi
>> @@ -21,9 +21,10 @@
>> };
>>
>> pmr735a_gpios: gpio@8800 {
>> - compatible = "qcom,pmr735a-gpio";
>> + compatible = "qcom,pmr735a-gpio", "qcom,spmi-gpio";
>> reg = <0x8800>;
>> gpio-controller;
>> + gpio-ranges = <&pmr735a_gpios 0 0 4>;
>> #gpio-cells = <2>;
>> interrupt-controller;
>> #interrupt-cells = <2>;
>
> Reviewed-by: Matthias Kaehlcke <[email protected]>