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

Commit a4bbf3df authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 5.2 into android-common 



Linux 5.2

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 9bc25811 0ecfebd2

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -7810,7 +7810,7 @@ INGENIC JZ4780 NAND DRIVER 
M:	Harvey Hunt <harveyhuntnexus@gmail.com>

L:	linux-mtd@lists.infradead.org

S:	Maintained

F:	drivers/mtd/nand/raw/jz4780_*

F:	drivers/mtd/nand/raw/ingenic/



INOTIFY

M:	Jan Kara <jack@suse.cz>
@@ -15503,6 +15503,7 @@ F: drivers/dma/tegra* 


TEGRA I2C DRIVER

M:	Laxman Dewangan <ldewangan@nvidia.com>

R:	Dmitry Osipenko <digetx@gmail.com>

S:	Supported

F:	drivers/i2c/busses/i2c-tegra.c

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
VERSION = 5

PATCHLEVEL = 2

SUBLEVEL = 0

EXTRAVERSION = -rc7

EXTRAVERSION =

NAME = Bobtail Squid



# *DOCUMENTATION*

arch/arm/boot/dts/armada-xp-98dx3236.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -336,3 +336,11 @@ 
	status = "disabled";

};



&uart0 {

	compatible = "marvell,armada-38x-uart";

};



&uart1 {

	compatible = "marvell,armada-38x-uart";

};

arch/arm/mach-davinci/board-da830-evm.c

+4 −1
Original line number Diff line number Diff line
@@ -61,6 +61,9 @@ static struct regulator_consumer_supply da830_evm_usb_supplies[] = { 
static struct regulator_init_data da830_evm_usb_vbus_data = {

	.consumer_supplies	= da830_evm_usb_supplies,

	.num_consumer_supplies	= ARRAY_SIZE(da830_evm_usb_supplies),

	.constraints    = {

		.valid_ops_mask = REGULATOR_CHANGE_STATUS,

	},

};



static struct fixed_voltage_config da830_evm_usb_vbus = {
@@ -88,7 +91,7 @@ static struct gpiod_lookup_table da830_evm_usb_oc_gpio_lookup = { 
static struct gpiod_lookup_table da830_evm_usb_vbus_gpio_lookup = {

	.dev_id		= "reg-fixed-voltage.0",

	.table = {

		GPIO_LOOKUP("davinci_gpio", ON_BD_USB_DRV, "vbus", 0),

		GPIO_LOOKUP("davinci_gpio", ON_BD_USB_DRV, NULL, 0),

		{ }

	},

};

arch/arm/mach-davinci/board-omapl138-hawk.c

+3 −0
Original line number Diff line number Diff line
@@ -306,6 +306,9 @@ static struct regulator_consumer_supply hawk_usb_supplies[] = { 
static struct regulator_init_data hawk_usb_vbus_data = {

	.consumer_supplies	= hawk_usb_supplies,

	.num_consumer_supplies	= ARRAY_SIZE(hawk_usb_supplies),

	.constraints    = {

		.valid_ops_mask = REGULATOR_CHANGE_STATUS,

	},

};



static struct fixed_voltage_config hawk_usb_vbus = {