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

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

Merge changes I7d83113e,Iab5cb23d into msm-4.14 

* changes:
  Merge remote-tracking branch 'remotes/origin/tmp-7e76ead2' into msm-4.14
  Merge remote-tracking branch 'remotes/origin/tmp-27e69ad2' into msm-4.14
parents 4e024506 92816ebe

Documentation/devicetree/bindings/serial/8250.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ Required properties: 
	- "ti,da830-uart"

	- "ti,da830-uart"

	- "aspeed,ast2400-vuart"

	- "aspeed,ast2400-vuart"

	- "aspeed,ast2500-vuart"

	- "aspeed,ast2500-vuart"

	- "nuvoton,npcm750-uart"

	- "serial" if the port type is unknown.

	- "serial" if the port type is unknown.

- reg : offset and length of the register set for the device.

- reg : offset and length of the register set for the device.

- interrupts : should contain uart interrupt.

- interrupts : should contain uart interrupt.

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 = 32

SUBLEVEL = 34

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";





	reset-gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;

	gpio-reset = <&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/dra76-evm.dts

+1 −0
Original line number Original line Diff line number Diff line
@@ -148,6 +148,7 @@ 
		compatible = "ti,tps65917";

		compatible = "ti,tps65917";

		reg = <0x58>;

		reg = <0x58>;

		ti,system-power-controller;

		ti,system-power-controller;

		ti,palmas-override-powerhold;

		interrupt-controller;

		interrupt-controller;

		#interrupt-cells = <2>;

		#interrupt-cells = <2>;

arch/arm/boot/dts/ls1021a.dtsi

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

		};





		esdhc: esdhc@1560000 {

		esdhc: esdhc@1560000 {

			compatible = "fsl,esdhc";

			compatible = "fsl,ls1021a-esdhc", "fsl,esdhc";

			reg = <0x0 0x1560000 0x0 0x10000>;

			reg = <0x0 0x1560000 0x0 0x10000>;

			interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;

			interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;

			clock-frequency = <0>;

			clock-frequency = <0>;