* [PATCH resend 0/1] mfd: intel_soc_pmic: Use CPU-id check instead of _HRV check to differentiate variants
@ 2021-12-06 17:48 Hans de Goede
2021-12-06 17:48 ` [PATCH resend 1/1] " Hans de Goede
0 siblings, 1 reply; 3+ messages in thread
From: Hans de Goede @ 2021-12-06 17:48 UTC (permalink / raw)
To: Lee Jones, Andy Shevchenko, Mika Westerberg; +Cc: Hans de Goede, linux-kernel
Hi Lee,
This patch seems to have fallen through the cracks,
so I'm resending it now.
Note it already has a Reviewed-by from Andy so AFAICT it is
ready for merging.
Regards,
Hans
Hans de Goede (1):
mfd: intel_soc_pmic: Use CPU-id check instead of _HRV check to
differentiate variants
drivers/mfd/intel_soc_pmic_core.c | 28 +++-------------------------
1 file changed, 3 insertions(+), 25 deletions(-)
--
2.33.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH resend 1/1] mfd: intel_soc_pmic: Use CPU-id check instead of _HRV check to differentiate variants
2021-12-06 17:48 [PATCH resend 0/1] mfd: intel_soc_pmic: Use CPU-id check instead of _HRV check to differentiate variants Hans de Goede
@ 2021-12-06 17:48 ` Hans de Goede
2021-12-29 13:33 ` Lee Jones
0 siblings, 1 reply; 3+ messages in thread
From: Hans de Goede @ 2021-12-06 17:48 UTC (permalink / raw)
To: Lee Jones, Andy Shevchenko, Mika Westerberg
Cc: Hans de Goede, linux-kernel, Tsuchiya Yuto, Andy Shevchenko
The Intel Crystal Cove PMIC has 2 different variants, one for use with
Bay Trail (BYT) SoCs and one for use with Cherry Trail (CHT) SoCs.
So far we have been using an ACPI _HRV check to differentiate between
the 2, but at least on the Microsoft Surface 3, which is a CHT device,
the wrong _HRV value is reported by ACPI.
So instead switch to a CPU-ID check which avoids us relying on the
possibly wrong ACPI _HRV value.
Reported-by: Tsuchiya Yuto <kitakar@gmail.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
drivers/mfd/intel_soc_pmic_core.c | 28 +++-------------------------
1 file changed, 3 insertions(+), 25 deletions(-)
diff --git a/drivers/mfd/intel_soc_pmic_core.c b/drivers/mfd/intel_soc_pmic_core.c
index ddd64f9e3341..47cb7f00dfcf 100644
--- a/drivers/mfd/intel_soc_pmic_core.c
+++ b/drivers/mfd/intel_soc_pmic_core.c
@@ -14,15 +14,12 @@
#include <linux/module.h>
#include <linux/mfd/core.h>
#include <linux/mfd/intel_soc_pmic.h>
+#include <linux/platform_data/x86/soc.h>
#include <linux/pwm.h>
#include <linux/regmap.h>
#include "intel_soc_pmic_core.h"
-/* Crystal Cove PMIC shares same ACPI ID between different platforms */
-#define BYT_CRC_HRV 2
-#define CHT_CRC_HRV 3
-
/* PWM consumed by the Intel GFX */
static struct pwm_lookup crc_pwm_lookup[] = {
PWM_LOOKUP("crystal_cove_pwm", 0, "0000:00:02.0", "pwm_pmic_backlight", 0, PWM_POLARITY_NORMAL),
@@ -34,31 +31,12 @@ static int intel_soc_pmic_i2c_probe(struct i2c_client *i2c,
struct device *dev = &i2c->dev;
struct intel_soc_pmic_config *config;
struct intel_soc_pmic *pmic;
- unsigned long long hrv;
- acpi_status status;
int ret;
- /*
- * There are 2 different Crystal Cove PMICs a Bay Trail and Cherry
- * Trail version, use _HRV to differentiate between the 2.
- */
- status = acpi_evaluate_integer(ACPI_HANDLE(dev), "_HRV", NULL, &hrv);
- if (ACPI_FAILURE(status)) {
- dev_err(dev, "Failed to get PMIC hardware revision\n");
- return -ENODEV;
- }
-
- switch (hrv) {
- case BYT_CRC_HRV:
+ if (soc_intel_is_byt())
config = &intel_soc_pmic_config_byt_crc;
- break;
- case CHT_CRC_HRV:
+ else
config = &intel_soc_pmic_config_cht_crc;
- break;
- default:
- dev_warn(dev, "Unknown hardware rev %llu, assuming BYT\n", hrv);
- config = &intel_soc_pmic_config_byt_crc;
- }
pmic = devm_kzalloc(dev, sizeof(*pmic), GFP_KERNEL);
if (!pmic)
--
2.33.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH resend 1/1] mfd: intel_soc_pmic: Use CPU-id check instead of _HRV check to differentiate variants
2021-12-06 17:48 ` [PATCH resend 1/1] " Hans de Goede
@ 2021-12-29 13:33 ` Lee Jones
0 siblings, 0 replies; 3+ messages in thread
From: Lee Jones @ 2021-12-29 13:33 UTC (permalink / raw)
To: Hans de Goede
Cc: Andy Shevchenko, Mika Westerberg, linux-kernel, Tsuchiya Yuto,
Andy Shevchenko
On Mon, 06 Dec 2021, Hans de Goede wrote:
> The Intel Crystal Cove PMIC has 2 different variants, one for use with
> Bay Trail (BYT) SoCs and one for use with Cherry Trail (CHT) SoCs.
>
> So far we have been using an ACPI _HRV check to differentiate between
> the 2, but at least on the Microsoft Surface 3, which is a CHT device,
> the wrong _HRV value is reported by ACPI.
>
> So instead switch to a CPU-ID check which avoids us relying on the
> possibly wrong ACPI _HRV value.
>
> Reported-by: Tsuchiya Yuto <kitakar@gmail.com>
> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
I switched these around (same with the other patches).
> ---
> drivers/mfd/intel_soc_pmic_core.c | 28 +++-------------------------
> 1 file changed, 3 insertions(+), 25 deletions(-)
Applied, thanks.
--
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-12-29 13:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-06 17:48 [PATCH resend 0/1] mfd: intel_soc_pmic: Use CPU-id check instead of _HRV check to differentiate variants Hans de Goede
2021-12-06 17:48 ` [PATCH resend 1/1] " Hans de Goede
2021-12-29 13:33 ` Lee Jones
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.