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

Commit b9358b24 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'platform-drivers-x86-v4.6-2' of... 

Merge tag 'platform-drivers-x86-v4.6-2' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86

Pull x86 platform driver fixes from Darren Hart:
 "An S4 fix for intel-hid, new platform 'quirk' for hp_accel, a fix for
  broader support of ACPI resources for the Intel P-unit, and a few
  uninitialized variable fixes.

  intel p-unit:
   - decouple telemetry driver from the optional IPC resources

  thinkpad_acpi:
   - Silence an uninitialized variable warning

  intel_telemetry_pltdrv:
   - Silence an uninitialized variable warning

  hp_accel:
   - Silence an uninitialized variable warning
   - Add support for HP ProBook 440 G3

  intel-hid:
   - add a workaround to ignore an event after waking up from S4"

* tag 'platform-drivers-x86-v4.6-2' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
  platform:x86 decouple telemetry driver from the optional IPC resources
  thinkpad_acpi: Silence an uninitialized variable warning
  intel_telemetry_pltdrv: Silence an uninitialized variable warning
  hp_accel: Silence an uninitialized variable warning
  hp_accel: Add support for HP ProBook 440 G3
  intel-hid: add a workaround to ignore an event after waking up from S4.
parents 55f058e7 5d071633

drivers/platform/x86/hp_accel.c

+5 −1
Original line number Diff line number Diff line
@@ -127,8 +127,10 @@ static int lis3lv02d_acpi_read(struct lis3lv02d *lis3, int reg, u8 *ret) 
	arg0.integer.value = reg;



	status = acpi_evaluate_integer(dev->handle, "ALRD", &args, &lret);

	if (ACPI_FAILURE(status))

		return -EINVAL;

	*ret = lret;

	return (status != AE_OK) ? -EINVAL : 0;

	return 0;

}



