Commit ef51ea44 authored by Olof Johansson's avatar Olof Johansson

Merge tag 'gemini-dts-v5.2' of...

Merge tag 'gemini-dts-v5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into arm/fixes

This fixes up two issues with the Gemini DTS files:
- Blank console after a while on the DIR-685 so as
  not to waste power
- Fix up the erroneous compatible string on the DNS-313

* tag 'gemini-dts-v5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
  ARM: dts: gemini Fix up DNS-313 compatible string
  ARM: dts: Blank D-Link DIR-685 console
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents c9147676 36558020
...@@ -20,7 +20,7 @@ memory@0 { ...@@ -20,7 +20,7 @@ memory@0 {
}; };
chosen { chosen {
bootargs = "console=ttyS0,19200n8 root=/dev/sda1 rw rootwait"; bootargs = "console=ttyS0,19200n8 root=/dev/sda1 rw rootwait consoleblank=300";
stdout-path = "uart0:19200n8"; stdout-path = "uart0:19200n8";
}; };
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
/ { / {
model = "D-Link DNS-313 1-Bay Network Storage Enclosure"; model = "D-Link DNS-313 1-Bay Network Storage Enclosure";
compatible = "dlink,dir-313", "cortina,gemini"; compatible = "dlink,dns-313", "cortina,gemini";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment