Commit 771e8f48 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-cppc' and 'acpi-docs' 

Merge two documentation fixes for 6.18-rc5, a commet typo fix in the
ACPI CPPC library (Chu Guangqing) and fixes for two ASL examples in the
firmware guide (Jonas Gorski).

* acpi-cppc:
  ACPI: CPPC: Fix typo in a comment

* acpi-docs:
  Documentation: ACPI: i2c-muxes: fix I2C device references
parents 01e11d18 1642fabf bd9e1199

Documentation/firmware-guide/acpi/i2c-muxes.rst

+4 −4
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ which corresponds to the following ASL (in the scope of \_SB):: 
                    Name (_HID, ...)

                    Name (_CRS, ResourceTemplate () {

                        I2cSerialBus (0x50, ControllerInitiated, I2C_SPEED,

                                    AddressingMode7Bit, "\\_SB.SMB1.CH00", 0x00,

                                    ResourceConsumer,,)

                                    AddressingMode7Bit, "\\_SB.SMB1.MUX0.CH00",

                                    0x00, ResourceConsumer,,)

                    }

                }

            }
@@ -52,8 +52,8 @@ which corresponds to the following ASL (in the scope of \_SB):: 
                    Name (_HID, ...)

                    Name (_CRS, ResourceTemplate () {

                        I2cSerialBus (0x50, ControllerInitiated, I2C_SPEED,

                                    AddressingMode7Bit, "\\_SB.SMB1.CH01", 0x00,

                                    ResourceConsumer,,)

                                    AddressingMode7Bit, "\\_SB.SMB1.MUX0.CH01",

                                    0x00, ResourceConsumer,,)

                    }

                }

            }

drivers/acpi/cppc_acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -750,7 +750,7 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr) 
	}



	/*

	 * Disregard _CPC if the number of entries in the return pachage is not

	 * Disregard _CPC if the number of entries in the return package is not

	 * as expected, but support future revisions being proper supersets of

	 * the v3 and only causing more entries to be returned by _CPC.

	 */