[PATCH 1/2] power: supply: axp288_fuel_gauge: Sort the DMI blacklist alphabetically

[PATCH 1/2] power: supply: axp288_fuel_gauge: Sort the DMI blacklist alphabetically

[Hans de Goede]

The blacklist is getting big enough that it is good to have some sort
of fixed order for it, sort it alphabetically.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 drivers/power/supply/axp288_fuel_gauge.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/drivers/power/supply/axp288_fuel_gauge.c b/drivers/power/supply/axp288_fuel_gauge.c
index 44169dabb705..6db2e86098e9 100644
--- a/drivers/power/supply/axp288_fuel_gauge.c
+++ b/drivers/power/supply/axp288_fuel_gauge.c
@@ -674,6 +674,7 @@ static void fuel_gauge_init_irq(struct axp288_fg_info *info)
 /*
  * Some devices have no battery (HDMI sticks) and the axp288 battery's
  * detection reports one despite it not being there.
+ * Please keep this listed sorted alphabetically.
  */
 static const struct dmi_system_id axp288_fuel_gauge_blacklist[] = {
 	{
@@ -696,6 +697,12 @@ static const struct dmi_system_id axp288_fuel_gauge_blacklist[] = {
 			DMI_EXACT_MATCH(DMI_BIOS_VERSION, "1.000"),
 		},
 	},
+	{
+		/* ECS EF20EA */
+		.matches = {
+			DMI_MATCH(DMI_PRODUCT_NAME, "EF20EA"),
+		},
+	},
 	{
 		/* Intel Cherry Trail Compute Stick, Windows version */
 		.matches = {
@@ -719,12 +726,6 @@ static const struct dmi_system_id axp288_fuel_gauge_blacklist[] = {
 			DMI_MATCH(DMI_BOARD_VERSION, "V1.1"),
 		},
 	},
-	{
-		/* ECS EF20EA */
-		.matches = {
-			DMI_MATCH(DMI_PRODUCT_NAME, "EF20EA"),
-		},
-	},
 	{}
 };
 
-- 
2.23.0

[PATCH 2/2] power: supply: axp288_fuel_gauge: Add Minix Neo Z83-4 to the blacklist

[Hans de Goede]

The Minix Neo Z83-4 is another mini PC using the AXP288 PMIC where the
EFI code does not disable the charger part of the PMIC causing us to report
battery readings (of always 100%) to userspace even though there is no
battery in this wall-outlet powered device.

Add it to the blacklist to avoid the bogus battery status reporting.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 drivers/power/supply/axp288_fuel_gauge.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/power/supply/axp288_fuel_gauge.c b/drivers/power/supply/axp288_fuel_gauge.c
index 6db2e86098e9..e1bc4e6e6f30 100644
--- a/drivers/power/supply/axp288_fuel_gauge.c
+++ b/drivers/power/supply/axp288_fuel_gauge.c
@@ -726,6 +726,13 @@ static const struct dmi_system_id axp288_fuel_gauge_blacklist[] = {
 			DMI_MATCH(DMI_BOARD_VERSION, "V1.1"),
 		},
 	},
+	{
+		/* Minix Neo Z83-4 mini PC */
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "MINIX"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "Z83-4"),
+		}
+	},
 	{}
 };
 
-- 
2.23.0

Re: [PATCH 1/2] power: supply: axp288_fuel_gauge: Sort the DMI blacklist alphabetically

[Sebastian Reichel]

[-- Attachment #1: Type: text/plain, Size: 1690 bytes --]

Hi,

On Sun, Aug 25, 2019 at 05:41:51PM +0200, Hans de Goede wrote:
> The blacklist is getting big enough that it is good to have some sort
> of fixed order for it, sort it alphabetically.
> 
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> ---

Thanks, queued.

-- Sebastian

>  drivers/power/supply/axp288_fuel_gauge.c | 13 +++++++------
>  1 file changed, 7 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/power/supply/axp288_fuel_gauge.c b/drivers/power/supply/axp288_fuel_gauge.c
> index 44169dabb705..6db2e86098e9 100644
> --- a/drivers/power/supply/axp288_fuel_gauge.c
> +++ b/drivers/power/supply/axp288_fuel_gauge.c
> @@ -674,6 +674,7 @@ static void fuel_gauge_init_irq(struct axp288_fg_info *info)
>  /*
>   * Some devices have no battery (HDMI sticks) and the axp288 battery's
>   * detection reports one despite it not being there.
> + * Please keep this listed sorted alphabetically.
>   */
>  static const struct dmi_system_id axp288_fuel_gauge_blacklist[] = {
>  	{
> @@ -696,6 +697,12 @@ static const struct dmi_system_id axp288_fuel_gauge_blacklist[] = {
>  			DMI_EXACT_MATCH(DMI_BIOS_VERSION, "1.000"),
>  		},
>  	},
> +	{
> +		/* ECS EF20EA */
> +		.matches = {
> +			DMI_MATCH(DMI_PRODUCT_NAME, "EF20EA"),
> +		},
> +	},
>  	{
>  		/* Intel Cherry Trail Compute Stick, Windows version */
>  		.matches = {
> @@ -719,12 +726,6 @@ static const struct dmi_system_id axp288_fuel_gauge_blacklist[] = {
>  			DMI_MATCH(DMI_BOARD_VERSION, "V1.1"),
>  		},
>  	},
> -	{
> -		/* ECS EF20EA */
> -		.matches = {
> -			DMI_MATCH(DMI_PRODUCT_NAME, "EF20EA"),
> -		},
> -	},
>  	{}
>  };
>  
> -- 
> 2.23.0
> 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH 2/2] power: supply: axp288_fuel_gauge: Add Minix Neo Z83-4 to the blacklist

[Sebastian Reichel]

[-- Attachment #1: Type: text/plain, Size: 1224 bytes --]

Hi,

On Sun, Aug 25, 2019 at 05:41:52PM +0200, Hans de Goede wrote:
> The Minix Neo Z83-4 is another mini PC using the AXP288 PMIC where the
> EFI code does not disable the charger part of the PMIC causing us to report
> battery readings (of always 100%) to userspace even though there is no
> battery in this wall-outlet powered device.
> 
> Add it to the blacklist to avoid the bogus battery status reporting.
> 
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> ---

Thanks, queued.

-- Sebastian

>  drivers/power/supply/axp288_fuel_gauge.c | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/drivers/power/supply/axp288_fuel_gauge.c b/drivers/power/supply/axp288_fuel_gauge.c
> index 6db2e86098e9..e1bc4e6e6f30 100644
> --- a/drivers/power/supply/axp288_fuel_gauge.c
> +++ b/drivers/power/supply/axp288_fuel_gauge.c
> @@ -726,6 +726,13 @@ static const struct dmi_system_id axp288_fuel_gauge_blacklist[] = {
>  			DMI_MATCH(DMI_BOARD_VERSION, "V1.1"),
>  		},
>  	},
> +	{
> +		/* Minix Neo Z83-4 mini PC */
> +		.matches = {
> +			DMI_MATCH(DMI_SYS_VENDOR, "MINIX"),
> +			DMI_MATCH(DMI_PRODUCT_NAME, "Z83-4"),
> +		}
> +	},
>  	{}
>  };
>  
> -- 
> 2.23.0
> 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]