Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a202e28 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v4.18/dt-part2-signed' of...

Merge tag 'omap-for-v4.18/dt-part2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Second set of dts changes for omap variants for v4.18 merge window

This series of changes contains fixes for already queued tps65218
IRQ_TYPE, and fixes for omap3 and am335x use of IRQ_TYPE. There are
also addition of oscillator clock for logicpd omap3 boards and a series
of changes to improve support for am3517-evm board. And there is also
a change to configure WLAN for am437x-sk-evm.

* tag 'omap-for-v4.18/dt-part2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

: (24 commits)
  ARM: dts: am3517-evm: Add User LEDs and Pushbutton
  ARM: dts: am3517-evm: Add I/O expander for User DIP switches and LEDS
  ARM: dts: logicpd-som-lv: Fix Touchscreen controller
  ARM: dts: am3517-som: Add Seiko Instruments RTC s35390a
  ARM: dts: am437x-sk-evm: add wilink8 support
  ARM: dts: am3517-evm: Add LCD panel type 15 support
  ARM: dts: am3517-som: Associate cpu to regulator supply
  ARM: dts: am3517-som: Add TI TPS65023 regulators
  ARM: dts: am3517-evm: Split off SOM features from baseboard
  ARM: dts: am3517: Add pinmuxing, CD and WP for MMC1
  ARM: dts: logicpd-som-lv: Add fixed 26MHz clock as fck for twl
  ARM: dts: logicpd-torpedo: Add fixed 26MHz clock as fck for twl
  ARM: dts: omap3-pandora-common: Use IRQ_TYPE specifier
  ARM: dts: am335x-boneblue: Use IRQ_TYPE specifier
  ARM: dts: am335x-baltos.dtsi: Use IRQ_TYPE specifier
  ARM: dts: am335x-baltos-ir5221: Use IRQ_TYPE specifier
  ARM: dts: am335x-baltos-ir3220: Use IRQ_TYPE specifier
  Revert "ARM: dts: am437x-sk-evm: Correct tps65218 irq type"
  ARM: dts: am437x-epos-evm: Fixup (again) tps65218 irq type
  ARM: dts: am437x-cm-t43: Fixup (again) tps65218 irq type
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 89bab02a 0dbf9954
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@
		gpio-controller;
		#gpio-cells = <2>;
		interrupt-parent = <&gpio0>;
		interrupts = <20 GPIO_ACTIVE_LOW>;
		interrupts = <20 IRQ_TYPE_EDGE_RISING>;
		pinctrl-names = "default";
		pinctrl-0 = <&tca6416_pins>;
	};
+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@
		gpio-controller;
		#gpio-cells = <2>;
		interrupt-parent = <&gpio0>;
		interrupts = <20 GPIO_ACTIVE_LOW>;
		interrupts = <20 IRQ_TYPE_EDGE_RISING>;
		pinctrl-names = "default";
		pinctrl-0 = <&tca6416_pins>;
	};
+1 −1
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@
		gpio-controller;
		#gpio-cells = <2>;
		interrupt-parent = <&gpio1>;
		interrupts = <28 GPIO_ACTIVE_LOW>;
		interrupts = <28 IRQ_TYPE_EDGE_RISING>;
		pinctrl-names = "default";
		pinctrl-0 = <&tps65910_pins>;
	};
+1 −1
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@
		compatible = "invensense,mpu9250";
		reg = <0x68>;
		interrupt-parent = <&gpio3>;
		interrupts = <21 GPIO_ACTIVE_LOW>;
		interrupts = <21 IRQ_TYPE_EDGE_RISING>;
		i2c-gate {
			#address-cells = <1>;
			#size-cells = <0>;
+2 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@
		};
	};

	backlight {
	lcd_bl: backlight {
		compatible = "pwm-backlight";
		pwms = <&ecap2 0 50000 PWM_POLARITY_INVERTED>;
		brightness-levels = <0 58 61 66 75 90 125 170 255>;
@@ -172,6 +172,7 @@
		pinctrl-names = "default", "sleep";
		pinctrl-0 = <&lcd_pins_default>;
		pinctrl-1 = <&lcd_pins_sleep>;
		backlight = <&lcd_bl>;
		status = "okay";
		panel-info {
			ac-bias		= <255>;
Loading