2020-09-03 14:55:35

by Matthias Schiffer

Subject: [PATCH v2 1/2] ARM: dts: imx6qdl: tqma6: fix indentation

Fixes: cac849e9bbc8 ("ARM: dts: imx6qdl: add TQMa6{S,Q,QP} SoM")
Signed-off-by: Matthias Schiffer <[email protected]>
---

v2: no changes

arch/arm/boot/dts/imx6qdl-tqma6.dtsi | 188 +++++++++++++--------------
1 file changed, 94 insertions(+), 94 deletions(-)

diff --git a/arch/arm/boot/dts/imx6qdl-tqma6.dtsi b/arch/arm/boot/dts/imx6qdl-tqma6.dtsi
index 29bcce20f5f3..9513020ddd1a 100644
--- a/arch/arm/boot/dts/imx6qdl-tqma6.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-tqma6.dtsi
@@ -83,101 +83,101 @@
};

&pmic {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_pmic>;
- interrupt-parent = <&gpio6>;
- interrupts = <10 IRQ_TYPE_LEVEL_LOW>;
-
- regulators {
- reg_vddcore: sw1ab {
- regulator-min-microvolt = <300000>;
- regulator-max-microvolt = <1875000>;
- regulator-always-on;
- };
-
- reg_vddsoc: sw1c {
- regulator-min-microvolt = <300000>;
- regulator-max-microvolt = <1875000>;
- regulator-always-on;
- };
-
- reg_gen_3v3: sw2 {
- regulator-min-microvolt = <800000>;
- regulator-max-microvolt = <3300000>;
- regulator-always-on;
- };
-
- reg_ddr_1v5a: sw3a {
- regulator-min-microvolt = <400000>;
- regulator-max-microvolt = <1975000>;
- regulator-always-on;
- };
-
- reg_ddr_1v5b: sw3b {
- regulator-min-microvolt = <400000>;
- regulator-max-microvolt = <1975000>;
- regulator-always-on;
- };
-
- sw4_reg: sw4 {
- regulator-min-microvolt = <800000>;
- regulator-max-microvolt = <3300000>;
- regulator-always-on;
- };
-
- reg_5v_600mA: swbst {
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5150000>;
- regulator-always-on;
- };
-
- reg_snvs_3v: vsnvs {
- regulator-min-microvolt = <1500000>;
- regulator-max-microvolt = <3000000>;
- regulator-always-on;
- };
-
- reg_vrefddr: vrefddr {
- regulator-boot-on;
- regulator-always-on;
- };
-
- reg_vgen1_1v5: vgen1 {
- regulator-min-microvolt = <800000>;
- regulator-max-microvolt = <1550000>;
- /* not used */
- };
-
- reg_vgen2_1v2_eth: vgen2 {
- regulator-min-microvolt = <800000>;
- regulator-max-microvolt = <1550000>;
- regulator-always-on;
- };
-
- reg_vgen3_2v8: vgen3 {
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <3300000>;
- regulator-always-on;
- };
-
- reg_vgen4_1v8: vgen4 {
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <3300000>;
- regulator-always-on;
- };
-
- reg_vgen5_1v8_eth: vgen5 {
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <3300000>;
- regulator-always-on;
- };
-
- reg_vgen6_3v3: vgen6 {
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <3300000>;
- regulator-always-on;
- };
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_pmic>;
+ interrupt-parent = <&gpio6>;
+ interrupts = <10 IRQ_TYPE_LEVEL_LOW>;
+
+ regulators {
+ reg_vddcore: sw1ab {
+ regulator-min-microvolt = <300000>;
+ regulator-max-microvolt = <1875000>;
+ regulator-always-on;
+ };
+
+ reg_vddsoc: sw1c {
+ regulator-min-microvolt = <300000>;
+ regulator-max-microvolt = <1875000>;
+ regulator-always-on;
+ };
+
+ reg_gen_3v3: sw2 {
+ regulator-min-microvolt = <800000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ };
+
+ reg_ddr_1v5a: sw3a {
+ regulator-min-microvolt = <400000>;
+ regulator-max-microvolt = <1975000>;
+ regulator-always-on;
+ };
+
+ reg_ddr_1v5b: sw3b {
+ regulator-min-microvolt = <400000>;
+ regulator-max-microvolt = <1975000>;
+ regulator-always-on;
+ };
+
+ sw4_reg: sw4 {
+ regulator-min-microvolt = <800000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ };
+
+ reg_5v_600mA: swbst {
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5150000>;
+ regulator-always-on;
+ };
+
+ reg_snvs_3v: vsnvs {
+ regulator-min-microvolt = <1500000>;
+ regulator-max-microvolt = <3000000>;
+ regulator-always-on;
};
+
+ reg_vrefddr: vrefddr {
+ regulator-boot-on;
+ regulator-always-on;
+ };
+
+ reg_vgen1_1v5: vgen1 {
+ regulator-min-microvolt = <800000>;
+ regulator-max-microvolt = <1550000>;
+ /* not used */
+ };
+
+ reg_vgen2_1v2_eth: vgen2 {
+ regulator-min-microvolt = <800000>;
+ regulator-max-microvolt = <1550000>;
+ regulator-always-on;
+ };
+
+ reg_vgen3_2v8: vgen3 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ };
+
+ reg_vgen4_1v8: vgen4 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ };
+
+ reg_vgen5_1v8_eth: vgen5 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ };
+
+ reg_vgen6_3v3: vgen6 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ };
+ };
};

