[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20200316060024.GG17221@dragon>
Date: Mon, 16 Mar 2020 14:00:25 +0800
From: Shawn Guo <shawnguo@...nel.org>
To: Anson Huang <Anson.Huang@....com>
Cc: robh+dt@...nel.org, mark.rutland@....com, s.hauer@...gutronix.de,
kernel@...gutronix.de, festevam@...il.com, abel.vesa@....com,
leonard.crestez@....com, daniel.baluta@....com,
devicetree@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
linux-kernel@...r.kernel.org, Linux-imx@....com
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@....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 = <ð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
> @@ -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";
> -};
> --
> 2.7.4
>
Powered by blists - more mailing lists