Commit 7b4baa39 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-ec', 'acpi-ac', 'acpi-fan', 'acpi-video' and 'acpi-amba' 

Merge EC, AC, fan and backlight driver changes and ACPI AMBA support
update for 6.1-rc1:

 - Drop unneeded result variable from ec_write() (ye xingchen).

 - Remove the leftover struct acpi_ac_bl from the ACPI AC driver (Hanjun
   Guo).

 - Reorder symbols to get rid of a few forward declarations in the ACPI
   fan driver (Uwe Kleine-König).

 - Add Toshiba Satellite/Portege Z830 ACPI backlight quirk (Arvid
   Norlander).

 - Add ARM DMA-330 controller to the supported list in the ACPI AMBA
   driver (Vijayenthiran Subramaniam).

* acpi-ec:
  ACPI: EC: Drop unneeded result variable from ec_write()

* acpi-ac:
  ACPI: AC: Remove the leftover struct acpi_ac_bl

* acpi-fan:
  ACPI: fan: Reorder symbols to get rid of a few forward declarations

* acpi-video:
  ACPI: video: Add Toshiba Satellite/Portege Z830 quirk

* acpi-amba:
  ACPI: AMBA: Add ARM DMA-330 controller to the supported list
parents b1d03b7e b3c0e38b f336443a f23470e6 574160b8 53e7380c

drivers/acpi/ac.c

+0 −5
Original line number Diff line number Diff line
@@ -36,11 +36,6 @@ static int acpi_ac_add(struct acpi_device *device); 
static int acpi_ac_remove(struct acpi_device *device);

static void acpi_ac_notify(struct acpi_device *device, u32 event);



struct acpi_ac_bl {

	const char *hid;

	int hrv;

};



static const struct acpi_device_id ac_device_ids[] = {

	{"ACPI0003", 0},

	{"", 0},

drivers/acpi/acpi_amba.c

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 


static const struct acpi_device_id amba_id_list[] = {

	{"ARMH0061", 0}, /* PL061 GPIO Device */

	{"ARMH0330", 0}, /* ARM DMA Controller DMA-330 */

	{"ARMHC500", 0}, /* ARM CoreSight ETM4x */

	{"ARMHC501", 0}, /* ARM CoreSight ETR */

	{"ARMHC502", 0}, /* ARM CoreSight STM */

drivers/acpi/acpi_video.c

+16 −0
Original line number Diff line number Diff line
@@ -496,6 +496,22 @@ static const struct dmi_system_id video_dmi_table[] = { 
		DMI_MATCH(DMI_PRODUCT_NAME, "SATELLITE R830"),

		},

	},

	{

	 .callback = video_disable_backlight_sysfs_if,

	 .ident = "Toshiba Satellite Z830",

	 .matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),

		DMI_MATCH(DMI_PRODUCT_NAME, "SATELLITE Z830"),

		},

	},

	{

	 .callback = video_disable_backlight_sysfs_if,

	 .ident = "Toshiba Portege Z830",

	 .matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),

		DMI_MATCH(DMI_PRODUCT_NAME, "PORTEGE Z830"),

		},

	},

	/*

	 * Some machine's _DOD IDs don't have bit 31(Device ID Scheme) set

	 * but the IDs actually follow the Device ID Scheme.

drivers/acpi/ec.c

+1 −5
Original line number Diff line number Diff line
@@ -917,14 +917,10 @@ EXPORT_SYMBOL(ec_read); 


int ec_write(u8 addr, u8 val)

{

	int err;



	if (!first_ec)

		return -ENODEV;



	err = acpi_ec_write(first_ec, addr, val);



	return err;

	return acpi_ec_write(first_ec, addr, val);

}

EXPORT_SYMBOL(ec_write);

drivers/acpi/fan_core.c

+27 −31
Original line number Diff line number Diff line
@@ -19,43 +19,12 @@ 


#include "fan.h"



MODULE_AUTHOR("Paul Diefenbaugh");

MODULE_DESCRIPTION("ACPI Fan Driver");

MODULE_LICENSE("GPL");



static int acpi_fan_probe(struct platform_device *pdev);

static int acpi_fan_remove(struct platform_device *pdev);



static const struct acpi_device_id fan_device_ids[] = {

	ACPI_FAN_DEVICE_IDS,

	{"", 0},

};

MODULE_DEVICE_TABLE(acpi, fan_device_ids);



#ifdef CONFIG_PM_SLEEP

static int acpi_fan_suspend(struct device *dev);

static int acpi_fan_resume(struct device *dev);

static const struct dev_pm_ops acpi_fan_pm = {

	.resume = acpi_fan_resume,

	.freeze = acpi_fan_suspend,

	.thaw = acpi_fan_resume,

	.restore = acpi_fan_resume,

};

#define FAN_PM_OPS_PTR (&acpi_fan_pm)

#else

#define FAN_PM_OPS_PTR NULL

#endif



static struct platform_driver acpi_fan_driver = {

	.probe = acpi_fan_probe,

	.remove = acpi_fan_remove,

	.driver = {

		.name = "acpi-fan",

		.acpi_match_table = fan_device_ids,

		.pm = FAN_PM_OPS_PTR,

	},

};



/* thermal cooling device callbacks */

static int fan_get_max_state(struct thermal_cooling_device *cdev, unsigned long

			     *state)
@@ -459,6 +428,33 @@ static int acpi_fan_resume(struct device *dev) 


	return result;

}



static const struct dev_pm_ops acpi_fan_pm = {

	.resume = acpi_fan_resume,

	.freeze = acpi_fan_suspend,

	.thaw = acpi_fan_resume,

	.restore = acpi_fan_resume,

};

#define FAN_PM_OPS_PTR (&acpi_fan_pm)



#else



#define FAN_PM_OPS_PTR NULL



#endif



static struct platform_driver acpi_fan_driver = {

	.probe = acpi_fan_probe,

	.remove = acpi_fan_remove,

	.driver = {

		.name = "acpi-fan",

		.acpi_match_table = fan_device_ids,

		.pm = FAN_PM_OPS_PTR,

	},

};



module_platform_driver(acpi_fan_driver);



MODULE_AUTHOR("Paul Diefenbaugh");

MODULE_DESCRIPTION("ACPI Fan Driver");

MODULE_LICENSE("GPL");