[PATCH V2 1/2] arm64: dts: imx8qxp-mek: Sort labels alphabetically

[PATCH V2 1/2] arm64: dts: imx8qxp-mek: Sort labels alphabetically

[Anson Huang]

Sort the labels alphabetically for consistency.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
---
Changes since V1:
	- Rebase to latest branch, no code change.
---
 arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 50 ++++++++++++++++-----------
 1 file changed, 30 insertions(+), 20 deletions(-)

diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts b/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts
index d3d26cc..b1befdb 100644
--- a/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts
+++ b/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts
@@ -30,18 +30,7 @@
 	};
 };
 
-&adma_lpuart0 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_lpuart0>;
-	status = "okay";
-};
-
-&fec1 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_fec1>;
-	phy-mode = "rgmii-id";
-	phy-handle = <&ethphy0>;
-	fsl,magic-packet;
+&adma_dsp {
 	status = "okay";
 
 	mdio {
@@ -136,6 +125,35 @@
 	};
 };
 
+&adma_lpuart0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_lpuart0>;
+	status = "okay";
+};
+
+&fec1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_fec1>;
+	phy-mode = "rgmii-id";
+	phy-handle = <&ethphy0>;
+	fsl,magic-packet;
+	status = "okay";
+
+	mdio {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		ethphy0: ethernet-phy@0 {
+			compatible = "ethernet-phy-ieee802.3-c22";
+			reg = <0>;
+		};
+	};
+};
+
+&scu_key {
+	status = "okay";
+};
+
 &usdhc1 {
 	assigned-clocks = <&clk IMX_CONN_SDHC0_CLK>;
 	assigned-clock-rates = <200000000>;
@@ -234,11 +252,3 @@
 		>;
 	};
 };
-
-&adma_dsp {
-	status = "okay";
-};
-
-&scu_key {
-	status = "okay";
-};
-- 
2.7.4

[PATCH V2 2/2] arm64: dts: imx8qxp-mek: Add PMIC thermal zone support

[Anson Huang]

i.MX8QXP MEK board has PMIC thermal sensor, add support for it.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
---
No change.
---
 arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 33 +++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts b/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts
index b1befdb..ff5695b 100644
--- a/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts
+++ b/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts
@@ -154,6 +154,39 @@
 	status = "okay";
 };
 
+&thermal_zones {
+	pmic-thermal0 {
+		polling-delay-passive = <250>;
+		polling-delay = <2000>;
+		thermal-sensors = <&tsens IMX_SC_R_PMIC_0>;
+
+		trips {
+			pmic_alert0: trip0 {
+				temperature = <110000>;
+				hysteresis = <2000>;
+				type = "passive";
+			};
+
+			pmic_crit0: trip1 {
+				temperature = <125000>;
+				hysteresis = <2000>;
+				type = "critical";
+			};
+		};
+
+		cooling-maps {
+			map0 {
+				trip = <&pmic_alert0>;
+				cooling-device =
+					<&A35_0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+					<&A35_1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+					<&A35_2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
+					<&A35_3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+			};
+		};
+	};
+};
+
 &usdhc1 {
 	assigned-clocks = <&clk IMX_CONN_SDHC0_CLK>;
 	assigned-clock-rates = <200000000>;
-- 
2.7.4

Re: [PATCH V2 1/2] arm64: dts: imx8qxp-mek: Sort labels alphabetically

[Shawn Guo]

On Mon, Mar 16, 2020 at 09:26:32AM +0800, Anson Huang wrote:
> Sort the labels alphabetically for consistency.
> 
> Signed-off-by: Anson Huang <Anson.Huang@nxp.com>

Applied both, thanks.

Re: [PATCH V2 1/2] arm64: dts: imx8qxp-mek: Sort labels alphabetically

[Shawn Guo]

On Mon, Mar 16, 2020 at 09:26:32AM +0800, Anson Huang wrote:
> Sort the labels alphabetically for consistency.
> 
> Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
> ---
> Changes since V1:
> 	- Rebase to latest branch, no code change.
> ---
>  arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 50 ++++++++++++++++-----------
>  1 file changed, 30 insertions(+), 20 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts b/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts
> index d3d26cc..b1befdb 100644
> --- a/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts
> +++ b/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts
> @@ -30,18 +30,7 @@
>  	};
>  };
>  
> -&adma_lpuart0 {
> -	pinctrl-names = "default";
> -	pinctrl-0 = <&pinctrl_lpuart0>;
> -	status = "okay";
> -};
> -
> -&fec1 {
> -	pinctrl-names = "default";
> -	pinctrl-0 = <&pinctrl_fec1>;
> -	phy-mode = "rgmii-id";
> -	phy-handle = <&ethphy0>;
> -	fsl,magic-packet;
> +&adma_dsp {
>  	status = "okay";
>  
>  	mdio {

Here is a rebase issue, i.e. adma_dsp shouldn't get a mdio child node.
It came from the conflict with one commit on my fixes branch.  I decided
to drop the series for the coming merge window.  Let's start over again
after 5.7-rc1 becomes available.

Shawn

> @@ -136,6 +125,35 @@
>  	};
>  };
>  
> +&adma_lpuart0 {
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&pinctrl_lpuart0>;
> +	status = "okay";
> +};
> +
> +&fec1 {
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&pinctrl_fec1>;
> +	phy-mode = "rgmii-id";
> +	phy-handle = <&ethphy0>;
> +	fsl,magic-packet;
> +	status = "okay";
> +
> +	mdio {
> +		#address-cells = <1>;
> +		#size-cells = <0>;
> +
> +		ethphy0: ethernet-phy@0 {
> +			compatible = "ethernet-phy-ieee802.3-c22";
> +			reg = <0>;
> +		};
> +	};
> +};
> +
> +&scu_key {
> +	status = "okay";
> +};
> +
>  &usdhc1 {
>  	assigned-clocks = <&clk IMX_CONN_SDHC0_CLK>;
>  	assigned-clock-rates = <200000000>;
> @@ -234,11 +252,3 @@
>  		>;
>  	};
>  };
> -
> -&adma_dsp {
> -	status = "okay";
> -};
> -
> -&scu_key {
> -	status = "okay";
> -};
> -- 
> 2.7.4
> 

