Skip to content

Commit ed852cd

Browse files
jwrdegoederafaeljw
authored andcommitted
ACPI / PMIC: Add byt prefix to Crystal Cove PMIC OpRegion driver
Our current Crystal Cove OpRegion driver is only valid for the Crystal Cove PMIC variant found on Bay Trail (BYT) boards, Cherry Trail (CHT) based boards use another variant. At least the regulator registers are different on CHT and these registers are one of the things controlled by the custom PMIC OpRegion. Commit 4d9ed62 ("mfd: intel_soc_pmic: Export separate mfd-cell configs for BYT and CHT") has disabled the intel_pmic_crc.c code for CHT devices by removing the "crystal_cove_pmic" MFD cell on CHT devices. This commit renames the intel_pmic_crc.c driver and the cell to be prefixed with "byt" to indicate that this code is for BYT devices only. This is a preparation patch for adding a separate PMIC OpRegion driver for the CHT variant of the Crystal Cove PMIC (sometimes called Crystal Cove Plus in Android kernel sources). Signed-off-by: Hans de Goede <[email protected]> Reviewed-by: Andy Shevchenko <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent a0fcfed commit ed852cd

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

drivers/acpi/Kconfig

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -513,11 +513,12 @@ menuconfig PMIC_OPREGION
513513
PMIC chip.
514514

515515
if PMIC_OPREGION
516-
config CRC_PMIC_OPREGION
517-
bool "ACPI operation region support for CrystalCove PMIC"
516+
config BYTCRC_PMIC_OPREGION
517+
bool "ACPI operation region support for Bay Trail Crystal Cove PMIC"
518518
depends on INTEL_SOC_PMIC
519519
help
520-
This config adds ACPI operation region support for CrystalCove PMIC.
520+
This config adds ACPI operation region support for the Bay Trail
521+
version of the Crystal Cove PMIC.
521522

522523
config XPOWER_PMIC_OPREGION
523524
bool "ACPI operation region support for XPower AXP288 PMIC"

drivers/acpi/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ obj-$(CONFIG_ACPI_APEI) += apei/
109109
obj-$(CONFIG_ACPI_EXTLOG) += acpi_extlog.o
110110

111111
obj-$(CONFIG_PMIC_OPREGION) += pmic/intel_pmic.o
112-
obj-$(CONFIG_CRC_PMIC_OPREGION) += pmic/intel_pmic_crc.o
112+
obj-$(CONFIG_BYTCRC_PMIC_OPREGION) += pmic/intel_pmic_bytcrc.o
113113
obj-$(CONFIG_XPOWER_PMIC_OPREGION) += pmic/intel_pmic_xpower.o
114114
obj-$(CONFIG_BXT_WC_PMIC_OPREGION) += pmic/intel_pmic_bxtwc.o
115115
obj-$(CONFIG_CHT_WC_PMIC_OPREGION) += pmic/intel_pmic_chtwc.o

drivers/acpi/pmic/intel_pmic_crc.c renamed to drivers/acpi/pmic/intel_pmic_bytcrc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0
22
/*
3-
* Intel CrystalCove PMIC operation region driver
3+
* Intel Bay Trail Crystal Cove PMIC operation region driver
44
*
55
* Copyright (C) 2014 Intel Corporation. All rights reserved.
66
*/
@@ -295,7 +295,7 @@ static int intel_crc_pmic_opregion_probe(struct platform_device *pdev)
295295
static struct platform_driver intel_crc_pmic_opregion_driver = {
296296
.probe = intel_crc_pmic_opregion_probe,
297297
.driver = {
298-
.name = "crystal_cove_pmic",
298+
.name = "byt_crystal_cove_pmic",
299299
},
300300
};
301301
builtin_platform_driver(intel_crc_pmic_opregion_driver);

drivers/mfd/intel_soc_pmic_crc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ static struct mfd_cell crystal_cove_byt_dev[] = {
7575
.resources = gpio_resources,
7676
},
7777
{
78-
.name = "crystal_cove_pmic",
78+
.name = "byt_crystal_cove_pmic",
7979
},
8080
{
8181
.name = "crystal_cove_pwm",

0 commit comments

Comments
 (0)