From nobody Sun Oct 5 14:38:37 2025 Received: from inva021.nxp.com (inva021.nxp.com [92.121.34.21]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8196B1F1527; Mon, 4 Aug 2025 02:14:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=92.121.34.21 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754273652; cv=none; b=KsieDCxCDCzkseJYOq9n8kewJHILftLvq6Z0KzNl8YzsRo0m7anHb7VRmtTL49tEFOsVxkN1plKXUbv8P04TloUAaPyrgvnkUd+D6YcIshDs+fhCgvt8WQs3TFSxlcqYtrzQ5f44eXEtMH8Uphow4plvJ13FdMHOIfaJCwVEsTw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754273652; c=relaxed/simple; bh=v4Qtuw0iQCGaRh9wXepraWYmf0E+O5vuzs/bBBqvwyM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=RWf6VPkhlPMf9uHHOWZSwBGAeP1A7cdje2jdooKp+LLOh9Ueo1CpSibcCPb+ERYNJkr+eSPz2lX0fANn23YWIeyWqTkTuN2RBAJYngUxPYTHIDRFb9qumQqKUAexXuEF/74hyZhZWO1BKNXKHta3kj0bCD+ztCBrGeYcWP7bEwI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; arc=none smtp.client-ip=92.121.34.21 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Received: from inva021.nxp.com (localhost [127.0.0.1]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id DC52420036B; Mon, 4 Aug 2025 04:08:06 +0200 (CEST) Received: from aprdc01srsp001v.ap-rdc01.nxp.com (aprdc01srsp001v.ap-rdc01.nxp.com [165.114.16.16]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 9DF26200349; Mon, 4 Aug 2025 04:08:06 +0200 (CEST) Received: from lsvm11u0000395.swis.ap-northeast-2.aws.nxp.com (lsvm11u0000395.swis.ap-northeast-2.aws.nxp.com [10.52.9.99]) by aprdc01srsp001v.ap-rdc01.nxp.com (Postfix) with ESMTP id 3C4B5180023F; Mon, 4 Aug 2025 10:08:04 +0800 (+08) From: Joseph Guo Date: Mon, 04 Aug 2025 11:07:42 +0900 Subject: [PATCH v2 3/3] drm: bridge: Add waveshare DSI2DPI unit driver Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250804-waveshare-v2-3-0a1b3ce92a95@nxp.com> References: <20250804-waveshare-v2-0-0a1b3ce92a95@nxp.com> In-Reply-To: <20250804-waveshare-v2-0-0a1b3ce92a95@nxp.com> To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jessica Zhang , Thierry Reding , Sam Ravnborg Cc: dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, victor.liu@nxp.com, Joseph Guo X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1754273277; l=7757; i=qijian.guo@nxp.com; s=20250519; h=from:subject:message-id; bh=v4Qtuw0iQCGaRh9wXepraWYmf0E+O5vuzs/bBBqvwyM=; b=vHVh/efFmKg8q0f59H0/OHJ4RpnTc3nG5nOBTQBqbt+GhOLG5eOlywavMTtl1W8dK/sxAjMXf oJpVK8o1auEBRLTtf7UQDLvaGyHWf6LLRq6eRUj87adZOeBATLXpRnq X-Developer-Key: i=qijian.guo@nxp.com; a=ed25519; pk=VRjOOFhVecTRwBzK4mt/k3JBnHoYfuXKCm9FM+hHQhs= X-Virus-Scanned: ClamAV using ClamSMTP Waveshare touchscreen consists of a DPI panel and a driver board. The waveshare driver board consists of ICN6211 and a MCU to convert DSI to DPI and control the backlight. This driver treats the MCU and ICN6211 board as a whole unit. It can support all resolution waveshare DSI2DPI based panel, the timing table should come from 'panel-dpi' panel in the device tree. Signed-off-by: Joseph Guo Reviewed-by: Neil Armstrong Suggested-by: Liu Ying --- drivers/gpu/drm/bridge/Kconfig | 11 ++ drivers/gpu/drm/bridge/Makefile | 1 + drivers/gpu/drm/bridge/waveshare-dsi.c | 210 +++++++++++++++++++++++++++++= ++++ 3 files changed, 222 insertions(+) diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig index cb3b797fcea1c73e83c9187fef6582296b340305..26fec25c61ed7d950c094e0224f= 1196946079485 100644 --- a/drivers/gpu/drm/bridge/Kconfig +++ b/drivers/gpu/drm/bridge/Kconfig @@ -472,4 +472,15 @@ config DRM_ITE_IT6161 help ITE IT6161 bridge chip driver. =20 +config DRM_WAVESHARE_BRIDGE + tristate "Waveshare DSI bridge" + depends on OF + select DRM_PANEL_BRIDGE + select DRM_KMS_HELPER + select DRM_MIPI_DSI + select REGMAP_I2C + help + Driver for waveshare DSI to DPI bridge board. + Please say Y if you have such hardware + endmenu diff --git a/drivers/gpu/drm/bridge/Makefile b/drivers/gpu/drm/bridge/Makef= ile index d1db90688a150fdc3a5fd40acebe740798c452b0..3caa4d8f71675804328aa5a51ec= 67b2587938621 100644 --- a/drivers/gpu/drm/bridge/Makefile +++ b/drivers/gpu/drm/bridge/Makefile @@ -48,3 +48,4 @@ obj-$(CONFIG_DRM_ITE_IT6263) +=3D it6263.o obj-$(CONFIG_DRM_ITE_IT6161) +=3D it6161.o obj-$(CONFIG_DRM_SEC_MIPI_DSIM) +=3D sec-dsim.o obj-$(CONFIG_DRM_NXP_SEIKO_43WVFIG) +=3D nxp-seiko-43wvfig.o +obj-$(CONFIG_DRM_WAVESHARE_BRIDGE) +=3D waveshare-dsi.o diff --git a/drivers/gpu/drm/bridge/waveshare-dsi.c b/drivers/gpu/drm/bridg= e/waveshare-dsi.c new file mode 100644 index 0000000000000000000000000000000000000000..efb3a2fc501b5725b02f4986252= 6d1704a3a4b7b --- /dev/null +++ b/drivers/gpu/drm/bridge/waveshare-dsi.c @@ -0,0 +1,210 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright 2025 NXP + * Based on panel-raspberrypi-touchscreen by Broadcom + */ + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +struct ws_bridge { + struct drm_bridge bridge; + struct drm_bridge *next_bridge; + struct backlight_device *backlight; + struct device *dev; + struct regmap *reg_map; +}; + +static const struct regmap_config ws_regmap_config =3D { + .reg_bits =3D 8, + .val_bits =3D 8, + .max_register =3D 0xff, + .disable_debugfs =3D true, +}; + +static struct ws_bridge *bridge_to_ws_bridge(struct drm_bridge *bridge) +{ + return container_of(bridge, struct ws_bridge, bridge); +} + +static int ws_bridge_attach_dsi(struct ws_bridge *ws) +{ + struct device_node *dsi_host_node; + struct mipi_dsi_host *host; + struct mipi_dsi_device *dsi; + const struct mipi_dsi_device_info info =3D { + .type =3D "ws-bridge", + .channel =3D 0, + .node =3D NULL, + }; + struct device *dev =3D ws->dev; + int ret; + + dsi_host_node =3D of_graph_get_remote_node(dev->of_node, 0, 0); + if (!dsi_host_node) { + dev_err(dev, "Failed to get remote port\n"); + return -ENODEV; + } + + host =3D of_find_mipi_dsi_host_by_node(dsi_host_node); + + of_node_put(dsi_host_node); + if (!host) + return dev_err_probe(dev, -EPROBE_DEFER, "Failed to find dsi_host\n"); + + dsi =3D devm_mipi_dsi_device_register_full(dev, host, &info); + + if (IS_ERR(dsi)) + return dev_err_probe(dev, PTR_ERR(dsi), "Failed to create dsi device\n"); + + dsi->mode_flags =3D MIPI_DSI_MODE_VIDEO_HSE | MIPI_DSI_MODE_VIDEO | + MIPI_DSI_CLOCK_NON_CONTINUOUS; + dsi->format =3D MIPI_DSI_FMT_RGB888; + dsi->lanes =3D 2; + + ret =3D devm_mipi_dsi_attach(dev, dsi); + if (ret < 0) + return dev_err_probe(dev, ret, "Failed to attach dsi to host\n"); + + return 0; +} + +static int ws_bridge_bridge_attach(struct drm_bridge *bridge, + enum drm_bridge_attach_flags flags) +{ + struct ws_bridge *ws =3D bridge_to_ws_bridge(bridge); + int ret; + + ret =3D ws_bridge_attach_dsi(ws); + if (ret) + return ret; + + return drm_bridge_attach(ws->bridge.encoder, ws->next_bridge, + &ws->bridge, flags); +} + +static void ws_bridge_bridge_enable(struct drm_bridge *bridge) +{ + struct ws_bridge *ws =3D bridge_to_ws_bridge(bridge); + + regmap_write(ws->reg_map, 0xad, 0x01); + backlight_enable(ws->backlight); +} + +static void ws_bridge_bridge_disable(struct drm_bridge *bridge) +{ + struct ws_bridge *ws =3D bridge_to_ws_bridge(bridge); + + backlight_disable(ws->backlight); + regmap_write(ws->reg_map, 0xad, 0x00); +} + +static const struct drm_bridge_funcs ws_bridge_bridge_funcs =3D { + .enable =3D ws_bridge_bridge_enable, + .disable =3D ws_bridge_bridge_disable, + .attach =3D ws_bridge_bridge_attach, +}; + +static int ws_bridge_bl_update_status(struct backlight_device *bl) +{ + struct ws_bridge *ws =3D bl_get_data(bl); + + regmap_write(ws->reg_map, 0xab, 0xff - backlight_get_brightness(bl)); + regmap_write(ws->reg_map, 0xaa, 0x01); + + return 0; +} + +static const struct backlight_ops ws_bridge_bl_ops =3D { + .update_status =3D ws_bridge_bl_update_status, +}; + +static struct backlight_device *ws_bridge_create_backlight(struct ws_bridg= e *ws) +{ + struct device *dev =3D ws->dev; + const struct backlight_properties props =3D { + .type =3D BACKLIGHT_RAW, + .brightness =3D 255, + .max_brightness =3D 255, + }; + + return devm_backlight_device_register(dev, dev_name(dev), dev, ws, + &ws_bridge_bl_ops, &props); +} + +static int ws_bridge_probe(struct i2c_client *i2c) +{ + struct device *dev =3D &i2c->dev; + struct ws_bridge *ws; + struct drm_panel *panel; + int ret; + struct backlight_device *backlight; + + ws =3D devm_kzalloc(dev, sizeof(*ws), GFP_KERNEL); + if (!ws) + return -ENOMEM; + + ws->dev =3D dev; + + ws->reg_map =3D devm_regmap_init_i2c(i2c, &ws_regmap_config); + if (IS_ERR(ws->reg_map)) + return dev_err_probe(dev, PTR_ERR(ws->reg_map), "Failed to allocate regm= ap\n"); + + ret =3D drm_of_find_panel_or_bridge(dev->of_node, 1, -1, &panel, NULL); + if (ret) + return dev_err_probe(dev, ret, "Failed to find remote panel\n"); + + ws->next_bridge =3D devm_drm_panel_bridge_add(dev, panel); + if (IS_ERR(ws->next_bridge)) + return PTR_ERR(ws->next_bridge); + + ws->backlight =3D ws_bridge_create_backlight(ws); + if (IS_ERR(backlight)) { + ret =3D PTR_ERR(backlight); + dev_err(dev, "Failed to create backlight: %d\n", ret); + return ret; + } + + regmap_write(ws->reg_map, 0xc0, 0x01); + regmap_write(ws->reg_map, 0xc2, 0x01); + regmap_write(ws->reg_map, 0xac, 0x01); + + ws->bridge.funcs =3D &ws_bridge_bridge_funcs; + ws->bridge.type =3D DRM_MODE_CONNECTOR_DPI; + ws->bridge.of_node =3D dev->of_node; + devm_drm_bridge_add(dev, &ws->bridge); + + return 0; +} + +static const struct of_device_id ws_bridge_of_ids[] =3D { + {.compatible =3D "waveshare,dsi2dpi",}, + { } +}; + +MODULE_DEVICE_TABLE(of, ws_bridge_of_ids); + +static struct i2c_driver ws_bridge_driver =3D { + .driver =3D { + .name =3D "ws_dsi2dpi", + .of_match_table =3D ws_bridge_of_ids, + }, + .probe =3D ws_bridge_probe, +}; +module_i2c_driver(ws_bridge_driver); + +MODULE_AUTHOR("Joseph Guo "); +MODULE_DESCRIPTION("Waveshare DSI2DPI bridge driver"); +MODULE_LICENSE("GPL"); --=20 2.34.1