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

Commit 602a4242 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v17/fixes-rc4' of... 

Merge tag 'omap-for-v17/fixes-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Fixes for omap variants for v4.17

This series of patches contains one BUG fix for trace if
CONFIG_DEBUG_PREEMPT is enabled and a regression fix for omap1 FIQ
handling on ams-delta. Then there's a dts fix for missing SoC
compatible on ti81xx board dts files that did matter until we added
the clkctrl clocks and without that some clocks are now not found.

Then there are two logicpd-som-lv specific dts fixes that fix
misconfigured pins for WLAN and audio. Turns out we had to revert
the third one because it caused another regression for USB.

* tag 'omap-for-v17/fixes-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  Revert "ARM: dts: logicpd-som-lv: Fix pinmux controller references"
  ARM: dts: correct missing "compatible" entry for ti81xx SoCs
  ARM: OMAP1: ams-delta: fix deferred_fiq handler
  ARM: dts: logicpd-som-lv: Fix pinmux controller references
  ARM: dts: logicpd-som-lv: Fix Audio Mute
  ARM: dts: logicpd-som-lv: Fix WL127x Startup Issues
  ARM: OMAP2+: powerdomain: use raw_smp_processor_id() for trace

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 51dff165 41bd6adf

arch/arm/boot/dts/dm8148-evm.dts

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 


/ {

	model = "DM8148 EVM";

	compatible = "ti,dm8148-evm", "ti,dm8148";

	compatible = "ti,dm8148-evm", "ti,dm8148", "ti,dm814";



	memory@80000000 {

		device_type = "memory";

arch/arm/boot/dts/dm8148-t410.dts

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 


/ {

	model = "HP t410 Smart Zero Client";

	compatible = "hp,t410", "ti,dm8148";

	compatible = "hp,t410", "ti,dm8148", "ti,dm814";



	memory@80000000 {

		device_type = "memory";

arch/arm/boot/dts/dm8168-evm.dts

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 


/ {

	model = "DM8168 EVM";

	compatible = "ti,dm8168-evm", "ti,dm8168";

	compatible = "ti,dm8168-evm", "ti,dm8168", "ti,dm816";



	memory@80000000 {

		device_type = "memory";

arch/arm/boot/dts/dra62x-j5eco-evm.dts

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 


/ {

	model = "DRA62x J5 Eco EVM";

	compatible = "ti,dra62x-j5eco-evm", "ti,dra62x", "ti,dm8148";

	compatible = "ti,dra62x-j5eco-evm", "ti,dra62x", "ti,dm8148", "ti,dm814";



	memory@80000000 {

		device_type = "memory";

arch/arm/boot/dts/logicpd-som-lv.dtsi

+9 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
		gpio = <&gpio1 3 0>;   /* gpio_3 */

		startup-delay-us = <70000>;

		enable-active-high;

		vin-supply = <&vmmc2>;

		vin-supply = <&vaux3>;

	};



	/* HS USB Host PHY on PORT 1 */
@@ -82,6 +82,7 @@ 
		twl_audio: audio {

			compatible = "ti,twl4030-audio";

			codec {

				ti,hs_extmute_gpio = <&gpio2 25 GPIO_ACTIVE_HIGH>;

			};

		};

	};
@@ -199,6 +200,7 @@ 
		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x21ba, PIN_INPUT | MUX_MODE0)        /* i2c1_scl.i2c1_scl */

			OMAP3_CORE1_IOPAD(0x21bc, PIN_INPUT | MUX_MODE0)        /* i2c1_sda.i2c1_sda */

			OMAP3_CORE1_IOPAD(0x20ba, PIN_OUTPUT | MUX_MODE4)        /* gpmc_ncs6.gpio_57 */

		>;

	};

};
@@ -213,7 +215,7 @@ 
	};

	wl127x_gpio: pinmux_wl127x_gpio_pin {

		pinctrl-single,pins = <

			OMAP3_WKUP_IOPAD(0x2a0c, PIN_INPUT | MUX_MODE4)		/* sys_boot0.gpio_2 */

			OMAP3_WKUP_IOPAD(0x2a0a, PIN_INPUT | MUX_MODE4)		/* sys_boot0.gpio_2 */

			OMAP3_WKUP_IOPAD(0x2a0c, PIN_OUTPUT | MUX_MODE4)	/* sys_boot1.gpio_3 */

		>;

	};
@@ -260,6 +262,11 @@ 
#include "twl4030.dtsi"

#include "twl4030_omap3.dtsi"



&vaux3 {

	regulator-min-microvolt = <2800000>;

	regulator-max-microvolt = <2800000>;

};



&twl {

	twl_power: power {

		compatible = "ti,twl4030-power-idle-osc-off", "ti,twl4030-power-idle";