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

Commit 80ac3620 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.19.10 (67319b77) into msm-4.19"

parents 394d921d f687fb99

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 9

SUBLEVEL = 10

EXTRAVERSION =

NAME = "People's Front"

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

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,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>;