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

Commit 4daea499 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'sunxi-dt-h3-for-4.13' of... 

Merge tag 'sunxi-dt-h3-for-4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/dt

Allwinner H3 changes for 4.13

This tag is about bringing the EMAC support to the H3 boards.

* tag 'sunxi-dt-h3-for-4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux

:
  ARM: sun8i: h3: Enable EMAC with external PHY on Orange Pi Plus 2E
  arm: sun8i: orangepi-zero: Enable dwmac-sun8i
  ARM: sun8i: bananapi-m2-plus: Enable dwmac-sun8i
  ARM: sun8i: orangepi-plus: Enable dwmac-sun8i
  arm: sun8i: nanopi-neo: Enable dwmac-sun8i
  arm: sun8i: orangepi-pc-plus: Set EMAC activity LEDs to active high
  arm: sun8i: orangepi-2: Enable dwmac-sun8i
  arm: sun8i: orangepi-one: Enable dwmac-sun8i
  arm: sun8i: orangepi-pc: Enable dwmac-sun8i
  arm: sun8i: sunxi-h3-h5: add dwmac-sun8i ethernet driver
  arm: sun8i: sunxi-h3-h5: Add dt node for the syscon control module
  ARM: sunxi: h3-h5: Convert R_CCU raw numbers to macros

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents bcab84fb 7a78ef92

arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts

+8 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 
	aliases {

		serial0 = &uart0;

		/* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */

		ethernet0 = &emac;

		ethernet1 = &xr819;

	};
@@ -103,6 +104,13 @@ 
	status = "okay";

};



&emac {

	phy-handle = <&int_mii_phy>;

	phy-mode = "mii";

	allwinner,leds-active-low;

	status = "okay";

};



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins_a>;

arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts

+29 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
	compatible = "sinovoip,bpi-m2-plus", "allwinner,sun8i-h3";



	aliases {

		ethernet0 = &emac;

		serial0 = &uart0;

		serial1 = &uart1;

	};
@@ -84,6 +85,16 @@ 
		};

	};



	reg_gmac_3v3: gmac-3v3 {

		      compatible = "regulator-fixed";

		      regulator-name = "gmac-3v3";

		      regulator-min-microvolt = <3300000>;

		      regulator-max-microvolt = <3300000>;

		      startup-delay-us = <100000>;

		      enable-active-high;

		      gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>;

	};



	wifi_pwrseq: wifi_pwrseq {

		compatible = "mmc-pwrseq-simple";

		pinctrl-names = "default";
@@ -104,12 +115,30 @@ 
	status = "okay";

};



&emac {

	pinctrl-names = "default";

	pinctrl-0 = <&emac_rgmii_pins>;

	phy-supply = <&reg_gmac_3v3>;

	phy-handle = <&ext_rgmii_phy>;

	phy-mode = "rgmii";



	allwinner,leds-active-low;

	status = "okay";

};



&ir {

	pinctrl-names = "default";

	pinctrl-0 = <&ir_pins_a>;

	status = "okay";

};



&mdio {

	ext_rgmii_phy: ethernet-phy@1 {

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

		reg = <0>;

	};

};



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;

arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts

+7 −0
Original line number Diff line number Diff line
@@ -46,3 +46,10 @@ 
	model = "FriendlyARM NanoPi NEO";

	compatible = "friendlyarm,nanopi-neo", "allwinner,sun8i-h3";

};



&emac {

	phy-handle = <&int_mii_phy>;

	phy-mode = "mii";

	allwinner,leds-active-low;

	status = "okay";

};

arch/arm/boot/dts/sun8i-h3-orangepi-2.dts

+8 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ 
	aliases {

		serial0 = &uart0;

		/* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */

		ethernet0 = &emac;

		ethernet1 = &rtl8189;

	};
@@ -117,6 +118,13 @@ 
	status = "okay";

};



&emac {

	phy-handle = <&int_mii_phy>;

	phy-mode = "mii";

	allwinner,leds-active-low;

	status = "okay";

};



&ir {

	pinctrl-names = "default";

	pinctrl-0 = <&ir_pins_a>;

arch/arm/boot/dts/sun8i-h3-orangepi-one.dts

+8 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
	compatible = "xunlong,orangepi-one", "allwinner,sun8i-h3";



	aliases {

		ethernet0 = &emac;

		serial0 = &uart0;

	};
@@ -97,6 +98,13 @@ 
	status = "okay";

};



&emac {

	phy-handle = <&int_mii_phy>;

	phy-mode = "mii";

	allwinner,leds-active-low;

	status = "okay";

};



&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;