Unverified Commit 5b78e809 authored by Hans de Goede's avatar Hans de Goede Committed by Ilpo Järvinen
Browse files

platform/x86: x86-android-tablets: Add support for getting i2c_adapter by PCI parent devname() 



On the Vexia EDU ATLA 10 tablet, which ships with Android + a custom Linux
(guadalinex) using the custom Android kernel the I2C controllers are not
enumerated as ACPI devices as they typically are.

Instead they are enumerated as PCI devices which do not have ACPI firmware
nodes associated with them, so getting the i2c_adapter by the ACPI path of
its firmware node does not work.

Add support for getting the i2c_adapter by the devname() of its PCI parent
instead.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarAndy Shevchenko <andy@kernel.org>
Link: https://lore.kernel.org/r/20241104200848.58693-3-hdegoede@redhat.com


Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
parent 01fbfcb3

drivers/platform/x86/x86-android-tablets/Kconfig

+3 −1
Original line number Diff line number Diff line
@@ -5,7 +5,9 @@ 


config X86_ANDROID_TABLETS

	tristate "X86 Android tablet support"

	depends on I2C && SPI && SERIAL_DEV_BUS && ACPI && EFI && GPIOLIB && PMIC_OPREGION

	depends on I2C && SPI && SERIAL_DEV_BUS

	depends on GPIOLIB && PMIC_OPREGION

	depends on ACPI && EFI && PCI

	select NEW_LEDS

	select LEDS_CLASS

	help

drivers/platform/x86/x86-android-tablets/core.c

+36 −1
Original line number Diff line number Diff line
@@ -11,11 +11,13 @@ 
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/acpi.h>

#include <linux/device.h>

#include <linux/dmi.h>

#include <linux/gpio/consumer.h>

#include <linux/gpio/machine.h>

#include <linux/irq.h>

#include <linux/module.h>

#include <linux/pci.h>

#include <linux/platform_device.h>

#include <linux/serdev.h>

#include <linux/string.h>
@@ -170,6 +172,35 @@ get_i2c_adap_by_handle(const struct x86_i2c_client_info *client_info) 
	return i2c_acpi_find_adapter_by_handle(handle);

}



static __init int match_parent(struct device *dev, const void *data)

{

	return dev->parent == data;

}



static struct i2c_adapter *

get_i2c_adap_by_pci_parent(const struct x86_i2c_client_info *client_info)

{

	struct i2c_adapter *adap = NULL;

	struct device *pdev, *adap_dev;



	pdev = bus_find_device_by_name(&pci_bus_type, NULL, client_info->adapter_path);

	if (!pdev) {

		pr_err("Error could not find %s PCI device\n", client_info->adapter_path);

		return NULL;

	}



	adap_dev = bus_find_device(&i2c_bus_type, NULL, pdev, match_parent);

	if (adap_dev) {

		adap = i2c_verify_adapter(adap_dev);

		if (!adap)

			put_device(adap_dev);

	}



	put_device(pdev);



	return adap;

}



static __init int x86_instantiate_i2c_client(const struct x86_dev_info *dev_info,

					     int idx)

{
@@ -181,7 +212,11 @@ static __init int x86_instantiate_i2c_client(const struct x86_dev_info *dev_info 
	if (board_info.irq < 0)

		return board_info.irq;



	if (dev_info->use_pci_devname)

		adap = get_i2c_adap_by_pci_parent(client_info);

	else

		adap = get_i2c_adap_by_handle(client_info);



	if (!adap) {

		pr_err("error could not get %s adapter\n", client_info->adapter_path);

		return -ENODEV;

drivers/platform/x86/x86-android-tablets/x86-android-tablets.h

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ struct x86_dev_info { 
	int gpio_button_count;

	int (*init)(struct device *dev);

	void (*exit)(void);

	bool use_pci_devname;

};



int x86_android_tablet_get_gpiod(const char *chip, int pin, const char *con_id,