summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2015-08-06 15:39:05 +0200
committerHans de Goede <hdegoede@redhat.com>2015-08-14 08:37:38 +0200
commitf00e8207c372b079b920b0d86cd03d6be06d2ff4 (patch)
tree776b9c2ac59940497e62cad7ac1eadd35a01ee9a
parent84d54bc005c5a908aaf99815606c90b04e6f53bb (diff)
downloadu-boot-imx-f00e8207c372b079b920b0d86cd03d6be06d2ff4.zip
u-boot-imx-f00e8207c372b079b920b0d86cd03d6be06d2ff4.tar.gz
u-boot-imx-f00e8207c372b079b920b0d86cd03d6be06d2ff4.tar.bz2
sunxi: Fix gmac not working on the Colombus board
The phy is using a RGMII interface, which we need to specify in our board-config, and the dts needs a gmac section (the dts changes have also been submitted to the kernel). Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Ian Campbell <ijc@hellion.org.uk>
-rw-r--r--arch/arm/dts/sun6i-a31-colombus.dts12
-rw-r--r--configs/Colombus_defconfig2
2 files changed, 13 insertions, 1 deletions
diff --git a/arch/arm/dts/sun6i-a31-colombus.dts b/arch/arm/dts/sun6i-a31-colombus.dts
index 0cf9926..0d0b6f2 100644
--- a/arch/arm/dts/sun6i-a31-colombus.dts
+++ b/arch/arm/dts/sun6i-a31-colombus.dts
@@ -66,6 +66,18 @@
status = "okay";
};
+&gmac {
+ pinctrl-names = "default";
+ pinctrl-0 = <&gmac_pins_rgmii_a>;
+ phy = <&phy1>;
+ phy-mode = "rgmii";
+ status = "okay";
+
+ phy1: ethernet-phy@1 {
+ reg = <1>;
+ };
+};
+
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
diff --git a/configs/Colombus_defconfig b/configs/Colombus_defconfig
index 1ae8c16..7fa9ef1 100644
--- a/configs/Colombus_defconfig
+++ b/configs/Colombus_defconfig
@@ -7,7 +7,7 @@ CONFIG_USB1_VBUS_PIN=""
CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-colombus"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL=y
-CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC"
+CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII"
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set