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

platform/x86: x86-android-tablets: Fix modules lists for Lenovo devices 



2 fixes for Lenovo tablets:

- The bq24190 charger on the Lenovo Yoga Tab2 830/1050 devices does not use
  the crystal-cove PMIC charger IRQ, so these shouldn't use bq24190_modules
  as that includes "intel_crystal_cove_charger"

- Both the Tab2 and the Tab3 devices have a SPI audio-codec which init()
  attaches properties to, resp. the whole SPI device gets instantiated by
  the x86-android-tablets code. This requires the "spi_pxa2xx_platform"
  module to be loaded before init() runs

Reviewed-by: default avatarAndy Shevchenko <andy@kernel.org>
Signed-off-by: default avatarHans de Goede <hansg@kernel.org>
Link: https://patch.msgid.link/20250920200713.20193-20-hansg@kernel.org


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

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

+14 −7
Original line number Diff line number Diff line
@@ -443,6 +443,12 @@ static const struct software_node *lenovo_yoga_tab2_830_1050_swnodes[] = { 
static int __init lenovo_yoga_tab2_830_1050_init(struct device *dev);

static void lenovo_yoga_tab2_830_1050_exit(void);



static const char * const lenovo_yoga_tab2_modules[] __initconst = {

	"spi_pxa2xx_platform",	/* For the SPI codec device */

	"bq24190_charger",	/* For the Vbus regulator for int3496/lc824206xa */

	NULL

};



const struct x86_dev_info lenovo_yoga_tab2_830_1050_info __initconst = {

	.i2c_client_info = lenovo_yoga_tab2_830_1050_i2c_clients,

	.i2c_client_count = ARRAY_SIZE(lenovo_yoga_tab2_830_1050_i2c_clients),
@@ -450,7 +456,7 @@ const struct x86_dev_info lenovo_yoga_tab2_830_1050_info __initconst = { 
	.pdev_count = ARRAY_SIZE(lenovo_yoga_tab2_830_1050_pdevs),

	.gpio_button_swnodes = lenovo_yoga_tab2_830_1050_lid_swnodes,

	.swnode_group = lenovo_yoga_tab2_830_1050_swnodes,

	.modules = bq24190_modules,

	.modules = lenovo_yoga_tab2_modules,

	.gpiochip_type = X86_GPIOCHIP_BAYTRAIL,

	.init = lenovo_yoga_tab2_830_1050_init,

	.exit = lenovo_yoga_tab2_830_1050_exit,
@@ -767,11 +773,6 @@ static const struct platform_device_info lenovo_yoga_tab2_1380_pdevs[] __initcon 
	},

};



static const char * const lenovo_yoga_tab2_1380_modules[] __initconst = {

	"bq24190_charger",            /* For the Vbus regulator for lc824206xa */

	NULL

};



static int __init lenovo_yoga_tab2_1380_init(struct device *dev)

{

	int ret;
@@ -800,7 +801,7 @@ const struct x86_dev_info lenovo_yoga_tab2_1380_info __initconst = { 
	.pdev_count = ARRAY_SIZE(lenovo_yoga_tab2_1380_pdevs),

	.gpio_button_swnodes = lenovo_yoga_tab2_830_1050_lid_swnodes,

	.swnode_group = lenovo_yoga_tab2_830_1050_swnodes,

	.modules = lenovo_yoga_tab2_1380_modules,

	.modules = lenovo_yoga_tab2_modules,

	.gpiochip_type = X86_GPIOCHIP_BAYTRAIL,

	.init = lenovo_yoga_tab2_1380_init,

	.exit = lenovo_yoga_tab2_830_1050_exit,
@@ -1061,12 +1062,18 @@ static int __init lenovo_yt3_init(struct device *dev) 
	return 0;

}



static const char * const lenovo_yt3_modules[] __initconst = {

	"spi_pxa2xx_platform",	/* For the SPI codec device */

	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),

	.swnode_group = lenovo_yt3_swnodes,

	.modules = lenovo_yt3_modules,

	.gpiochip_type = X86_GPIOCHIP_CHERRYVIEW,

	.init = lenovo_yt3_init,

};