2022-06-22 18:07:41

by Prashant Malani

Subject: [PATCH v5 7/9] drm/bridge: it6505: Register number of Type C switches

From: Pin-Yen Lin <[email protected]>

Parse the "switches" node, if available, and count and store the number
of Type-C switches within it. The extcon registration is still
supported, but we don't expect both extcon and typec-switch be
registered at the same time.

This patch sets a foundation for the actual registering of Type-C
switches with the Type-C connector class framework.

Signed-off-by: Pin-Yen Lin <[email protected]>
Signed-off-by: Prashant Malani <[email protected]>
---

v5 is the first version for this patch.

drivers/gpu/drm/bridge/ite-it6505.c | 34 +++++++++++++++++++++++++----
1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/bridge/ite-it6505.c b/drivers/gpu/drm/bridge/ite-it6505.c
index 4b673c4792d7..b259f9f367f6 100644
--- a/drivers/gpu/drm/bridge/ite-it6505.c
+++ b/drivers/gpu/drm/bridge/ite-it6505.c
@@ -452,6 +452,7 @@ struct it6505 {
struct delayed_work delayed_audio;
struct it6505_audio_data audio;
struct dentry *debugfs;
+ int num_typec_switches;

/* it6505 driver hold option */
bool enable_drv_hold;
@@ -3229,13 +3230,28 @@ static void it6505_shutdown(struct i2c_client *client)
it6505_lane_off(it6505);
}

+static int it6505_register_typec_switches(struct device *device, struct it6505 *it6505)
+{
+ struct device_node *of;
+
+ of = of_get_child_by_name(device->of_node, "switches");
+ if (!of)
+ return -ENODEV;
+
+ it6505->num_typec_switches = of_get_child_count(of);
+ if (it6505->num_typec_switches <= 0)
+ return -ENODEV;
+
+ return 0;
+}
+
static int it6505_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct it6505 *it6505;
struct device *dev = &client->dev;
struct extcon_dev *extcon;
- int err, intp_irq;
+ int err, intp_irq, ret;

it6505 = devm_kzalloc(&client->dev, sizeof(*it6505), GFP_KERNEL);
if (!it6505)
@@ -3255,11 +3271,21 @@ static int it6505_i2c_probe(struct i2c_client *client,
if (PTR_ERR(extcon) == -EPROBE_DEFER)
return -EPROBE_DEFER;
if (IS_ERR(extcon)) {
- dev_err(dev, "can not get extcon device!");
- return PTR_ERR(extcon);
+ if (PTR_ERR(extcon) != -ENODEV)
+ dev_warn(dev, "Cannot get extcon device: %ld", PTR_ERR(extcon));
+ it6505->extcon = NULL;
+ } else {
+ it6505->extcon = extcon;
}

- it6505->extcon = extcon;
+ ret = it6505_register_typec_switches(dev, it6505);
+ if (ret) {
+ dev_dbg(dev, "Didn't register Type C switches, err: %d", ret);
+ if (!it6505->extcon) {
+ dev_err(dev, "Both extcon and typec-switch are not registered.");
+ return -EINVAL;
+ }
+ }

it6505->regmap = devm_regmap_init_i2c(client, &it6505_regmap_config);
if (IS_ERR(it6505->regmap)) {
--
2.37.0.rc0.104.g0611611a94-goog

2022-06-27 21:44:17

by Rob Herring

Subject: Re: [PATCH v5 7/9] drm/bridge: it6505: Register number of Type C switches

On Wed, Jun 22, 2022 at 05:34:36PM +0000, Prashant Malani wrote:
> From: Pin-Yen Lin <[email protected]>
>
> Parse the "switches" node, if available, and count and store the number
> of Type-C switches within it. The extcon registration is still
> supported, but we don't expect both extcon and typec-switch be
> registered at the same time.
>
> This patch sets a foundation for the actual registering of Type-C
> switches with the Type-C connector class framework.
>
> Signed-off-by: Pin-Yen Lin <[email protected]>
> Signed-off-by: Prashant Malani <[email protected]>
> ---
>
> v5 is the first version for this patch.
>
> drivers/gpu/drm/bridge/ite-it6505.c | 34 +++++++++++++++++++++++++----
> 1 file changed, 30 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/ite-it6505.c b/drivers/gpu/drm/bridge/ite-it6505.c
> index 4b673c4792d7..b259f9f367f6 100644
> --- a/drivers/gpu/drm/bridge/ite-it6505.c
> +++ b/drivers/gpu/drm/bridge/ite-it6505.c
> @@ -452,6 +452,7 @@ struct it6505 {
> struct delayed_work delayed_audio;
> struct it6505_audio_data audio;
> struct dentry *debugfs;
> + int num_typec_switches;
>
> /* it6505 driver hold option */
> bool enable_drv_hold;
> @@ -3229,13 +3230,28 @@ static void it6505_shutdown(struct i2c_client *client)
> it6505_lane_off(it6505);
> }
>
> +static int it6505_register_typec_switches(struct device *device, struct it6505 *it6505)
> +{
> + struct device_node *of;
> +
> + of = of_get_child_by_name(device->of_node, "switches");
> + if (!of)
> + return -ENODEV;
> +
> + it6505->num_typec_switches = of_get_child_count(of);
> + if (it6505->num_typec_switches <= 0)
> + return -ENODEV;
> +
> + return 0;
> +}

Not that I expect this to remain, but you have the same function in 2
files. That's a clear sign this belongs in a helper.

Rob