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

Few omap dts fixes and n9 volume keys update for v4.16 merge window 

For now, we need to rely on dts alias for n900 lcd and tvout order
 to prevent occasional blank lcd. And we need to reduce the shut down
 temperature for dra7 for non-cpu thermal cases.
 
 And looks like we're missing the n9 volume key mappings and there is
 active work going happening for n9 at least for postmarketos. So let's
 make sure the keys can be actually used as they are the only buttons
 on n9 in addition to the power key.
 -----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCAAvFiEEkgNvrZJU/QSQYIcQG9Q+yVyrpXMFAlpiE+kRHHRvbnlAYXRv
 bWlkZS5jb20ACgkQG9Q+yVyrpXOx7w//cVIQ+pmrnUkvnFRZLvWjzccqlAOpOKSf
 9S+af34MrkvAkSa45dYR3MIDdUjoXZLndbY+HFgAQAu66OzUginxuTu4I6mtC/Ge
 /Lq/7W7X+a5r3wY0x1XpJX/nRXYYujfelPrDl0Hu6nL2el8BWCVTt++VhsE5jgYM
 fIUKQjXvv4zxN/9y/QFjG5psk4jtXSG5JMbiqpJADIi1cM7mzkTQI+D3b4t89AIZ
 bOQggyB8Z+QrSIQxQA+iCkItu8BgYT1H0pdCs4ZC1BKN2EAG8lc9WKtDBVQR0mlE
 MAxrqyhPXKRy4rCzZ5sWyFe+cxlrnw9AdolHXSjYGYl/iQs8e8HjjiU8SxM0xLGV
 8Fn7bTPSqCXO+La8GBEEWEYNvt9muA9smzxOeALEMHKaM1SlFiYg/vz42teld4zT
 Z+KUv0lQhbKuYVWDG1goIc9IWaFi3Q892ldXWuDeOOQuCWOhfOrx25bN5F2wdmhy
 M6GprbNw3sfCZg7MGDYIfupFywbTK7hikdBECQUwB9Kghgh0xTyCRgD1IibyIHeq
 RxEF/NB5lKn8FbmVRDmAiVhAEupJPKBf2CKKU7uHmAKHmsqL7zWBs71XV25PXBI8
 vTd33sMWdos4DjWNAIW0xMTsCAa6ZDW2NSfuq6E3RQ1xsbbb+BBIU98eyji0jvVK
 D8v2r6dgPfc=
 =M8S+
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v4.16/dt-pt3-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Pull "dts fixes for omaps for v4.16 merge window" from Tony Lindgren:

Few omap dts fixes and n9 volume keys update for v4.16 merge window

For now, we need to rely on dts alias for n900 lcd and tvout order
to prevent occasional blank lcd. And we need to reduce the shut down
temperature for dra7 for non-cpu thermal cases.

And looks like we're missing the n9 volume key mappings and there is
active work going happening for n9 at least for postmarketos. So let's
make sure the keys can be actually used as they are the only buttons
on n9 in addition to the power key.

* tag 'omap-for-v4.16/dt-pt3-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: Nokia N9: add support for up/down keys in the dts
  ARM: dts: dra7: Reduce shut down temperature of non-cpu thermal zones
  ARM: dts: n900: Add aliases for lcd and tvout displays
This commit is contained in:
Arnd Bergmann 2018-01-23 10:19:46 +01:00
parent 6ab1e867ac 0e6e6dcce8
commit 1585defa51
3 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/arm/boot/dts/dra7.dtsi
View File

@ -2151,3 +2151,19 @@
};
#include "dra7xx-clocks.dtsi"
&core_crit {
temperature = <120000>; /* milli Celsius */
};
&gpu_crit {
temperature = <120000>; /* milli Celsius */
};
&dspeve_crit {
temperature = <120000>; /* milli Celsius */
};
&iva_crit {
temperature = <120000>; /* milli Celsius */
};

7
arch/arm/boot/dts/omap3-n9.dts
View File

@ -11,6 +11,7 @@
/dts-v1/;
#include "omap3-n950-n9.dtsi"
#include <dt-bindings/input/input.h>
/ {
model = "Nokia N9";
@ -72,3 +73,9 @@
st,max-limit-y = <46>;
st,max-limit-z = <46>;
};
&twl_keypad {
linux,keymap = < MATRIX_KEY(6, 8, KEY_VOLUMEUP)
MATRIX_KEY(7, 8, KEY_VOLUMEDOWN)
>;
};

4
arch/arm/boot/dts/omap3-n900.dts
View File

@ -35,6 +35,8 @@
i2c1 = &i2c1;
i2c2 = &i2c2;
i2c3 = &i2c3;
display0 = &lcd;
display1 = &tv;
};
cpus {
@ -965,7 +967,7 @@
ti,esd-recovery-timeout-ms = <8000>;
};
acx565akm@2 {
lcd: acx565akm@2 {
compatible = "sony,acx565akm";
spi-max-frequency = <6000000>;
reg = <2>;