iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allwinner arm64 changes, take 2

Browse Source 
Reintroduction of the EMAC bindings that were reverted in 4.13.
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABAgAGBQJaACruAAoJEBx+YmzsjxAgkK0QAL1BCHcrpftvznMta5QuuHrE
 fP++mGTv/upsnfGCb5D1gsQu+6bqyomrbCUjZspl7s+qrJSZo5Flto5KepPFNG4M
 vaFApl27HdUM4ppsOAVCokEp8r/QmRppc1CbDF0wqKL996ShUs71zwJ1yEZ5OwgR
 1j5hcmEwUhHC6mpROeycYG9+cp040q8Mj01hA5ClfrlwITTqf2rZWF51MTtraUDK
 3glww3ZCx9MdivqvlH8EKAKBaExIctoj9LZAcQZee+5yrKsXlOpzYwSO2qs4KxxA
 /5pdXitPp27jzzVB9w0oyYXb2ehixXHT6cYmTb4Ny9p+8xQo4V5qk++nMyY+kV2l
 1FJlVCLR+I4eYgr6ekWFWanxnyGwcLNtOCggfvSVYrwjHGsBjyX7tOZM1zfHRWP+
 W1DbWODow0So1b91Jfu63hyxkXawp2qA1+rMkrFnTHeXz3NRxdbTHP0SroXaWZd7
 e06WGxNVH/7SBtozkfvMk8rt3loXW1Rghx+R7d2HmU9AjZBgnVErf9TUAwD7S/rV
 rlfAUeRPN9uO7tjbEXysBKqNgXGBFIHcWEaEgETePvWwadG1sA7+Y+Pt1mXinpV0
 7SIE6JRzYgORXh7fii91gTlv0cr4VwfrxO+Ik0yMflfxgZ66FruwY8Q3Qjd2x8na
 6yIpvwY9I57usi7RW8nQ
 =mDKb
 -----END PGP SIGNATURE-----

Merge tag 'sunxi-dt64-for-4.15-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/dt

Pull "Allwinner arm64 changes, take 2" from Maxime Ripard:

Reintroduction of the EMAC bindings that were reverted in 4.13.

* tag 'sunxi-dt64-for-4.15-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  arm64: dts: allwinner: add snps,dwmac-mdio compatible to emac/mdio
  arm64: dts: allwinner: A64: Restore EMAC changes
This commit is contained in:
Arnd Bergmann 2017-11-07 16:20:25 +01:00
commit ea7cdc066e
5 changed files with 85 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,6 +51,7 @@
compatible = "sinovoip,bananapi-m64", "allwinner,sun50i-a64";
aliases {
ethernet0 = &emac;
serial0 = &uart0;
serial1 = &uart1;
};
@ -69,6 +70,14 @@
status = "okay";
};
&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>;
@ -79,6 +88,13 @@
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>;

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

@ -48,3 +48,18 @@
/* 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>;
};
};

17
arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
View File

@ -51,6 +51,7 @@
compatible = "pine64,pine64", "allwinner,sun50i-a64";
aliases {
ethernet0 = &emac;
serial0 = &uart0;
serial1 = &uart1;
serial2 = &uart2;
@ -71,6 +72,15 @@
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>;
@ -81,6 +91,13 @@
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>;

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

@ -53,6 +53,7 @@
"allwinner,sun50i-a64";
aliases {
ethernet0 = &emac;
serial0 = &uart0;
};
@ -76,6 +77,21 @@
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>;

21
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
View File

@ -505,6 +505,27 @@
#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 {
compatible = "snps,dwmac-mdio";
#address-cells = <1>;
#size-cells = <0>;
};
};
gic: interrupt-controller@1c81000 {
compatible = "arm,gic-400";
reg = <0x01c81000 0x1000>,