diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-12-11 08:41:08 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-12-11 08:41:08 +0100 |
commit | 42e64571d516ef761d9f330c80493637cbf3bdda (patch) | |
tree | 5f3df1c06c2d571efa5fd72d0c8022a80140eec2 /arch/arm/boot/dts/r8a7790.dtsi | |
parent | serial: imx: Support common rs485 binding for RTS polarity (diff) | |
parent | Linux 4.15-rc3 (diff) | |
download | linux-42e64571d516ef761d9f330c80493637cbf3bdda.tar.xz linux-42e64571d516ef761d9f330c80493637cbf3bdda.zip |
Merge 4.15-rc3 into tty-next
We want the serial/tty fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/boot/dts/r8a7790.dtsi')
-rw-r--r-- | arch/arm/boot/dts/r8a7790.dtsi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi index 2f017fee4009..62baabd757b6 100644 --- a/arch/arm/boot/dts/r8a7790.dtsi +++ b/arch/arm/boot/dts/r8a7790.dtsi @@ -1201,6 +1201,7 @@ clock-names = "extal", "usb_extal"; #clock-cells = <2>; #power-domain-cells = <0>; + #reset-cells = <1>; }; prr: chipid@ff000044 { |