RE: [PATCH V2 1/2] arm64: dts: imx8qxp-mek: Sort labels alphabetically

[Anson Huang]

Hi, Shawn

> Subject: Re: [PATCH V2 1/2] arm64: dts: imx8qxp-mek: Sort labels
> alphabetically
> 
> On Mon, Mar 16, 2020 at 09:26:32AM +0800, Anson Huang wrote:
> > Sort the labels alphabetically for consistency.
> >
> > Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
> > ---
> > Changes since V1:
> > 	- Rebase to latest branch, no code change.
> > ---
> >  arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 50
> > ++++++++++++++++-----------
> >  1 file changed, 30 insertions(+), 20 deletions(-)
> >
> > diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts
> > b/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts
> > index d3d26cc..b1befdb 100644
> > --- a/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts
> > +++ b/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts
> > @@ -30,18 +30,7 @@
> >  	};
> >  };
> >
> > -&adma_lpuart0 {
> > -	pinctrl-names = "default";
> > -	pinctrl-0 = <&pinctrl_lpuart0>;
> > -	status = "okay";
> > -};
> > -
> > -&fec1 {
> > -	pinctrl-names = "default";
> > -	pinctrl-0 = <&pinctrl_fec1>;
> > -	phy-mode = "rgmii-id";
> > -	phy-handle = <&ethphy0>;
> > -	fsl,magic-packet;
> > +&adma_dsp {
> >  	status = "okay";
> >
> >  	mdio {
> 
> Here is a rebase issue, i.e. adma_dsp shouldn't get a mdio child node.
> It came from the conflict with one commit on my fixes branch.  I decided to
> drop the series for the coming merge window.  Let's start over again after
> 5.7-rc1 becomes available.

OK, I am also confused by this conflict, I normally do the patch based on your
for-next branch, and I did NOT meet the conflict at all, then I redo it based on
your dt branch I met the conflict and fix it...

So, do I need to resend the patch series later when 5.7-rc1 available?

Anson

Re: [PATCH V2 1/2] arm64: dts: imx8qxp-mek: Sort labels alphabetically

[Shawn Guo]

On Mon, Mar 16, 2020 at 06:31:21AM +0000, Anson Huang wrote:
> Hi, Shawn
> 
> > Subject: Re: [PATCH V2 1/2] arm64: dts: imx8qxp-mek: Sort labels
> > alphabetically
> > 
> > On Mon, Mar 16, 2020 at 09:26:32AM +0800, Anson Huang wrote:
> > > Sort the labels alphabetically for consistency.
> > >
> > > Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
> > > ---
> > > Changes since V1:
> > > 	- Rebase to latest branch, no code change.
> > > ---
> > >  arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 50
> > > ++++++++++++++++-----------
> > >  1 file changed, 30 insertions(+), 20 deletions(-)
> > >
> > > diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts
> > > b/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts
> > > index d3d26cc..b1befdb 100644
> > > --- a/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts
> > > +++ b/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts
> > > @@ -30,18 +30,7 @@
> > >  	};
> > >  };
> > >
> > > -&adma_lpuart0 {
> > > -	pinctrl-names = "default";
> > > -	pinctrl-0 = <&pinctrl_lpuart0>;
> > > -	status = "okay";
> > > -};
> > > -
> > > -&fec1 {
> > > -	pinctrl-names = "default";
> > > -	pinctrl-0 = <&pinctrl_fec1>;
> > > -	phy-mode = "rgmii-id";
> > > -	phy-handle = <&ethphy0>;
> > > -	fsl,magic-packet;
> > > +&adma_dsp {
> > >  	status = "okay";
> > >
> > >  	mdio {
> > 
> > Here is a rebase issue, i.e. adma_dsp shouldn't get a mdio child node.
> > It came from the conflict with one commit on my fixes branch.  I decided to
> > drop the series for the coming merge window.  Let's start over again after
> > 5.7-rc1 becomes available.
> 
> OK, I am also confused by this conflict, I normally do the patch based on your
> for-next branch, and I did NOT meet the conflict at all, then I redo it based on
> your dt branch I met the conflict and fix it...
> 
> So, do I need to resend the patch series later when 5.7-rc1 available?

You need to resend later.

Shawn

RE: [PATCH V2 1/2] arm64: dts: imx8qxp-mek: Sort labels alphabetically

[Aisheng Dong]

> From: Shawn Guo <shawnguo@kernel.org>
> Sent: Monday, March 16, 2020 2:45 PM
> 
> On Mon, Mar 16, 2020 at 06:31:21AM +0000, Anson Huang wrote:
> > Hi, Shawn
> >
> > > Subject: Re: [PATCH V2 1/2] arm64: dts: imx8qxp-mek: Sort labels
> > > alphabetically
> > >
> > > On Mon, Mar 16, 2020 at 09:26:32AM +0800, Anson Huang wrote:
> > > > Sort the labels alphabetically for consistency.
> > > >
> > > > Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
> > > > ---
> > > > Changes since V1:
> > > > 	- Rebase to latest branch, no code change.
> > > > ---
> > > >  arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 50
> > > > ++++++++++++++++-----------
> > > >  1 file changed, 30 insertions(+), 20 deletions(-)
> > > >
> > > > diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts
> > > > b/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts
> > > > index d3d26cc..b1befdb 100644
> > > > --- a/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts
> > > > +++ b/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts
> > > > @@ -30,18 +30,7 @@
> > > >  	};
> > > >  };
> > > >
> > > > -&adma_lpuart0 {
> > > > -	pinctrl-names = "default";
> > > > -	pinctrl-0 = <&pinctrl_lpuart0>;
> > > > -	status = "okay";
> > > > -};
> > > > -
> > > > -&fec1 {
> > > > -	pinctrl-names = "default";
> > > > -	pinctrl-0 = <&pinctrl_fec1>;
> > > > -	phy-mode = "rgmii-id";
> > > > -	phy-handle = <&ethphy0>;
> > > > -	fsl,magic-packet;
> > > > +&adma_dsp {
> > > >  	status = "okay";
> > > >
> > > >  	mdio {
> > >
> > > Here is a rebase issue, i.e. adma_dsp shouldn't get a mdio child node.
> > > It came from the conflict with one commit on my fixes branch.  I
> > > decided to drop the series for the coming merge window.  Let's start
> > > over again after
> > > 5.7-rc1 becomes available.
> >
> > OK, I am also confused by this conflict, I normally do the patch based
> > on your for-next branch, and I did NOT meet the conflict at all, then
> > I redo it based on your dt branch I met the conflict and fix it...
> >
> > So, do I need to resend the patch series later when 5.7-rc1 available?
> 
> You need to resend later.

Hi Shawn,

Could we hold on this patch as subsys prefix (e.g adma_) will be removed later and
devices will be embedded into each subsys dtsi?
So this re-order may become meaningless which also potentially cause a lot troubles
on the rebase of the dts re-org patch:
[RESEND,v3,00/15] arm64: dts: imx8: architecture improvement and adding imx8qm support
https://patchwork.kernel.org/cover/11248271/

Regards
Aisheng

> 
> Shawn