1 From 94f442886711c6c4f4383a1c5a6994a788ba05d8 Mon Sep 17 00:00:00 2001
2 From: Corentin Labbe <clabbe.montjoie@gmail.com>
3 Date: Tue, 31 Oct 2017 09:19:13 +0100
4 Subject: [PATCH] arm64: dts: allwinner: A64: Restore EMAC changes
6 The original dwmac-sun8i DT bindings have some issue on how to handle
7 integrated PHY and was reverted in last RC of 4.13.
8 But now we have a solution so we need to get back that was reverted.
10 This patch restore arm64 DT about dwmac-sun8i for A64
11 This reverts commit 87e1f5e8bb4b ("arm64: dts: allwinner: Revert EMAC changes")
13 Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>
14 Acked-by: Florian Fainelli <f.fainelli@gmail.com>
15 Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
17 .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 16 ++++++++++++++++
18 .../boot/dts/allwinner/sun50i-a64-pine64-plus.dts | 15 +++++++++++++++
19 arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 17 +++++++++++++++++
20 .../dts/allwinner/sun50i-a64-sopine-baseboard.dts | 16 ++++++++++++++++
21 arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 20 ++++++++++++++++++++
22 5 files changed, 84 insertions(+)
24 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
25 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
27 compatible = "sinovoip,bananapi-m64", "allwinner,sun50i-a64";
39 + pinctrl-names = "default";
40 + pinctrl-0 = <&rgmii_pins>;
42 + phy-handle = <&ext_rgmii_phy>;
47 pinctrl-names = "default";
48 pinctrl-0 = <&i2c1_pins>;
54 + ext_rgmii_phy: ethernet-phy@1 {
55 + compatible = "ethernet-phy-ieee802.3-c22";
61 pinctrl-names = "default";
62 pinctrl-0 = <&mmc0_pins>;
63 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts
64 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts
67 /* TODO: Camera, touchscreen, etc. */
71 + pinctrl-names = "default";
72 + pinctrl-0 = <&rgmii_pins>;
74 + phy-handle = <&ext_rgmii_phy>;
79 + ext_rgmii_phy: ethernet-phy@1 {
80 + compatible = "ethernet-phy-ieee802.3-c22";
84 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
85 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
87 compatible = "pine64,pine64", "allwinner,sun50i-a64";
99 + pinctrl-names = "default";
100 + pinctrl-0 = <&rmii_pins>;
102 + phy-handle = <&ext_rmii_phy1>;
108 pinctrl-names = "default";
109 pinctrl-0 = <&i2c1_pins>;
115 + ext_rmii_phy1: ethernet-phy@1 {
116 + compatible = "ethernet-phy-ieee802.3-c22";
122 pinctrl-names = "default";
123 pinctrl-0 = <&mmc0_pins>;
124 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
125 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
127 "allwinner,sun50i-a64";
139 + pinctrl-names = "default";
140 + pinctrl-0 = <&rgmii_pins>;
141 + phy-mode = "rgmii";
142 + phy-handle = <&ext_rgmii_phy>;
147 + ext_rgmii_phy: ethernet-phy@1 {
148 + compatible = "ethernet-phy-ieee802.3-c22";
154 pinctrl-names = "default";
155 pinctrl-0 = <&mmc2_pins>;
156 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
157 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
162 + emac: ethernet@1c30000 {
163 + compatible = "allwinner,sun50i-a64-emac";
164 + syscon = <&syscon>;
165 + reg = <0x01c30000 0x10000>;
166 + interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
167 + interrupt-names = "macirq";
168 + resets = <&ccu RST_BUS_EMAC>;
169 + reset-names = "stmmaceth";
170 + clocks = <&ccu CLK_BUS_EMAC>;
171 + clock-names = "stmmaceth";
172 + status = "disabled";
173 + #address-cells = <1>;
177 + #address-cells = <1>;
182 gic: interrupt-controller@1c81000 {
183 compatible = "arm,gic-400";
184 reg = <0x01c81000 0x1000>,