diff options
author | Marc Zyngier <maz@kernel.org> | 2020-11-13 00:20:43 +0300 |
---|---|---|
committer | Marc Zyngier <maz@kernel.org> | 2020-11-13 00:20:43 +0300 |
commit | 4f6b838c378a52ea3ae0b15f12ca8a20849072fa (patch) | |
tree | fbd8c2346320f97eda221b9150d787f9006e8b35 /arch/arm/boot/dts/rk3288-evb.dtsi | |
parent | c512298eed0360923d0cbc4a1f30bc0509af0d50 (diff) | |
parent | 3650b228f83adda7e5ee532e2b90429c03f7b9ec (diff) | |
download | linux-4f6b838c378a52ea3ae0b15f12ca8a20849072fa.tar.xz |
Merge tag 'v5.10-rc1' into kvmarm-master/next
Linux 5.10-rc1
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/rk3288-evb.dtsi')
-rw-r--r-- | arch/arm/boot/dts/rk3288-evb.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/rk3288-evb.dtsi b/arch/arm/boot/dts/rk3288-evb.dtsi index 018802df4c0e..c4ca73b40d4a 100644 --- a/arch/arm/boot/dts/rk3288-evb.dtsi +++ b/arch/arm/boot/dts/rk3288-evb.dtsi @@ -247,7 +247,7 @@ pinctrl-0 = <&rgmii_pins>; tx_delay = <0x30>; rx_delay = <0x10>; - status = "ok"; + status = "okay"; }; &gpu { |