Commit 9ed55e9a authored by Hans de Goede's avatar Hans de Goede Committed by Lee Jones
Browse files

mfd: arizona-spi: Add Android board ACPI table handling 



x86/ACPI boards with an arizona WM5102 codec ship with either Windows or
Android as factory installed OS.

The ACPI fwnode for the codec on Android boards misses 2 things compared
to the Windows boards (this is hardcoded in the Android board kernels):

1. There is no CLKE ACPI method to enabe the 32 KHz clock the codec needs
   for jack-detection.

2. The GPIOs used by the codec are not listed in the fwnode for the codec.

The ACPI tables on x86/ACPI boards shipped with Android being incomplete
happens a lot. The special drivers/platform/x86/x86-android-tablets.c
module contains DMI based per model handling to compensate for this.

This module will enable the 32KHz clock through the pinctrl framework
to fix 1. and it will also register a gpio-lookup table for all GPIOs
needed by the codec + machine driver, including the GPIOs coming from
the codec itself.

Add an arizona_spi_acpi_android_probe() function which waits for the
x86-android-tablets to have set things up before continue with probing
the arizona WM5102 codec.

Acked-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Link: https://lore.kernel.org/r/20220307173844.199135-2-hdegoede@redhat.com
parent 3cf2b434

drivers/mfd/arizona-spi.c

+34 −1
Original line number Diff line number Diff line
@@ -81,6 +81,30 @@ static int arizona_spi_acpi_windows_probe(struct arizona *arizona) 
	return 0;

}



/* For ACPI tables from boards which ship with Android as factory OS */

static int arizona_spi_acpi_android_probe(struct arizona *arizona)

{

	int ret;



	/*

	 * Get the reset GPIO, treating -ENOENT as -EPROBE_DEFER to wait for

	 * the x86-android-tablets module to register the board specific GPIO

	 * lookup table.

	 */

	arizona->pdata.reset = devm_gpiod_get(arizona->dev, "reset", GPIOD_OUT_LOW);

	if (IS_ERR(arizona->pdata.reset)) {

		ret = PTR_ERR(arizona->pdata.reset);

		if (ret == -ENOENT) {

			dev_info_once(arizona->dev,

				      "Deferring probe till GPIO lookup is registered\n");

			ret = -EPROBE_DEFER;

		}

		return dev_err_probe(arizona->dev, ret, "getting reset GPIO\n");

	}



	return 0;

}



/*

 * The AOSP 3.5 mm Headset: Accessory Specification gives the following values:

 * Function A Play/Pause:           0 ohm
@@ -102,9 +126,14 @@ static const struct arizona_micd_range arizona_micd_aosp_ranges[] = { 


static int arizona_spi_acpi_probe(struct arizona *arizona)

{

	struct acpi_device *adev = ACPI_COMPANION(arizona->dev);

	int ret;



	if (acpi_dev_hid_uid_match(adev, "10WM5102", NULL))

		ret = arizona_spi_acpi_android_probe(arizona);

	else

		ret = arizona_spi_acpi_windows_probe(arizona);



	if (ret)

		return ret;
@@ -142,6 +171,10 @@ static const struct acpi_device_id arizona_acpi_match[] = { 
		.id = "WM510205",

		.driver_data = WM5102,

	},

	{

		.id = "10WM5102",

		.driver_data = WM5102,

	},

	{ }

};

MODULE_DEVICE_TABLE(acpi, arizona_acpi_match);