2020-03-12 09:57:51

by Anson Huang

Subject: [PATCH 1/2] ARM: dts: imx7: Correct CPU supply name

i.MX7 uses cpufreq-dt driver which requires the CPU supply name to be
either "cpu0-supply" or "cpu-supply", correct it.

Signed-off-by: Anson Huang <[email protected]>
---
arch/arm/boot/dts/imx7-tqma7.dtsi | 2 +-
arch/arm/boot/dts/imx7d-zii-rmu2.dts | 2 +-
arch/arm/boot/dts/imx7d-zii-rpu2.dts | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/imx7-tqma7.dtsi b/arch/arm/boot/dts/imx7-tqma7.dtsi
index 9aaed85..8773344 100644
--- a/arch/arm/boot/dts/imx7-tqma7.dtsi
+++ b/arch/arm/boot/dts/imx7-tqma7.dtsi
@@ -16,7 +16,7 @@
};

&cpu0 {
- arm-supply = <&sw1a_reg>;
+ cpu-supply = <&sw1a_reg>;
};

&i2c1 {
diff --git a/arch/arm/boot/dts/imx7d-zii-rmu2.dts b/arch/arm/boot/dts/imx7d-zii-rmu2.dts
index 2b8d6cc..e5e20b0 100644
--- a/arch/arm/boot/dts/imx7d-zii-rmu2.dts
+++ b/arch/arm/boot/dts/imx7d-zii-rmu2.dts
@@ -33,7 +33,7 @@
};

&cpu0 {
- arm-supply = <&sw1a_reg>;
+ cpu-supply = <&sw1a_reg>;
};

&ecspi1 {
diff --git a/arch/arm/boot/dts/imx7d-zii-rpu2.dts b/arch/arm/boot/dts/imx7d-zii-rpu2.dts
index 39812c9..cbf0dbb 100644
--- a/arch/arm/boot/dts/imx7d-zii-rpu2.dts
+++ b/arch/arm/boot/dts/imx7d-zii-rpu2.dts
@@ -182,7 +182,7 @@
};

&cpu0 {
- arm-supply = <&sw1a_reg>;
+ cpu-supply = <&sw1a_reg>;
};

&clks {
--
2.7.4

2020-03-12 09:58:43

by Anson Huang

Subject: [PATCH 2/2] ARM: dts: imx7d: Add cpu1 supply

Each cpu-core is supposed to list its supply separately, add
supply for cpu1.

Signed-off-by: Anson Huang <[email protected]>
---
arch/arm/boot/dts/imx7d-cl-som-imx7.dts | 4 ++++
arch/arm/boot/dts/imx7d-colibri.dtsi | 4 ++++
arch/arm/boot/dts/imx7d-nitrogen7.dts | 4 ++++
arch/arm/boot/dts/imx7d-sdb.dts | 4 ++++
arch/arm/boot/dts/imx7d-tqma7.dtsi | 4 ++++
5 files changed, 20 insertions(+)

diff --git a/arch/arm/boot/dts/imx7d-cl-som-imx7.dts b/arch/arm/boot/dts/imx7d-cl-som-imx7.dts
index 89267cd..713483c 100644
--- a/arch/arm/boot/dts/imx7d-cl-som-imx7.dts
+++ b/arch/arm/boot/dts/imx7d-cl-som-imx7.dts
@@ -37,6 +37,10 @@
cpu-supply = <&sw1a_reg>;
};

+&cpu1 {
+ cpu-supply = <&sw1a_reg>;
+};
+
&fec1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_enet1>;
diff --git a/arch/arm/boot/dts/imx7d-colibri.dtsi b/arch/arm/boot/dts/imx7d-colibri.dtsi
index e2e327f..cae3299 100644
--- a/arch/arm/boot/dts/imx7d-colibri.dtsi
+++ b/arch/arm/boot/dts/imx7d-colibri.dtsi
@@ -50,6 +50,10 @@
};
};

+&cpu1 {
+ cpu-supply = <&reg_DCDC2>;
+};
+
&gpmi {
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx7d-nitrogen7.dts b/arch/arm/boot/dts/imx7d-nitrogen7.dts
index 6b4acea..e0751e6 100644
--- a/arch/arm/boot/dts/imx7d-nitrogen7.dts
+++ b/arch/arm/boot/dts/imx7d-nitrogen7.dts
@@ -121,6 +121,10 @@
cpu-supply = <&sw1a_reg>;
};

+&cpu1 {
+ cpu-supply = <&sw1a_reg>;
+};
+
&fec1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_enet1>;
diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts
index 869efbc..17cca8a 100644
--- a/arch/arm/boot/dts/imx7d-sdb.dts
+++ b/arch/arm/boot/dts/imx7d-sdb.dts
@@ -162,6 +162,10 @@
cpu-supply = <&sw1a_reg>;
};

+&cpu1 {
+ cpu-supply = <&sw1a_reg>;
+};
+
&ecspi3 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi3>;
diff --git a/arch/arm/boot/dts/imx7d-tqma7.dtsi b/arch/arm/boot/dts/imx7d-tqma7.dtsi
index 8ad3048..598aed1 100644
--- a/arch/arm/boot/dts/imx7d-tqma7.dtsi
+++ b/arch/arm/boot/dts/imx7d-tqma7.dtsi
@@ -9,3 +9,7 @@

#include "imx7d.dtsi"
#include "imx7-tqma7.dtsi"
+
+&cpu1 {
+ cpu-supply = <&sw1a_reg>;
+};
--
2.7.4

2020-04-14 15:40:50

by Shawn Guo

Subject: Re: [PATCH 1/2] ARM: dts: imx7: Correct CPU supply name

On Thu, Mar 12, 2020 at 05:50:12PM +0800, Anson Huang wrote:
> i.MX7 uses cpufreq-dt driver which requires the CPU supply name to be
> either "cpu0-supply" or "cpu-supply", correct it.
>
> Signed-off-by: Anson Huang <[email protected]>

Applied both, thanks.