On 7/31/23 7:42 AM, Tzung-Bi Shih wrote: > Support official HID GOOG0016 for ChromeOS ACPI (see [1]). > > [1]: https://crrev.com/c/2266713 > > Signed-off-by: Tzung-Bi Shih <tzungbi@xxxxxxxxxx> Reviewed-by: Muhammad Usama Anjum <usama.anjum@xxxxxxxxxxxxx> > --- > Changes from v2[2]: > - Instead of replacing, appending "GOOG0016" in sysfs-driver-chromeos-acpi. > > Changes from v1[3]: > - Preserve the PNP ID GGL0001 for backward compatible to older firmwares. > - Modify commit title and message accordingly. > > [2]: https://patchwork.kernel.org/project/chrome-platform/patch/20230728065438.4026629-1-tzungbi@xxxxxxxxxx/ > [3]: https://patchwork.kernel.org/project/chrome-platform/patch/20230728014256.3836298-1-tzungbi@xxxxxxxxxx/ > > .../ABI/testing/sysfs-driver-chromeos-acpi | 15 +++++++++++++++ > .../firmware-guide/acpi/chromeos-acpi-device.rst | 5 ++--- > drivers/platform/chrome/chromeos_acpi.c | 2 +- > 3 files changed, 18 insertions(+), 4 deletions(-) > > diff --git a/Documentation/ABI/testing/sysfs-driver-chromeos-acpi b/Documentation/ABI/testing/sysfs-driver-chromeos-acpi > index c308926e1568..22082f9a7922 100644 > --- a/Documentation/ABI/testing/sysfs-driver-chromeos-acpi > +++ b/Documentation/ABI/testing/sysfs-driver-chromeos-acpi > @@ -1,4 +1,5 @@ > What: /sys/bus/platform/devices/GGL0001:*/BINF.2 > + /sys/bus/platform/devices/GOOG0016:*/BINF.2 > Date: May 2022 > KernelVersion: 5.19 > Description: > @@ -10,6 +11,7 @@ Description: > == =============================== > > What: /sys/bus/platform/devices/GGL0001:*/BINF.3 > + /sys/bus/platform/devices/GOOG0016:*/BINF.3 > Date: May 2022 > KernelVersion: 5.19 > Description: > @@ -23,6 +25,7 @@ Description: > == ===================================== > > What: /sys/bus/platform/devices/GGL0001:*/CHSW > + /sys/bus/platform/devices/GOOG0016:*/CHSW > Date: May 2022 > KernelVersion: 5.19 > Description: > @@ -38,6 +41,7 @@ Description: > ==== =========================================== > > What: /sys/bus/platform/devices/GGL0001:*/FMAP > + /sys/bus/platform/devices/GOOG0016:*/FMAP > Date: May 2022 > KernelVersion: 5.19 > Description: > @@ -45,6 +49,7 @@ Description: > processor firmware flashmap. > > What: /sys/bus/platform/devices/GGL0001:*/FRID > + /sys/bus/platform/devices/GOOG0016:*/FRID > Date: May 2022 > KernelVersion: 5.19 > Description: > @@ -52,6 +57,7 @@ Description: > main processor firmware. > > What: /sys/bus/platform/devices/GGL0001:*/FWID > + /sys/bus/platform/devices/GOOG0016:*/FWID > Date: May 2022 > KernelVersion: 5.19 > Description: > @@ -59,6 +65,7 @@ Description: > main processor firmware. > > What: /sys/bus/platform/devices/GGL0001:*/GPIO.X/GPIO.0 > + /sys/bus/platform/devices/GOOG0016:*/GPIO.X/GPIO.0 > Date: May 2022 > KernelVersion: 5.19 > Description: > @@ -73,6 +80,7 @@ Description: > =========== ================================== > > What: /sys/bus/platform/devices/GGL0001:*/GPIO.X/GPIO.1 > + /sys/bus/platform/devices/GOOG0016:*/GPIO.X/GPIO.1 > Date: May 2022 > KernelVersion: 5.19 > Description: > @@ -84,6 +92,7 @@ Description: > == ======================= > > What: /sys/bus/platform/devices/GGL0001:*/GPIO.X/GPIO.2 > + /sys/bus/platform/devices/GOOG0016:*/GPIO.X/GPIO.2 > Date: May 2022 > KernelVersion: 5.19 > Description: > @@ -91,18 +100,21 @@ Description: > controller. > > What: /sys/bus/platform/devices/GGL0001:*/GPIO.X/GPIO.3 > + /sys/bus/platform/devices/GOOG0016:*/GPIO.X/GPIO.3 > Date: May 2022 > KernelVersion: 5.19 > Description: > Returns name of the GPIO controller. > > What: /sys/bus/platform/devices/GGL0001:*/HWID > + /sys/bus/platform/devices/GOOG0016:*/HWID > Date: May 2022 > KernelVersion: 5.19 > Description: > Returns hardware ID for the Chromebook. > > What: /sys/bus/platform/devices/GGL0001:*/MECK > + /sys/bus/platform/devices/GOOG0016:*/MECK > Date: May 2022 > KernelVersion: 5.19 > Description: > @@ -113,6 +125,7 @@ Description: > present, or if the firmware was unable to read the extended registers, this buffer size can be zero. > > What: /sys/bus/platform/devices/GGL0001:*/VBNV.0 > + /sys/bus/platform/devices/GOOG0016:*/VBNV.0 > Date: May 2022 > KernelVersion: 5.19 > Description: > @@ -122,6 +135,7 @@ Description: > clock data). > > What: /sys/bus/platform/devices/GGL0001:*/VBNV.1 > + /sys/bus/platform/devices/GOOG0016:*/VBNV.1 > Date: May 2022 > KernelVersion: 5.19 > Description: > @@ -129,6 +143,7 @@ Description: > storage block. > > What: /sys/bus/platform/devices/GGL0001:*/VDAT > + /sys/bus/platform/devices/GOOG0016:*/VDAT > Date: May 2022 > KernelVersion: 5.19 > Description: > diff --git a/Documentation/firmware-guide/acpi/chromeos-acpi-device.rst b/Documentation/firmware-guide/acpi/chromeos-acpi-device.rst > index f37fc90ce340..89419e116413 100644 > --- a/Documentation/firmware-guide/acpi/chromeos-acpi-device.rst > +++ b/Documentation/firmware-guide/acpi/chromeos-acpi-device.rst > @@ -5,9 +5,8 @@ Chrome OS ACPI Device > ===================== > > Hardware functionality specific to Chrome OS is exposed through a Chrome OS ACPI device. > -The plug and play ID of a Chrome OS ACPI device is GGL0001. GGL is a valid PNP ID of Google. > -PNP ID can be used with the ACPI devices according to the guidelines. The following ACPI > -objects are supported: > +The plug and play ID of a Chrome OS ACPI device is GGL0001 and the hardware ID is > +GOOG0016. The following ACPI objects are supported: > > .. flat-table:: Supported ACPI Objects > :widths: 1 2 > diff --git a/drivers/platform/chrome/chromeos_acpi.c b/drivers/platform/chrome/chromeos_acpi.c > index 50d8a4d4352d..1cc01d893ada 100644 > --- a/drivers/platform/chrome/chromeos_acpi.c > +++ b/drivers/platform/chrome/chromeos_acpi.c > @@ -235,9 +235,9 @@ static int chromeos_acpi_device_probe(struct platform_device *pdev) > return 0; > } > > -/* GGL is valid PNP ID of Google. PNP ID can be used with the ACPI devices. */ > static const struct acpi_device_id chromeos_device_ids[] = { > { "GGL0001", 0 }, > + { "GOOG0016", 0 }, > {} > }; > MODULE_DEVICE_TABLE(acpi, chromeos_device_ids); -- BR, Muhammad Usama Anjum
