diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2018-06-08 11:20:42 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2018-06-08 11:20:42 +0300 |
| commit | c1144d29f405ce1f4e6ede6482beb3d0d09750c6 (patch) | |
| tree | 0f9fe36a50005bae6ffe28a4f978e71273f5b1d1 /arch/arm/boot/dts/uniphier-pro4-ace.dts | |
| parent | d6c70a86bc72fabe7fc9d9533afdb46a56c16896 (diff) | |
| parent | a317e559574b2af62095b39792d168cb98cb2561 (diff) | |
| download | linux-c1144d29f405ce1f4e6ede6482beb3d0d09750c6.tar.xz | |
Merge branch 'for-4.18/alps' into for-linus
hid-alps driver cleanups wrt. t4_read_write_register() handling
from Christophe Jaillet
Diffstat (limited to 'arch/arm/boot/dts/uniphier-pro4-ace.dts')
| -rw-r--r-- | arch/arm/boot/dts/uniphier-pro4-ace.dts | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/uniphier-pro4-ace.dts b/arch/arm/boot/dts/uniphier-pro4-ace.dts index 089419cee273..db1b08935ae5 100644 --- a/arch/arm/boot/dts/uniphier-pro4-ace.dts +++ b/arch/arm/boot/dts/uniphier-pro4-ace.dts @@ -1,11 +1,9 @@ -/* - * Device Tree Source for UniPhier Pro4 Ace Board - * - * Copyright (C) 2016 Socionext Inc. - * Author: Masahiro Yamada <yamada.masahiro@socionext.com> - * - * SPDX-License-Identifier: (GPL-2.0+ OR MIT) - */ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +// +// Device Tree Source for UniPhier Pro4 Ace Board +// +// Copyright (C) 2016 Socionext Inc. +// Author: Masahiro Yamada <yamada.masahiro@socionext.com> /dts-v1/; #include "uniphier-pro4.dtsi" @@ -77,3 +75,14 @@ &usb3 { status = "okay"; }; + +ð { + status = "okay"; + phy-handle = <ðphy>; +}; + +&mdio { + ethphy: ethphy@1 { + reg = <1>; + }; +}; |