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

Commit 5ac3d09d authored by Treehugger Robot's avatar Treehugger Robot
Browse files

Merge "Merge 4.19.286 into android-4.19-stable" into android-4.19-stable

parents 0a4993df ab7a9cec

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 285

SUBLEVEL = 286

EXTRAVERSION =

NAME = "People's Front"

drivers/gpu/drm/amd/amdgpu/vi.c

+9 −2
Original line number Diff line number Diff line
@@ -328,8 +328,15 @@ static u32 vi_get_xclk(struct amdgpu_device *adev) 
	u32 reference_clock = adev->clock.spll.reference_freq;

	u32 tmp;



	if (adev->flags & AMD_IS_APU)

	if (adev->flags & AMD_IS_APU) {

		switch (adev->asic_type) {

		case CHIP_STONEY:

			/* vbios says 48Mhz, but the actual freq is 100Mhz */

			return 10000;

		default:

			return reference_clock;

		}

	}



	tmp = RREG32_SMC(ixCG_CLKPIN_CNTL_2);

	if (REG_GET_FIELD(tmp, CG_CLKPIN_CNTL_2, MUX_TCLK_TO_XCLK))

drivers/i2c/busses/i2c-sprd.c

+4 −2
Original line number Diff line number Diff line
@@ -581,9 +581,11 @@ static int sprd_i2c_remove(struct platform_device *pdev) 


	ret = pm_runtime_get_sync(i2c_dev->dev);

	if (ret < 0)

		return ret;

		dev_err(&pdev->dev, "Failed to resume device (%pe)\n", ERR_PTR(ret));



	i2c_del_adapter(&i2c_dev->adap);



	if (ret >= 0)

		clk_disable_unprepare(i2c_dev->clk);



	pm_runtime_put_noidle(i2c_dev->dev);

drivers/infiniband/hw/i40iw/i40iw.h

+2 −3
Original line number Diff line number Diff line
@@ -411,9 +411,8 @@ void i40iw_manage_arp_cache(struct i40iw_device *iwdev, 
			    bool ipv4,

			    u32 action);



int i40iw_manage_apbvt(struct i40iw_device *iwdev,

		       u16 accel_local_port,

		       bool add_port);

enum i40iw_status_code i40iw_manage_apbvt(struct i40iw_device *iwdev,

					  u16 accel_local_port, bool add_port);



struct i40iw_cqp_request *i40iw_get_cqp_request(struct i40iw_cqp *cqp, bool wait);

void i40iw_free_cqp_request(struct i40iw_cqp *cqp, struct i40iw_cqp_request *cqp_request);

drivers/input/joystick/xpad.c

+0 −1
Original line number Diff line number Diff line
@@ -276,7 +276,6 @@ static const struct xpad_device { 
	{ 0x1430, 0xf801, "RedOctane Controller", 0, XTYPE_XBOX360 },

	{ 0x146b, 0x0601, "BigBen Interactive XBOX 360 Controller", 0, XTYPE_XBOX360 },

	{ 0x146b, 0x0604, "Bigben Interactive DAIJA Arcade Stick", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 },

	{ 0x1532, 0x0037, "Razer Sabertooth", 0, XTYPE_XBOX360 },

	{ 0x1532, 0x0a00, "Razer Atrox Arcade Stick", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOXONE },

	{ 0x1532, 0x0a03, "Razer Wildcat", 0, XTYPE_XBOXONE },

	{ 0x15e4, 0x3f00, "Power A Mini Pro Elite", 0, XTYPE_XBOX360 },