Merge tag 'omap-for-v4.16/dt-pt3-signed' of... (1585defa) · Commits · 戴 / test

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

arch/arm/boot/dts/dra7.dtsi

+16 −0

Original line number	Diff line number	Diff line
		@@ -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 */
		};

arch/arm/boot/dts/omap3-n9.dts

+7 −0

Original line number	Diff line number	Diff line
		@@ -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)
		>;
		};

arch/arm/boot/dts/omap3-n900.dts

+3 −1

Original line number	Diff line number	Diff line
		@@ -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>;

Admin message