/* eMMC */
--
2.17.1

2020-09-03 14:56:36

by Matthias Schiffer

Subject: [PATCH v2 2/2] ARM: dts: imx6qdl: tqma6: minor fixes

- Fix national,lm75 compatible string
- Remove obsolete fsl,spi-num-chipselects

Fixes: cac849e9bbc8 ("ARM: dts: imx6qdl: add TQMa6{S,Q,QP} SoM")
Signed-off-by: Matthias Schiffer <[email protected]>
---

v2: drop fsl,spi-num-chipselects instead of replacing with num-cs

arch/arm/boot/dts/imx6qdl-tqma6.dtsi | 1 -
arch/arm/boot/dts/imx6qdl-tqma6a.dtsi | 2 +-
arch/arm/boot/dts/imx6qdl-tqma6b.dtsi | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/imx6qdl-tqma6.dtsi b/arch/arm/boot/dts/imx6qdl-tqma6.dtsi
index 9513020ddd1a..b18b83ac6aee 100644
--- a/arch/arm/boot/dts/imx6qdl-tqma6.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-tqma6.dtsi
@@ -20,7 +20,6 @@
&ecspi1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi1>;
- fsl,spi-num-chipselects = <1>;
cs-gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>;
status = "okay";

diff --git a/arch/arm/boot/dts/imx6qdl-tqma6a.dtsi b/arch/arm/boot/dts/imx6qdl-tqma6a.dtsi
index c18a06cf7929..b679bec78e6c 100644
--- a/arch/arm/boot/dts/imx6qdl-tqma6a.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-tqma6a.dtsi
@@ -16,7 +16,7 @@
};

sensor@48 {
- compatible = "lm75";
+ compatible = "national,lm75";
reg = <0x48>;
};

diff --git a/arch/arm/boot/dts/imx6qdl-tqma6b.dtsi b/arch/arm/boot/dts/imx6qdl-tqma6b.dtsi
index a7460075f517..49c472285c06 100644
--- a/arch/arm/boot/dts/imx6qdl-tqma6b.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-tqma6b.dtsi
@@ -16,7 +16,7 @@
};

sensor@48 {
- compatible = "lm75";
+ compatible = "national,lm75";
reg = <0x48>;
};

--
2.17.1

2020-09-05 08:01:04

by Shawn Guo

Subject: Re: [PATCH v2 1/2] ARM: dts: imx6qdl: tqma6: fix indentation

On Thu, Sep 03, 2020 at 04:53:46PM +0200, Matthias Schiffer wrote:
> Fixes: cac849e9bbc8 ("ARM: dts: imx6qdl: add TQMa6{S,Q,QP} SoM")
> Signed-off-by: Matthias Schiffer <[email protected]>

Sorry, I do not take patch with empty commit log.

Shawn

