diff options
author | David S. Miller <davem@davemloft.net> | 2020-08-02 01:02:12 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2020-08-02 01:02:12 -0700 |
commit | bd0b33b24897ba9ddad221e8ac5b6f0e38a2e004 (patch) | |
tree | 3f03062a9e759dba7b09df0feccbb58b8f7ab4cc /arch/arm/boot/dts/keystone-k2g-evm.dts | |
parent | mptcp: fix syncookie build error on UP (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
download | linux-dev-bd0b33b24897ba9ddad221e8ac5b6f0e38a2e004.tar.xz linux-dev-bd0b33b24897ba9ddad221e8ac5b6f0e38a2e004.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Resolved kernel/bpf/btf.c using instructions from merge commit
69138b34a7248d2396ab85c8652e20c0c39beaba
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm/boot/dts/keystone-k2g-evm.dts')
-rw-r--r-- | arch/arm/boot/dts/keystone-k2g-evm.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/keystone-k2g-evm.dts b/arch/arm/boot/dts/keystone-k2g-evm.dts index db640bab8c1d..8b3d64c913d8 100644 --- a/arch/arm/boot/dts/keystone-k2g-evm.dts +++ b/arch/arm/boot/dts/keystone-k2g-evm.dts @@ -402,7 +402,7 @@ &gbe0 { phy-handle = <ðphy0>; - phy-mode = "rgmii-id"; + phy-mode = "rgmii-rxid"; status = "okay"; }; |