arm64: dts: imx8qxp-mek: Sort labels alphabetically
Subsystems (2)
PATCH v2 1/2 arm64: dts: imx8qxp-mek: Sort labels alphabetically
Sort the labels alphabetically for consistency.
---
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(-)
arch/arm64/boot/dts/freescale/imx8qxp-mek.dts +30 -20
@@ -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 = <ðphy0>; - 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 = <ðphy0>; + 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"; -};
Signature · 1 line
2.7.4
PATCH v2 2/2 arm64: dts: imx8qxp-mek: Add PMIC thermal zone support
i.MX8QXP MEK board has PMIC thermal sensor, add support for it.
---
No change.
--- arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 33 +++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)
arch/arm64/boot/dts/freescale/imx8qxp-mek.dts +33 -0
@@ -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>;
Signature · 1 line
2.7.4
Shawn Guo
AppliedQuoted 3 lines · Anson Huang
Sort the labels alphabetically for consistency.
Signed-off-by Anson Huang <[email protected]>
Applied both, thanks.
Quoted 24 lines · Anson Huang
Sort the labels alphabetically for consistency.
Signed-off-by Anson Huang <[email protected]>---
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(-)arch/arm64/boot/dts/freescale/imx8qxp-mek.dts +0
-6@@ -30,18 +30,7 @@ }; }; -&adma_lpuart0 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_lpuart0>; - status = "okay"; -}; -
arch/arm64/boot/dts/freescale/imx8qxp-mek.dts line 36
Quoted 10 lines
arch/arm64/boot/dts/freescale/imx8qxp-mek.dts +1
-6-&fec1 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_fec1>; - phy-mode = "rgmii-id"; - phy-handle = <ðphy0>; - 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
Quoted 51 lines
arch/arm64/boot/dts/freescale/imx8qxp-mek.dts +29
-8@@ -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 = <ðphy0>; + 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"; -};Signature · 1 line
2.7.4
Hi, Shawn
Quoted 39 lines
Subject: Re: [PATCH V2 1/2] arm64: dts: imx8qxp-mek: Sort labels alphabetically
Quoted 35 lines · Anson Huang
Sort the labels alphabetically for consistency.
Signed-off-by Anson Huang <[email protected]>---
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(-)arch/arm64/boot/dts/freescale/imx8qxp-mek.dts +1
-12@@ -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 = <ðphy0>; - fsl,magic-packet; +&adma_dsp { status = "okay";
Quoted 6 lines
arch/arm64/boot/dts/freescale/imx8qxp-mek.dts line 36
Quoted 1 line
arch/arm64/boot/dts/freescale/imx8qxp-mek.dts +0
-0mdio {Here is a rebase issue, i.e.
adma_dspshouldn'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
Quoted 48 lines · Anson Huang
Hi, Shawn
Quoted 39 lines
Subject: Re: [PATCH V2 1/2] arm64: dts: imx8qxp-mek: Sort labels alphabetically
Quoted 35 lines · Anson Huang
Sort the labels alphabetically for consistency.
Signed-off-by Anson Huang <[email protected]>---
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(-)arch/arm64/boot/dts/freescale/imx8qxp-mek.dts +1
-12@@ -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 = <ðphy0>; - fsl,magic-packet; +&adma_dsp { status = "okay";Quoted 6 lines
arch/arm64/boot/dts/freescale/imx8qxp-mek.dts line 36
Quoted 1 line
arch/arm64/boot/dts/freescale/imx8qxp-mek.dts +0
-0mdio {Here is a rebase issue, i.e.
adma_dspshouldn'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.
Quoted 5 lines
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
Quoted 53 lines
From: Shawn Guo <[email protected]>
Sent: Monday, March 16, 2020 2:45 PMQuoted 49 lines · Anson Huang
Hi, Shawn
Quoted 46 lines
Subject: Re: [PATCH V2 1/2] arm64: dts: imx8qxp-mek: Sort labels alphabetically
Quoted 26 lines · Anson Huang
Sort the labels alphabetically for consistency.
Signed-off-by Anson Huang <[email protected]>---
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(-)arch/arm64/boot/dts/freescale/imx8qxp-mek.dts +0
-6@@ -30,18 +30,7 @@ }; }; -&adma_lpuart0 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_lpuart0>; - status = "okay"; -}; -arch/arm64/boot/dts/freescale/imx8qxp-mek.dts line 36
Quoted 10 lines
arch/arm64/boot/dts/freescale/imx8qxp-mek.dts +1
-6-&fec1 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_fec1>; - phy-mode = "rgmii-id"; - phy-handle = <ðphy0>; - fsl,magic-packet; +&adma_dsp { status = "okay"; mdio {Here is a rebase issue, i.e.
adma_dspshouldn'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.
Quoted 7 lines
Quoted 5 lines
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
Quoted 2 lines
Shawn