/**
@@ -173,6 +175,7 @@ static int lis3lv02d_dmi_matched(const struct dmi_system_id *dmi) 
DEFINE_CONV(normal, 1, 2, 3);

DEFINE_CONV(y_inverted, 1, -2, 3);

DEFINE_CONV(x_inverted, -1, 2, 3);

DEFINE_CONV(x_inverted_usd, -1, 2, -3);

DEFINE_CONV(z_inverted, 1, 2, -3);

DEFINE_CONV(xy_swap, 2, 1, 3);

DEFINE_CONV(xy_rotated_left, -2, 1, 3);
@@ -236,6 +239,7 @@ static const struct dmi_system_id lis3lv02d_dmi_ids[] = { 
	AXIS_DMI_MATCH("HP8710", "HP Compaq 8710", y_inverted),

	AXIS_DMI_MATCH("HDX18", "HP HDX 18", x_inverted),

	AXIS_DMI_MATCH("HPB432x", "HP ProBook 432", xy_rotated_left),

	AXIS_DMI_MATCH("HPB440G3", "HP ProBook 440 G3", x_inverted_usd),

	AXIS_DMI_MATCH("HPB442x", "HP ProBook 442", xy_rotated_left),

	AXIS_DMI_MATCH("HPB452x", "HP ProBook 452", y_inverted),

	AXIS_DMI_MATCH("HPB522x", "HP ProBook 522", xy_swap),

drivers/platform/x86/intel-hid.c

+2 −0
Original line number Diff line number Diff line
@@ -91,6 +91,8 @@ static int intel_hid_pl_resume_handler(struct device *device) 
}



static const struct dev_pm_ops intel_hid_pl_pm_ops = {

	.freeze  = intel_hid_pl_suspend_handler,

	.restore  = intel_hid_pl_resume_handler,

	.suspend  = intel_hid_pl_suspend_handler,

	.resume  = intel_hid_pl_resume_handler,

};

drivers/platform/x86/intel_pmc_ipc.c

+22 −26
Original line number Diff line number Diff line
@@ -687,8 +687,8 @@ static int ipc_plat_get_res(struct platform_device *pdev) 
	ipcdev.acpi_io_size = size;

	dev_info(&pdev->dev, "io res: %pR\n", res);



	/* This is index 0 to cover BIOS data register */

	punit_res = punit_res_array;

	/* This is index 0 to cover BIOS data register */

	res = platform_get_resource(pdev, IORESOURCE_MEM,

				    PLAT_RESOURCE_BIOS_DATA_INDEX);

	if (!res) {
@@ -698,55 +698,51 @@ static int ipc_plat_get_res(struct platform_device *pdev) 
	*punit_res = *res;

	dev_info(&pdev->dev, "punit BIOS data res: %pR\n", res);



	/* This is index 1 to cover BIOS interface register */

	res = platform_get_resource(pdev, IORESOURCE_MEM,

				    PLAT_RESOURCE_BIOS_IFACE_INDEX);

	if (!res) {

		dev_err(&pdev->dev, "Failed to get res of punit BIOS iface\n");

		return -ENXIO;

	}

	/* This is index 1 to cover BIOS interface register */

	*++punit_res = *res;

	dev_info(&pdev->dev, "punit BIOS interface res: %pR\n", res);



	/* This is index 2 to cover ISP data register, optional */

	res = platform_get_resource(pdev, IORESOURCE_MEM,

				    PLAT_RESOURCE_ISP_DATA_INDEX);

	if (!res) {

		dev_err(&pdev->dev, "Failed to get res of punit ISP data\n");

		return -ENXIO;

	}

	/* This is index 2 to cover ISP data register */

	*++punit_res = *res;

	++punit_res;

	if (res) {

		*punit_res = *res;

		dev_info(&pdev->dev, "punit ISP data res: %pR\n", res);

	}



	/* This is index 3 to cover ISP interface register, optional */

	res = platform_get_resource(pdev, IORESOURCE_MEM,

				    PLAT_RESOURCE_ISP_IFACE_INDEX);

	if (!res) {

		dev_err(&pdev->dev, "Failed to get res of punit ISP iface\n");

		return -ENXIO;

	}

	/* This is index 3 to cover ISP interface register */

	*++punit_res = *res;

	++punit_res;

	if (res) {

		*punit_res = *res;

		dev_info(&pdev->dev, "punit ISP interface res: %pR\n", res);

	}



	/* This is index 4 to cover GTD data register, optional */

	res = platform_get_resource(pdev, IORESOURCE_MEM,

				    PLAT_RESOURCE_GTD_DATA_INDEX);

	if (!res) {

		dev_err(&pdev->dev, "Failed to get res of punit GTD data\n");

		return -ENXIO;

	}

	/* This is index 4 to cover GTD data register */

	*++punit_res = *res;

	++punit_res;

	if (res) {

		*punit_res = *res;

		dev_info(&pdev->dev, "punit GTD data res: %pR\n", res);

	}



	/* This is index 5 to cover GTD interface register, optional */

	res = platform_get_resource(pdev, IORESOURCE_MEM,

				    PLAT_RESOURCE_GTD_IFACE_INDEX);

	if (!res) {

		dev_err(&pdev->dev, "Failed to get res of punit GTD iface\n");

		return -ENXIO;

	}

	/* This is index 5 to cover GTD interface register */

	*++punit_res = *res;

	++punit_res;

	if (res) {

		*punit_res = *res;

		dev_info(&pdev->dev, "punit GTD interface res: %pR\n", res);

	}



	res = platform_get_resource(pdev, IORESOURCE_MEM,

				    PLAT_RESOURCE_IPC_INDEX);

drivers/platform/x86/intel_punit_ipc.c

+32 −16
Original line number Diff line number Diff line
@@ -227,6 +227,11 @@ static int intel_punit_get_bars(struct platform_device *pdev) 
	struct resource *res;

	void __iomem *addr;



	/*

	 * The following resources are required

	 * - BIOS_IPC BASE_DATA

	 * - BIOS_IPC BASE_IFACE

	 */

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	addr = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(addr))
@@ -239,29 +244,40 @@ static int intel_punit_get_bars(struct platform_device *pdev) 
		return PTR_ERR(addr);

	punit_ipcdev->base[BIOS_IPC][BASE_IFACE] = addr;



	/*

	 * The following resources are optional

	 * - ISPDRIVER_IPC BASE_DATA

	 * - ISPDRIVER_IPC BASE_IFACE

	 * - GTDRIVER_IPC BASE_DATA

	 * - GTDRIVER_IPC BASE_IFACE

	 */

	res = platform_get_resource(pdev, IORESOURCE_MEM, 2);

	if (res) {

		addr = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(addr))

		return PTR_ERR(addr);

		if (!IS_ERR(addr))

			punit_ipcdev->base[ISPDRIVER_IPC][BASE_DATA] = addr;

	}



	res = platform_get_resource(pdev, IORESOURCE_MEM, 3);

	if (res) {

		addr = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(addr))

		return PTR_ERR(addr);

		if (!IS_ERR(addr))

			punit_ipcdev->base[ISPDRIVER_IPC][BASE_IFACE] = addr;

	}



	res = platform_get_resource(pdev, IORESOURCE_MEM, 4);

	if (res) {

		addr = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(addr))

		return PTR_ERR(addr);

		if (!IS_ERR(addr))

			punit_ipcdev->base[GTDRIVER_IPC][BASE_DATA] = addr;

	}



	res = platform_get_resource(pdev, IORESOURCE_MEM, 5);

	if (res) {

		addr = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(addr))

		return PTR_ERR(addr);

		if (!IS_ERR(addr))

			punit_ipcdev->base[GTDRIVER_IPC][BASE_IFACE] = addr;

	}



	return 0;

}

drivers/platform/x86/intel_telemetry_pltdrv.c

+1 −1
Original line number Diff line number Diff line
@@ -659,7 +659,7 @@ static int telemetry_plt_update_events(struct telemetry_evtconfig pss_evtconfig, 
static int telemetry_plt_set_sampling_period(u8 pss_period, u8 ioss_period)

{

	u32 telem_ctrl = 0;

	int ret;

	int ret = 0;



	mutex_lock(&(telm_conf->telem_lock));

	if (ioss_period) {