ACPI: scan: Add LNXVIDEO HID to ignore_serial_bus_ids[]
PATCH v2 1/4 ACPI: scan: Add LNXVIDEO HID to ignore_serial_bus_ids[]
The I2C-core already has filtering to skip i2c_client instantiation for LNXVIDEO acpi_device-s with I2cSerialBus resources, since LNXVIDEO devices are not i2c_client-s and are handled by the acpi_video driver.
This filtering was added to i2c-core-acpi.c in commit 3a4991a9864c ("i2c:
acpi: Do not create i2c-clients for LNXVIDEO ACPI devices").
Now a similar problem has shown up where the SPI-core is instantiating an unwanted SPI-device for a SpiSerialBus resource under a LNXVIDEO acpi_device. On a Lenovo Yoga Tab 3 YT3-X90F this unwanted SPI-device instanstantiation causes the SPI-device instanstantiation for the WM5102 audio codec to fail with:
[ 21.988441] pxa2xx-spi 8086228E:00: chipselect 0 already in use
Instead of duplicating the I2C-core filtering in the SPI-core code, push the filtering of SerialBus resources under LNXVIDEO acpi_device-s up into the ACPI-core by adding the LNXVIDEO HID to ignore_serial_bus_ids[].
Note the filtering in the I2C-core i2c_acpi_do_lookup() function is still necessary because this not only impacts i2c_client instantiation but it also makes the I2C-core ignore the I2cSerialBus resource when checking what the maximum speed is the I2C bus supports, which is still necessary.
--- drivers/acpi/scan.c | 1 + 1 file changed, 1 insertion(+)
drivers/acpi/scan.c +1 -0
@@ -1727,6 +1727,7 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)* Some ACPI devs contain SerialBus resources even though they are not * attached to a serial bus at all. */ + {ACPI_VIDEO_HID, }, {"MSHW0028", },/* * HIDs of device with an UartSerialBusV2 resource for which userspace
Signature · 1 line
2.41.0
PATCH v2 2/4 platform/x86: x86-android-tablets: Add support for SPI device instantiation
Some x86 Android tablets have SPI devices which are not properly described in their DSDT. Add support for instantiating SPI devices.
--- .../platform/x86/x86-android-tablets/core.c | 62 +++++++++++++++++++ .../x86-android-tablets/x86-android-tablets.h | 9 +++ 2 files changed, 71 insertions(+)
drivers/platform/x86/x86-android-tablets/core.c +62 -0
@@ -141,9 +141,11 @@ int x86_acpi_irq_helper_get(const struct x86_acpi_irq_data *data) }static int i2c_client_count; +static int spi_dev_count;static int pdev_count;static int serdev_count;static struct i2c_client **i2c_clients; +static struct spi_device **spi_devs;static struct platform_device **pdevs;static struct serdev_device **serdevs;static struct gpio_keys_button *buttons;
@@ -185,6 +187,46 @@ static __init int x86_instantiate_i2c_client(const struct x86_dev_info *dev_inforeturn 0 ; } +static __init int x86_instantiate_spi_dev (const struct x86_dev_info *dev_info,int idx) +{ +const struct x86_spi_dev_info *spi_dev_info = &dev_info->spi_dev_info[idx]; +struct spi_board_info board_info = spi_dev_info->board_info; +struct spi_controller *controller; +struct acpi_device *adev; +acpi_handle handle; +acpi_status status; + + board_info.irq =x86_acpi_irq_helper_get (&spi_dev_info->irq_data); +if (board_info.irq <0 ) +return board_info.irq; + + status =acpi_get_handle (NULL , spi_dev_info->ctrl_path, &handle); +if (ACPI_FAILURE (status)) { +pr_err ("Error could not get %s handle\n" , spi_dev_info->ctrl_path); +return -ENODEV ; + } + + adev =acpi_fetch_acpi_dev (handle); +if (!adev) { +pr_err ("Error could not get adev for %s\n" , spi_dev_info->ctrl_path); +return -ENODEV ; + } + + controller =acpi_spi_find_controller_by_adev (adev); +if (!controller) { +pr_err ("Error could not get SPI controller for %s\n" , spi_dev_info->ctrl_path); +return -ENODEV ; + } + + spi_devs[idx] =spi_new_device (controller, &board_info); +put_device (&controller->dev); +if (IS_ERR (spi_devs[idx])) +return dev_err_probe (&controller->dev,PTR_ERR (spi_devs[idx]), +"creating SPI-device %d\n" , idx); + +return 0 ; +} +static __init int x86_instantiate_serdev (const struct x86_serdev_info *info,int idx) {struct acpi_device *ctrl_adev, *serdev_adev;
@@ -263,6 +305,11 @@ static void x86_android_tablet_remove(struct platform_device *pdev)kfree (pdevs);kfree (buttons); +for (i =0 ; i < spi_dev_count; i++) +spi_unregister_device (spi_devs[i]); + +kfree (spi_devs); +for (i =0 ; i < i2c_client_count; i++)i2c_unregister_device (i2c_clients[i]);
@@ -333,6 +380,21 @@ static __init int x86_android_tablet_probe(struct platform_device *pdev) } } + spi_devs =kcalloc (dev_info->spi_dev_count,sizeof (*spi_devs),GFP_KERNEL ); +if (!spi_devs) { +x86_android_tablet_remove (pdev); +return -ENOMEM ; + } + + spi_dev_count = dev_info->spi_dev_count; +for (i =0 ; i < spi_dev_count; i++) { + ret =x86_instantiate_spi_dev (dev_info, i); +if (ret <0 ) { +x86_android_tablet_remove (pdev); +return ret; + } + } +/* + 1 to make space for (optional) gpio_keys_button pdev */ pdevs =kcalloc (dev_info->pdev_count +1 ,sizeof (*pdevs),GFP_KERNEL );if (!pdevs) {
drivers/platform/x86/x86-android-tablets/x86-android-tablets.h +9 -0
@@ -14,6 +14,7 @@#include <linux/gpio_keys.h> #include <linux/i2c.h> #include <linux/irqdomain_defs.h> +#include <linux/spi/spi.h> struct gpio_desc ;struct gpiod_lookup_table ;
@@ -48,6 +49,12 @@ struct x86_i2c_client_info {struct x86_acpi_irq_data irq_data; }; +struct x86_spi_dev_info { +struct spi_board_info board_info; +char *ctrl_path; +struct x86_acpi_irq_data irq_data; +}; +struct x86_serdev_info {const char *ctrl_hid;const char *ctrl_uid;
@@ -72,10 +79,12 @@ struct x86_dev_info {const struct software_node *bat_swnode;struct gpiod_lookup_table *const *gpiod_lookup_tables;const struct x86_i2c_client_info *i2c_client_info; +const struct x86_spi_dev_info *spi_dev_info;const struct platform_device_info *pdev_info;const struct x86_serdev_info *serdev_info;const struct x86_gpio_button *gpio_button;int i2c_client_count; +int spi_dev_count;int pdev_count;int serdev_count;int gpio_button_count;
Signature · 1 line
2.41.0
PATCH v2 3/4 platform/x86: x86-android-tablets: Add audio codec info for Lenovo Yoga Tab 3 Pro YT3-X90F
In reply to Hans de GoedeThe SPI attached WM5102 codec on the Lenovo Yoga Tab 3 Pro YT3-X90F is not described in the ACPI tables.
Add info to instantiate the SPI device for the codec manually.
---
Changes in v2:
- Fix identation and style issues in lenovo_yt3_wm5102_pdata initializer
--- .../platform/x86/x86-android-tablets/lenovo.c | 98 +++++++++++++++++++ 1 file changed, 98 insertions(+)
drivers/platform/x86/x86-android-tablets/lenovo.c +98 -0
@@ -12,6 +12,8 @@#include <linux/efi.h> #include <linux/gpio/machine.h> +#include <linux/mfd/arizona/pdata.h> +#include <linux/mfd/arizona/registers.h> #include <linux/mfd/intel_soc_pmic.h> #include <linux/pinctrl/consumer.h> #include <linux/pinctrl/machine.h>
@@ -659,6 +661,88 @@ static const struct x86_i2c_client_info lenovo_yt3_i2c_clients[] __initconst = { } }; +/* +* The AOSP 3.5 mm Headset: Accessory Specification gives the following values: +* Function A Play/Pause: 0 ohm +* Function D Voice assistant: 135 ohm +* Function B Volume Up 240 ohm +* Function C Volume Down 470 ohm +* Minimum Mic DC resistance 1000 ohm +* Minimum Ear speaker impedance 16 ohm +* Note the first max value below must be less then the min. speaker impedance, +* to allow CTIA/OMTP detection to work. The other max values are the closest +* value from extcon-arizona.c:arizona_micd_levels halfway 2 button resistances. +*/ +static const struct arizona_micd_range arizona_micd_aosp_ranges[] = { + { .max =11 , .key =KEY_PLAYPAUSE }, + { .max =186 , .key =KEY_VOICECOMMAND }, + { .max =348 , .key =KEY_VOLUMEUP }, + { .max =752 , .key =KEY_VOLUMEDOWN }, +}; + +/* YT3 WM5102 arizona_micd_config comes from Android kernel sources */ +static struct arizona_micd_config lenovo_yt3_wm5102_micd_config[] = { + {0 ,1 ,0 }, + {ARIZONA_ACCDET_SRC ,2 ,1 }, +}; + +static struct arizona_pdata lenovo_yt3_wm5102_pdata = { + .irq_flags =IRQF_TRIGGER_LOW , + .micd_detect_debounce =200 , + .micd_ranges = arizona_micd_aosp_ranges, + .num_micd_ranges =ARRAY_SIZE (arizona_micd_aosp_ranges), + .hpdet_channel =ARIZONA_ACCDET_MODE_HPL , + +/* Below settings come from Android kernel sources */ + .micd_bias_start_time =1 , + .micd_rate =6 , + .micd_configs = lenovo_yt3_wm5102_micd_config, + .num_micd_configs =ARRAY_SIZE (lenovo_yt3_wm5102_micd_config), + .micbias = { + [0 ] = {/* MICBIAS1 */ + .mV =2800 , + .ext_cap =1 , + .discharge =1 , + .soft_start =0 , + .bypass =0 , + }, + [1 ] = {/* MICBIAS2 */ + .mV =2800 , + .ext_cap =1 , + .discharge =1 , + .soft_start =0 , + .bypass =0 , + }, + [2 ] = {/* MICBIAS2 */ + .mV =2800 , + .ext_cap =1 , + .discharge =1 , + .soft_start =0 , + .bypass =0 , + }, + }, +}; + +static const struct x86_spi_dev_info lenovo_yt3_spi_devs[]__initconst = { + { +/* WM5102 codec */ + .board_info = { + .modalias ="wm5102" , + .platform_data = &lenovo_yt3_wm5102_pdata, + .max_speed_hz =5000000 , + }, + .ctrl_path ="\\_SB_.PCI0.SPI1" , + .irq_data = { + .type =X86_ACPI_IRQ_TYPE_GPIOINT , + .chip ="INT33FF:00" , + .index =91 , + .trigger =ACPI_LEVEL_SENSITIVE , + .polarity =ACPI_ACTIVE_LOW , + .con_id ="wm5102_irq" , + }, + } +}; +static int __init lenovo_yt3_init (void ) {int ret;
@@ -702,14 +786,28 @@ static struct gpiod_lookup_table lenovo_yt3_hideep_gpios = { }, }; +static struct gpiod_lookup_table lenovo_yt3_wm5102_gpios = { + .dev_id ="spi1.0" , + .table = { +GPIO_LOOKUP ("INT33FF:00" ,75 ,"wlf,spkvdd-ena" ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP ("INT33FF:00" ,81 ,"wlf,ldoena" ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP ("INT33FF:00" ,82 ,"reset" ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP ("arizona" ,2 ,"wlf,micd-pol" ,GPIO_ACTIVE_HIGH ), + { } + }, +}; +static struct gpiod_lookup_table *const lenovo_yt3_gpios[] = { &lenovo_yt3_hideep_gpios, + &lenovo_yt3_wm5102_gpios,NULL };const struct x86_dev_info lenovo_yt3_info__initconst = { .i2c_client_info = lenovo_yt3_i2c_clients, .i2c_client_count =ARRAY_SIZE (lenovo_yt3_i2c_clients), + .spi_dev_info = lenovo_yt3_spi_devs, + .spi_dev_count =ARRAY_SIZE (lenovo_yt3_spi_devs), .gpiod_lookup_tables = lenovo_yt3_gpios, .init = lenovo_yt3_init, };
Signature · 1 line
2.41.0
PATCH v2 4/4 platform/x86: x86-android-tablets: Fix backlight ctrl for Lenovo Yoga Tab 3 Pro YT3-X90F
In reply to Hans de GoedeFix the maximum brightness being much too low on the Yoga Tab 3 Pro.
The LP8557 backlight controller can either be configured to multiply its PWM input and the I2C register set level (requiring both to be at 100% for 100% output); or to only take the I2C register set level into account.
Multiplying the 2 levels is useful because this will turn off the backlight when the panel goes off and turns off its PWM output.
But on the YT3-X90F the panel's PWM output defaults to a duty-cycle of much less then 100%, severely limiting max brightness. In this case the LP8557 should be configured to only take the I2C register into account and the i915 driver must turn off the backlight separately using a VBT MIPI sequence to turn off the backlight.
--- .../platform/x86/x86-android-tablets/lenovo.c | 26 ++++++++++++++++--- 1 file changed, 22 insertions(+), 4 deletions(-)
drivers/platform/x86/x86-android-tablets/lenovo.c +22 -4
@@ -34,12 +34,30 @@* * To avoid having to have a similar hack in the mainline kernel program the * LP8557 to directly set the level and use the lp855x_bl driver for control. +* +* The LP8557 can either be configured to multiply its PWM input and +* the I2C register set level (requiring both to be at 100% for 100% output); +* or to only take the I2C register set level into account. +* +* Multiplying the 2 levels is useful because this will turn off the backlight +* when the panel goes off and turns off its PWM output. +* +* But on some models the panel's PWM output defaults to a duty-cycle of +* much less then 100%, severely limiting max brightness. In this case +* the LP8557 should be configured to only take the I2C register into +* account and the i915 driver must turn off the panel and the backlight +* separately using e.g. VBT MIPI sequences to turn off the backlight. */ -static struct lp855x_platform_data lenovo_lp8557_pdata = { +static struct lp855x_platform_data lenovo_lp8557_pwm_and_reg_pdata = { .device_control =0x86 , .initial_brightness =128 , }; +static struct lp855x_platform_data lenovo_lp8557_reg_only_pdata = { + .device_control =0x85 , + .initial_brightness =128 , +}; +/* Lenovo Yoga Book X90F / X90L's Android factory img has everything hardcoded */ static const struct property_entry lenovo_yb1_x90_wacom_props[] = {
@@ -122,7 +140,7 @@ static const struct x86_i2c_client_info lenovo_yb1_x90_i2c_clients[] __initconst .type = "lp8557", .addr = 0x2c, .dev_name = "lp8557", - .platform_data = &lenovo_lp8557_pdata, + .platform_data = &lenovo_lp8557_pwm_and_reg_pdata, }, .adapter_path = "\\_SB_.PCI0.I2C4", }, {
@@ -358,7 +376,7 @@ static struct x86_i2c_client_info lenovo_yoga_tab2_830_1050_i2c_clients[] __init .type = "lp8557", .addr = 0x2c, .dev_name = "lp8557", - .platform_data = &lenovo_lp8557_pdata, + .platform_data = &lenovo_lp8557_pwm_and_reg_pdata, }, .adapter_path = "\\_SB_.I2C3", },
@@ -655,7 +673,7 @@ static const struct x86_i2c_client_info lenovo_yt3_i2c_clients[] __initconst = { .type = "lp8557", .addr = 0x2c, .dev_name = "lp8557", - .platform_data = &lenovo_lp8557_pdata, + .platform_data = &lenovo_lp8557_reg_only_pdata, }, .adapter_path = "\\_SB_.PCI0.I2C1", }
Signature · 1 line
2.41.0
Hi All,
Quoted 19 lines · Hans de Goede
The I2C-core already has filtering to skip
i2c_clientinstantiation for LNXVIDEO acpi_device-s with I2cSerialBus resources, since LNXVIDEO devices are not i2c_client-s and are handled by theacpi_videodriver.This filtering was added to
i2c-core-acpi.cin commit3a4991a9864c("i2c:
acpi: Do not create i2c-clients for LNXVIDEO ACPI devices").Now a similar problem has shown up where the SPI-core is instantiating an unwanted SPI-device for a SpiSerialBus resource under a LNXVIDEO
acpi_device. On a Lenovo Yoga Tab 3 YT3-X90F this unwanted SPI-device instanstantiation causes the SPI-device instanstantiation for the WM5102 audio codec to fail with:[ 21.988441] pxa2xx-spi 8086228E:00: chipselect 0 already in useInstead of duplicating the I2C-core filtering in the SPI-core code, push the filtering of SerialBus resources under LNXVIDEO acpi_device-s up into the ACPI-core by adding the LNXVIDEO HID to ignore_serial_bus_ids[].
Quoted 7 lines
Note the filtering in the I2C-core
i2c_acpi_do_lookup()function is still necessary because this not only impactsi2c_clientinstantiation but it also makes the I2C-core ignore the I2cSerialBus resource when checking what the maximum speed is the I2C bus supports, which is still necessary.Signed-off-by Hans de Goede <[email protected]>
I've added this series to my review-hans (soon to be for-next) branch now.
Regards,
Hans
Quoted 16 lines
--- drivers/acpi/scan.c | 1 + 1 file changed, 1 insertion(+)drivers/acpi/scan.c +1
-0@@ -1727,6 +1727,7 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)* Some ACPI devs contain SerialBus resources even though they are not * attached to a serial bus at all. */ + {ACPI_VIDEO_HID, }, {"MSHW0028", },/* * HIDs of device with an UartSerialBusV2 resource for which userspace