diff options
| author | Olof Johansson <olof@lixom.net> | 2019-06-19 07:26:35 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-06-19 07:26:35 -0700 |
| commit | ef51ea44a96f6d7a770a4210a04d93ec820df077 (patch) | |
| tree | c7bbc6a6ee5618c5f9ea22f9471a9909b55096ec /arch/arm | |
| parent | c914767610946845bd3054341f4636b702fd7632 (diff) | |
| parent | 36558020128b1a48b7bddd5792ee70e3f64b04b0 (diff) | |
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 <olof@lixom.net>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/gemini-dlink-dir-685.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/gemini-dlink-dns-313.dts | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/gemini-dlink-dir-685.dts b/arch/arm/boot/dts/gemini-dlink-dir-685.dts index cfbfbc91a1e1..3613f05f8a80 100644 --- a/arch/arm/boot/dts/gemini-dlink-dir-685.dts +++ b/arch/arm/boot/dts/gemini-dlink-dir-685.dts @@ -20,7 +20,7 @@ }; 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"; }; diff --git a/arch/arm/boot/dts/gemini-dlink-dns-313.dts b/arch/arm/boot/dts/gemini-dlink-dns-313.dts index b12504e10f0b..360642a02a48 100644 --- a/arch/arm/boot/dts/gemini-dlink-dns-313.dts +++ b/arch/arm/boot/dts/gemini-dlink-dns-313.dts @@ -11,7 +11,7 @@ / { 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>; #size-cells = <1>; |