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

Commit 87e1f5e8 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

arm64: dts: allwinner: Revert EMAC changes 



Since the discussion is not settled yet for the EMAC, and that the release
in getting really close, let's revert the changes for now, and we'll
reintroduce them later.

Acked-by: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
parent 8aa33ec2

arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts

+0 −16
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ 
	compatible = "sinovoip,bananapi-m64", "allwinner,sun50i-a64";



	aliases {

		ethernet0 = &emac;

		serial0 = &uart0;

		serial1 = &uart1;

	};
@@ -68,14 +67,6 @@ 
	};

};



&emac {

	pinctrl-names = "default";

	pinctrl-0 = <&rgmii_pins>;

	phy-mode = "rgmii";

	phy-handle = <&ext_rgmii_phy>;

	status = "okay";

};



&i2c1 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c1_pins>;
@@ -86,13 +77,6 @@ 
	bias-pull-up;

};



&mdio {

	ext_rgmii_phy: ethernet-phy@1 {

		compatible = "ethernet-phy-ieee802.3-c22";

		reg = <1>;

	};

};



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts

+0 −15
Original line number Diff line number Diff line
@@ -48,18 +48,3 @@ 


	/* TODO: Camera, touchscreen, etc. */

};
 


&emac {

	pinctrl-names = "default";

	pinctrl-0 = <&rgmii_pins>;

	phy-mode = "rgmii";

	phy-handle = <&ext_rgmii_phy>;

	status = "okay";

};



&mdio {

	ext_rgmii_phy: ethernet-phy@1 {

		compatible = "ethernet-phy-ieee802.3-c22";

		reg = <1>;

	};

};

arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts

+0 −17
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ 
	compatible = "pine64,pine64", "allwinner,sun50i-a64";



	aliases {

		ethernet0 = &emac;

		serial0 = &uart0;

		serial1 = &uart1;

		serial2 = &uart2;
@@ -79,15 +78,6 @@ 
	status = "okay";

};



&emac {

	pinctrl-names = "default";

	pinctrl-0 = <&rmii_pins>;

	phy-mode = "rmii";

	phy-handle = <&ext_rmii_phy1>;

	status = "okay";



};



&i2c1 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c1_pins>;
@@ -98,13 +88,6 @@ 
	bias-pull-up;

};



&mdio {

	ext_rmii_phy1: ethernet-phy@1 {

		compatible = "ethernet-phy-ieee802.3-c22";

		reg = <1>;

	};

};



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts

+0 −16
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ 
		     "allwinner,sun50i-a64";



	aliases {

		ethernet0 = &emac;

		serial0 = &uart0;

	};
@@ -77,21 +76,6 @@ 
	status = "okay";

};



&emac {

	pinctrl-names = "default";

	pinctrl-0 = <&rgmii_pins>;

	phy-mode = "rgmii";

	phy-handle = <&ext_rgmii_phy>;

	status = "okay";

};



&mdio {

	ext_rgmii_phy: ethernet-phy@1 {

		compatible = "ethernet-phy-ieee802.3-c22";

		reg = <1>;

	};

};



&mmc2 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc2_pins>;

arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi

+0 −20
Original line number Diff line number Diff line
@@ -449,26 +449,6 @@ 
			#size-cells = <0>;

		};



		emac: ethernet@1c30000 {

			compatible = "allwinner,sun50i-a64-emac";

			syscon = <&syscon>;

			reg = <0x01c30000 0x10000>;

			interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "macirq";

			resets = <&ccu RST_BUS_EMAC>;

			reset-names = "stmmaceth";

			clocks = <&ccu CLK_BUS_EMAC>;

			clock-names = "stmmaceth";

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <0>;



			mdio: mdio {

				#address-cells = <1>;

				#size-cells = <0>;

			};

		};



		gic: interrupt-controller@1c81000 {

			compatible = "arm,gic-400";

			reg = <0x01c81000 0x1000>,