Commit 4dc12f37 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'platform-drivers-x86-v6.1-2' of... 

Merge tag 'platform-drivers-x86-v6.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86

Pull x86 platform driver fixes from Hans de Goede:
 "The only thing which stands out is a fix for a backlight regression on
  Chromebooks (under drivers/acpi, with ack from Rafael).

  Other then that nothing special to report just various small fixes and
  hardware-id additions"

* tag 'platform-drivers-x86-v6.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86:
  ACPI: video: Fix missing native backlight on Chromebooks
  platform/x86/intel: pmc/core: Add Raptor Lake support to pmc core driver
  leds: simatic-ipc-leds-gpio: fix incorrect LED to GPIO mapping
  platform/x86/amd: pmc: Read SMU version during suspend on Cezanne systems
  platform/x86: thinkpad_acpi: Fix reporting a non present second fan on some models
  platform/x86: asus-wmi: Add support for ROG X16 tablet mode
parents 1a2dcbdd e9cf4d9b

drivers/acpi/video_detect.c

+12 −0
Original line number Diff line number Diff line
@@ -668,6 +668,11 @@ static const struct dmi_system_id video_detect_dmi_table[] = { 
	{ },

};



static bool google_cros_ec_present(void)

{

	return acpi_dev_found("GOOG0004");

}



/*

 * Determine which type of backlight interface to use on this system,

 * First check cmdline, then dmi quirks, then do autodetect.
@@ -730,6 +735,13 @@ static enum acpi_backlight_type __acpi_video_get_backlight_type(bool native) 
			return acpi_backlight_video;

	}



	/*

	 * Chromebooks that don't have backlight handle in ACPI table

	 * are supposed to use native backlight if it's available.

	 */

	if (google_cros_ec_present() && native_available)

		return acpi_backlight_native;



	/* No ACPI video (old hw), use vendor specific fw methods. */

	return acpi_backlight_vendor;

}

drivers/leds/simple/simatic-ipc-leds-gpio.c

+6 −6
Original line number Diff line number Diff line
@@ -20,12 +20,12 @@ static struct gpiod_lookup_table *simatic_ipc_led_gpio_table; 
static struct gpiod_lookup_table simatic_ipc_led_gpio_table_127e = {

	.dev_id = "leds-gpio",

	.table = {

		GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 52, NULL, 1, GPIO_ACTIVE_LOW),

		GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 53, NULL, 2, GPIO_ACTIVE_LOW),

		GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 57, NULL, 3, GPIO_ACTIVE_LOW),

		GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 58, NULL, 4, GPIO_ACTIVE_LOW),

		GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 60, NULL, 5, GPIO_ACTIVE_LOW),

		GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 51, NULL, 0, GPIO_ACTIVE_LOW),

		GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 52, NULL, 0, GPIO_ACTIVE_LOW),

		GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 53, NULL, 1, GPIO_ACTIVE_LOW),

		GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 57, NULL, 2, GPIO_ACTIVE_LOW),

		GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 58, NULL, 3, GPIO_ACTIVE_LOW),

		GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 60, NULL, 4, GPIO_ACTIVE_LOW),

		GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 51, NULL, 5, GPIO_ACTIVE_LOW),

		GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 56, NULL, 6, GPIO_ACTIVE_LOW),

		GPIO_LOOKUP_IDX("apollolake-pinctrl.0", 59, NULL, 7, GPIO_ACTIVE_HIGH),

	},

drivers/platform/x86/amd/pmc.c

+7 −0
Original line number Diff line number Diff line
@@ -663,6 +663,13 @@ static int amd_pmc_verify_czn_rtc(struct amd_pmc_dev *pdev, u32 *arg) 
	struct rtc_time tm;

	int rc;



	/* we haven't yet read SMU version */

	if (!pdev->major) {

		rc = amd_pmc_get_smu_version(pdev);

		if (rc)

			return rc;

	}



	if (pdev->major < 64 || (pdev->major == 64 && pdev->minor < 53))

		return 0;

drivers/platform/x86/asus-nb-wmi.c

+9 −0
Original line number Diff line number Diff line
@@ -464,6 +464,15 @@ static const struct dmi_system_id asus_quirks[] = { 
		},

		.driver_data = &quirk_asus_tablet_mode,

	},

	{

		.callback = dmi_matched,

		.ident = "ASUS ROG FLOW X16",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_PRODUCT_NAME, "GV601R"),

		},

		.driver_data = &quirk_asus_tablet_mode,

	},

	{},

};

drivers/platform/x86/intel/pmc/core.c

+2 −0
Original line number Diff line number Diff line
@@ -1914,6 +1914,8 @@ static const struct x86_cpu_id intel_pmc_core_ids[] = { 
	X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_N,		&tgl_reg_map),

	X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE,		&adl_reg_map),

	X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P,        &tgl_reg_map),

	X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE,		&adl_reg_map),

	X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S,	&adl_reg_map),

	{}

};