Skip to content

Commit ef51ea4

Browse files
committed
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: Olof Johansson <[email protected]>
2 parents c914767 + 3655802 commit ef51ea4

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

arch/arm/boot/dts/gemini-dlink-dir-685.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
};
2121

2222
chosen {
23-
bootargs = "console=ttyS0,19200n8 root=/dev/sda1 rw rootwait";
23+
bootargs = "console=ttyS0,19200n8 root=/dev/sda1 rw rootwait consoleblank=300";
2424
stdout-path = "uart0:19200n8";
2525
};
2626

arch/arm/boot/dts/gemini-dlink-dns-313.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
/ {
1313
model = "D-Link DNS-313 1-Bay Network Storage Enclosure";
14-
compatible = "dlink,dir-313", "cortina,gemini";
14+
compatible = "dlink,dns-313", "cortina,gemini";
1515
#address-cells = <1>;
1616
#size-cells = <1>;
1717

0 commit comments

Comments
 (0)