samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "disp/bridge/lt9611uxc: update bridge_attach and compatible string"

Browse Source
This commit is contained in:
qctecmdr
2023-11-30 19:27:17 -08:00
committed by Gerrit - the friendly Code Review server
parent a07896383d de1e6dfd58
commit 0b5d746481
1 changed files with 34 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
bridge-drivers/lt9611uxc.c
View File

@@ -4,6 +4,10 @@
* Copyright (c) 2019-2020. Linaro Limited. * Copyright (c) 2019-2020. Linaro Limited.
*/ */
/*
* Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
*/
#include <linux/firmware.h> #include <linux/firmware.h>
#include <linux/gpio/consumer.h> #include <linux/gpio/consumer.h>
#include <linux/i2c.h> #include <linux/i2c.h>
@@ -353,7 +357,31 @@ static int lt9611uxc_connector_init(struct drm_bridge *bridge, struct lt9611uxc
return ret; return ret;
} }
return drm_connector_attach_encoder(&lt9611uxc->connector, bridge->encoder); ret = drm_connector_attach_encoder(&lt9611uxc->connector, bridge->encoder);
if (ret) {
DRM_ERROR("Failed to link up connector to encoder: %d\n", ret);
return ret;
}
/* Attach primary DSI */
lt9611uxc->dsi0 = lt9611uxc_attach_dsi(lt9611uxc, lt9611uxc->dsi0_node);
if (IS_ERR(lt9611uxc->dsi0)) {
ret = PTR_ERR(lt9611uxc->dsi0);
drm_bridge_remove(&lt9611uxc->bridge);
return ret;
}
/* Attach secondary DSI, if specified */
if (lt9611uxc->dsi1_node) {
lt9611uxc->dsi1 = lt9611uxc_attach_dsi(lt9611uxc, lt9611uxc->dsi1_node);
if (IS_ERR(lt9611uxc->dsi1)) {
ret = PTR_ERR(lt9611uxc->dsi1);
drm_bridge_remove(&lt9611uxc->bridge);
return ret;
}
}
return ret;
} }
static int lt9611uxc_bridge_attach(struct drm_bridge *bridge, static int lt9611uxc_bridge_attach(struct drm_bridge *bridge,
@@ -362,11 +390,9 @@ static int lt9611uxc_bridge_attach(struct drm_bridge *bridge,
struct lt9611uxc *lt9611uxc = bridge_to_lt9611uxc(bridge); struct lt9611uxc *lt9611uxc = bridge_to_lt9611uxc(bridge);
int ret; int ret;
if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR)) { ret = lt9611uxc_connector_init(bridge, lt9611uxc);
ret = lt9611uxc_connector_init(bridge, lt9611uxc); if (ret < 0)
if (ret < 0) return ret;
return ret;
}
return 0; return 0;
} }
@@ -948,27 +974,8 @@ retry:
drm_bridge_add(&lt9611uxc->bridge); drm_bridge_add(&lt9611uxc->bridge);
/* Attach primary DSI */
lt9611uxc->dsi0 = lt9611uxc_attach_dsi(lt9611uxc, lt9611uxc->dsi0_node);
if (IS_ERR(lt9611uxc->dsi0)) {
ret = PTR_ERR(lt9611uxc->dsi0);
goto err_remove_bridge;
}
/* Attach secondary DSI, if specified */
if (lt9611uxc->dsi1_node) {
lt9611uxc->dsi1 = lt9611uxc_attach_dsi(lt9611uxc, lt9611uxc->dsi1_node);
if (IS_ERR(lt9611uxc->dsi1)) {
ret = PTR_ERR(lt9611uxc->dsi1);
goto err_remove_bridge;
}
}
return lt9611uxc_audio_init(dev, lt9611uxc); return lt9611uxc_audio_init(dev, lt9611uxc);
err_remove_bridge:
drm_bridge_remove(&lt9611uxc->bridge);
err_disable_regulators: err_disable_regulators:
regulator_bulk_disable(ARRAY_SIZE(lt9611uxc->supplies), lt9611uxc->supplies); regulator_bulk_disable(ARRAY_SIZE(lt9611uxc->supplies), lt9611uxc->supplies);
@@ -997,12 +1004,12 @@ static void lt9611uxc_remove(struct i2c_client *client)
} }
static struct i2c_device_id lt9611uxc_id[] = { static struct i2c_device_id lt9611uxc_id[] = {
{ "lontium,lt9611uxc", 0 }, { "lt,lt9611uxc", 0 },
{ /* sentinel */ } { /* sentinel */ }
}; };
static const struct of_device_id lt9611uxc_match_table[] = { static const struct of_device_id lt9611uxc_match_table[] = {
{ .compatible = "lontium,lt9611uxc" }, { .compatible = "lt,lt9611uxc" },
{ /* sentinel */ } { /* sentinel */ }
}; };
MODULE_DEVICE_TABLE(of, lt9611uxc_match_table); MODULE_DEVICE_TABLE(of, lt9611uxc_match_table);