UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEElDRnuGcz/wPCXQWMQRCzN7AZXXMFAl0KHBoACgkQQRCzN7AZ
 XXMYShAAzHt7Mi4w8voKEjoGdL5FCnrs1tILmGqn4ZSGMq4ePqTP6NdDq+Lk5cVm
 a8CFmBdujAf4S3IVoQ4gepuysDLqxlK18857DkoiYak9CyZ5nk+/hAxhoJRbSNxo
 OlrhaI/fMvvP3Z61T69B2X8YifGnr/Fj6ZK6Pv4FIwXx0kuaaihqtPcq0h2N4Elb
 ah6qvx5UGhSPSGQxqBDijFcDpbmBt3CZl0o8TE5N+Y+pM6ibyndpU/RHuYjtm0P1
 Z44zgEh3JvyoG/dkpH546YW5tqQFyfSiYshcRriW1XzD1TUYicjrhmbGTYOnwwj/
 hOzXVgp48hmoqEl8O47dTs+zvJO9Gzg7+lnh6WWdoKN0feGyFll5Doj4gj6R3TkN
 T7c46ICk/XNJvapvYMdjyDQxJ591GmN7I4q4g2z8WVlXgdGt1GwU+7p7YikBmiyt
 KWMP/2K2Vl3kxZ7DK9rkQpNyjb+/WkkuczkA8ymj34vh8qYOhQ4alqxyUYv306eq
 PM2+/by6WnDzOZl6IxtOnKylMFfrY1ULVcn+85V/8oJQ+7ls1VNuBo31/iBE2H+3
 tVY0JtUcBApI8zsx0HcQFRblViOOJwlHvZOrJs2HY6h2BRKSrY04T9LxS2AWnAcL
 /SiHCUY9oje9Sb+b9kEph6vsGYDJozwDiWI2iAFeB3whtVI8YFM=
 =lkt2
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Olof Johansson 2019-06-19 07:26:35 -07:00
parent c914767610 3655802012
commit ef51ea44a9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/gemini-dlink-dir-685.dts
View File

@ -20,7 +20,7 @@
}; };
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";
}; };

2
arch/arm/boot/dts/gemini-dlink-dns-313.dts
View File

@ -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>;