diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2016-08-18 18:51:12 (GMT) |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2016-08-26 14:58:36 (GMT) |
| commit | 860fbdd41f010348757926ca8f9c65dd00616d1e (patch) | |
| tree | eb92453773199d5077ced5b2fa53f3c79769ba67 /arch/arm/dts/sun8i-h3-orangepi-2.dts | |
| parent | a1243f78519f91ec4da7dd70daccfdfae9100cd0 (diff) | |
| download | u-boot-860fbdd41f010348757926ca8f9c65dd00616d1e.tar.xz | |
sunxi: Sync dts files with upstream kernel
Sync dts files with the current (Aug 18th 2016) state of Maxime's
linux/sunxi/for-next repo.
Note this commit also updates configs/MSI_Primo81_defconfig,
adding: "# CONFIG_REQUIRE_SERIAL_CONSOLE is not set", this is necessary
because the tablet does not have a reachable uart so the dts sync
drops its serial0 alias.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
Diffstat (limited to 'arch/arm/dts/sun8i-h3-orangepi-2.dts')
| -rw-r--r-- | arch/arm/dts/sun8i-h3-orangepi-2.dts | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/arch/arm/dts/sun8i-h3-orangepi-2.dts b/arch/arm/dts/sun8i-h3-orangepi-2.dts index d3f8f55..f89fe00 100644 --- a/arch/arm/dts/sun8i-h3-orangepi-2.dts +++ b/arch/arm/dts/sun8i-h3-orangepi-2.dts @@ -54,6 +54,8 @@ aliases { serial0 = &uart0; + /* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */ + ethernet1 = &rtl8189; }; chosen { @@ -131,6 +133,14 @@ bus-width = <4>; non-removable; status = "okay"; + + /* + * Explicitly define the sdio device, so that we can add an ethernet + * alias for it (which e.g. makes u-boot set a mac-address). + */ + rtl8189: sdio_wifi@1 { + reg = <1>; + }; }; &pio { @@ -184,16 +194,3 @@ usb1_vbus-supply = <®_usb1_vbus>; status = "okay"; }; - -&emac { - pinctrl-names = "default"; - pinctrl-0 = <&rgmii_pins>; - phy-mode = "rgmii"; - phy = <&phy1>; - status = "okay"; - - phy1: ethernet-phy@1 { - reg = <1>; - }; -}; - |