Commit d7a4ec8c authored by popcornmix's avatar popcornmix
Browse files

Merge remote-tracking branch 'stable/linux-4.14.y' into rpi-4.14.y

parents fe7f4052 b867b7a7

Documentation/devicetree/bindings/serial/8250.txt

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

	- "aspeed,ast2400-vuart"

	- "aspeed,ast2500-vuart"

	- "nuvoton,npcm750-uart"

	- "serial" if the port type is unknown.

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

- interrupts : should contain uart interrupt.

Makefile

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

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 32

SUBLEVEL = 33

EXTRAVERSION =

NAME = Petit Gorille

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

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

	status = "okay";



	reset-gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;

	gpio-reset = <&gpio1 16 GPIO_ACTIVE_LOW>;

	AVDD-supply = <&ldo3_reg>;

	IOVDD-supply = <&ldo3_reg>;

	DRVDD-supply = <&ldo3_reg>;

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

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

		reg = <0x58>;

		ti,system-power-controller;

		ti,palmas-override-powerhold;

		interrupt-controller;

		#interrupt-cells = <2>;

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

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

		compatible = "ti,tlv320aic3x";

		reg = <0x18>;

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

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

		ai3x-gpio-func = <

			0 /* AIC3X_GPIO1_FUNC_DISABLED */

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

		compatible = "ti,tlv320aic3x";

		reg = <0x19>;

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

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



		AVDD-supply = <&vmmc2>;

		DRVDD-supply = <&vmmc2>;