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

rafaeljw · rafaeljw · commit 771e8f483583 · 2025-11-06T22:10:27.000+01:00
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
diff --git a/Documentation/firmware-guide/acpi/i2c-muxes.rst b/Documentation/firmware-guide/acpi/i2c-muxes.rst
@@ -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,,)
                     }
                 }
             }
diff --git a/drivers/acpi/cppc_acpi.c b/drivers/acpi/cppc_acpi.c
@@ -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.
 	 */

Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,8 @@ which corresponds to the following ASL (in the scope of \_SB)::`
`37`	`37`	`Name (_HID, ...)`
`38`	`38`	`Name (_CRS, ResourceTemplate () {`
`39`	`39`	`I2cSerialBus (0x50, ControllerInitiated, I2C_SPEED,`
`40`		`- AddressingMode7Bit, "\\_SB.SMB1.CH00", 0x00,`
`41`		`- ResourceConsumer,,)`
	`40`	`+ AddressingMode7Bit, "\\_SB.SMB1.MUX0.CH00",`
	`41`	`+ 0x00, ResourceConsumer,,)`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`	`}`
`@@ -52,8 +52,8 @@ which corresponds to the following ASL (in the scope of \_SB)::`
`52`	`52`	`Name (_HID, ...)`
`53`	`53`	`Name (_CRS, ResourceTemplate () {`
`54`	`54`	`I2cSerialBus (0x50, ControllerInitiated, I2C_SPEED,`
`55`		`- AddressingMode7Bit, "\\_SB.SMB1.CH01", 0x00,`
`56`		`- ResourceConsumer,,)`
	`55`	`+ AddressingMode7Bit, "\\_SB.SMB1.MUX0.CH01",`
	`56`	`+ 0x00, ResourceConsumer,,)`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -750,7 +750,7 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr)`
`750`	`750`	`}`
`751`	`751`
`752`	`752`	`/*`
`753`		`- * Disregard _CPC if the number of entries in the return pachage is not`
	`753`	`+ * Disregard _CPC if the number of entries in the return package is not`
`754`	`754`	`* as expected, but support future revisions being proper supersets of`
`755`	`755`	`* the v3 and only causing more entries to be returned by _CPC.`
`756`	`756`	`*/`