Merge "drm/bridge: LT9611UXC: Change LT9611UXC fw version auto-upgrade rule" (7faa6fd5) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/gpu/drm/bridge/lt9611uxc.c

+8 −9

Original line number	Original line	Diff line number	Diff line
	// SPDX-License-Identifier: GPL-2.0-only		// SPDX-License-Identifier: GPL-2.0-only
	/*		/*
	* Copyright (c) 2019, The Linux Foundation. All rights reserved.		* Copyright (c) 2020, The Linux Foundation. All rights reserved.
	*/		*/

	#define pr_fmt(fmt) "%s: " fmt, __func__		#define pr_fmt(fmt) "%s: " fmt, __func__
	@@ -40,7 +40,6 @@
	#define READ_BUF_MAX_SIZE 64		#define READ_BUF_MAX_SIZE 64
	#define WRITE_BUF_MAX_SIZE 64		#define WRITE_BUF_MAX_SIZE 64
	#define HPD_UEVENT_BUFFER_SIZE 30		#define HPD_UEVENT_BUFFER_SIZE 30
	#define VERSION_NUM 0x32

	struct lt9611_reg_cfg {		struct lt9611_reg_cfg {
	u8 reg;		u8 reg;
	@@ -1657,7 +1656,13 @@ static int lt9611_probe(struct i2c_client *client,
	i2c_set_clientdata(client, pdata);		i2c_set_clientdata(client, pdata);
	dev_set_drvdata(&client->dev, pdata);		dev_set_drvdata(&client->dev, pdata);

	if (lt9611_get_version(pdata) == VERSION_NUM) {		ret = lt9611_sysfs_init(&client->dev);
			if (ret) {
			pr_err("sysfs init failed\n");
			goto err_sysfs_init;
			}

			if (lt9611_get_version(pdata)) {
	pr_info("LT9611 works, no need to upgrade FW\n");		pr_info("LT9611 works, no need to upgrade FW\n");
	} else {		} else {
	ret = request_firmware_nowait(THIS_MODULE, true,		ret = request_firmware_nowait(THIS_MODULE, true,
	@@ -1671,12 +1676,6 @@ static int lt9611_probe(struct i2c_client *client,
	return 0;		return 0;
	}		}

	ret = lt9611_sysfs_init(&client->dev);
	if (ret) {
	pr_err("sysfs init failed\n");
	goto err_sysfs_init;
	}

	#if IS_ENABLED(CONFIG_OF)		#if IS_ENABLED(CONFIG_OF)
	pdata->bridge.of_node = client->dev.of_node;		pdata->bridge.of_node = client->dev.of_node;
	#endif		#endif