Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3fd415af authored by Lothar Waßmann's avatar Lothar Waßmann Committed by Shawn Guo
Browse files

ARM: dts: imx6-tx6: improve ethernet related pinctrl setup 



Remove the PHY INT and RESET pins from hog section and put them into
their own pinctrl nodes referenced by the appropriate driver nodes.
Also, the MDIO pins are required for probing the Ethernet PHY, so they
must be configured by the FEC driver, not by the PHY driver. Move the
corresponding pinctrl settings from the PHY subnode to the FEC node.

Signed-off-by: default avatarLothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 01b175c5

arch/arm/boot/dts/imx6qdl-tx6.dtsi

+17 −6
Original line number Diff line number Diff line 
/*

 * Copyright 2014-2016 Lothar Waßmann <LW@KARO-electronics.de>

 * Copyright 2014-2017 Lothar Waßmann <LW@KARO-electronics.de>

 *

 * This file is dual-licensed: you can use it either under the terms

 * of the GPL or the X11 license, at your option. Note that this dual
@@ -241,7 +241,7 @@ 


&fec {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_enet>;

	pinctrl-0 = <&pinctrl_enet &pinctrl_enet_mdio &pinctrl_etnphy_rst>;

	clocks = <&clks IMX6QDL_CLK_ENET>,

		 <&clks IMX6QDL_CLK_ENET>,

		 <&clks IMX6QDL_CLK_ENET_REF>,
@@ -261,8 +261,9 @@ 
			compatible = "ethernet-phy-ieee802.3-c22";

			reg = <0>;

			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_enet_mdio>;

			interrupts-extended = <&gpio7 1 IRQ_TYPE_EDGE_FALLING>;

			pinctrl-0 = <&pinctrl_etnphy_int>;

			interrupt-parent = <&gpio7>;

			interrupts = <1 IRQ_TYPE_EDGE_FALLING>;

		};

	};

};
@@ -334,8 +335,6 @@ 


	pinctrl_hog: hoggrp {

		fsl,pins = <

			MX6QDL_PAD_SD3_DAT2__GPIO7_IO06		0x1b0b1 /* ETN PHY RESET */

			MX6QDL_PAD_SD3_DAT4__GPIO7_IO01		0x1b0b1 /* ETN PHY INT */

			MX6QDL_PAD_EIM_A25__GPIO5_IO02		0x1b0b1 /* PWR BTN */

		>;

	};
@@ -453,12 +452,24 @@ 
		>;

	};



	pinctrl_etnphy_int: etnphy-intgrp {

		fsl,pins = <

			MX6QDL_PAD_SD3_DAT4__GPIO7_IO01		0x1b0b1 /* ETN PHY INT */

		>;

	};



	pinctrl_etnphy_power: etnphy-pwrgrp {

		fsl,pins = <

			MX6QDL_PAD_EIM_D20__GPIO3_IO20		0x1b0b1 /* ETN PHY POWER */

		>;

	};



	pinctrl_etnphy_rst: etnphy-rstgrp {

		fsl,pins = <

			MX6QDL_PAD_SD3_DAT2__GPIO7_IO06		0x1b0b1 /* ETN PHY RESET */

		>;

	};



	pinctrl_flexcan1: flexcan1grp {

		fsl,pins = <

			MX6QDL_PAD_GPIO_7__FLEXCAN1_TX		0x1b0b0