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

Commit f6149484 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v4.20/fixes-rc4' of... 

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

Few minor fixes for omaps for v4.20-rc cycle

This set of fixes contains minor regression fixes for LogicPD dts files
for MMC pinctrl and interrupts. There is also one section annotation fix
that shows up with Clang, and a fix for an unitialized field for omap1.

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

:
  ARM: OMAP1: ams-delta: Fix possible use of uninitialized field
  ARM: dts: am3517-som: Fix WL127x Wifi interrupt
  ARM: dts: logicpd-somlv: Fix interrupt on mmc3_dat1
  ARM: dts: LogicPD Torpedo: Fix mmc3_dat1 interrupt
  ARM: dts: am3517: Fix pinmuxing for CD on MMC1
  ARM: OMAP2+: prm44xx: Fix section annotation on omap44xx_prm_enable_io_wakeup

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 89acb56d 91e43395

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

+1 −1
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ 
	vmmc-supply = <&vmmc_fixed>;

	bus-width = <4>;

	wp-gpios = <&gpio4 30 GPIO_ACTIVE_HIGH>; /* gpio_126 */

	cd-gpios = <&gpio4 31 GPIO_ACTIVE_HIGH>; /* gpio_127 */

	cd-gpios = <&gpio4 31 GPIO_ACTIVE_LOW>; /* gpio_127 */

};



&mmc3 {

arch/arm/boot/dts/am3517-som.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ 
		compatible = "ti,wl1271";

		reg = <2>;

		interrupt-parent = <&gpio6>;

		interrupts = <10 IRQ_TYPE_LEVEL_HIGH>; /* gpio_170 */

		interrupts = <10 IRQ_TYPE_EDGE_RISING>; /* gpio_170 */

		ref-clock-frequency = <26000000>;

		tcxo-clock-frequency = <26000000>;

	};

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

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ 
};



&mmc3 {

	interrupts-extended = <&intc 94 &omap3_pmx_core2 0x46>;

	interrupts-extended = <&intc 94 &omap3_pmx_core 0x136>;

	pinctrl-0 = <&mmc3_pins &wl127x_gpio>;

	pinctrl-names = "default";

	vmmc-supply = <&wl12xx_vmmc>;

arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
 * jumpering combinations for the long run.

 */

&mmc3 {

	interrupts-extended = <&intc 94 &omap3_pmx_core2 0x46>;

	interrupts-extended = <&intc 94 &omap3_pmx_core 0x136>;

	pinctrl-0 = <&mmc3_pins &mmc3_core2_pins>;

	pinctrl-names = "default";

	vmmc-supply = <&wl12xx_vmmc>;

arch/arm/mach-omap1/board-ams-delta.c

+3 −0
Original line number Diff line number Diff line
@@ -750,6 +750,9 @@ static void modem_pm(struct uart_port *port, unsigned int state, unsigned old) 
	struct modem_private_data *priv = port->private_data;

	int ret;



	if (!priv)

		return;



	if (IS_ERR(priv->regulator))

		return;