From: Prashant Malani <pmalani@chromium.org> To: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org Cc: bleung@chromium.org, swboyd@chromium.org, heikki.krogerus@linux.intel.com, "Pin-Yen Lin" <treapking@chromium.org>, "AngeloGioacchino Del Regno" <angelogioacchino.delregno@collabora.com>, "Nícolas F . R . A . Prado" <nfraprado@collabora.com>, "Prashant Malani" <pmalani@chromium.org>, "Andrzej Hajda" <andrzej.hajda@intel.com>, "Daniel Vetter" <daniel@ffwll.ch>, "David Airlie" <airlied@linux.ie>, devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), dri-devel@lists.freedesktop.org (open list:DRM DRIVERS), "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>, "Hsin-Yi Wang" <hsinyi@chromium.org>, "Jernej Skrabec" <jernej.skrabec@gmail.com>, "Jonas Karlman" <jonas@kwiboo.se>, "José Expósito" <jose.exposito89@gmail.com>, "Krzysztof Kozlowski" <krzysztof.kozlowski+dt@linaro.org>, "Laurent Pinchart" <Laurent.pinchart@ideasonboard.com>, "Maxime Ripard" <maxime@cerno.tech>, "Neil Armstrong" <narmstrong@baylibre.com>, "Robert Foss" <robert.foss@linaro.org>, "Rob Herring" <robh+dt@kernel.org>, "Sam Ravnborg" <sam@ravnborg.org>, "Thomas Zimmermann" <tzimmermann@suse.de>, "Xin Ji" <xji@analogixsemi.com> Subject: [PATCH v4 7/7] drm/bridge: anx7625: Add typec_mux_set callback function Date: Wed, 15 Jun 2022 17:20:23 +0000 [thread overview] Message-ID: <20220615172129.1314056-8-pmalani@chromium.org> (raw) In-Reply-To: <20220615172129.1314056-1-pmalani@chromium.org> From: Pin-Yen Lin <treapking@chromium.org> Add the callback function when the driver receives state changes of the Type-C port. The callback function configures the crosspoint switch of the anx7625 bridge chip, which can change the output pins of the signals according to the port state. Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Reviewed-by: Nícolas F. R. A. Prado <nfraprado@collabora.com> Tested-by: Nícolas F. R. A. Prado <nfraprado@collabora.com> Signed-off-by: Pin-Yen Lin <treapking@chromium.org> Signed-off-by: Prashant Malani <pmalani@chromium.org> --- Changes since v3: - Added Reviewed-by tag from Angelo. Changes since v2: - Moved num_typec_switches check to beginning of function - Made dp_connected assignments fit on one line (and removed unnecessary parentheses) - Added Reviewed-by and Tested-by tags. Changes since v1: - No changes. drivers/gpu/drm/bridge/analogix/anx7625.c | 56 +++++++++++++++++++++++ drivers/gpu/drm/bridge/analogix/anx7625.h | 13 ++++++ 2 files changed, 69 insertions(+) diff --git a/drivers/gpu/drm/bridge/analogix/anx7625.c b/drivers/gpu/drm/bridge/analogix/anx7625.c index bd21f159b973..5992fc8beeeb 100644 --- a/drivers/gpu/drm/bridge/analogix/anx7625.c +++ b/drivers/gpu/drm/bridge/analogix/anx7625.c @@ -15,6 +15,7 @@ #include <linux/regulator/consumer.h> #include <linux/slab.h> #include <linux/types.h> +#include <linux/usb/typec_dp.h> #include <linux/usb/typec_mux.h> #include <linux/workqueue.h> @@ -2582,9 +2583,64 @@ static void anx7625_runtime_disable(void *data) pm_runtime_disable(data); } +static void anx7625_set_crosspoint_switch(struct anx7625_data *ctx, + enum typec_orientation orientation) +{ + if (orientation == TYPEC_ORIENTATION_NORMAL) { + anx7625_reg_write(ctx, ctx->i2c.tcpc_client, TCPC_SWITCH_0, + SW_SEL1_SSRX_RX1 | SW_SEL1_DPTX0_RX2); + anx7625_reg_write(ctx, ctx->i2c.tcpc_client, TCPC_SWITCH_1, + SW_SEL2_SSTX_TX1 | SW_SEL2_DPTX1_TX2); + } else if (orientation == TYPEC_ORIENTATION_REVERSE) { + anx7625_reg_write(ctx, ctx->i2c.tcpc_client, TCPC_SWITCH_0, + SW_SEL1_SSRX_RX2 | SW_SEL1_DPTX0_RX1); + anx7625_reg_write(ctx, ctx->i2c.tcpc_client, TCPC_SWITCH_1, + SW_SEL2_SSTX_TX2 | SW_SEL2_DPTX1_TX1); + } +} + +static void anx7625_typec_two_ports_update(struct anx7625_data *ctx) +{ + if (ctx->typec_ports[0].dp_connected && ctx->typec_ports[1].dp_connected) + /* Both ports available, do nothing to retain the current one. */ + return; + else if (ctx->typec_ports[0].dp_connected) + anx7625_set_crosspoint_switch(ctx, TYPEC_ORIENTATION_NORMAL); + else if (ctx->typec_ports[1].dp_connected) + anx7625_set_crosspoint_switch(ctx, TYPEC_ORIENTATION_REVERSE); +} + static int anx7625_typec_mux_set(struct typec_mux_dev *mux, struct typec_mux_state *state) { + struct anx7625_port_data *data = typec_mux_get_drvdata(mux); + struct anx7625_data *ctx = data->ctx; + struct device *dev = &ctx->client->dev; + bool new_dp_connected, old_dp_connected; + + if (ctx->num_typec_switches == 1) + return 0; + + old_dp_connected = ctx->typec_ports[0].dp_connected || ctx->typec_ports[1].dp_connected; + + dev_dbg(dev, "mux_set dp_connected: c0=%d, c1=%d\n", + ctx->typec_ports[0].dp_connected, ctx->typec_ports[1].dp_connected); + + data->dp_connected = (state->alt && state->alt->svid == USB_TYPEC_DP_SID && + state->alt->mode == USB_TYPEC_DP_MODE); + + new_dp_connected = ctx->typec_ports[0].dp_connected || ctx->typec_ports[1].dp_connected; + + /* dp on, power on first */ + if (!old_dp_connected && new_dp_connected) + pm_runtime_get_sync(dev); + + anx7625_typec_two_ports_update(ctx); + + /* dp off, power off last */ + if (old_dp_connected && !new_dp_connected) + pm_runtime_put_sync(dev); + return 0; } diff --git a/drivers/gpu/drm/bridge/analogix/anx7625.h b/drivers/gpu/drm/bridge/analogix/anx7625.h index 76cfc64f7574..7d6c6fdf9a3a 100644 --- a/drivers/gpu/drm/bridge/analogix/anx7625.h +++ b/drivers/gpu/drm/bridge/analogix/anx7625.h @@ -55,6 +55,18 @@ #define HPD_STATUS_CHANGE 0x80 #define HPD_STATUS 0x80 +#define TCPC_SWITCH_0 0xB4 +#define SW_SEL1_DPTX0_RX2 BIT(0) +#define SW_SEL1_DPTX0_RX1 BIT(1) +#define SW_SEL1_SSRX_RX2 BIT(4) +#define SW_SEL1_SSRX_RX1 BIT(5) + +#define TCPC_SWITCH_1 0xB5 +#define SW_SEL2_DPTX1_TX2 BIT(0) +#define SW_SEL2_DPTX1_TX1 BIT(1) +#define SW_SEL2_SSTX_TX2 BIT(4) +#define SW_SEL2_SSTX_TX1 BIT(5) + /******** END of I2C Address 0x58 ********/ /***************************************************************/ @@ -444,6 +456,7 @@ struct anx7625_i2c_client { }; struct anx7625_port_data { + bool dp_connected; struct typec_mux_dev *typec_mux; struct anx7625_data *ctx; }; -- 2.36.1.476.g0c4daa206d-goog
WARNING: multiple messages have this Message-ID (diff)
From: Prashant Malani <pmalani@chromium.org> To: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org Cc: heikki.krogerus@linux.intel.com, "Andrzej Hajda" <andrzej.hajda@intel.com>, "Neil Armstrong" <narmstrong@baylibre.com>, "David Airlie" <airlied@linux.ie>, "open list:DRM DRIVERS" <dri-devel@lists.freedesktop.org>, "Laurent Pinchart" <Laurent.pinchart@ideasonboard.com>, "Krzysztof Kozlowski" <krzysztof.kozlowski+dt@linaro.org>, "Sam Ravnborg" <sam@ravnborg.org>, "Jernej Skrabec" <jernej.skrabec@gmail.com>, "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" <devicetree@vger.kernel.org>, "Thomas Zimmermann" <tzimmermann@suse.de>, "Nícolas F . R . A . Prado" <nfraprado@collabora.com>, "Jonas Karlman" <jonas@kwiboo.se>, swboyd@chromium.org, "Pin-Yen Lin" <treapking@chromium.org>, "Rob Herring" <robh+dt@kernel.org>, "Maxime Ripard" <maxime@cerno.tech>, "Hsin-Yi Wang" <hsinyi@chromium.org>, "Xin Ji" <xji@analogixsemi.com>, "AngeloGioacchino Del Regno" <angelogioacchino.delregno@collabora.com>, "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>, "Robert Foss" <robert.foss@linaro.org>, "Prashant Malani" <pmalani@chromium.org>, "José Expósito" <jose.exposito89@gmail.com> Subject: [PATCH v4 7/7] drm/bridge: anx7625: Add typec_mux_set callback function Date: Wed, 15 Jun 2022 17:20:23 +0000 [thread overview] Message-ID: <20220615172129.1314056-8-pmalani@chromium.org> (raw) In-Reply-To: <20220615172129.1314056-1-pmalani@chromium.org> From: Pin-Yen Lin <treapking@chromium.org> Add the callback function when the driver receives state changes of the Type-C port. The callback function configures the crosspoint switch of the anx7625 bridge chip, which can change the output pins of the signals according to the port state. Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Reviewed-by: Nícolas F. R. A. Prado <nfraprado@collabora.com> Tested-by: Nícolas F. R. A. Prado <nfraprado@collabora.com> Signed-off-by: Pin-Yen Lin <treapking@chromium.org> Signed-off-by: Prashant Malani <pmalani@chromium.org> --- Changes since v3: - Added Reviewed-by tag from Angelo. Changes since v2: - Moved num_typec_switches check to beginning of function - Made dp_connected assignments fit on one line (and removed unnecessary parentheses) - Added Reviewed-by and Tested-by tags. Changes since v1: - No changes. drivers/gpu/drm/bridge/analogix/anx7625.c | 56 +++++++++++++++++++++++ drivers/gpu/drm/bridge/analogix/anx7625.h | 13 ++++++ 2 files changed, 69 insertions(+) diff --git a/drivers/gpu/drm/bridge/analogix/anx7625.c b/drivers/gpu/drm/bridge/analogix/anx7625.c index bd21f159b973..5992fc8beeeb 100644 --- a/drivers/gpu/drm/bridge/analogix/anx7625.c +++ b/drivers/gpu/drm/bridge/analogix/anx7625.c @@ -15,6 +15,7 @@ #include <linux/regulator/consumer.h> #include <linux/slab.h> #include <linux/types.h> +#include <linux/usb/typec_dp.h> #include <linux/usb/typec_mux.h> #include <linux/workqueue.h> @@ -2582,9 +2583,64 @@ static void anx7625_runtime_disable(void *data) pm_runtime_disable(data); } +static void anx7625_set_crosspoint_switch(struct anx7625_data *ctx, + enum typec_orientation orientation) +{ + if (orientation == TYPEC_ORIENTATION_NORMAL) { + anx7625_reg_write(ctx, ctx->i2c.tcpc_client, TCPC_SWITCH_0, + SW_SEL1_SSRX_RX1 | SW_SEL1_DPTX0_RX2); + anx7625_reg_write(ctx, ctx->i2c.tcpc_client, TCPC_SWITCH_1, + SW_SEL2_SSTX_TX1 | SW_SEL2_DPTX1_TX2); + } else if (orientation == TYPEC_ORIENTATION_REVERSE) { + anx7625_reg_write(ctx, ctx->i2c.tcpc_client, TCPC_SWITCH_0, + SW_SEL1_SSRX_RX2 | SW_SEL1_DPTX0_RX1); + anx7625_reg_write(ctx, ctx->i2c.tcpc_client, TCPC_SWITCH_1, + SW_SEL2_SSTX_TX2 | SW_SEL2_DPTX1_TX1); + } +} + +static void anx7625_typec_two_ports_update(struct anx7625_data *ctx) +{ + if (ctx->typec_ports[0].dp_connected && ctx->typec_ports[1].dp_connected) + /* Both ports available, do nothing to retain the current one. */ + return; + else if (ctx->typec_ports[0].dp_connected) + anx7625_set_crosspoint_switch(ctx, TYPEC_ORIENTATION_NORMAL); + else if (ctx->typec_ports[1].dp_connected) + anx7625_set_crosspoint_switch(ctx, TYPEC_ORIENTATION_REVERSE); +} + static int anx7625_typec_mux_set(struct typec_mux_dev *mux, struct typec_mux_state *state) { + struct anx7625_port_data *data = typec_mux_get_drvdata(mux); + struct anx7625_data *ctx = data->ctx; + struct device *dev = &ctx->client->dev; + bool new_dp_connected, old_dp_connected; + + if (ctx->num_typec_switches == 1) + return 0; + + old_dp_connected = ctx->typec_ports[0].dp_connected || ctx->typec_ports[1].dp_connected; + + dev_dbg(dev, "mux_set dp_connected: c0=%d, c1=%d\n", + ctx->typec_ports[0].dp_connected, ctx->typec_ports[1].dp_connected); + + data->dp_connected = (state->alt && state->alt->svid == USB_TYPEC_DP_SID && + state->alt->mode == USB_TYPEC_DP_MODE); + + new_dp_connected = ctx->typec_ports[0].dp_connected || ctx->typec_ports[1].dp_connected; + + /* dp on, power on first */ + if (!old_dp_connected && new_dp_connected) + pm_runtime_get_sync(dev); + + anx7625_typec_two_ports_update(ctx); + + /* dp off, power off last */ + if (old_dp_connected && !new_dp_connected) + pm_runtime_put_sync(dev); + return 0; } diff --git a/drivers/gpu/drm/bridge/analogix/anx7625.h b/drivers/gpu/drm/bridge/analogix/anx7625.h index 76cfc64f7574..7d6c6fdf9a3a 100644 --- a/drivers/gpu/drm/bridge/analogix/anx7625.h +++ b/drivers/gpu/drm/bridge/analogix/anx7625.h @@ -55,6 +55,18 @@ #define HPD_STATUS_CHANGE 0x80 #define HPD_STATUS 0x80 +#define TCPC_SWITCH_0 0xB4 +#define SW_SEL1_DPTX0_RX2 BIT(0) +#define SW_SEL1_DPTX0_RX1 BIT(1) +#define SW_SEL1_SSRX_RX2 BIT(4) +#define SW_SEL1_SSRX_RX1 BIT(5) + +#define TCPC_SWITCH_1 0xB5 +#define SW_SEL2_DPTX1_TX2 BIT(0) +#define SW_SEL2_DPTX1_TX1 BIT(1) +#define SW_SEL2_SSTX_TX2 BIT(4) +#define SW_SEL2_SSTX_TX1 BIT(5) + /******** END of I2C Address 0x58 ********/ /***************************************************************/ @@ -444,6 +456,7 @@ struct anx7625_i2c_client { }; struct anx7625_port_data { + bool dp_connected; struct typec_mux_dev *typec_mux; struct anx7625_data *ctx; }; -- 2.36.1.476.g0c4daa206d-goog
next prev parent reply other threads:[~2022-06-15 17:32 UTC|newest] Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-06-15 17:20 [PATCH v4 0/7] usb: typec: Introduce typec-switch binding Prashant Malani 2022-06-15 17:20 ` Prashant Malani 2022-06-15 17:20 ` [PATCH v4 1/7] usb: typec: mux: Allow muxes to specify mode-switch Prashant Malani 2022-06-15 17:20 ` Prashant Malani 2022-06-15 17:20 ` [PATCH v4 2/7] usb: typec: mux: Add CONFIG guards for functions Prashant Malani 2022-06-15 17:20 ` Prashant Malani 2022-06-16 6:22 ` Heikki Krogerus 2022-06-16 6:22 ` Heikki Krogerus 2022-06-15 17:20 ` [PATCH v4 3/7] dt-bindings: usb: Add Type-C switch binding Prashant Malani 2022-06-15 17:20 ` Prashant Malani 2022-06-22 14:52 ` Krzysztof Kozlowski 2022-06-22 14:52 ` Krzysztof Kozlowski 2022-06-15 17:20 ` [PATCH v4 4/7] dt-bindings: drm/bridge: anx7625: Add mode-switch support Prashant Malani 2022-06-15 17:20 ` Prashant Malani 2022-06-15 17:51 ` Krzysztof Kozlowski 2022-06-15 17:51 ` Krzysztof Kozlowski 2022-06-16 7:42 ` Stephen Boyd 2022-06-16 7:42 ` Stephen Boyd 2022-06-16 8:54 ` Prashant Malani 2022-06-16 8:54 ` Prashant Malani 2022-06-16 19:34 ` Rob Herring 2022-06-16 19:34 ` Rob Herring 2022-06-16 19:57 ` Prashant Malani 2022-06-16 19:57 ` Prashant Malani 2022-06-21 21:12 ` Prashant Malani 2022-06-21 21:12 ` Prashant Malani 2022-06-15 17:20 ` [PATCH v4 5/7] drm/bridge: anx7625: Register number of Type C switches Prashant Malani 2022-06-15 17:20 ` Prashant Malani 2022-06-15 17:20 ` [PATCH v4 6/7] drm/bridge: anx7625: Register Type-C mode switches Prashant Malani 2022-06-15 17:20 ` Prashant Malani 2022-06-15 17:20 ` Prashant Malani [this message] 2022-06-15 17:20 ` [PATCH v4 7/7] drm/bridge: anx7625: Add typec_mux_set callback function Prashant Malani 2022-06-15 18:13 ` [PATCH v4 0/7] usb: typec: Introduce typec-switch binding Prashant Malani 2022-06-15 18:13 ` Prashant Malani 2022-06-21 13:17 ` Greg Kroah-Hartman 2022-06-21 13:17 ` Greg Kroah-Hartman 2022-06-22 14:53 ` Krzysztof Kozlowski 2022-06-22 14:53 ` Krzysztof Kozlowski 2022-06-22 15:11 ` Greg Kroah-Hartman 2022-06-22 15:11 ` Greg Kroah-Hartman 2022-06-22 17:52 ` Prashant Malani 2022-06-22 17:52 ` Prashant Malani 2022-06-16 8:55 ` AngeloGioacchino Del Regno 2022-06-16 8:55 ` AngeloGioacchino Del Regno
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220615172129.1314056-8-pmalani@chromium.org \ --to=pmalani@chromium.org \ --cc=Laurent.pinchart@ideasonboard.com \ --cc=airlied@linux.ie \ --cc=andrzej.hajda@intel.com \ --cc=angelogioacchino.delregno@collabora.com \ --cc=bleung@chromium.org \ --cc=daniel@ffwll.ch \ --cc=devicetree@vger.kernel.org \ --cc=dri-devel@lists.freedesktop.org \ --cc=gregkh@linuxfoundation.org \ --cc=heikki.krogerus@linux.intel.com \ --cc=hsinyi@chromium.org \ --cc=jernej.skrabec@gmail.com \ --cc=jonas@kwiboo.se \ --cc=jose.exposito89@gmail.com \ --cc=krzysztof.kozlowski+dt@linaro.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-usb@vger.kernel.org \ --cc=maxime@cerno.tech \ --cc=narmstrong@baylibre.com \ --cc=nfraprado@collabora.com \ --cc=robert.foss@linaro.org \ --cc=robh+dt@kernel.org \ --cc=sam@ravnborg.org \ --cc=swboyd@chromium.org \ --cc=treapking@chromium.org \ --cc=tzimmermann@suse.de \ --cc=xji@analogixsemi.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.