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

Commit 8ecd48cc authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.14.29 (45c8dbed) into msm-4.14" into msm-4.14

parents a047ae59 24b2e60f

Documentation/devicetree/bindings/usb/usb-xhci.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -12,6 +12,7 @@ Required properties: 
    - "renesas,xhci-r8a7793" for r8a7793 SoC

    - "renesas,xhci-r8a7793" for r8a7793 SoC

    - "renesas,xhci-r8a7795" for r8a7795 SoC

    - "renesas,xhci-r8a7795" for r8a7795 SoC

    - "renesas,xhci-r8a7796" for r8a7796 SoC

    - "renesas,xhci-r8a7796" for r8a7796 SoC

    - "renesas,xhci-r8a77965" for r8a77965 SoC

    - "renesas,rcar-gen2-xhci" for a generic R-Car Gen2 compatible device

    - "renesas,rcar-gen2-xhci" for a generic R-Car Gen2 compatible device

    - "renesas,rcar-gen3-xhci" for a generic R-Car Gen3 compatible device

    - "renesas,rcar-gen3-xhci" for a generic R-Car Gen3 compatible device

    - "xhci-platform" (deprecated)

    - "xhci-platform" (deprecated)

Makefile

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

# SPDX-License-Identifier: GPL-2.0

VERSION = 4

VERSION = 4

PATCHLEVEL = 14

PATCHLEVEL = 14

SUBLEVEL = 27

SUBLEVEL = 29

EXTRAVERSION =

EXTRAVERSION =

NAME = Petit Gorille

NAME = Petit Gorille

arch/arm/boot/dts/am335x-pepper.dts

+1 −1
Original line number Original line Diff line number Diff line
@@ -139,7 +139,7 @@ 
&audio_codec {

&audio_codec {

	status = "okay";

	status = "okay";





	gpio-reset = <&gpio1 16 GPIO_ACTIVE_LOW>;

	reset-gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;

	AVDD-supply = <&ldo3_reg>;

	AVDD-supply = <&ldo3_reg>;

	IOVDD-supply = <&ldo3_reg>;

	IOVDD-supply = <&ldo3_reg>;

	DRVDD-supply = <&ldo3_reg>;

	DRVDD-supply = <&ldo3_reg>;

arch/arm/boot/dts/exynos4412-trats2.dts

+1 −1
Original line number Original line Diff line number Diff line
@@ -395,7 +395,7 @@ 
		reg = <0>;

		reg = <0>;

		vdd3-supply = <&lcd_vdd3_reg>;

		vdd3-supply = <&lcd_vdd3_reg>;

		vci-supply = <&ldo25_reg>;

		vci-supply = <&ldo25_reg>;

		reset-gpios = <&gpy4 5 GPIO_ACTIVE_HIGH>;

		reset-gpios = <&gpf2 1 GPIO_ACTIVE_HIGH>;

		power-on-delay= <50>;

		power-on-delay= <50>;

		reset-delay = <100>;

		reset-delay = <100>;

		init-delay = <100>;

		init-delay = <100>;

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -558,7 +558,7 @@ 
	tlv320aic3x: tlv320aic3x@18 {

	tlv320aic3x: tlv320aic3x@18 {

		compatible = "ti,tlv320aic3x";

		compatible = "ti,tlv320aic3x";

		reg = <0x18>;

		reg = <0x18>;

		gpio-reset = <&gpio2 28 GPIO_ACTIVE_HIGH>; /* 60 */

		reset-gpios = <&gpio2 28 GPIO_ACTIVE_LOW>; /* 60 */

		ai3x-gpio-func = <

		ai3x-gpio-func = <

			0 /* AIC3X_GPIO1_FUNC_DISABLED */

			0 /* AIC3X_GPIO1_FUNC_DISABLED */

			5 /* AIC3X_GPIO2_FUNC_DIGITAL_MIC_INPUT */

			5 /* AIC3X_GPIO2_FUNC_DIGITAL_MIC_INPUT */
@@ -575,7 +575,7 @@ 
	tlv320aic3x_aux: tlv320aic3x@19 {

	tlv320aic3x_aux: tlv320aic3x@19 {

		compatible = "ti,tlv320aic3x";

		compatible = "ti,tlv320aic3x";

		reg = <0x19>;

		reg = <0x19>;

		gpio-reset = <&gpio2 28 GPIO_ACTIVE_HIGH>; /* 60 */

		reset-gpios = <&gpio2 28 GPIO_ACTIVE_LOW>; /* 60 */





		AVDD-supply = <&vmmc2>;

		AVDD-supply = <&vmmc2>;

		DRVDD-supply = <&vmmc2>;

		DRVDD-supply = <&vmmc2>;