Commit 384f8ef4 authored by Justin Swartz's avatar Justin Swartz Committed by Thomas Bogendoerfer
Browse files

mips: dts: ralink: mt7621: move pinctrl and sort its children 



Move the pinctrl node prior to the nodes that feature unit
addresses.

Sort pinctrl's child nodes into alphabetical order.

Signed-off-by: default avatarJustin Swartz <justin.swartz@risingedge.co.za>
Reviewed-by: default avatarArınç ÜNAL <arinc.unal@arinc9.com>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: default avatarSergio Paracuellos <sergio.paracuellos@gmail.com>
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent f5a0fc0a

arch/mips/boot/dts/ralink/mt7621.dtsi

+86 −86
Original line number Diff line number Diff line
@@ -57,6 +57,92 @@ mmc_fixed_1v8_io: regulator-1v8 { 
		regulator-name = "mmc_io";

	};



	pinctrl: pinctrl {

		compatible = "ralink,mt7621-pinctrl";



		i2c_pins: i2c0-pins {

			pinmux {

				groups = "i2c";

				function = "i2c";

			};

		};



		mdio_pins: mdio0-pins {

			pinmux {

				groups = "mdio";

				function = "mdio";

			};

		};



		nand_pins: nand0-pins {

			sdhci-pinmux {

				groups = "sdhci";

				function = "nand2";

			};



			spi-pinmux {

				groups = "spi";

				function = "nand1";

			};

		};



		pcie_pins: pcie0-pins {

			pinmux {

				groups = "pcie";

				function = "gpio";

			};

		};



		rgmii1_pins: rgmii1-pins {

			pinmux {

				groups = "rgmii1";

				function = "rgmii1";

			};

		};



		rgmii2_pins: rgmii2-pins {

			pinmux {

				groups = "rgmii2";

				function = "rgmii2";

			};

		};



		sdhci_pins: sdhci0-pins {

			pinmux {

				groups = "sdhci";

				function = "sdhci";

			};

		};



		spi_pins: spi0-pins {

			pinmux {

				groups = "spi";

				function = "spi";

			};

		};



		uart1_pins: uart1-pins {

			pinmux {

				groups = "uart1";

				function = "uart1";

			};

		};



		uart2_pins: uart2-pins {

			pinmux {

				groups = "uart2";

				function = "uart2";

			};

		};



		uart3_pins: uart3-pins {

			pinmux {

				groups = "uart3";

				function = "uart3";

			};

		};

	};



	palmbus: palmbus@1e000000 {

		compatible = "palmbus";

		reg = <0x1e000000 0x100000>;
@@ -202,92 +288,6 @@ spi0: spi@b00 { 
		};

	};



	pinctrl: pinctrl {

		compatible = "ralink,mt7621-pinctrl";



		i2c_pins: i2c0-pins {

			pinmux {

				groups = "i2c";

				function = "i2c";

			};

		};



		spi_pins: spi0-pins {

			pinmux {

				groups = "spi";

				function = "spi";

			};

		};



		uart1_pins: uart1-pins {

			pinmux {

				groups = "uart1";

				function = "uart1";

			};

		};



		uart2_pins: uart2-pins {

			pinmux {

				groups = "uart2";

				function = "uart2";

			};

		};



		uart3_pins: uart3-pins {

			pinmux {

				groups = "uart3";

				function = "uart3";

			};

		};



		rgmii1_pins: rgmii1-pins {

			pinmux {

				groups = "rgmii1";

				function = "rgmii1";

			};

		};



		rgmii2_pins: rgmii2-pins {

			pinmux {

				groups = "rgmii2";

				function = "rgmii2";

			};

		};



		mdio_pins: mdio0-pins {

			pinmux {

				groups = "mdio";

				function = "mdio";

			};

		};



		pcie_pins: pcie0-pins {

			pinmux {

				groups = "pcie";

				function = "gpio";

			};

		};



		nand_pins: nand0-pins {

			spi-pinmux {

				groups = "spi";

				function = "nand1";

			};



			sdhci-pinmux {

				groups = "sdhci";

				function = "nand2";

			};

		};



		sdhci_pins: sdhci0-pins {

			pinmux {

				groups = "sdhci";

				function = "sdhci";

			};

		};

	};



	mmc: mmc@1e130000 {

		status = "disabled";