> ---
>
> v2: no changes
>
> arch/arm/boot/dts/imx6qdl-tqma6.dtsi | 188 +++++++++++++--------------
> 1 file changed, 94 insertions(+), 94 deletions(-)
>
> diff --git a/arch/arm/boot/dts/imx6qdl-tqma6.dtsi b/arch/arm/boot/dts/imx6qdl-tqma6.dtsi
> index 29bcce20f5f3..9513020ddd1a 100644
> --- a/arch/arm/boot/dts/imx6qdl-tqma6.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl-tqma6.dtsi
> @@ -83,101 +83,101 @@
> };
>
> &pmic {
> - pinctrl-names = "default";
> - pinctrl-0 = <&pinctrl_pmic>;
> - interrupt-parent = <&gpio6>;
> - interrupts = <10 IRQ_TYPE_LEVEL_LOW>;
> -
> - regulators {
> - reg_vddcore: sw1ab {
> - regulator-min-microvolt = <300000>;
> - regulator-max-microvolt = <1875000>;
> - regulator-always-on;
> - };
> -
> - reg_vddsoc: sw1c {
> - regulator-min-microvolt = <300000>;
> - regulator-max-microvolt = <1875000>;
> - regulator-always-on;
> - };
> -
> - reg_gen_3v3: sw2 {
> - regulator-min-microvolt = <800000>;
> - regulator-max-microvolt = <3300000>;
> - regulator-always-on;
> - };
> -
> - reg_ddr_1v5a: sw3a {
> - regulator-min-microvolt = <400000>;
> - regulator-max-microvolt = <1975000>;
> - regulator-always-on;
> - };
> -
> - reg_ddr_1v5b: sw3b {
> - regulator-min-microvolt = <400000>;
> - regulator-max-microvolt = <1975000>;
> - regulator-always-on;
> - };
> -
> - sw4_reg: sw4 {
> - regulator-min-microvolt = <800000>;
> - regulator-max-microvolt = <3300000>;
> - regulator-always-on;
> - };
> -
> - reg_5v_600mA: swbst {
> - regulator-min-microvolt = <5000000>;
> - regulator-max-microvolt = <5150000>;
> - regulator-always-on;
> - };
> -
> - reg_snvs_3v: vsnvs {
> - regulator-min-microvolt = <1500000>;
> - regulator-max-microvolt = <3000000>;
> - regulator-always-on;
> - };
> -
> - reg_vrefddr: vrefddr {
> - regulator-boot-on;
> - regulator-always-on;
> - };
> -
> - reg_vgen1_1v5: vgen1 {
> - regulator-min-microvolt = <800000>;
> - regulator-max-microvolt = <1550000>;
> - /* not used */
> - };
> -
> - reg_vgen2_1v2_eth: vgen2 {
> - regulator-min-microvolt = <800000>;
> - regulator-max-microvolt = <1550000>;
> - regulator-always-on;
> - };
> -
> - reg_vgen3_2v8: vgen3 {
> - regulator-min-microvolt = <1800000>;
> - regulator-max-microvolt = <3300000>;
> - regulator-always-on;
> - };
> -
> - reg_vgen4_1v8: vgen4 {
> - regulator-min-microvolt = <1800000>;
> - regulator-max-microvolt = <3300000>;
> - regulator-always-on;
> - };
> -
> - reg_vgen5_1v8_eth: vgen5 {
> - regulator-min-microvolt = <1800000>;
> - regulator-max-microvolt = <3300000>;
> - regulator-always-on;
> - };
> -
> - reg_vgen6_3v3: vgen6 {
> - regulator-min-microvolt = <1800000>;
> - regulator-max-microvolt = <3300000>;
> - regulator-always-on;
> - };
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_pmic>;
> + interrupt-parent = <&gpio6>;
> + interrupts = <10 IRQ_TYPE_LEVEL_LOW>;
> +
> + regulators {
> + reg_vddcore: sw1ab {
> + regulator-min-microvolt = <300000>;
> + regulator-max-microvolt = <1875000>;
> + regulator-always-on;
> + };
> +
> + reg_vddsoc: sw1c {
> + regulator-min-microvolt = <300000>;
> + regulator-max-microvolt = <1875000>;
> + regulator-always-on;
> + };
> +
> + reg_gen_3v3: sw2 {
> + regulator-min-microvolt = <800000>;
> + regulator-max-microvolt = <3300000>;
> + regulator-always-on;
> + };
> +
> + reg_ddr_1v5a: sw3a {
> + regulator-min-microvolt = <400000>;
> + regulator-max-microvolt = <1975000>;
> + regulator-always-on;
> + };
> +
> + reg_ddr_1v5b: sw3b {
> + regulator-min-microvolt = <400000>;
> + regulator-max-microvolt = <1975000>;
> + regulator-always-on;
> + };
> +
> + sw4_reg: sw4 {
> + regulator-min-microvolt = <800000>;
> + regulator-max-microvolt = <3300000>;
> + regulator-always-on;
> + };
> +
> + reg_5v_600mA: swbst {
> + regulator-min-microvolt = <5000000>;
> + regulator-max-microvolt = <5150000>;
> + regulator-always-on;
> + };
> +
> + reg_snvs_3v: vsnvs {
> + regulator-min-microvolt = <1500000>;
> + regulator-max-microvolt = <3000000>;
> + regulator-always-on;
> };
> +
> + reg_vrefddr: vrefddr {
> + regulator-boot-on;
> + regulator-always-on;
> + };
> +
> + reg_vgen1_1v5: vgen1 {
> + regulator-min-microvolt = <800000>;
> + regulator-max-microvolt = <1550000>;
> + /* not used */
> + };
> +
> + reg_vgen2_1v2_eth: vgen2 {
> + regulator-min-microvolt = <800000>;
> + regulator-max-microvolt = <1550000>;
> + regulator-always-on;
> + };
> +
> + reg_vgen3_2v8: vgen3 {
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <3300000>;
> + regulator-always-on;
> + };
> +
> + reg_vgen4_1v8: vgen4 {
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <3300000>;
> + regulator-always-on;
> + };
> +
> + reg_vgen5_1v8_eth: vgen5 {
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <3300000>;
> + regulator-always-on;
> + };
> +
> + reg_vgen6_3v3: vgen6 {
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <3300000>;
> + regulator-always-on;
> + };
> + };
> };
>
> /* eMMC */
> --
> 2.17.1
>

2020-09-05 08:01:29

by Shawn Guo

Subject: Re: [PATCH v2 2/2] ARM: dts: imx6qdl: tqma6: minor fixes

On Thu, Sep 03, 2020 at 04:53:47PM +0200, Matthias Schiffer wrote:
> - Fix national,lm75 compatible string
> - Remove obsolete fsl,spi-num-chipselects

Two patches, please.

Shawn

>
> Fixes: cac849e9bbc8 ("ARM: dts: imx6qdl: add TQMa6{S,Q,QP} SoM")
> Signed-off-by: Matthias Schiffer <[email protected]>
> ---
>
> v2: drop fsl,spi-num-chipselects instead of replacing with num-cs
>
> arch/arm/boot/dts/imx6qdl-tqma6.dtsi | 1 -
> arch/arm/boot/dts/imx6qdl-tqma6a.dtsi | 2 +-
> arch/arm/boot/dts/imx6qdl-tqma6b.dtsi | 2 +-
> 3 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/boot/dts/imx6qdl-tqma6.dtsi b/arch/arm/boot/dts/imx6qdl-tqma6.dtsi
> index 9513020ddd1a..b18b83ac6aee 100644
> --- a/arch/arm/boot/dts/imx6qdl-tqma6.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl-tqma6.dtsi
> @@ -20,7 +20,6 @@
> &ecspi1 {
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_ecspi1>;
> - fsl,spi-num-chipselects = <1>;
> cs-gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>;
> status = "okay";
>
> diff --git a/arch/arm/boot/dts/imx6qdl-tqma6a.dtsi b/arch/arm/boot/dts/imx6qdl-tqma6a.dtsi
> index c18a06cf7929..b679bec78e6c 100644
> --- a/arch/arm/boot/dts/imx6qdl-tqma6a.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl-tqma6a.dtsi
> @@ -16,7 +16,7 @@
> };
>
> sensor@48 {
> - compatible = "lm75";
> + compatible = "national,lm75";
> reg = <0x48>;
> };
>
> diff --git a/arch/arm/boot/dts/imx6qdl-tqma6b.dtsi b/arch/arm/boot/dts/imx6qdl-tqma6b.dtsi
> index a7460075f517..49c472285c06 100644
> --- a/arch/arm/boot/dts/imx6qdl-tqma6b.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl-tqma6b.dtsi
> @@ -16,7 +16,7 @@
> };
>
> sensor@48 {
> - compatible = "lm75";
> + compatible = "national,lm75";
> reg = <0x48>;
> };
>
> --
> 2.17.1
>