From nobody Fri Oct 3 07:42:25 2025 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0D0A228F948; Wed, 3 Sep 2025 16:17:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756916252; cv=none; b=R5781CaFF9DRxNZEQTv8ZNZZWKQuXgAbx3OaKqH4DNOf4xy+i6OskiYYylPrRQNrEqCBotHfSmGhoAY+L3CzmXjPib60XAdswAC+7PdF/FzcqxZwJ6MSAOPd0glu6jQ80vz9H8yQwKjKFDXGoNgDWLEHkGxkYK9smUolN2TDNhU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756916252; c=relaxed/simple; bh=FjSJsFmFmtQxgmj8+P+bZR5mX5R+vL/ZZpr6mTIkgGA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aeAWXUSkeiI9QELUW0KwDvbbOneIbVoTRlcloIZmaU3vXn1eQRSh+XjV1DAyCTpLb9bBDZphwGi5Xj66oxGiV5ixjF71ElzBYb+MTtg37hTpYgaQ7fLf46YMrpGIBSpExzDmAkGaoS/UBj96Fyn50B1buXMy+AqPknnu84NUk+o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=gjhvSAT9; arc=none smtp.client-ip=209.85.128.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gjhvSAT9" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-45b7c01a708so493455e9.3; Wed, 03 Sep 2025 09:17:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1756916248; x=1757521048; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=g/okqN9bKCpoU9t2/g49V1bui3QD4VMJiIMsCcD14P8=; b=gjhvSAT94OGwsDfPo06aYQtU2YF2sWu/isD/ESNYHRYctQZeBl3VNChH4RmBcjul72 BrXuXqMnsr5p7GZUjkEF5iVe1XKtbKNOGe+aAC7vJfMM4ig5r1s9NjpMDotx95Ni6cad 7E2Fz4M5HhpEXfc6YykQCQwkFQAd1cbF0uBdXneHv6kPlWcOJnedrJUiIJBxD+vUiHw2 OqcuRsaD0HzQ4LiTucLLgRq6EOhBwoAIULDLxKPVtdqoefjMvdoW3vukaYnsV2MWPdJP qhTui2c2GvhmMD+xmyLGSd3TVl8odCihWKxbX8H7ePexGLCurtHoIOo2nlvPeKysxyaq yFuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756916248; x=1757521048; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=g/okqN9bKCpoU9t2/g49V1bui3QD4VMJiIMsCcD14P8=; b=nbHseJEDpeIzecGGVorY1TOv1TMl88Chz4eKwwfDI+Y6FunCnK01zXS1UyMFUx49pM bIII3th7ARerodG6yhuJnUsyk4SU8wsy9RfkKTMlrSl3JXHGO189O4+3xuQFuwfVgcee WCYKtc/RAVv+Y8Mk+a8D1RedvvOvAi0E/N7zKxeUUYxCZaclV9t8aLoDeisBhOmLQ8dk 70rwk7RrpbMu0BcraDgM5GdHcdrRlcvFkmDASsd2yLgV+I8QCuSmB39hppyuoRWDbD5w ziKON2sHvM0wO3Pwotm1WQG/GtX945MThRl9MEVaj8epUMX7x5yCJAgLC15XJsEiAeIw QJIQ== X-Forwarded-Encrypted: i=1; AJvYcCVXiLcDxxbdShEqAndT6ZKcs8/gLdYUe1RO61gNfetnXIiwi78Z6IJdFz5+66nxxWDjg1tFTZXEXx8Q@vger.kernel.org, AJvYcCW7NU0jgxIVO1fymoruiPbtOoxOxWu+NIxbCwxQMWRQFRCd/eWfYyMEFUJAkE4Ad/dZuwsGZoYauQpTWtoh@vger.kernel.org, AJvYcCW8mkbzZLQ0C0Ojnitae1/yhCI+lJ7agtcnzHUjUXPnLzNxqAPT6iT5eu/0sWuIz83Rt9gFCdJZbaCd9Xo17GnXQdk=@vger.kernel.org, AJvYcCXTsEyiMCTRkrWq0CY6QWG1CMeRIkpOVLTX0/hWrND65XQQNVoIxyKnBZ1spY9pAT3pvYugi34KuqZn@vger.kernel.org X-Gm-Message-State: AOJu0Yxhw2x9r5VDr/vGJWTN8xIkI24rpGH7GR9TOMHg/T47NCF3+kWm LPcqKN323/v0JcgTfnMdvWZls3THmw55hPo2cjqstgANkVoav5scsnCw X-Gm-Gg: ASbGncuXME1cpjs+NgTpTowXAxN8WW/fuKQeuhH3agxigpBqUi5SbTqEfII8YeBAzG6 QoNmKG+AC9zV+tBk4OnoTkeCPsT8NL3qTu2nfYHVLUqeQFTLEWSCfqYOpEB34XulVicoPN/LnwJ rk+vdKfc3p0OdqW3zLCRTov/myOuRHmzEPjj1584KOYzltOdvyLDblEVd5jhLav03e4FoOl2szx dI67ReC1rfVKAHD8rgumtWpw/qwB4gRdiMTTo6g42fgl0Xyib8o+Vx7G+nYqvoDwAQ+ks+smNAe PdA1XzQyQSVhqtM59xft7RQl2zbd9FJdS6Jm4xBNsutBntHulKCFoePoaPBtpWQiZVtoXVUJNvl CpbkKry8ryvZ7oldPH5qYNItnqNWDCdlEyYmHvAi4VIFhfUFCXgttTUGK X-Google-Smtp-Source: AGHT+IG5fCsD9RpqHsN6fdU1xDs5FlEGumpRU6I9wG0qe9GQCj5TyawUM1xwIAow1pLMVJ+8FN259w== X-Received: by 2002:a05:6000:2486:b0:3de:b99d:d43 with SMTP id ffacd0b85a97d-3deb99d10camr2123919f8f.19.1756916248033; Wed, 03 Sep 2025 09:17:28 -0700 (PDT) Received: from iku.example.org ([2a06:5906:61b:2d00:9019:aa0f:b6e4:7952]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3db72983560sm5645734f8f.1.2025.09.03.09.17.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Sep 2025 09:17:27 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Tomi Valkeinen , Jonas Karlman , Jernej Skrabec , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Geert Uytterhoeven , Michael Turquette , Stephen Boyd , Biju Das , Magnus Damm Cc: dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-clk@vger.kernel.org, Prabhakar , Fabrizio Castro , Tommaso Merciai , Lad Prabhakar Subject: [PATCH v8 1/6] clk: renesas: rzv2h-cpg: Add instance field to struct pll Date: Wed, 3 Sep 2025 17:17:13 +0100 Message-ID: <20250903161718.180488-2-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250903161718.180488-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20250903161718.180488-1-prabhakar.mahadev-lad.rj@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Lad Prabhakar Add a two-bit "instance" member to struct pll and extend the PLL_PACK() macro to accept an instance parameter. Initialize all existing PLL definitions with instance 0 to preserve legacy behavior. This change enables support for SoCs with multiple PLL instances (for example, RZ/G3E we have two PLL DSIs). Signed-off-by: Lad Prabhakar Reviewed-by: Biju Das Reviewed-by: Geert Uytterhoeven --- v7->v8: - Added reviewed-by tags from Geert and Biju v6->v7: - New patch --- drivers/clk/renesas/rzv2h-cpg.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/clk/renesas/rzv2h-cpg.h b/drivers/clk/renesas/rzv2h-cp= g.h index 840eed25aeda..e2053049c299 100644 --- a/drivers/clk/renesas/rzv2h-cpg.h +++ b/drivers/clk/renesas/rzv2h-cpg.h @@ -16,20 +16,23 @@ * * @offset: STBY register offset * @has_clkn: Flag to indicate if CLK1/2 are accessible or not + * @instance: PLL instance number */ struct pll { unsigned int offset:9; unsigned int has_clkn:1; + unsigned int instance:2; }; =20 -#define PLL_PACK(_offset, _has_clkn) \ +#define PLL_PACK(_offset, _has_clkn, _instance) \ ((struct pll){ \ .offset =3D _offset, \ - .has_clkn =3D _has_clkn \ + .has_clkn =3D _has_clkn, \ + .instance =3D _instance \ }) =20 -#define PLLCA55 PLL_PACK(0x60, 1) -#define PLLGPU PLL_PACK(0x120, 1) +#define PLLCA55 PLL_PACK(0x60, 1, 0) +#define PLLGPU PLL_PACK(0x120, 1, 0) =20 /** * struct ddiv - Structure for dynamic switching divider --=20 2.51.0 From nobody Fri Oct 3 07:42:25 2025 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 746522C027C; Wed, 3 Sep 2025 16:17:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756916254; cv=none; b=Au5FoWGSIjIkJanqfNRF6fthwq6AmBOYTHlIaf7a7geNBo6e7hvn00egpaQ7DbSExJMWzZWmH+455PHr7EQvASV+ibMnjDeIMQqdn4Kmmi5QeCGTfKe2RGOq8TF396Z1IEAi00Cp0IkBf+l2Icw/yXJm6tPyIOKy6kIhOFPVd0k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756916254; c=relaxed/simple; bh=QpBAoUwhqh0mn6YX3vS9g0MHeMTZ1dlOPqp613KKxt0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=edXnGcS9bfFuQ/EfwjqvZk12/mBV6rt8r+FJscEeGQbayNjH/Q99pGV314ax30fBs7nAHkJQQZWefsnxexnYN2MPQZcWFmMNEG9fRYRQ+hL4CJlKHeAaUWXzhHO2h3W7rETRlOQ5cJ0zbPIx/I6qpuUW6ksEoTUdX0uEOBO+Hs0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=lYi2Pc47; arc=none smtp.client-ip=209.85.221.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lYi2Pc47" Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-3ceb9c3d98cso81476f8f.0; Wed, 03 Sep 2025 09:17:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1756916250; x=1757521050; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1erzqLrIcVJE+SzfSh1SX2vSSBF2D3fHVYjgLIafMLg=; b=lYi2Pc47rp/W4CZEMYyTFhz74h/4Js6LXo692p+//U2nHHhCQPdGIKM1bVzFVGckvs pnOTWa51Mif4ytGsj7S7nIuSNgn9zcvv138VRQrZI1c/efq3pxJRyCupzt3hlm5MAVN1 zBzb5JrHC18JNH1HfzzL0KmxADwGpMKIbrvvxAGQW6DqzkJuB/SffPR22mJykBhpPjsC 3QVPsDhlBay4KV0hhFu0MNKrWCDV9jJ0iy1tEd/ISQVfmQnw+TevXJulvabJNcha4t2O DVixeiAmJtdR21JPaAsew/qBkWrdXYcVRhRioewdeIHccsz8QXOvKhIf8OwQ+W66SaTE 9HoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756916250; x=1757521050; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1erzqLrIcVJE+SzfSh1SX2vSSBF2D3fHVYjgLIafMLg=; b=tTvuFtO5xlNCxOQnM0YU/7xrtaCBXrLtzIoOHRGLxA0zLS1Ins+pT3JTPyGZREBvFl Lnhgqq8gPjzPpTn/Tnq77zgBvS2Sg77Hwzb12GNgkSue/hDY/PvPZaBZaXmY9ecS+zCJ i0+pHJP537cmuAJrwGXp/8EnnMw5E4RNM/eiHUwOXTG7xYDzMtc3I+0Xvc+mDXXfwJX6 DSu80mWjymF6tDsVS7jSVEK1k4TCRFjn1cYIsHuGgK/Nmt7/2xoe78uA4G6yiKdn2kfV QPA59Yzn8Ei4yCoEhSxflOv1zAwGBvDqtdIpRtMbNQpJOlEH5XOdk1779Fd/eW10GS03 /OPA== X-Forwarded-Encrypted: i=1; AJvYcCUa9J97NVo+uCS+pLBrF8ZDYLPA8bRuDEOgu1y2c6Yn8znzQTJLJJitL6LzYqkwYGCXUgZkt5sSyozcmArW@vger.kernel.org, AJvYcCUzsVaVz0GG1RJgesa2IhnkabhvIMwShM1tIHVKtKEjba21zrUmi0593BKRn6m5k5O9cSHHNW16pofD@vger.kernel.org, AJvYcCVW8t6tsvnQvmJ1n262fkvM+RFfWyqMsN0w3jUMLcHuNwx3QWrYG+/ARPBCEr7gynXKA3lty2aHZbAw@vger.kernel.org, AJvYcCX+03pVdc2Mj5CkBMKkL1zlZzN9Dmrmk1M2yOXB1g4V5I+XjNHoPq8rO+q8pgke89grqpNA5qjcv+lyI0uq+w/G3To=@vger.kernel.org X-Gm-Message-State: AOJu0YzEJIaEYREN8UxMfT7o5p08mE1T960TfqxgazNwnimIQlHCSteS ROp8sGDX42B7EdWaXaP/HWQrP6M3zTmHOQLQ5jJb2FQFa1A6FwU+1YDW X-Gm-Gg: ASbGncvzQo6bPCOFPolp9+wS5PGrVmwBvwK7eAVOFIYfZxZ4XW8ojHsU35yVL6/gZBU Dzzhw7PszsXe+zfG4RwQ4zUBLosz2BRH++rTlxIvVxbrr8WFL28d3SRevFBU8JgsY6uRYEqMnIw l+WHY5q2ski8M459srRdkgDBZcrbEREt6nfnlES1pzaDR8hdcdOUKjQpW1MUOWbeHl5xCH9oNq/ NxUsvJF4dMAWsDviszREBvFv3vi9S1qcTJ6m7SxlYvbNxPsc967aIAunZ+fmgdVv/SvCDHXoa+e RD0iXjYOWx/qhap3qj4Kma8GIDY1PHopYJhZ8MCbE6mImVC/5uJlwAIx2WHgVVUM9wBh7tvY0NZ M4+YRs0WnvDuQBKFhNXQGsnohiJnLieJ9ORHLYprw7a6aGXwkqNFtmYqb/7Q4a1Z/RWXNvUPLjC s+qA== X-Google-Smtp-Source: AGHT+IECRk9YouQwcZOlbNJOHZXyB5R3pAS0LhRypxgeZirs7sNk0nUFyegpy0yhVOX7LQ9NCnhOsw== X-Received: by 2002:a05:6000:2207:b0:3dc:f2f:d5de with SMTP id ffacd0b85a97d-3dc0f2fda44mr3008672f8f.49.1756916249309; Wed, 03 Sep 2025 09:17:29 -0700 (PDT) Received: from iku.example.org ([2a06:5906:61b:2d00:9019:aa0f:b6e4:7952]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3db72983560sm5645734f8f.1.2025.09.03.09.17.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Sep 2025 09:17:28 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Tomi Valkeinen , Jonas Karlman , Jernej Skrabec , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Geert Uytterhoeven , Michael Turquette , Stephen Boyd , Biju Das , Magnus Damm Cc: dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-clk@vger.kernel.org, Prabhakar , Fabrizio Castro , Tommaso Merciai , Lad Prabhakar Subject: [PATCH v8 2/6] clk: renesas: rzv2h-cpg: Add support for DSI clocks Date: Wed, 3 Sep 2025 17:17:14 +0100 Message-ID: <20250903161718.180488-3-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250903161718.180488-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20250903161718.180488-1-prabhakar.mahadev-lad.rj@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Lad Prabhakar Add support for PLLDSI and PLLDSI divider clocks. Introduce the `renesas-rzv2h-cpg-pll.h` header to centralize and share PLLDSI related data structures, limits, and algorithms between the RZ/V2H(P) CPG and DSI drivers. The DSI PLL is functionally similar to the CPG's PLLDSI, but has slightly different parameter limits and omits the programmable divider present in CPG. To ensure precise frequency calculations, especially for milliHz-level accuracy needed by the DSI driver, the shared algorithm allows both drivers to compute PLL parameters consistently using the same logic and input clock. Co-developed-by: Fabrizio Castro Signed-off-by: Fabrizio Castro Signed-off-by: Lad Prabhakar Reviewed-by: Biju Das Reviewed-by: Geert Uytterhoeven --- v7->v8: - Dropped rzv2h_get_pll_dsi_info() helper and opencoded instead. - Dropped is_plldsi parameter from rzv2h_cpg_pll_clk_register() v6->v7: - Made struct rzv2h_pll_limits more modular also added Ffout limits - Made the alogirithm modular and also added apis based on the needs for lvds and dpi v5->v6: - Renamed CPG_PLL_STBY_SSCGEN_WEN to CPG_PLL_STBY_SSC_EN_WEN - Updated CPG_PLL_CLK1_DIV_K, CPG_PLL_CLK1_DIV_M, and CPG_PLL_CLK1_DIV_P macros to use GENMASK - Updated req->rate in rzv2h_cpg_plldsi_div_determine_rate() - Dropped the cast in rzv2h_cpg_plldsi_div_set_rate() - Dropped rzv2h_cpg_plldsi_round_rate() and implemented rzv2h_cpg_plldsi_determine_rate() instead - Made use of FIELD_PREP() - Moved CPG_CSDIV1 macro in patch 2/4 - Dropped two_pow_s in rzv2h_dsi_get_pll_parameters_values() - Used mul_u32_u32() while calculating output_m and output_k_range - Used div_s64() instead of div64_s64() while calculating pll_k - Used mul_u32_u32() while calculating fvco and fvco checks - Rounded the final output using DIV_U64_ROUND_CLOSEST() v4->v5: - No changes v3->v4: - Corrected parameter name in rzv2h_dsi_get_pll_parameters_values() description freq_millihz v2->v3: - Update the commit message to clarify the purpose of `renesas-rzv2h-dsi.h` header - Used mul_u32_u32() in rzv2h_cpg_plldsi_div_determine_rate() - Replaced *_mhz to *_millihz for clarity - Updated u64->u32 for fvco limits - Initialized the members in declaration order for RZV2H_CPG_PLL_DSI_LIMITS() macro - Used clk_div_mask() in rzv2h_cpg_plldsi_div_recalc_rate() - Replaced `unsigned long long` with u64 - Dropped rzv2h_cpg_plldsi_clk_recalc_rate() and reused rzv2h_cpg_pll_clk_recalc_rate() instead - In rzv2h_cpg_plldsi_div_set_rate() followed the same style of RMW-operation as done in the other functions - Renamed rzv2h_cpg_plldsi_set_rate() to rzv2h_cpg_pll_set_rate() - Dropped rzv2h_cpg_plldsi_clk_register() and reused rzv2h_cpg_pll_clk_register() instead - Added a gaurd in renesas-rzv2h-dsi.h header v1->v2: - No changes --- drivers/clk/renesas/rzv2h-cpg.c | 298 +++++++++++++++- drivers/clk/renesas/rzv2h-cpg.h | 19 +- include/linux/clk/renesas-rzv2h-cpg-pll.h | 395 ++++++++++++++++++++++ 3 files changed, 703 insertions(+), 9 deletions(-) create mode 100644 include/linux/clk/renesas-rzv2h-cpg-pll.h diff --git a/drivers/clk/renesas/rzv2h-cpg.c b/drivers/clk/renesas/rzv2h-cp= g.c index 58ccbae0f904..4e12d706b8f3 100644 --- a/drivers/clk/renesas/rzv2h-cpg.c +++ b/drivers/clk/renesas/rzv2h-cpg.c @@ -14,9 +14,13 @@ #include #include #include +#include #include #include #include +#include +#include +#include #include #include #include @@ -26,6 +30,7 @@ #include #include #include +#include =20 #include =20 @@ -47,13 +52,15 @@ =20 #define CPG_PLL_STBY(x) ((x)) #define CPG_PLL_STBY_RESETB BIT(0) +#define CPG_PLL_STBY_SSC_EN BIT(2) #define CPG_PLL_STBY_RESETB_WEN BIT(16) +#define CPG_PLL_STBY_SSC_EN_WEN BIT(18) #define CPG_PLL_CLK1(x) ((x) + 0x004) -#define CPG_PLL_CLK1_KDIV(x) ((s16)FIELD_GET(GENMASK(31, 16), (x))) -#define CPG_PLL_CLK1_MDIV(x) FIELD_GET(GENMASK(15, 6), (x)) -#define CPG_PLL_CLK1_PDIV(x) FIELD_GET(GENMASK(5, 0), (x)) +#define CPG_PLL_CLK1_KDIV GENMASK(31, 16) +#define CPG_PLL_CLK1_MDIV GENMASK(15, 6) +#define CPG_PLL_CLK1_PDIV GENMASK(5, 0) #define CPG_PLL_CLK2(x) ((x) + 0x008) -#define CPG_PLL_CLK2_SDIV(x) FIELD_GET(GENMASK(2, 0), (x)) +#define CPG_PLL_CLK2_SDIV GENMASK(2, 0) #define CPG_PLL_MON(x) ((x) + 0x010) #define CPG_PLL_MON_RESETB BIT(0) #define CPG_PLL_MON_LOCK BIT(4) @@ -65,6 +72,22 @@ =20 #define CPG_CLKSTATUS0 (0x700) =20 +/* On RZ/G3E SoC we have two DSI PLLs */ +#define MAX_CPG_DSI_PLL 2 + +/** + * struct rzv2h_pll_dsi_info - PLL DSI information, holds the limits and p= arameters + * + * @pll_dsi_limits: PLL DSI parameters limits + * @pll_dsi_parameters: Calculated PLL DSI parameters + * @req_pll_dsi_rate: Requested PLL DSI rate + */ +struct rzv2h_pll_dsi_info { + const struct rzv2h_pll_limits *pll_dsi_limits; + struct rzv2h_pll_div_pars pll_dsi_parameters; + unsigned long req_pll_dsi_rate; +}; + /** * struct rzv2h_cpg_priv - Clock Pulse Generator Private Data * @@ -80,6 +103,7 @@ * @ff_mod_status_ops: Fixed Factor Module Status Clock operations * @mstop_count: Array of mstop values * @rcdev: Reset controller entity + * @pll_dsi_info: Array of PLL DSI information, holds the limits and param= eters */ struct rzv2h_cpg_priv { struct device *dev; @@ -98,6 +122,8 @@ struct rzv2h_cpg_priv { atomic_t *mstop_count; =20 struct reset_controller_dev rcdev; + + struct rzv2h_pll_dsi_info pll_dsi_info[MAX_CPG_DSI_PLL]; }; =20 #define rcdev_to_priv(x) container_of(x, struct rzv2h_cpg_priv, rcdev) @@ -168,6 +194,247 @@ struct rzv2h_ff_mod_status_clk { #define to_rzv2h_ff_mod_status_clk(_hw) \ container_of(_hw, struct rzv2h_ff_mod_status_clk, fix.hw) =20 +/** + * struct rzv2h_plldsi_div_clk - PLL DSI DDIV clock + * + * @dtable: divider table + * @priv: CPG private data + * @hw: divider clk + * @ddiv: divider configuration + */ +struct rzv2h_plldsi_div_clk { + const struct clk_div_table *dtable; + struct rzv2h_cpg_priv *priv; + struct clk_hw hw; + struct ddiv ddiv; +}; + +#define to_plldsi_div_clk(_hw) \ + container_of(_hw, struct rzv2h_plldsi_div_clk, hw) + +static unsigned long rzv2h_cpg_plldsi_div_recalc_rate(struct clk_hw *hw, + unsigned long parent_rate) +{ + struct rzv2h_plldsi_div_clk *dsi_div =3D to_plldsi_div_clk(hw); + struct rzv2h_cpg_priv *priv =3D dsi_div->priv; + struct ddiv ddiv =3D dsi_div->ddiv; + u32 div; + + div =3D readl(priv->base + ddiv.offset); + div >>=3D ddiv.shift; + div &=3D clk_div_mask(ddiv.width); + div =3D dsi_div->dtable[div].div; + + return DIV_ROUND_CLOSEST_ULL(parent_rate, div); +} + +static int rzv2h_cpg_plldsi_div_determine_rate(struct clk_hw *hw, + struct clk_rate_request *req) +{ + struct rzv2h_plldsi_div_clk *dsi_div =3D to_plldsi_div_clk(hw); + struct pll_clk *pll_clk =3D to_pll(clk_hw_get_parent(hw)); + struct rzv2h_cpg_priv *priv =3D dsi_div->priv; + struct rzv2h_pll_div_pars *dsi_params; + struct rzv2h_pll_dsi_info *dsi_info; + u64 rate_millihz; + + dsi_info =3D &priv->pll_dsi_info[pll_clk->pll.instance]; + dsi_params =3D &dsi_info->pll_dsi_parameters; + + rate_millihz =3D mul_u32_u32(req->rate, MILLI); + if (rate_millihz =3D=3D dsi_params->div.error_millihz + dsi_params->div.f= req_millihz) + goto exit_determine_rate; + + if (!rzv2h_get_pll_dtable_pars(dsi_info->pll_dsi_limits, dsi_params, dsi_= div->dtable, + rate_millihz)) { + dev_err(priv->dev, + "failed to determine rate for req->rate: %lu\n", + req->rate); + return -EINVAL; + } + +exit_determine_rate: + req->rate =3D DIV_ROUND_CLOSEST_ULL(dsi_params->div.freq_millihz, MILLI); + req->best_parent_rate =3D req->rate * dsi_params->div.divider_value; + dsi_info->req_pll_dsi_rate =3D req->best_parent_rate; + + return 0; +}; + +static int rzv2h_cpg_plldsi_div_set_rate(struct clk_hw *hw, + unsigned long rate, + unsigned long parent_rate) +{ + struct rzv2h_plldsi_div_clk *dsi_div =3D to_plldsi_div_clk(hw); + struct pll_clk *pll_clk =3D to_pll(clk_hw_get_parent(hw)); + struct rzv2h_cpg_priv *priv =3D dsi_div->priv; + struct rzv2h_pll_div_pars *dsi_params; + struct rzv2h_pll_dsi_info *dsi_info; + struct ddiv ddiv =3D dsi_div->ddiv; + const struct clk_div_table *clkt; + bool divider_found =3D false; + u32 val, shift; + + dsi_info =3D &priv->pll_dsi_info[pll_clk->pll.instance]; + dsi_params =3D &dsi_info->pll_dsi_parameters; + + for (clkt =3D dsi_div->dtable; clkt->div; clkt++) { + if (clkt->div =3D=3D dsi_params->div.divider_value) { + divider_found =3D true; + break; + } + } + + if (!divider_found) + return -EINVAL; + + shift =3D ddiv.shift; + val =3D readl(priv->base + ddiv.offset) | DDIV_DIVCTL_WEN(shift); + val &=3D ~(clk_div_mask(ddiv.width) << shift); + val |=3D clkt->val << shift; + writel(val, priv->base + ddiv.offset); + + return 0; +}; + +static const struct clk_ops rzv2h_cpg_plldsi_div_ops =3D { + .recalc_rate =3D rzv2h_cpg_plldsi_div_recalc_rate, + .determine_rate =3D rzv2h_cpg_plldsi_div_determine_rate, + .set_rate =3D rzv2h_cpg_plldsi_div_set_rate, +}; + +static struct clk * __init +rzv2h_cpg_plldsi_div_clk_register(const struct cpg_core_clk *core, + struct rzv2h_cpg_priv *priv) +{ + struct rzv2h_plldsi_div_clk *clk_hw_data; + struct clk **clks =3D priv->clks; + struct clk_init_data init; + const struct clk *parent; + const char *parent_name; + struct clk_hw *clk_hw; + int ret; + + parent =3D clks[core->parent]; + if (IS_ERR(parent)) + return ERR_CAST(parent); + + clk_hw_data =3D devm_kzalloc(priv->dev, sizeof(*clk_hw_data), GFP_KERNEL); + if (!clk_hw_data) + return ERR_PTR(-ENOMEM); + + clk_hw_data->priv =3D priv; + clk_hw_data->ddiv =3D core->cfg.ddiv; + clk_hw_data->dtable =3D core->dtable; + + parent_name =3D __clk_get_name(parent); + init.name =3D core->name; + init.ops =3D &rzv2h_cpg_plldsi_div_ops; + init.flags =3D core->flag; + init.parent_names =3D &parent_name; + init.num_parents =3D 1; + + clk_hw =3D &clk_hw_data->hw; + clk_hw->init =3D &init; + + ret =3D devm_clk_hw_register(priv->dev, clk_hw); + if (ret) + return ERR_PTR(ret); + + return clk_hw->clk; +} + +static int rzv2h_cpg_plldsi_determine_rate(struct clk_hw *hw, + struct clk_rate_request *req) +{ + struct pll_clk *pll_clk =3D to_pll(hw); + struct rzv2h_cpg_priv *priv =3D pll_clk->priv; + struct rzv2h_pll_dsi_info *dsi_info; + u64 rate_millihz; + + dsi_info =3D &priv->pll_dsi_info[pll_clk->pll.instance]; + /* check if the divider has already invoked the algorithm */ + if (req->rate =3D=3D dsi_info->req_pll_dsi_rate) + return 0; + + /* If the req->rate doesn't match we do the calculation assuming there is= no divider */ + rate_millihz =3D mul_u32_u32(req->rate, MILLI); + if (!rzv2h_get_pll_pars(dsi_info->pll_dsi_limits, + &dsi_info->pll_dsi_parameters.pll, rate_millihz)) { + dev_err(priv->dev, + "failed to determine rate for req->rate: %lu\n", + req->rate); + return -EINVAL; + } + + req->rate =3D DIV_ROUND_CLOSEST_ULL(dsi_info->pll_dsi_parameters.pll.freq= _millihz, MILLI); + dsi_info->req_pll_dsi_rate =3D req->rate; + + return 0; +} + +static int rzv2h_cpg_pll_set_rate(struct pll_clk *pll_clk, + struct rzv2h_pll_pars *params, + bool ssc_disable) +{ + struct rzv2h_cpg_priv *priv =3D pll_clk->priv; + u16 offset =3D pll_clk->pll.offset; + u32 val; + int ret; + + /* Put PLL into standby mode */ + writel(CPG_PLL_STBY_RESETB_WEN, priv->base + CPG_PLL_STBY(offset)); + ret =3D readl_poll_timeout_atomic(priv->base + CPG_PLL_MON(offset), + val, !(val & CPG_PLL_MON_LOCK), + 100, 2000); + if (ret) { + dev_err(priv->dev, "Failed to put PLLDSI into standby mode"); + return ret; + } + + /* Output clock setting 1 */ + writel(FIELD_PREP(CPG_PLL_CLK1_KDIV, (u16)params->k) | + FIELD_PREP(CPG_PLL_CLK1_MDIV, params->m) | + FIELD_PREP(CPG_PLL_CLK1_PDIV, params->p), + priv->base + CPG_PLL_CLK1(offset)); + + /* Output clock setting 2 */ + val =3D readl(priv->base + CPG_PLL_CLK2(offset)); + writel((val & ~CPG_PLL_CLK2_SDIV) | FIELD_PREP(CPG_PLL_CLK2_SDIV, params-= >s), + priv->base + CPG_PLL_CLK2(offset)); + + /* Put PLL to normal mode */ + if (ssc_disable) + val =3D CPG_PLL_STBY_SSC_EN_WEN; + else + val =3D CPG_PLL_STBY_SSC_EN_WEN | CPG_PLL_STBY_SSC_EN; + writel(val | CPG_PLL_STBY_RESETB_WEN | CPG_PLL_STBY_RESETB, + priv->base + CPG_PLL_STBY(offset)); + + /* PLL normal mode transition, output clock stability check */ + ret =3D readl_poll_timeout_atomic(priv->base + CPG_PLL_MON(offset), + val, (val & CPG_PLL_MON_LOCK), + 100, 2000); + if (ret) { + dev_err(priv->dev, "Failed to put PLLDSI into normal mode"); + return ret; + } + + return 0; +}; + +static int rzv2h_cpg_plldsi_set_rate(struct clk_hw *hw, unsigned long rate, + unsigned long parent_rate) +{ + struct pll_clk *pll_clk =3D to_pll(hw); + struct rzv2h_pll_dsi_info *dsi_info; + struct rzv2h_cpg_priv *priv =3D pll_clk->priv; + + dsi_info =3D &priv->pll_dsi_info[pll_clk->pll.instance]; + + return rzv2h_cpg_pll_set_rate(pll_clk, &dsi_info->pll_dsi_parameters.pll,= true); +}; + static int rzv2h_cpg_pll_clk_is_enabled(struct clk_hw *hw) { struct pll_clk *pll_clk =3D to_pll(hw); @@ -231,12 +498,19 @@ static unsigned long rzv2h_cpg_pll_clk_recalc_rate(st= ruct clk_hw *hw, clk1 =3D readl(priv->base + CPG_PLL_CLK1(pll.offset)); clk2 =3D readl(priv->base + CPG_PLL_CLK2(pll.offset)); =20 - rate =3D mul_u64_u32_shr(parent_rate, (CPG_PLL_CLK1_MDIV(clk1) << 16) + - CPG_PLL_CLK1_KDIV(clk1), 16 + CPG_PLL_CLK2_SDIV(clk2)); + rate =3D mul_u64_u32_shr(parent_rate, (FIELD_GET(CPG_PLL_CLK1_MDIV, clk1)= << 16) + + (s16)FIELD_GET(CPG_PLL_CLK1_KDIV, clk1), + 16 + FIELD_GET(CPG_PLL_CLK2_SDIV, clk2)); =20 - return DIV_ROUND_CLOSEST_ULL(rate, CPG_PLL_CLK1_PDIV(clk1)); + return DIV_ROUND_CLOSEST_ULL(rate, FIELD_GET(CPG_PLL_CLK1_PDIV, clk1)); } =20 +static const struct clk_ops rzv2h_cpg_plldsi_ops =3D { + .recalc_rate =3D rzv2h_cpg_pll_clk_recalc_rate, + .determine_rate =3D rzv2h_cpg_plldsi_determine_rate, + .set_rate =3D rzv2h_cpg_plldsi_set_rate, +}; + static const struct clk_ops rzv2h_cpg_pll_ops =3D { .is_enabled =3D rzv2h_cpg_pll_clk_is_enabled, .enable =3D rzv2h_cpg_pll_clk_enable, @@ -263,6 +537,10 @@ rzv2h_cpg_pll_clk_register(const struct cpg_core_clk *= core, if (!pll_clk) return ERR_PTR(-ENOMEM); =20 + if (core->type =3D=3D CLK_TYPE_PLLDSI) + priv->pll_dsi_info[core->cfg.pll.instance].pll_dsi_limits =3D + core->cfg.pll.limits; + parent_name =3D __clk_get_name(parent); init.name =3D core->name; init.ops =3D ops; @@ -587,6 +865,12 @@ rzv2h_cpg_register_core_clk(const struct cpg_core_clk = *core, case CLK_TYPE_SMUX: clk =3D rzv2h_cpg_mux_clk_register(core, priv); break; + case CLK_TYPE_PLLDSI: + clk =3D rzv2h_cpg_pll_clk_register(core, priv, &rzv2h_cpg_plldsi_ops); + break; + case CLK_TYPE_PLLDSI_DIV: + clk =3D rzv2h_cpg_plldsi_div_clk_register(core, priv); + break; default: goto fail; } diff --git a/drivers/clk/renesas/rzv2h-cpg.h b/drivers/clk/renesas/rzv2h-cp= g.h index e2053049c299..637803bc1e89 100644 --- a/drivers/clk/renesas/rzv2h-cpg.h +++ b/drivers/clk/renesas/rzv2h-cpg.h @@ -22,15 +22,20 @@ struct pll { unsigned int offset:9; unsigned int has_clkn:1; unsigned int instance:2; + const struct rzv2h_pll_limits *limits; }; =20 -#define PLL_PACK(_offset, _has_clkn, _instance) \ +#define PLL_PACK_LIMITS(_offset, _has_clkn, _instance, _limits) \ ((struct pll){ \ .offset =3D _offset, \ .has_clkn =3D _has_clkn, \ - .instance =3D _instance \ + .instance =3D _instance, \ + .limits =3D _limits \ }) =20 +#define PLL_PACK(_offset, _has_clkn, _instance) \ + PLL_PACK_LIMITS(_offset, _has_clkn, _instance, NULL) + #define PLLCA55 PLL_PACK(0x60, 1, 0) #define PLLGPU PLL_PACK(0x120, 1, 0) =20 @@ -191,6 +196,8 @@ enum clk_types { CLK_TYPE_PLL, CLK_TYPE_DDIV, /* Dynamic Switching Divider */ CLK_TYPE_SMUX, /* Static Mux */ + CLK_TYPE_PLLDSI, /* PLLDSI */ + CLK_TYPE_PLLDSI_DIV, /* PLLDSI divider */ }; =20 #define DEF_TYPE(_name, _id, _type...) \ @@ -221,6 +228,14 @@ enum clk_types { .num_parents =3D ARRAY_SIZE(_parent_names), \ .flag =3D CLK_SET_RATE_PARENT, \ .mux_flags =3D CLK_MUX_HIWORD_MASK) +#define DEF_PLLDSI(_name, _id, _parent, _pll_packed) \ + DEF_TYPE(_name, _id, CLK_TYPE_PLLDSI, .parent =3D _parent, .cfg.pll =3D _= pll_packed) +#define DEF_PLLDSI_DIV(_name, _id, _parent, _ddiv_packed, _dtable) \ + DEF_TYPE(_name, _id, CLK_TYPE_PLLDSI_DIV, \ + .cfg.ddiv =3D _ddiv_packed, \ + .dtable =3D _dtable, \ + .parent =3D _parent, \ + .flag =3D CLK_SET_RATE_PARENT) =20 /** * struct rzv2h_mod_clk - Module Clocks definitions diff --git a/include/linux/clk/renesas-rzv2h-cpg-pll.h b/include/linux/clk/= renesas-rzv2h-cpg-pll.h new file mode 100644 index 000000000000..f34904cba8de --- /dev/null +++ b/include/linux/clk/renesas-rzv2h-cpg-pll.h @@ -0,0 +1,395 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Renesas RZ/V2H(P) CPG PLL helper + * + * Copyright (C) 2025 Renesas Electronics Corp. + */ +#ifndef __RENESAS_RZV2H_CPG_PLL_H__ +#define __RENESAS_RZV2H_CPG_PLL_H__ + +#include +#include +#include +#include +#include + +#define RZ_V2H_OSC_CLK_IN_MEGA (24 * MEGA) +#define RZV2H_MAX_DIV_TABLES (16) + +/** + * struct rzv2h_pll_limits - PLL parameter constraints + * + * This structure defines the minimum and maximum allowed values for + * various parameters used to configure a PLL. These limits ensure + * the PLL operates within valid and stable ranges. + * + * @fout: Output frequency range (in MHz) + * @fout.min: Minimum allowed output frequency + * @fout.max: Maximum allowed output frequency + * + * @fvco: PLL oscillation frequency range (in MHz) + * @fvco.min: Minimum allowed VCO frequency + * @fvco.max: Maximum allowed VCO frequency + * + * @m: Main-divider range + * @m.min: Minimum main-divider value + * @m.max: Maximum main-divider value + * + * @p: Pre-divider range + * @p.min: Minimum pre-divider value + * @p.max: Maximum pre-divider value + * + * @s: Divider range + * @s.min: Minimum divider value + * @s.max: Maximum divider value + * + * @k: Delta-sigma modulator range (signed) + * @k.min: Minimum delta-sigma value + * @k.max: Maximum delta-sigma value + */ +struct rzv2h_pll_limits { + struct { + u32 min; + u32 max; + } fout; + + struct { + u32 min; + u32 max; + } fvco; + + struct { + u16 min; + u16 max; + } m; + + struct { + u8 min; + u8 max; + } p; + + struct { + u8 min; + u8 max; + } s; + + struct { + s16 min; + s16 max; + } k; +}; + +/** + * struct rzv2h_pll_pars - PLL configuration parameters + * + * This structure contains the configuration parameters for the + * Phase-Locked Loop (PLL), used to achieve a specific output frequency. + * + * @m: Main divider value + * @p: Pre-divider value + * @s: Output divider value + * @k: Delta-sigma modulation value + * @freq_millihz: Calculated PLL output frequency in millihertz + * @error_millihz: Frequency error from target in millihertz (signed) + */ +struct rzv2h_pll_pars { + u16 m; + u8 p; + u8 s; + s16 k; + u64 freq_millihz; + s64 error_millihz; +}; + +/** + * struct rzv2h_pll_div_pars - PLL parameters with post-divider + * + * This structure is used for PLLs that include an additional post-divider + * stage after the main PLL block. It contains both the PLL configuration + * parameters and the resulting frequency/error values after the divider. + * + * @pll: Main PLL configuration parameters (see struct rzv2h_pll_pars) + * + * @div: Post-divider configuration and result + * @div.divider_value: Divider applied to the PLL output + * @div.freq_millihz: Output frequency after divider in millihertz + * @div.error_millihz: Frequency error from target in millihertz (signed) + */ +struct rzv2h_pll_div_pars { + struct rzv2h_pll_pars pll; + struct { + u8 divider_value; + u64 freq_millihz; + s64 error_millihz; + } div; +}; + +#define RZV2H_CPG_PLL_DSI_LIMITS(name) \ + static const struct rzv2h_pll_limits (name) =3D { \ + .fout =3D { .min =3D 25 * MEGA, .max =3D 375 * MEGA }, \ + .fvco =3D { .min =3D 1600 * MEGA, .max =3D 3200 * MEGA }, \ + .m =3D { .min =3D 64, .max =3D 533 }, \ + .p =3D { .min =3D 1, .max =3D 4 }, \ + .s =3D { .min =3D 0, .max =3D 6 }, \ + .k =3D { .min =3D -32768, .max =3D 32767 }, \ + } \ + +/** + * rzv2h_get_pll_pars - Finds the best combination of PLL parameters + * for a given frequency. + * + * @limits: Pointer to the structure containing the limits for the PLL par= ameters + * @pars: Pointer to the structure where the best calculated PLL parameter= s values + * will be stored + * @freq_millihz: Target output frequency in millihertz + * + * This function calculates the best set of PLL parameters (M, K, P, S) to= achieve + * the desired frequency. + * There is no direct formula to calculate the PLL parameters, as it's an = open + * system of equations, therefore this function uses an iterative approach= to + * determine the best solution. The best solution is one that minimizes th= e error + * (desired frequency - actual frequency). + * + * Return: true if a valid set of parameters values is found, false otherw= ise. + */ +static __maybe_unused bool +rzv2h_get_pll_pars(const struct rzv2h_pll_limits *limits, + struct rzv2h_pll_pars *pars, u64 freq_millihz) +{ + u64 fout_min_millihz =3D mul_u32_u32(limits->fout.min, MILLI); + u64 fout_max_millihz =3D mul_u32_u32(limits->fout.max, MILLI); + struct rzv2h_pll_pars p, best; + + if (freq_millihz > fout_max_millihz || + freq_millihz < fout_min_millihz) + return false; + + /* Initialize best error to maximum possible value */ + best.error_millihz =3D S64_MAX; + + for (p.p =3D limits->p.min; p.p <=3D limits->p.max; p.p++) { + u32 fref =3D RZ_V2H_OSC_CLK_IN_MEGA / p.p; + u16 divider; + + for (divider =3D 1 << limits->s.min, p.s =3D limits->s.min; + p.s <=3D limits->s.max; p.s++, divider <<=3D 1) { + for (p.m =3D limits->m.min; p.m <=3D limits->m.max; p.m++) { + u64 output_m, output_k_range; + s64 pll_k, output_k; + u64 fvco, output; + + /* + * The frequency generated by the PLL + divider + * is calculated as follows: + * + * With: + * Freq =3D Ffout =3D Ffvco / 2^(pll_s) + * Ffvco =3D (pll_m + (pll_k / 65536)) * Ffref + * Ffref =3D 24MHz / pll_p + * + * Freq can also be rewritten as: + * Freq =3D Ffvco / 2^(pll_s) + * =3D ((pll_m + (pll_k / 65536)) * Ffref) / 2^(pll_s) + * =3D (pll_m * Ffref) / 2^(pll_s) + ((pll_k / 65536) * Ffref) / = 2^(pll_s) + * =3D output_m + output_k + * + * Every parameter has been determined at this + * point, but pll_k. + * + * Considering that: + * limits->k.min <=3D pll_k <=3D limits->k.max + * Then: + * -0.5 <=3D (pll_k / 65536) < 0.5 + * Therefore: + * -Ffref / (2 * 2^(pll_s)) <=3D output_k < Ffref / (2 * 2^(pll_s)) + */ + + /* Compute output M component (in mHz) */ + output_m =3D DIV_ROUND_CLOSEST_ULL(mul_u32_u32(p.m, fref) * MILLI, + divider); + /* Compute range for output K (in mHz) */ + output_k_range =3D DIV_ROUND_CLOSEST_ULL(mul_u32_u32(fref, MILLI), + 2 * divider); + /* + * No point in continuing if we can't achieve + * the desired frequency + */ + if (freq_millihz < (output_m - output_k_range) || + freq_millihz >=3D (output_m + output_k_range)) { + continue; + } + + /* + * Compute the K component + * + * Since: + * Freq =3D output_m + output_k + * Then: + * output_k =3D Freq - output_m + * =3D ((pll_k / 65536) * Ffref) / 2^(pll_s) + * Therefore: + * pll_k =3D (output_k * 65536 * 2^(pll_s)) / Ffref + */ + output_k =3D freq_millihz - output_m; + pll_k =3D div_s64(output_k * 65536ULL * divider, + fref); + pll_k =3D DIV_S64_ROUND_CLOSEST(pll_k, MILLI); + + /* Validate K value within allowed limits */ + if (pll_k < limits->k.min || + pll_k > limits->k.max) + continue; + + p.k =3D pll_k; + + /* Compute (Ffvco * 65536) */ + fvco =3D mul_u32_u32(p.m * 65536 + p.k, fref); + if (fvco < mul_u32_u32(limits->fvco.min, 65536) || + fvco > mul_u32_u32(limits->fvco.max, 65536)) + continue; + + /* PLL_M component of (output * 65536 * PLL_P) */ + output =3D mul_u32_u32(p.m * 65536, RZ_V2H_OSC_CLK_IN_MEGA); + /* PLL_K component of (output * 65536 * PLL_P) */ + output +=3D p.k * RZ_V2H_OSC_CLK_IN_MEGA; + /* Make it in mHz */ + output *=3D MILLI; + output =3D DIV_U64_ROUND_CLOSEST(output, 65536 * p.p * divider); + + /* Check output frequency against limits */ + if (output < fout_min_millihz || + output > fout_max_millihz) + continue; + + p.error_millihz =3D freq_millihz - output; + p.freq_millihz =3D output; + + /* If an exact match is found, return immediately */ + if (p.error_millihz =3D=3D 0) { + *pars =3D p; + return true; + } + + /* Update best match if error is smaller */ + if (abs(best.error_millihz) > abs(p.error_millihz)) + best =3D p; + } + } + } + + /* If no valid parameters were found, return false */ + if (best.error_millihz =3D=3D S64_MAX) + return false; + + *pars =3D best; + return true; +} + +/* + * rzv2h_get_pll_div_pars - Finds the best combination of PLL parameters + * and divider value for a given frequency. + * + * @limits: Pointer to the structure containing the limits for the PLL par= ameters + * @pars: Pointer to the structure where the best calculated PLL parameter= s and + * divider values will be stored + * @divider: Divider value to be applied to the PLL output + * @freq_millihz: Target output frequency in millihertz + * + * This function calculates the best set of PLL parameters (M, K, P, S) wh= ere + * the divider value is already known. See rzv2h_get_pll_pars() for more d= etails + * on how the PLL parameters are calculated. + */ +static __maybe_unused bool +rzv2h_get_pll_div_pars(const struct rzv2h_pll_limits *limits, + struct rzv2h_pll_div_pars *pars, u8 divider, + u64 freq_millihz) +{ + if (!rzv2h_get_pll_pars(limits, &pars->pll, freq_millihz * divider)) + return false; + + pars->div.divider_value =3D divider; + pars->div.freq_millihz =3D DIV_U64_ROUND_CLOSEST(pars->pll.freq_millihz, = divider); + pars->div.error_millihz =3D freq_millihz - pars->div.freq_millihz; + + return true; +} + +/* + * rzv2h_get_pll_divs_pars - Finds the best combination of PLL parameters + * and divider value for a given frequency. + * + * @limits: Pointer to the structure containing the limits for the PLL par= ameters + * @pars: Pointer to the structure where the best calculated PLL parameter= s and + * divider values will be stored + * @table: Pointer to the array of valid divider values + * @table_size: Size of the divider values array + * @freq_millihz: Target output frequency in millihertz + * + * This function calculates the best set of PLL parameters (M, K, P, S) an= d divider + * value to achieve the desired frequency. See rzv2h_get_pll_pars() for mo= re details + * on how the PLL parameters are calculated. + * + * freq_millihz is the desired frequency generated by the PLL followed by a + * a gear. + */ +static __maybe_unused bool +rzv2h_get_pll_divs_pars(const struct rzv2h_pll_limits *limits, + struct rzv2h_pll_div_pars *pars, + const u8 *table, u8 table_size, u64 freq_millihz) +{ + struct rzv2h_pll_div_pars p, best; + + best.div.error_millihz =3D S64_MAX; + p.div.error_millihz =3D S64_MAX; + for (unsigned int i =3D 0; i < table_size; i++) { + if (!rzv2h_get_pll_div_pars(limits, &p, table[i], freq_millihz)) + continue; + + if (p.div.error_millihz =3D=3D 0) { + *pars =3D p; + return true; + } + + if (abs(best.div.error_millihz) > abs(p.div.error_millihz)) + best =3D p; + } + + if (best.div.error_millihz =3D=3D S64_MAX) + return false; + + *pars =3D best; + return true; +} + +/* + * rzv2h_get_pll_dtable_pars - Finds the best combination of PLL parameters + * and divider value for a given frequency using a divider table. + * + * @limits: Pointer to the structure containing the limits for the PLL par= ameters + * @pars: Pointer to the structure where the best calculated PLL parameter= s and + * divider values will be stored + * @dtable: Pointer to the array of valid divider values + * @freq_millihz: Target output frequency in millihertz + * + * See rzv2h_get_pll_divs_pars() for more details on how the PLL + * parameters and divider values are calculated. + */ +static __maybe_unused bool +rzv2h_get_pll_dtable_pars(const struct rzv2h_pll_limits *limits, + struct rzv2h_pll_div_pars *pars, + const struct clk_div_table *dtable, u64 freq_millihz) +{ + const struct clk_div_table *div =3D dtable; + u8 table[RZV2H_MAX_DIV_TABLES] =3D { 0 }; + unsigned int i =3D 0; + + for (; div->div; div++) { + if (i >=3D RZV2H_MAX_DIV_TABLES) + return false; + table[i++] =3D div->div; + } + + return rzv2h_get_pll_divs_pars(limits, pars, table, i, freq_millihz); +} + +#endif /* __RENESAS_RZV2H_CPG_PLL_H__ */ --=20 2.51.0 From nobody Fri Oct 3 07:42:25 2025 Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E4F722C0286; Wed, 3 Sep 2025 16:17:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756916254; cv=none; b=GxU+iiCxVw1GJl+BWEwnJmTvDt4d4eprFoeQxUiYSCh5+evJ1zZdyaC0EyZjWgwe+s8UzoinfFFogxmzZXNfq1nWT3FSFP8vY2xOXCDoYSN3L2Uv+H8mVyzcw0qjQBtDa8aWPFEbkq10PHcAWGFxUwadStqy8de0B7apfJ86jDA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756916254; c=relaxed/simple; bh=llSXAfQNlcyyZfLirw0M4x46rOeysa3VZza7rgjFeSo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=A7vfB4CaKl0ENn6UfXL6ncgUBUEeHJxdfFirpSXuEocFdtZETqsZFzlrjf7Xb9DhiSSh50DEdXnIgBiizG/cVOuJ6sFmtJEfI8IT9YHlCew3349qIha/fBvjt+qyNvCD0gEsV1r9faA7yAzNqYSKzS/KSRsroje1VVKjgVMj38Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Zhz2x/Ia; arc=none smtp.client-ip=209.85.221.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Zhz2x/Ia" Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-3d1bf79d7acso90109f8f.0; Wed, 03 Sep 2025 09:17:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1756916251; x=1757521051; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dXu593Z6/Zyd/OLORNhu/Njg17UMthP5PExhY9eiWrw=; b=Zhz2x/Ia1MSFxYvfQcObM1WufhmTqsbhGIpKIeHxSPvX/2mp/S3w8FLHdaqL1q1zg2 Qsrf04qrOIu41j4+O9zOqPuvloCaumocwQHSMQ1Ws88IupZkOKdYoKFsbwwMZutG+lm4 f2fWu3puO+Im/AipoYf70qwjNnOCN8UJyp9BRe1zxiOJypFeKXvq/KaNqHpClyfWKgzF vbcw+/8efZg8JKX84i/GLE6KJfOn3nt3lDGq2XPjZjFvCFP1jh5E2k7ctsh+RiSAd34G xJ5wWBof3pNxzJUCOim8U+D8oGjKT5G/moRMNGhR/P7Fl56LGvsgXYxEbY5/N5W76ryD eydg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756916251; x=1757521051; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dXu593Z6/Zyd/OLORNhu/Njg17UMthP5PExhY9eiWrw=; b=pzB5gRj/u6ksanpxQJw9/C1Wi+dTWltAqWOTWXA77/ayNwdS8sxxlA5PrbnM2dAJH9 ob4s+QguXDzotmJS5UeCeniNjhYE5BrnEOhK0gWmOq0cmr3h+nJiDBoy1ydtRSa8iciW rpsx6k9lKWFohgnZWQFgDAQYabLsWOoTosBfR0JK/Tyutx4IEbwLEOuwge7zjfNoNODE yoRXi8UQ/T6Vp6gW8r6Ei2uur+ugHwPOKuKG71bEm0xRcxKn1qwEfkgfCmYMi6iXpapm iY0XZQTLFP0Op67P0DfdL/JmbydI2/ZDt2sQjpiwEfqcfvNzizlwwsv5KezJDJojt52u vDvw== X-Forwarded-Encrypted: i=1; AJvYcCU+1tKPzacnr8wpJgyMwy/XahWzXO97p+M47uV3bybKSNfw7AyJvqvr1tbuSRV//HuWE/skBiIhnREW9Mpxy19dQxU=@vger.kernel.org, AJvYcCUE4fVlgwUaB/gxqdc88s5+zyufF5D3UltyLgPq/iLnch8KHnfsY/vudIQ2vQAv7R2TvBGuSANtpcKY@vger.kernel.org, AJvYcCUVkxsjwFnjYslMHMCPkGqdWlCFjlPdJ+7vS9px4zNlOwkcBY90FPLwzuU/qhPdOXJVd3A7ihKwt2OL@vger.kernel.org, AJvYcCW962AjiCUEW0rwwbDzVBqeBQL+/BTOhmkBsW45VLXvUnZ4wsUnjUuQYdkwZiBO1B1JKVPe/fqQTv/nos7n@vger.kernel.org X-Gm-Message-State: AOJu0YyFAP8gRFk+Dz+4Chk5zD1+jAko2L2jDoP4j64Ryq5l0pvMOK1w lmWDcIPe3OdVRyFsHPUzrmRNHvZpxRwaJbGexZ0nsdRwQiP2cFAZI95X X-Gm-Gg: ASbGnctn4AxFESTa6pg7zy/NVvIjp53jfUTpZpD6wTHfNZ/f1lDaIXpFyQoF1ly8p2C yukIn4mGL70G/jOHwxxcMdAYh8mMQyzytVZ1wB+e4FK4pOolTCZrPPNrlrUyUzmw7cYTr7KxWqi BFtQpfAMTAPKEFMOe139ohYSUg7Z1+jvrO3tQUSH3gbXH/XkHWHz02zlE/mO3sFDUP7qxqiXZUG 8TUsdsOckyW62MhezU8x/JXCnNUaIB20BfQqugE11vnOViLyQW9xPscRup6EDqCqW9nqL3zbX9F cZWTDz6iPIObf9ei1BnByKrhz7CyoMCFngi/vyXq/FVIIyP/eElpJzfyCSqnmRmgZ3dP5L7WoPD K7nMchRnYu1S4uUrV2FQyN7R6bh4AH+h3z9PAZGt1Yq6ilM8q2/k3fvTt X-Google-Smtp-Source: AGHT+IHhnPPm+VsqWeOJZuxDusBwRwDQHIJc7jPhZrB/5gABflX+H+ogrlhMop2KYChCvaG84W3t9Q== X-Received: by 2002:a5d:5887:0:b0:3dc:280c:5f83 with SMTP id ffacd0b85a97d-3dc281ba2eamr3472649f8f.5.1756916250780; Wed, 03 Sep 2025 09:17:30 -0700 (PDT) Received: from iku.example.org ([2a06:5906:61b:2d00:9019:aa0f:b6e4:7952]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3db72983560sm5645734f8f.1.2025.09.03.09.17.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Sep 2025 09:17:30 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Tomi Valkeinen , Jonas Karlman , Jernej Skrabec , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Geert Uytterhoeven , Michael Turquette , Stephen Boyd , Biju Das , Magnus Damm Cc: dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-clk@vger.kernel.org, Prabhakar , Fabrizio Castro , Tommaso Merciai , Lad Prabhakar Subject: [PATCH v8 3/6] clk: renesas: r9a09g057: Add clock and reset entries for DSI and LCDC Date: Wed, 3 Sep 2025 17:17:15 +0100 Message-ID: <20250903161718.180488-4-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250903161718.180488-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20250903161718.180488-1-prabhakar.mahadev-lad.rj@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Lad Prabhakar Add clock and reset entries for the DSI and LCDC peripherals. Co-developed-by: Fabrizio Castro Signed-off-by: Fabrizio Castro Signed-off-by: Lad Prabhakar Reviewed-by: Biju Das Reviewed-by: Geert Uytterhoeven --- v7->v8: - Added reviewed-by tags from Geert and Biju v6->v7: - Dropped passing plldsi_limits v5->v6: - Renamed CLK_DIV_PLLETH_LPCLK to CLK_CDIV4_PLLETH_LPCLK - Renamed CLK_CSDIV_PLLETH_LPCLK to CLK_PLLETH_LPCLK_GEAR - Renamed CLK_PLLDSI_SDIV2 to CLK_PLLDSI_GEAR - Renamed plldsi_sdiv2 to plldsi_gear v4->v5: - No changes v3->v4: - No changes v2->v3: - Reverted CSDIV0_DIVCTL2() to use DDIV_PACK() - Renamed plleth_lpclk_div4 -> cdiv4_plleth_lpclk - Renamed plleth_lpclk -> plleth_lpclk_gear v1->v2: - Changed CSDIV0_DIVCTL2 to the NO_RMW --- drivers/clk/renesas/r9a09g057-cpg.c | 62 +++++++++++++++++++++++++++++ drivers/clk/renesas/rzv2h-cpg.h | 3 ++ 2 files changed, 65 insertions(+) diff --git a/drivers/clk/renesas/r9a09g057-cpg.c b/drivers/clk/renesas/r9a0= 9g057-cpg.c index f7de69a93de1..f94040f9d8a3 100644 --- a/drivers/clk/renesas/r9a09g057-cpg.c +++ b/drivers/clk/renesas/r9a09g057-cpg.c @@ -6,6 +6,7 @@ */ =20 #include +#include #include #include #include @@ -30,6 +31,7 @@ enum clk_ids { CLK_PLLCA55, CLK_PLLVDO, CLK_PLLETH, + CLK_PLLDSI, CLK_PLLGPU, =20 /* Internal Core Clocks */ @@ -63,6 +65,9 @@ enum clk_ids { CLK_SMUX2_GBE0_RXCLK, CLK_SMUX2_GBE1_TXCLK, CLK_SMUX2_GBE1_RXCLK, + CLK_CDIV4_PLLETH_LPCLK, + CLK_PLLETH_LPCLK_GEAR, + CLK_PLLDSI_GEAR, CLK_PLLGPU_GEAR, =20 /* Module Clocks */ @@ -91,6 +96,26 @@ static const struct clk_div_table dtable_2_16[] =3D { {0, 0}, }; =20 +static const struct clk_div_table dtable_2_32[] =3D { + {0, 2}, + {1, 4}, + {2, 6}, + {3, 8}, + {4, 10}, + {5, 12}, + {6, 14}, + {7, 16}, + {8, 18}, + {9, 20}, + {10, 22}, + {11, 24}, + {12, 26}, + {13, 28}, + {14, 30}, + {15, 32}, + {0, 0}, +}; + static const struct clk_div_table dtable_2_64[] =3D { {0, 2}, {1, 4}, @@ -107,6 +132,17 @@ static const struct clk_div_table dtable_2_100[] =3D { {0, 0}, }; =20 +static const struct clk_div_table dtable_16_128[] =3D { + {0, 16}, + {1, 32}, + {2, 64}, + {3, 128}, + {0, 0}, +}; + +RZV2H_CPG_PLL_DSI_LIMITS(rzv2h_cpg_pll_dsi_limits); +#define PLLDSI PLL_PACK_LIMITS(0xc0, 1, 0, &rzv2h_cpg_pll_dsi_limits) + /* Mux clock tables */ static const char * const smux2_gbe0_rxclk[] =3D { ".plleth_gbe0", "et0_rx= clk" }; static const char * const smux2_gbe0_txclk[] =3D { ".plleth_gbe0", "et0_tx= clk" }; @@ -128,6 +164,7 @@ static const struct cpg_core_clk r9a09g057_core_clks[] = __initconst =3D { DEF_PLL(".pllca55", CLK_PLLCA55, CLK_QEXTAL, PLLCA55), DEF_FIXED(".pllvdo", CLK_PLLVDO, CLK_QEXTAL, 105, 2), DEF_FIXED(".plleth", CLK_PLLETH, CLK_QEXTAL, 125, 3), + DEF_PLLDSI(".plldsi", CLK_PLLDSI, CLK_QEXTAL, PLLDSI), DEF_PLL(".pllgpu", CLK_PLLGPU, CLK_QEXTAL, PLLGPU), =20 /* Internal Core Clocks */ @@ -169,6 +206,12 @@ static const struct cpg_core_clk r9a09g057_core_clks[]= __initconst =3D { DEF_SMUX(".smux2_gbe0_rxclk", CLK_SMUX2_GBE0_RXCLK, SSEL0_SELCTL3, smux2_= gbe0_rxclk), DEF_SMUX(".smux2_gbe1_txclk", CLK_SMUX2_GBE1_TXCLK, SSEL1_SELCTL0, smux2_= gbe1_txclk), DEF_SMUX(".smux2_gbe1_rxclk", CLK_SMUX2_GBE1_RXCLK, SSEL1_SELCTL1, smux2_= gbe1_rxclk), + DEF_FIXED(".cdiv4_plleth_lpclk", CLK_CDIV4_PLLETH_LPCLK, CLK_PLLETH, 1, 4= ), + DEF_CSDIV(".plleth_lpclk_gear", CLK_PLLETH_LPCLK_GEAR, CLK_CDIV4_PLLETH_L= PCLK, + CSDIV0_DIVCTL2, dtable_16_128), + + DEF_PLLDSI_DIV(".plldsi_gear", CLK_PLLDSI_GEAR, CLK_PLLDSI, + CSDIV1_DIVCTL2, dtable_2_32), =20 DEF_DDIV(".pllgpu_gear", CLK_PLLGPU_GEAR, CLK_PLLGPU, CDDIV3_DIVCTL1, dta= ble_2_64), =20 @@ -366,6 +409,22 @@ static const struct rzv2h_mod_clk r9a09g057_mod_clks[]= __initconst =3D { BUS_MSTOP(9, BIT(7))), DEF_MOD("cru_3_pclk", CLK_PLLDTY_DIV16, 13, 13, 6, 29, BUS_MSTOP(9, BIT(7))), + DEF_MOD("dsi_0_pclk", CLK_PLLDTY_DIV16, 14, 8, 7, 8, + BUS_MSTOP(9, BIT(14) | BIT(15))), + DEF_MOD("dsi_0_aclk", CLK_PLLDTY_ACPU_DIV2, 14, 9, 7, 9, + BUS_MSTOP(9, BIT(14) | BIT(15))), + DEF_MOD("dsi_0_vclk1", CLK_PLLDSI_GEAR, 14, 10, 7, 10, + BUS_MSTOP(9, BIT(14) | BIT(15))), + DEF_MOD("dsi_0_lpclk", CLK_PLLETH_LPCLK_GEAR, 14, 11, 7, 11, + BUS_MSTOP(9, BIT(14) | BIT(15))), + DEF_MOD("dsi_0_pllref_clk", CLK_QEXTAL, 14, 12, 7, 12, + BUS_MSTOP(9, BIT(14) | BIT(15))), + DEF_MOD("lcdc_0_clk_a", CLK_PLLDTY_ACPU_DIV2, 14, 13, 7, 13, + BUS_MSTOP(10, BIT(1) | BIT(2) | BIT(3))), + DEF_MOD("lcdc_0_clk_p", CLK_PLLDTY_DIV16, 14, 14, 7, 14, + BUS_MSTOP(10, BIT(1) | BIT(2) | BIT(3))), + DEF_MOD("lcdc_0_clk_d", CLK_PLLDSI_GEAR, 14, 15, 7, 15, + BUS_MSTOP(10, BIT(1) | BIT(2) | BIT(3))), DEF_MOD("gpu_0_clk", CLK_PLLGPU_GEAR, 15, 0, 7, 16, BUS_MSTOP(3, BIT(4))), DEF_MOD("gpu_0_axi_clk", CLK_PLLDTY_ACPU_DIV2, 15, 1, 7, 17, @@ -435,6 +494,9 @@ static const struct rzv2h_reset r9a09g057_resets[] __in= itconst =3D { DEF_RST(12, 14, 5, 31), /* CRU_3_PRESETN */ DEF_RST(12, 15, 6, 0), /* CRU_3_ARESETN */ DEF_RST(13, 0, 6, 1), /* CRU_3_S_RESETN */ + DEF_RST(13, 7, 6, 8), /* DSI_0_PRESETN */ + DEF_RST(13, 8, 6, 9), /* DSI_0_ARESETN */ + DEF_RST(13, 12, 6, 13), /* LCDC_0_RESET_N */ DEF_RST(13, 13, 6, 14), /* GPU_0_RESETN */ DEF_RST(13, 14, 6, 15), /* GPU_0_AXI_RESETN */ DEF_RST(13, 15, 6, 16), /* GPU_0_ACE_RESETN */ diff --git a/drivers/clk/renesas/rzv2h-cpg.h b/drivers/clk/renesas/rzv2h-cp= g.h index 637803bc1e89..3dceb8dc5c13 100644 --- a/drivers/clk/renesas/rzv2h-cpg.h +++ b/drivers/clk/renesas/rzv2h-cpg.h @@ -126,6 +126,7 @@ struct fixed_mod_conf { #define CPG_CDDIV3 (0x40C) #define CPG_CDDIV4 (0x410) #define CPG_CSDIV0 (0x500) +#define CPG_CSDIV1 (0x504) =20 #define CDDIV0_DIVCTL1 DDIV_PACK(CPG_CDDIV0, 4, 3, 1) #define CDDIV0_DIVCTL2 DDIV_PACK(CPG_CDDIV0, 8, 3, 2) @@ -142,7 +143,9 @@ struct fixed_mod_conf { =20 #define CSDIV0_DIVCTL0 DDIV_PACK(CPG_CSDIV0, 0, 2, CSDIV_NO_MON) #define CSDIV0_DIVCTL1 DDIV_PACK(CPG_CSDIV0, 4, 2, CSDIV_NO_MON) +#define CSDIV0_DIVCTL2 DDIV_PACK(CPG_CSDIV0, 8, 2, CSDIV_NO_MON) #define CSDIV0_DIVCTL3 DDIV_PACK_NO_RMW(CPG_CSDIV0, 12, 2, CSDIV_NO_MON) +#define CSDIV1_DIVCTL2 DDIV_PACK(CPG_CSDIV1, 8, 4, CSDIV_NO_MON) =20 #define SSEL0_SELCTL2 SMUX_PACK(CPG_SSEL0, 8, 1) #define SSEL0_SELCTL3 SMUX_PACK(CPG_SSEL0, 12, 1) --=20 2.51.0 From nobody Fri Oct 3 07:42:25 2025 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 188DE2C11D7; Wed, 3 Sep 2025 16:17:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756916256; cv=none; b=eakIqBBOs2Ye3gI5t+vJdXgb+BtieE6NUqfwe+iY+jSHRfjNZZgbdIyazpEISL7l5ATwMtlo3OQ31u1NyQ9mRVwSXVNHnjDE//96gH/Mvql2VE2C7rBijxytWWSBMAtj/2caviK9jn+YRt/D2To5DEfnndSxb/ddvig3qV8cFak= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756916256; c=relaxed/simple; bh=V/eTeUoO94nrf8X5xXa5P7/7D5kjRmYF3BVLIjVZWwc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bW3Zson7qJCXaYPjPufQGHvFdqiirh9lYVBdvn6AvTZnXlC0UGF/gSPytfS3sN55yp/ZSEVV5nusqqcGPIcnZwmXo7nJFQ775rB8jyDV5272TRH11nOyqf+yK86j1Epssz5tJ/RSaGJ/Ihwjssz7Vf/gDxMqnCf3cEwZ2ZVcGwk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=C3WQdfc8; arc=none smtp.client-ip=209.85.128.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="C3WQdfc8" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-45cb5492350so842865e9.1; Wed, 03 Sep 2025 09:17:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1756916252; x=1757521052; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OtgegsYQgoMs+VRvy45Y08IsP3REyx6k5syyJ1k7tLc=; b=C3WQdfc8BAdl2L/bN1kERsvCVIFhATWRcV7DpOzFjvpPLLgNg5IBmIv/XbzYWRkjay wpefRVKYTQIrF1E/OEUs3QkKjubY5BbPcVfaoF543iqXu1CsTI/tiTPwUtUOSMyuzmZH 9DJIqmhSwpd9AUvDVvVYrdw2hB/jykkojXfLTPoQ64WcWpI1CNWEb2VXZiwqQohx1vKz L+umSrdnR8q11nrUT6anJPZPTwdGHNpWlu4U/qR1vEcCMehe5TdQi0pzNXOWGptI9xf1 H7ThsgRrelJFqnV3HFeIAEnYd9q+tzN7tYlhV3WjvTjeKwN4xjXgiHw8hzOl8qLg9lNC E5eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756916252; x=1757521052; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OtgegsYQgoMs+VRvy45Y08IsP3REyx6k5syyJ1k7tLc=; b=VMFT2gnbIaJErOoyTwWPxtG0R2T72ED/lO778/ZKT6XzA42DAO/3sUHlmlu9sb7t8W 8flpB8xtGuddSM0+v2msmHr7CAwLwtCI1lUcLqT3lXNCyOkEU+HugNRAHEGv93v7Zi7j ZQshEoFTJPqrEfj8SsSIuTyw7ACMxaRNBujkMNrlMyS+9hhDSh2H553qzCHal+5rbnrr QnP4jvEidh2BuqZoT7dBtXDAbnVj1T6AwyTHOaCmkbL3FquY5vw+plnwXJQZgBRYO5Nb EWDXWLdgC0N5LQIyQgd1KQwRzgxZU5fSojiVTa2EWZaxphpi4vIkFeteNF1Gdxr5m1K4 nmmw== X-Forwarded-Encrypted: i=1; AJvYcCV+J2sXNSyfhpns0puHZHOe0ehbTZPfTYmSfOihkWttswDPJxLdBzdcnmFcN7qSAR6PC/YLonm/6AlQ3inty6EFfqA=@vger.kernel.org, AJvYcCVfqkTUG1vrSpE0jUQ3xW6qATlKulqckrf3whu682K3bPoZl2DDQCw5rB5zalOAG4mG7zX6NIhHJbFN@vger.kernel.org, AJvYcCXn4l4Qd5Q1MdufvfJfDNXWGVyDIRWToErzauFNNszdD1THJ8gLA6gjlCdBFgy8IbJRxX1hVp/yonf2@vger.kernel.org, AJvYcCXvzWxMVqx13s+RDF6PWRwacEl1Pdp0x9a4qwDK2hYcnjGfs/SlYs3BuPzHfQSx8p8fv6zZgGEGwHjWD8gZ@vger.kernel.org X-Gm-Message-State: AOJu0YyQMUtc+wooHu8/BnrrPE4QQ0ofdm4sAJ/3wpk5dkV6lGDQ8Dlx QdGRDu5CQfd9SfYmgdnA5OjB1ZmpoL1GEnp3bJMWVbLRaH17ynsEzz/m X-Gm-Gg: ASbGncurpaBQpPknOSCJe48KxjytUPXjcl60/dJBCwzwNIJrL/uG1TRj4rqC8PYrPLe WXf5XCclFWmr3XpW4JK6WucYXh2vnQzjlAeCUIB4mi9ml0JZnHVd7sQA2ZOvUzXZG9jbkNPG+3g M0IGxcyhE/yMYiCCF5TfkUhJOGxLsUDuhuky0Lfga9oi6yZUt3EmCoULBeD6iQwunNzqoxY4HZT 0h2oLZIKsGxp8m6WQ9RQ7JK0ivlC1h1IDZYIJWzeLfSDq1VErHY1U+0FACFpHPpQOsGZYL+1Gpf uRYmIGutfWvX8m7eNecNqTfo+B9RFNMHytPNAXdQdrWgVh/Ke6TFlkPWW+HKoB9Uvsghd+shWLC kCAHWCTCSkMU00HttxEUWbmqyEmqHqkEjegYLYFuxrjxIizG5whJCjfRDmt4MZwl0FYX5uGJ9pJ glIw== X-Google-Smtp-Source: AGHT+IFd5CmrZRXPdtdnpZx4wodP7UGYIRF8rXD7UIiPOJu9eHsNXe6+1sJmv/UeL9ZFL4OLKTP3HQ== X-Received: by 2002:a05:6000:1788:b0:3df:c5e3:55fe with SMTP id ffacd0b85a97d-3dfc5e35ffemr1040752f8f.29.1756916252251; Wed, 03 Sep 2025 09:17:32 -0700 (PDT) Received: from iku.example.org ([2a06:5906:61b:2d00:9019:aa0f:b6e4:7952]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3db72983560sm5645734f8f.1.2025.09.03.09.17.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Sep 2025 09:17:31 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Tomi Valkeinen , Jonas Karlman , Jernej Skrabec , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Geert Uytterhoeven , Michael Turquette , Stephen Boyd , Biju Das , Magnus Damm Cc: dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-clk@vger.kernel.org, Prabhakar , Fabrizio Castro , Tommaso Merciai , Lad Prabhakar , Krzysztof Kozlowski Subject: [PATCH v8 4/6] dt-bindings: display: bridge: renesas,dsi: Document RZ/V2H(P) and RZ/V2N Date: Wed, 3 Sep 2025 17:17:16 +0100 Message-ID: <20250903161718.180488-5-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250903161718.180488-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20250903161718.180488-1-prabhakar.mahadev-lad.rj@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Lad Prabhakar Add the compatible string "renesas,r9a09g057-mipi-dsi" for the Renesas RZ/V2H(P) (R9A09G057) SoC. While the MIPI DSI LINK registers are shared with the RZ/G2L SoC, the D-PHY register layout differs. Additionally, the RZ/V2H(P) uses only two resets compared to three on RZ/G2L, and requires five clocks instead of six. To reflect these hardware differences, update the binding schema to support the reduced clock and reset requirements for RZ/V2H(P). Since the RZ/V2N (R9A09G056) SoC integrates an identical DSI IP to RZ/V2H(P), the same "renesas,r9a09g057-mipi-dsi" compatible string is reused for RZ/V2N. Signed-off-by: Lad Prabhakar Reviewed-by: Krzysztof Kozlowski Reviewed-by: Geert Uytterhoeven Reviewed-by: Tomi Valkeinen --- v7->v8: - Added reviewed-by tags from Geert and Tomi v6->v7: - Renamed pllclk to pllrefclk - Preserved the reviewed by tag from Geert and Krzysztof v5->v6: - Preserved the sort order (by part number). - Added reviewed tag from Geert. v4->v5: - No changes v3->v4: - No changes v2->v3: - Collected reviewed tag from Krzysztof v1->v2: - Kept the sort order for schema validation - Added `port@1: false` for RZ/V2H(P) SoC --- .../bindings/display/bridge/renesas,dsi.yaml | 120 +++++++++++++----- 1 file changed, 91 insertions(+), 29 deletions(-) diff --git a/Documentation/devicetree/bindings/display/bridge/renesas,dsi.y= aml b/Documentation/devicetree/bindings/display/bridge/renesas,dsi.yaml index 5a99d9b9635e..c20625b8425e 100644 --- a/Documentation/devicetree/bindings/display/bridge/renesas,dsi.yaml +++ b/Documentation/devicetree/bindings/display/bridge/renesas,dsi.yaml @@ -14,16 +14,21 @@ description: | RZ/G2L alike family of SoC's. The encoder can operate in DSI mode, with up to four data lanes. =20 -allOf: - - $ref: /schemas/display/dsi-controller.yaml# - properties: compatible: - items: + oneOf: + - items: + - enum: + - renesas,r9a07g044-mipi-dsi # RZ/G2{L,LC} + - renesas,r9a07g054-mipi-dsi # RZ/V2L + - const: renesas,rzg2l-mipi-dsi + + - items: + - const: renesas,r9a09g056-mipi-dsi # RZ/V2N + - const: renesas,r9a09g057-mipi-dsi + - enum: - - renesas,r9a07g044-mipi-dsi # RZ/G2{L,LC} - - renesas,r9a07g054-mipi-dsi # RZ/V2L - - const: renesas,rzg2l-mipi-dsi + - renesas,r9a09g057-mipi-dsi # RZ/V2H(P) =20 reg: maxItems: 1 @@ -49,34 +54,56 @@ properties: - const: debug =20 clocks: - items: - - description: DSI D-PHY PLL multiplied clock - - description: DSI D-PHY system clock - - description: DSI AXI bus clock - - description: DSI Register access clock - - description: DSI Video clock - - description: DSI D-PHY Escape mode transmit clock + oneOf: + - items: + - description: DSI D-PHY PLL multiplied clock + - description: DSI D-PHY system clock + - description: DSI AXI bus clock + - description: DSI Register access clock + - description: DSI Video clock + - description: DSI D-PHY Escape mode transmit clock + - items: + - description: DSI D-PHY PLL reference clock + - description: DSI AXI bus clock + - description: DSI Register access clock + - description: DSI Video clock + - description: DSI D-PHY Escape mode transmit clock =20 clock-names: - items: - - const: pllclk - - const: sysclk - - const: aclk - - const: pclk - - const: vclk - - const: lpclk + oneOf: + - items: + - const: pllclk + - const: sysclk + - const: aclk + - const: pclk + - const: vclk + - const: lpclk + - items: + - const: pllrefclk + - const: aclk + - const: pclk + - const: vclk + - const: lpclk =20 resets: - items: - - description: MIPI_DSI_CMN_RSTB - - description: MIPI_DSI_ARESET_N - - description: MIPI_DSI_PRESET_N + oneOf: + - items: + - description: MIPI_DSI_CMN_RSTB + - description: MIPI_DSI_ARESET_N + - description: MIPI_DSI_PRESET_N + - items: + - description: MIPI_DSI_ARESET_N + - description: MIPI_DSI_PRESET_N =20 reset-names: - items: - - const: rst - - const: arst - - const: prst + oneOf: + - items: + - const: rst + - const: arst + - const: prst + - items: + - const: arst + - const: prst =20 power-domains: maxItems: 1 @@ -130,6 +157,41 @@ required: =20 unevaluatedProperties: false =20 +allOf: + - $ref: ../dsi-controller.yaml# + + - if: + properties: + compatible: + contains: + const: renesas,r9a09g057-mipi-dsi + then: + properties: + clocks: + maxItems: 5 + + clock-names: + maxItems: 5 + + resets: + maxItems: 2 + + reset-names: + maxItems: 2 + else: + properties: + clocks: + minItems: 6 + + clock-names: + minItems: 6 + + resets: + minItems: 3 + + reset-names: + minItems: 3 + examples: - | #include --=20 2.51.0 From nobody Fri Oct 3 07:42:25 2025 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1F7002C158A; Wed, 3 Sep 2025 16:17:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756916257; cv=none; b=jG9Xv8GFUEJVNsRakF8EzBdSBdlr2BSltUxaCeuWSunWfucjYRRLrCaDp1xavyJbJpxDaOPWdJq43+JHPjRWCIua4QNdiopPGlqxZtC0uW8/erWYkwCQCOnSi8l80eg8p1MFpkxYAEUxMsHc79687jgFXVeRXmM8NyhGcO+1otY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756916257; c=relaxed/simple; bh=hzs5MMdEa63rQmotreKQ/MI7EuD2U8Ur6DKtKqZnLis=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HJxcdjcRP9XOvOVQakpZZ8FezoCiIt4SAWB8I4cETTZqyUmPTDoFM/YbOiRTb4k2Mw0ks13C2qDcu0QYn7jv5QyCDGE53Aebq6/g7IYBB2zHXzsjn1E1ogTzM3ILZgDtMSF7RXBvF/wHa5xfnIfiDHWLTNlmDuajKJyIABYNwm0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=H9P+hzvA; arc=none smtp.client-ip=209.85.128.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="H9P+hzvA" Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-45b9c35bc0aso993745e9.2; Wed, 03 Sep 2025 09:17:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1756916253; x=1757521053; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NSjM+a/UtCOs+KeC+1Mwe43tHaErZzo30UMBBl9ALYI=; b=H9P+hzvAVRGZO2kt0swPvnQU+hB5mdxctEzfEU9NfL8ye7dqe5T4e1VWoYNyY1wscy aBU6IhTNTZ040TTmACxywmWFv02gy3vAfX12APJT2wJ9uOcnwJnHB/c1CbyZp7OhLuMI seui/nK10wkhmtnumr1u+JG0DfRZKuFQurRi9c+FS6Xnvzc2oy5roplsYo/pDpPavQET hECN/m0thgu/IlG3Ct8Gi1MVeqm5m7vb6MiBg4HeTNuezwqgZRs0E6dDEdOjPJcP13mM g/sBulAIkjx3lGwjtn4haA6pH/skOD/eecqja+UBRNZlZmLm+ITH4hsrFCIupyflxLh9 ffQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756916253; x=1757521053; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NSjM+a/UtCOs+KeC+1Mwe43tHaErZzo30UMBBl9ALYI=; b=kosUPLWjVZT2zhZvhoLUDd/Z9MUYenjfaBHEqY/f793mQNS1+PZMFrjkkDXcaaqe6t qrRLVF1Q8X7ZqC41he/wm0BhYB7wVD29oKR2KiY0KRh8nDq/QMg5ZnJbArAzL1kyaYoe e8UCUzUNKB3qWyfTRWLGzKKWmfpdns5k63A993VGDv/1MiQ/sYeBHLLBQ9unnhGJW9vd nk8V8wCWKVlI7JHcu3H3PyP+c6Z3IAA76SKy74cAY9qOJQiqrGd1Tsm3kF1+k5K23tAM qw4Ki3Na7ghbq0Bp7LtbgX2Z2WUw6ne5r8PutmvVIezKJ+VBUq6amiuCMDboNX2QbLAX GIRQ== X-Forwarded-Encrypted: i=1; AJvYcCU8YQyUcZSXRMXElYN57AcIqMEtOUI5HSx7dlbSEr/v71c/vr5LkEy6Viuxe3pscsMWpBFVXhu/tqPGFbk1@vger.kernel.org, AJvYcCUUYKlizvG1oUn++z11mPsIEpzdsIICbISDncKcvGLCRXYp63nJx6Ysb1uzplCmwS12PSeuaDqqDaSg5MtvB2XZTJU=@vger.kernel.org, AJvYcCXMXPcTpa1j7shuayEskxx+6CcsEytxrszEOz18QpvXm2mII7xZEr5EFykdE9VOyw0+2uSw1ehe4vGf@vger.kernel.org, AJvYcCXwN9h3lGodidP4FKY8VDGUHo1qCMPjKjIgnvBX6O3RioPjdSfOtv6UhAo6q87pDTIDl7CYXstO9ks+@vger.kernel.org X-Gm-Message-State: AOJu0Yx3tUNdklRw6OyMaTSJ1XLJzeOCCV8ZmB3uqM9S4nyQgezSPv90 HRDtwN96fJ7YRQBfdBkhCO+2k1YCi3CJVOw7x6DvS1OMz8eXAP/4bX5y X-Gm-Gg: ASbGncsisqPG06NZBmP119iFlCyeRvojNX31l7buv1jAR3SVETMENRxPTIivbouPJkM rv5ZjVOI5mFAOwnooCK0/HNiNTpfvYi8G+dhp5Pr2nmxlmsiyqjURKUtTIFvGohHtAlKOSAQtmR k11/Z0zI1QwTlL9PKHAGDxiQTmVN2alFLfi5pT7vhsUhsHT1qQES8U+mLznHOFfQ3XD/vTALDlV QQzQZyObaDepSndMFzSQM6GWUL/DtGj9oKRK7rK9A7qBThrapyo33/qCva/xFFNpinIivdkd7sk T2Y5hdb5CCVX7yQgdavAI5lHFVFns2B1UdkbkhIbqVsNg+hveNLmk2/ONzerntMtWL6S9MEzgcj RDVQ6dJBQiOQ8SdqebTaCXDNR08IXRGfUDEZLSbRMlt+zXC4RH/l7O8hg X-Google-Smtp-Source: AGHT+IH2Pu4JhVqS/UbbYXuRvueIRTHUHdGhkRCEOOqAyE1x3zxd/y+K9oiLsym8FuhfUcGJ4iZqig== X-Received: by 2002:a05:6000:24c3:b0:3d0:ef30:d332 with SMTP id ffacd0b85a97d-3d1dea8dda6mr14556634f8f.46.1756916253425; Wed, 03 Sep 2025 09:17:33 -0700 (PDT) Received: from iku.example.org ([2a06:5906:61b:2d00:9019:aa0f:b6e4:7952]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3db72983560sm5645734f8f.1.2025.09.03.09.17.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Sep 2025 09:17:32 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Tomi Valkeinen , Jonas Karlman , Jernej Skrabec , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Geert Uytterhoeven , Michael Turquette , Stephen Boyd , Biju Das , Magnus Damm Cc: dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-clk@vger.kernel.org, Prabhakar , Fabrizio Castro , Tommaso Merciai , Lad Prabhakar Subject: [PATCH v8 5/6] drm: renesas: rz-du: mipi_dsi: Add LPCLK clock support Date: Wed, 3 Sep 2025 17:17:17 +0100 Message-ID: <20250903161718.180488-6-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250903161718.180488-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20250903161718.180488-1-prabhakar.mahadev-lad.rj@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Lad Prabhakar Add LPCLK clock handling to the RZ/G2L MIPI DSI driver to support proper DSI timing parameter configuration on RZ/V2H SoCs. While lpclk is present on both RZ/G2L and RZ/V2H SoCs, the RZ/V2H SoC specifically uses the lpclk rate to configure the DSI timing parameter ULPSEXIT. Introduce a new lpclk field in the rzg2l_mipi_dsi structure and acquire the "lpclk" clock during probe to enable lpclk rate-based timing calculations on RZ/V2H while maintaining compatibility with RZ/G2L. Co-developed-by: Fabrizio Castro Signed-off-by: Fabrizio Castro Signed-off-by: Lad Prabhakar Reviewed-by: Biju Das Reviewed-by: Tomi Valkeinen --- v7->v8: - Updated commit message - Switched to use devm_clk_get() instead of devm_clk_get_optional() as lpclk clock is available on all SoCs. v6->v7: - New patch Note, this patch was previously part of series [0]. [0] https://lore.kernel.org/all/20250609225630.502888-1-prabhakar.mahadev-l= ad.rj@bp.renesas.com/ --- drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi.c b/drivers/gpu/d= rm/renesas/rz-du/rzg2l_mipi_dsi.c index 3b52dfc0ea1e..bb03b49b1e85 100644 --- a/drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi.c +++ b/drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi.c @@ -68,6 +68,7 @@ struct rzg2l_mipi_dsi { struct drm_bridge *next_bridge; =20 struct clk *vclk; + struct clk *lpclk; =20 enum mipi_dsi_pixel_format format; unsigned int num_data_lanes; @@ -979,6 +980,10 @@ static int rzg2l_mipi_dsi_probe(struct platform_device= *pdev) if (IS_ERR(dsi->vclk)) return PTR_ERR(dsi->vclk); =20 + dsi->lpclk =3D devm_clk_get(dsi->dev, "lpclk"); + if (IS_ERR(dsi->lpclk)) + return PTR_ERR(dsi->lpclk); + dsi->rstc =3D devm_reset_control_get_optional_exclusive(dsi->dev, "rst"); if (IS_ERR(dsi->rstc)) return dev_err_probe(dsi->dev, PTR_ERR(dsi->rstc), --=20 2.51.0 From nobody Fri Oct 3 07:42:25 2025 Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BB1662C21F7; Wed, 3 Sep 2025 16:17:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756916259; cv=none; b=q3IFA5vV+SP4dHAkiHtHRQJANcWBuxt2XGXAWZyZt3fhGx4EfswxYHh2ftpC3zq1T6aawMQ6ifW3dF9iOTpfZJWy6JNUTJMvAJuotB30lgfVSRnivk7vXF70aLOVzAdQXrrr90g809Tyq19tSEcTKMesO8aamnYBb0K19wfd13g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756916259; c=relaxed/simple; bh=tMRwuCP6+qbTxZotVNThPWpgRaSNqmDfGbQ1LQ0djAs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OvoA/4Cf4U32/z9ZxZXGqd48bkV5CeEbD1bfIQzEU5UYGdPihL+fKjYiDJKXetN4cLh0NEinaXXPCZEodqRKQvu7B2oV8OulMBwXd+YQj6y09KLqgjvXgd+TcQGfmu6b2m6KN+m9mW4NWQul3LIcbqOUXMFZTSpRXbkZjzXKZTo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Tlodw0RM; arc=none smtp.client-ip=209.85.221.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Tlodw0RM" Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-3d17f24d42fso125134f8f.1; Wed, 03 Sep 2025 09:17:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1756916255; x=1757521055; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=q4HS16WWDh1ChbEkUIBdyeolgXj3/TLZPwNWVcgs6dY=; b=Tlodw0RMKS1NAPS1kC5xY29B3An3fkN82pNHN4eenLnM+QMwh0uPaxsoCvR+W6Y8l3 ttZRAxr9VWowLpLI1fe3nrsiwewHFm+rUwTPS6KVO7EMFBiz+pLQhr1joCiIW2zqdrMJ GirFil0kW4sS9UP3n6ANRIc+MFuZSTGDoJ/xDBiq0cAZKd+6LeD0XtdQkWVB3sEOu7PJ 7RbvlibyUbQgBRIUwpTAvqR8cYjy2M1u4u9+dwq6Z/TQhKFZ5/A845yUHTG0QELrgaG+ dCRsVEpux3uQ9kMivWbcqK+JXEEf1tCAR7GYsvh1hM/NfViZYQiLP0WYDQByAwQUfU1B VLQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756916255; x=1757521055; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=q4HS16WWDh1ChbEkUIBdyeolgXj3/TLZPwNWVcgs6dY=; b=dD+pHCZ147qR3JXRVLONk4ijnY6uo3jh0PiA/OtT6Ao83fERkOWZ8ZqlsCJIpqQE5T NjihrDxGXfUshPY7QDagnvdIpSid7swjx5a04O2gyk39GVAYqpHyppli8S9pvzasjQFX aekltwLYU9c04lXN7uJ8kzWXy2q3EML10jAFbDGQGMxKXf+8EVGsOxFEzibSn7CJM0CX nrsp86URgKL+XTpGqoZN7rbtflKLemy6ouv9ETjHAP3i1fORMNlmP4kC4yJXIj90DHfP 8R1coqeynCbZnEA1rHapU+i78ycoxKm8jyKJB+wUAgebOQWLseFZHEpM4zRe2ZOvoFLn qt7w== X-Forwarded-Encrypted: i=1; AJvYcCU/+LXHiv+ZhdI6w+r2PbjqSS6rCr7cFSHCzsGZq6lkTryFmmAa8Y3DWozKkjifgsTe31+XgzuWIV1g/Ml7utQmcK0=@vger.kernel.org, AJvYcCW97Vlu44snBzp2B5woI6+WjDJ3Ss5kit/5Dc8YMoqwEqKY3E4Lwi4+39yajsXb7OlPRXMRIuV7TWGu@vger.kernel.org, AJvYcCWDHuNfTzytIoVVj2bCsR/XNovji64A7eK+9TqwyCaztdwYFchHcqN37VRYeA354xFwdLb1e87mWqHoD4/r@vger.kernel.org, AJvYcCWiBJ+jmlaXFzcxVSApWL3kYnF5HFw8sFZwZYxMFdBx/YhO/Z5w9XlLlgZ7HlxYJ2kGIPGKrgA85dKf@vger.kernel.org X-Gm-Message-State: AOJu0Yzh8B01zMhkCg/ADLWpUIh1GzXlUpQycWmOJvmU2rmFpP0n9MqI 3mjy3JoqlzZa5B9UPNMTdn3RmRjmhuvWRDkVQvUJExWLwxQ5z58idf6L X-Gm-Gg: ASbGncuT2tzNUxTPfgCz+4nU1T+a++aIPH96J1C0CbeLqAhRy14BlpyG71UFYMhJ5aP kTtwZAgmoj+8SpE/M6Ug2j/A2IkHq48cJQC+iqFi/krHn54eaJJtDCUGi/FHEfSpqyoQVsFTQc9 IjPoMJrMgw75VMERAwZGLfuA0U6jhLhEFsmC/YTFmpJ7W7nPv8r99HilElsJp1la2LTSMNN8HG6 nFl0ihas2fpOltQAdRDPJAc/C8y1DyFYPrAG/sgy5Tlwla2cutJzs3PaWwQJi6hbWOvVoRzGSoO /0arWPXXKfu8dDJxFX+p7oh1AXel2kLoIOfvZ9pItDSRMH188yAsi9QTgimNgYdBu/F0CimK6iR DXpKuE4yVFC9wRsf9ViuhjKFjW8QJYbqz8NKuxyHataAIaGLG+rd93/Oo X-Google-Smtp-Source: AGHT+IG1lukqOxm8Spz471yZJ3IkhJ2oXGOlcsk+qwQ5oc2vC1O6X6Qe32OoyA9UJdjlbjQmA3MKWQ== X-Received: by 2002:a05:6000:144e:b0:3d4:eac4:9db2 with SMTP id ffacd0b85a97d-3d4eac4a063mr11453007f8f.5.1756916254647; Wed, 03 Sep 2025 09:17:34 -0700 (PDT) Received: from iku.example.org ([2a06:5906:61b:2d00:9019:aa0f:b6e4:7952]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3db72983560sm5645734f8f.1.2025.09.03.09.17.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Sep 2025 09:17:34 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Tomi Valkeinen , Jonas Karlman , Jernej Skrabec , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Geert Uytterhoeven , Michael Turquette , Stephen Boyd , Biju Das , Magnus Damm Cc: dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-clk@vger.kernel.org, Prabhakar , Fabrizio Castro , Tommaso Merciai , Lad Prabhakar Subject: [PATCH v8 6/6] drm: renesas: rz-du: mipi_dsi: Add support for RZ/V2H(P) SoC Date: Wed, 3 Sep 2025 17:17:18 +0100 Message-ID: <20250903161718.180488-7-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250903161718.180488-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20250903161718.180488-1-prabhakar.mahadev-lad.rj@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Lad Prabhakar Add MIPI DSI support for the Renesas RZ/V2H(P) SoC. Compared to the RZ/G2L family, the RZ/V2H(P) requires dedicated D-PHY PLL programming, different clock configuration, and additional timing parameter handling. The driver introduces lookup tables and helpers for D-PHY timings (TCLK*, THS*, TLPX, and ULPS exit) as specified in the RZ/V2H(P) hardware manual. ULPS exit timing depends on the LPCLK rate and is now handled explicitly. The implementation also adds support for 16 bpp RGB format, updates the clock setup path to use the RZ/V2H PLL divider limits, and provides new .dphy_init, .dphy_conf_clks, and .dphy_startup_late_init callbacks to match the RZ/V2H sequence. With these changes, the RZ/V2H(P) can operate the MIPI DSI interface in compliance with its hardware specification while retaining support for existing RZ/G2L platforms. Co-developed-by: Fabrizio Castro Signed-off-by: Fabrizio Castro Signed-off-by: Lad Prabhakar Reviewed-by: Tomi Valkeinen --- v7->v8: - Updated commit message - Simplified check in rzv2h_mipi_dsi_dphy_init() for PLL parameters - Renamed start_index member to base_value in struct rzv2h_mipi_dsi_timings - Added comments in the code for DSI arrays and their usage - Added comments in the code for sleeps v6->v7: - Used the new apis for calculating the PLLDSI parameters in the DSI driver. v5->v6: - Made use of GENMASK() macro for PLLCLKSET0R_PLL_*, PHYTCLKSETR_* and PHYTHSSETR_* macros. - Replaced 10000000UL with 10 * MEGA - Renamed mode_freq_hz to mode_freq_khz in rzv2h_dsi_mode_calc - Replaced `i -=3D 1;` with `i--;` - Renamed RZV2H_MIPI_DPHY_FOUT_MIN_IN_MEGA to RZV2H_MIPI_DPHY_FOUT_MIN_IN_MHZ and RZV2H_MIPI_DPHY_FOUT_MAX_IN_MEGA to RZV2H_MIPI_DPHY_FOUT_MAX_IN_MHZ. v4->v5: - No changes v3->v4 - In rzv2h_dphy_find_ulpsexit() made the array static const. v2->v3: - Simplifed V2H DSI timings array to save space - Switched to use fsleep() instead of udelay() v1->v2: - Dropped unused macros - Added missing LPCLK flag to rzv2h_info --- .../gpu/drm/renesas/rz-du/rzg2l_mipi_dsi.c | 446 ++++++++++++++++++ .../drm/renesas/rz-du/rzg2l_mipi_dsi_regs.h | 34 ++ 2 files changed, 480 insertions(+) diff --git a/drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi.c b/drivers/gpu/d= rm/renesas/rz-du/rzg2l_mipi_dsi.c index bb03b49b1e85..ed7ee5883c00 100644 --- a/drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi.c +++ b/drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi.c @@ -7,6 +7,7 @@ =20 #include #include +#include #include #include #include @@ -46,6 +47,11 @@ struct rzg2l_mipi_dsi_hw_info { u64 *hsfreq_millihz); unsigned int (*dphy_mode_clk_check)(struct rzg2l_mipi_dsi *dsi, unsigned long mode_freq); + struct { + const struct rzv2h_pll_limits **limits; + const u8 *table; + const u8 table_size; + } cpg_plldsi; u32 phy_reg_offset; u32 link_reg_offset; unsigned long min_dclk; @@ -53,6 +59,11 @@ struct rzg2l_mipi_dsi_hw_info { u8 features; }; =20 +struct rzv2h_dsi_mode_calc { + unsigned long mode_freq_khz; + struct rzv2h_pll_pars dsi_parameters; +}; + struct rzg2l_mipi_dsi { struct device *dev; void __iomem *mmio; @@ -75,11 +86,22 @@ struct rzg2l_mipi_dsi { unsigned int lanes; unsigned long mode_flags; =20 + struct rzv2h_dsi_mode_calc mode_calc; + /* DCS buffer pointers when using external memory. */ dma_addr_t dcs_buf_phys; u8 *dcs_buf_virt; }; =20 +static const struct rzv2h_pll_limits rzv2h_plldsi_div_limits =3D { + .fout =3D { .min =3D 80 * MEGA, .max =3D 1500 * MEGA }, + .fvco =3D { .min =3D 1050 * MEGA, .max =3D 2100 * MEGA }, + .m =3D { .min =3D 64, .max =3D 1023 }, + .p =3D { .min =3D 1, .max =3D 4 }, + .s =3D { .min =3D 0, .max =3D 5 }, + .k =3D { .min =3D -32768, .max =3D 32767 }, +}; + static inline struct rzg2l_mipi_dsi * bridge_to_rzg2l_mipi_dsi(struct drm_bridge *bridge) { @@ -194,6 +216,237 @@ static const struct rzg2l_mipi_dsi_timings rzg2l_mipi= _dsi_global_timings[] =3D { }, }; =20 +/** + * struct rzv2h_mipi_dsi_timings - Timing parameter table structure + * + * @hsfreq: Pointer to frequency threshold array + * @len: Number of entries in the hsfreq array + * @base_value: Base register value offset for this timing parameter + * + * Each timing parameter (TCLK*, THS*, etc.) has its own table with + * frequency thresholds and corresponding base register values. + */ +struct rzv2h_mipi_dsi_timings { + const u8 *hsfreq; + u8 len; + u8 base_value; +}; + +/* + * enum rzv2h_dsi_timing_idx - MIPI DSI timing parameter indices + * + * These enums correspond to different MIPI DSI PHY timing parameters. + */ +enum rzv2h_dsi_timing_idx { + TCLKPRPRCTL, + TCLKZEROCTL, + TCLKPOSTCTL, + TCLKTRAILCTL, + THSPRPRCTL, + THSZEROCTL, + THSTRAILCTL, + TLPXCTL, + THSEXITCTL, +}; + +/* + * RZ/V2H(P) Frequency threshold lookup tables for D-PHY timing parameters + * + * - Each array contains frequency thresholds (in units of 10 Mbps), + * taken directly from the table 9.5-4 hardware manual. + * - These thresholds define the frequency ranges for which timing + * register values must be programmed. + * - The actual register value is calculated in + * rzv2h_dphy_find_timings_val(): + * + * register_value =3D timings->base_value + table_index + * + * Example (TCLKPRPRCTL, from HW manual): + * 0-150 Mbps -> index 0 -> register_value =3D base + 0 =3D 0 + 0 =3D 0 + * 151-260 Mbps -> index 1 -> register_value =3D base + 1 =3D 0 + 1 =3D 1 + * 261-370 Mbps -> index 2 -> register_value =3D base + 2 =3D 0 + 2 =3D 2 + * + * Each of the following arrays corresponds to a specific timing + * parameter (TCLKPRPRCTL, TCLKZEROCTL, TCLKPOSTCTL, etc.). + */ +static const u8 tclkprprctl[] =3D { + 15, 26, 37, 47, 58, 69, 79, 90, 101, 111, 122, 133, 143, 150, +}; + +static const u8 tclkzeroctl[] =3D { + 9, 11, 13, 15, 18, 21, 23, 24, 25, 27, 29, 31, 34, 36, 38, + 41, 43, 45, 47, 50, 52, 54, 57, 59, 61, 63, 66, 68, 70, 73, + 75, 77, 79, 82, 84, 86, 89, 91, 93, 95, 98, 100, 102, 105, + 107, 109, 111, 114, 116, 118, 121, 123, 125, 127, 130, 132, + 134, 137, 139, 141, 143, 146, 148, 150, +}; + +static const u8 tclkpostctl[] =3D { + 8, 21, 34, 48, 61, 74, 88, 101, 114, 128, 141, 150, +}; + +static const u8 tclktrailctl[] =3D { + 14, 25, 37, 48, 59, 71, 82, 94, 105, 117, 128, 139, 150, +}; + +static const u8 thsprprctl[] =3D { + 11, 19, 29, 40, 50, 61, 72, 82, 93, 103, 114, 125, 135, 146, 150, +}; + +static const u8 thszeroctl[] =3D { + 18, 24, 29, 35, 40, 46, 51, 57, 62, 68, 73, 79, 84, 90, + 95, 101, 106, 112, 117, 123, 128, 134, 139, 145, 150, +}; + +static const u8 thstrailctl[] =3D { + 10, 21, 32, 42, 53, 64, 75, 85, 96, 107, 118, 128, 139, 150, +}; + +static const u8 tlpxctl[] =3D { + 13, 26, 39, 53, 66, 79, 93, 106, 119, 133, 146, 150, +}; + +static const u8 thsexitctl[] =3D { + 15, 23, 31, 39, 47, 55, 63, 71, 79, 87, + 95, 103, 111, 119, 127, 135, 143, 150, +}; + +/* + * rzv2h_dsi_timings_tables - main timing parameter lookup table + * Maps timing parameter enum to its frequency table, array length and + * base register offset value. + */ +static const struct rzv2h_mipi_dsi_timings rzv2h_dsi_timings_tables[] =3D { + [TCLKPRPRCTL] =3D { + .hsfreq =3D tclkprprctl, + .len =3D ARRAY_SIZE(tclkprprctl), + .base_value =3D 0, + }, + [TCLKZEROCTL] =3D { + .hsfreq =3D tclkzeroctl, + .len =3D ARRAY_SIZE(tclkzeroctl), + .base_value =3D 2, + }, + [TCLKPOSTCTL] =3D { + .hsfreq =3D tclkpostctl, + .len =3D ARRAY_SIZE(tclkpostctl), + .base_value =3D 6, + }, + [TCLKTRAILCTL] =3D { + .hsfreq =3D tclktrailctl, + .len =3D ARRAY_SIZE(tclktrailctl), + .base_value =3D 1, + }, + [THSPRPRCTL] =3D { + .hsfreq =3D thsprprctl, + .len =3D ARRAY_SIZE(thsprprctl), + .base_value =3D 0, + }, + [THSZEROCTL] =3D { + .hsfreq =3D thszeroctl, + .len =3D ARRAY_SIZE(thszeroctl), + .base_value =3D 0, + }, + [THSTRAILCTL] =3D { + .hsfreq =3D thstrailctl, + .len =3D ARRAY_SIZE(thstrailctl), + .base_value =3D 3, + }, + [TLPXCTL] =3D { + .hsfreq =3D tlpxctl, + .len =3D ARRAY_SIZE(tlpxctl), + .base_value =3D 0, + }, + [THSEXITCTL] =3D { + .hsfreq =3D thsexitctl, + .len =3D ARRAY_SIZE(thsexitctl), + .base_value =3D 1, + }, +}; + +/** + * rzv2h_dphy_find_ulpsexit - Find ULP Exit timing value based on frequency + * The function maps frequency ranges to ULP exit timing values. + * Thresholds in the local hsfreq[] are expressed in Hz already. + * + * @freq: Input frequency in Hz + * + * Return: ULP exit timing value + */ +static u16 rzv2h_dphy_find_ulpsexit(unsigned long freq) +{ + /* Frequency thresholds in Hz for ULP exit timing selection */ + static const unsigned long hsfreq[] =3D { + 1953125UL, + 3906250UL, + 7812500UL, + 15625000UL, + }; + /* Corresponding ULP exit timing values for each frequency range */ + static const u16 ulpsexit[] =3D {49, 98, 195, 391}; + unsigned int i; + + /* Find the appropriate frequency range */ + for (i =3D 0; i < ARRAY_SIZE(hsfreq); i++) { + if (freq <=3D hsfreq[i]) + break; + } + + /* If frequency exceeds all thresholds, use the highest range */ + if (i =3D=3D ARRAY_SIZE(hsfreq)) + i--; + + return ulpsexit[i]; +} + +/** + * rzv2h_dphy_find_timings_val - Find timing parameter value from lookup t= ables + * @freq: Input frequency in Hz + * @index: Index to select timing parameter table (see enum rzv2h_dsi_timi= ng_idx) + * + * Selects the timing table for the requested parameter, finds the + * frequency range entry and returns the register value to program: + * + * register_value =3D timings->base_value + table_index + * + * Note: frequency table entries are stored as small integers (units of 10= ): + * threshold_in_hz =3D (unsigned long)table_entry * 10 * MEGA + * + * Return: timing register value to be programmed into hardware + */ +static u16 rzv2h_dphy_find_timings_val(unsigned long freq, u8 index) +{ + const struct rzv2h_mipi_dsi_timings *timings; + u16 i; + + /* Get the timing table structure for the requested parameter */ + timings =3D &rzv2h_dsi_timings_tables[index]; + + /* + * Search through frequency table to find appropriate range + * timings->hsfreq[i] contains frequency values from HW manual + * Convert to Hz by multiplying by 10 * MEGA. + */ + for (i =3D 0; i < timings->len; i++) { + unsigned long hsfreq =3D timings->hsfreq[i] * 10 * MEGA; + + if (freq <=3D hsfreq) + break; + } + + /* If frequency exceeds table range, use the last entry */ + if (i =3D=3D timings->len) + i--; + + /* + * Calculate final register value: + * - timings->base_value: base value for this timing parameter + * - i: index into frequency table (0-based) + * Combined they give the exact register value to program + */ + return timings->base_value + i; +}; + static void rzg2l_mipi_dsi_phy_write(struct rzg2l_mipi_dsi *dsi, u32 reg, = u32 data) { iowrite32(data, dsi->mmio + dsi->info->phy_reg_offset + reg); @@ -318,6 +571,169 @@ static int rzg2l_dphy_conf_clks(struct rzg2l_mipi_dsi= *dsi, unsigned long mode_f return 0; } =20 +static unsigned int rzv2h_dphy_mode_clk_check(struct rzg2l_mipi_dsi *dsi, + unsigned long mode_freq) +{ + u64 hsfreq_millihz, mode_freq_hz, mode_freq_millihz; + struct rzv2h_pll_div_pars cpg_dsi_parameters; + struct rzv2h_pll_pars dsi_parameters; + bool parameters_found; + unsigned int bpp; + + bpp =3D mipi_dsi_pixel_format_to_bpp(dsi->format); + mode_freq_hz =3D mul_u32_u32(mode_freq, KILO); + mode_freq_millihz =3D mode_freq_hz * MILLI; + parameters_found =3D + rzv2h_get_pll_divs_pars(dsi->info->cpg_plldsi.limits[0], + &cpg_dsi_parameters, + dsi->info->cpg_plldsi.table, + dsi->info->cpg_plldsi.table_size, + mode_freq_millihz); + if (!parameters_found) + return MODE_CLOCK_RANGE; + + hsfreq_millihz =3D DIV_ROUND_CLOSEST_ULL(cpg_dsi_parameters.div.freq_mill= ihz * bpp, + dsi->lanes); + parameters_found =3D rzv2h_get_pll_pars(&rzv2h_plldsi_div_limits, + &dsi_parameters, hsfreq_millihz); + if (!parameters_found) + return MODE_CLOCK_RANGE; + + if (abs(dsi_parameters.error_millihz) >=3D 500) + return MODE_CLOCK_RANGE; + + memcpy(&dsi->mode_calc.dsi_parameters, &dsi_parameters, sizeof(dsi_parame= ters)); + dsi->mode_calc.mode_freq_khz =3D mode_freq; + + return MODE_OK; +} + +static int rzv2h_dphy_conf_clks(struct rzg2l_mipi_dsi *dsi, unsigned long = mode_freq, + u64 *hsfreq_millihz) +{ + struct rzv2h_pll_pars *dsi_parameters =3D &dsi->mode_calc.dsi_parameters; + unsigned long status; + + if (dsi->mode_calc.mode_freq_khz !=3D mode_freq) { + status =3D rzv2h_dphy_mode_clk_check(dsi, mode_freq); + if (status !=3D MODE_OK) { + dev_err(dsi->dev, "No PLL parameters found for mode clk %lu\n", + mode_freq); + return -EINVAL; + } + } + + *hsfreq_millihz =3D dsi_parameters->freq_millihz; + + return 0; +} + +static int rzv2h_mipi_dsi_dphy_init(struct rzg2l_mipi_dsi *dsi, + u64 hsfreq_millihz) +{ + struct rzv2h_pll_pars *dsi_parameters =3D &dsi->mode_calc.dsi_parameters; + unsigned long lpclk_rate =3D clk_get_rate(dsi->lpclk); + u32 phytclksetr, phythssetr, phytlpxsetr, phycr; + struct rzg2l_mipi_dsi_timings dphy_timings; + u16 ulpsexit; + u64 hsfreq; + + hsfreq =3D DIV_ROUND_CLOSEST_ULL(hsfreq_millihz, MILLI); + + if (dsi_parameters->freq_millihz !=3D hsfreq_millihz && + !rzv2h_get_pll_pars(&rzv2h_plldsi_div_limits, dsi_parameters, + hsfreq_millihz)) { + dev_err(dsi->dev, "No PLL parameters found for HSFREQ %lluHz\n", hsfreq); + return -EINVAL; + } + + dphy_timings.tclk_trail =3D + rzv2h_dphy_find_timings_val(hsfreq, TCLKTRAILCTL); + dphy_timings.tclk_post =3D + rzv2h_dphy_find_timings_val(hsfreq, TCLKPOSTCTL); + dphy_timings.tclk_zero =3D + rzv2h_dphy_find_timings_val(hsfreq, TCLKZEROCTL); + dphy_timings.tclk_prepare =3D + rzv2h_dphy_find_timings_val(hsfreq, TCLKPRPRCTL); + dphy_timings.ths_exit =3D + rzv2h_dphy_find_timings_val(hsfreq, THSEXITCTL); + dphy_timings.ths_trail =3D + rzv2h_dphy_find_timings_val(hsfreq, THSTRAILCTL); + dphy_timings.ths_zero =3D + rzv2h_dphy_find_timings_val(hsfreq, THSZEROCTL); + dphy_timings.ths_prepare =3D + rzv2h_dphy_find_timings_val(hsfreq, THSPRPRCTL); + dphy_timings.tlpx =3D + rzv2h_dphy_find_timings_val(hsfreq, TLPXCTL); + ulpsexit =3D rzv2h_dphy_find_ulpsexit(lpclk_rate); + + phytclksetr =3D FIELD_PREP(PHYTCLKSETR_TCLKTRAILCTL, dphy_timings.tclk_tr= ail) | + FIELD_PREP(PHYTCLKSETR_TCLKPOSTCTL, dphy_timings.tclk_post) | + FIELD_PREP(PHYTCLKSETR_TCLKZEROCTL, dphy_timings.tclk_zero) | + FIELD_PREP(PHYTCLKSETR_TCLKPRPRCTL, dphy_timings.tclk_prepare); + phythssetr =3D FIELD_PREP(PHYTHSSETR_THSEXITCTL, dphy_timings.ths_exit) | + FIELD_PREP(PHYTHSSETR_THSTRAILCTL, dphy_timings.ths_trail) | + FIELD_PREP(PHYTHSSETR_THSZEROCTL, dphy_timings.ths_zero) | + FIELD_PREP(PHYTHSSETR_THSPRPRCTL, dphy_timings.ths_prepare); + phytlpxsetr =3D rzg2l_mipi_dsi_phy_read(dsi, PHYTLPXSETR) & ~PHYTLPXSETR_= TLPXCTL; + phytlpxsetr |=3D FIELD_PREP(PHYTLPXSETR_TLPXCTL, dphy_timings.tlpx); + phycr =3D rzg2l_mipi_dsi_phy_read(dsi, PHYCR) & ~GENMASK(9, 0); + phycr |=3D FIELD_PREP(PHYCR_ULPSEXIT, ulpsexit); + + /* Setting all D-PHY Timings Registers */ + rzg2l_mipi_dsi_phy_write(dsi, PHYTCLKSETR, phytclksetr); + rzg2l_mipi_dsi_phy_write(dsi, PHYTHSSETR, phythssetr); + rzg2l_mipi_dsi_phy_write(dsi, PHYTLPXSETR, phytlpxsetr); + rzg2l_mipi_dsi_phy_write(dsi, PHYCR, phycr); + + rzg2l_mipi_dsi_phy_write(dsi, PLLCLKSET0R, + FIELD_PREP(PLLCLKSET0R_PLL_S, dsi_parameters->s) | + FIELD_PREP(PLLCLKSET0R_PLL_P, dsi_parameters->p) | + FIELD_PREP(PLLCLKSET0R_PLL_M, dsi_parameters->m)); + rzg2l_mipi_dsi_phy_write(dsi, PLLCLKSET1R, + FIELD_PREP(PLLCLKSET1R_PLL_K, dsi_parameters->k)); + + /* + * From RZ/V2H HW manual (Rev.1.20) section 9.5.3 Operation, + * (C) After write to D-PHY registers we need to wait for more than 1 x tp + * + * tp =3D 1 / (PLLREFCLK / PLLCLKSET0R.PLL_P) + * PLLREFCLK =3D 24MHz + * PLLCLKSET0R.PLL_P =3D {1, 2, 3, 4} + * + * To handle all the cases lets use PLLCLKSET0R.PLL_P =3D 4 + * tp =3D 1 / (24MHz / 4) =3D 1 / 6MHz =3D 166.67ns + */ + ndelay(200); + + rzg2l_mipi_dsi_phy_write(dsi, PLLENR, PLLENR_PLLEN); + /* + * From RZ/V2H HW manual (Rev.1.20) section 9.5.3 Operation, + * (D) After write to PLLENR.PLLEN we need to wait for more than 3000 x tp + * + * 3000 x tp =3D 3000 x 0.16667 ns =3D 500.01 microseconds + */ + usleep_range(510, 520); + + return 0; +} + +static void rzv2h_mipi_dsi_dphy_startup_late_init(struct rzg2l_mipi_dsi *d= si) +{ + /* + * From RZ/V2H HW manual (Rev.1.20) section 9.5.3 Operation, + * (E) After write to TXSETR we need to wait for more than 200 microsecon= ds + * and then write to PHYRSTR + */ + usleep_range(210, 220); + rzg2l_mipi_dsi_phy_write(dsi, PHYRSTR, PHYRSTR_PHYMRSTN); +} + +static void rzv2h_mipi_dsi_dphy_exit(struct rzg2l_mipi_dsi *dsi) +{ + rzg2l_mipi_dsi_phy_write(dsi, PLLENR, 0); +} + static int rzg2l_mipi_dsi_startup(struct rzg2l_mipi_dsi *dsi, const struct drm_display_mode *mode) { @@ -430,6 +846,9 @@ static void rzg2l_mipi_dsi_set_display_timing(struct rz= g2l_mipi_dsi *dsi, case 18: vich1ppsetr =3D VICH1PPSETR_DT_RGB18; break; + case 16: + vich1ppsetr =3D VICH1PPSETR_DT_RGB16; + break; } =20 if ((dsi->mode_flags & MIPI_DSI_MODE_VIDEO_SYNC_PULSE) && @@ -1056,6 +1475,32 @@ static void rzg2l_mipi_dsi_remove(struct platform_de= vice *pdev) pm_runtime_disable(&pdev->dev); } =20 +RZV2H_CPG_PLL_DSI_LIMITS(rzv2h_cpg_pll_dsi_limits); + +static const struct rzv2h_pll_limits *rzv2h_plldsi_limits[] =3D { + &rzv2h_cpg_pll_dsi_limits, +}; + +static const u8 rzv2h_cpg_div_table[] =3D { + 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, +}; + +static const struct rzg2l_mipi_dsi_hw_info rzv2h_mipi_dsi_info =3D { + .dphy_init =3D rzv2h_mipi_dsi_dphy_init, + .dphy_startup_late_init =3D rzv2h_mipi_dsi_dphy_startup_late_init, + .dphy_exit =3D rzv2h_mipi_dsi_dphy_exit, + .dphy_mode_clk_check =3D rzv2h_dphy_mode_clk_check, + .dphy_conf_clks =3D rzv2h_dphy_conf_clks, + .cpg_plldsi.limits =3D rzv2h_plldsi_limits, + .cpg_plldsi.table =3D rzv2h_cpg_div_table, + .cpg_plldsi.table_size =3D ARRAY_SIZE(rzv2h_cpg_div_table), + .phy_reg_offset =3D 0x10000, + .link_reg_offset =3D 0, + .min_dclk =3D 5440, + .max_dclk =3D 187500, + .features =3D RZ_MIPI_DSI_FEATURE_16BPP, +}; + static const struct rzg2l_mipi_dsi_hw_info rzg2l_mipi_dsi_info =3D { .dphy_init =3D rzg2l_mipi_dsi_dphy_init, .dphy_exit =3D rzg2l_mipi_dsi_dphy_exit, @@ -1066,6 +1511,7 @@ static const struct rzg2l_mipi_dsi_hw_info rzg2l_mipi= _dsi_info =3D { }; =20 static const struct of_device_id rzg2l_mipi_dsi_of_table[] =3D { + { .compatible =3D "renesas,r9a09g057-mipi-dsi", .data =3D &rzv2h_mipi_dsi= _info, }, { .compatible =3D "renesas,rzg2l-mipi-dsi", .data =3D &rzg2l_mipi_dsi_inf= o, }, { /* sentinel */ } }; diff --git a/drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi_regs.h b/drivers/= gpu/drm/renesas/rz-du/rzg2l_mipi_dsi_regs.h index d8082a87d874..2bef20566648 100644 --- a/drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi_regs.h +++ b/drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi_regs.h @@ -40,6 +40,39 @@ #define DSIDPHYTIM3_THS_TRAIL(x) ((x) << 8) #define DSIDPHYTIM3_THS_ZERO(x) ((x) << 0) =20 +/* RZ/V2H DPHY Registers */ +#define PLLENR 0x000 +#define PLLENR_PLLEN BIT(0) + +#define PHYRSTR 0x004 +#define PHYRSTR_PHYMRSTN BIT(0) + +#define PLLCLKSET0R 0x010 +#define PLLCLKSET0R_PLL_S GENMASK(2, 0) +#define PLLCLKSET0R_PLL_P GENMASK(13, 8) +#define PLLCLKSET0R_PLL_M GENMASK(25, 16) + +#define PLLCLKSET1R 0x014 +#define PLLCLKSET1R_PLL_K GENMASK(15, 0) + +#define PHYTCLKSETR 0x020 +#define PHYTCLKSETR_TCLKTRAILCTL GENMASK(7, 0) +#define PHYTCLKSETR_TCLKPOSTCTL GENMASK(15, 8) +#define PHYTCLKSETR_TCLKZEROCTL GENMASK(23, 16) +#define PHYTCLKSETR_TCLKPRPRCTL GENMASK(31, 24) + +#define PHYTHSSETR 0x024 +#define PHYTHSSETR_THSEXITCTL GENMASK(7, 0) +#define PHYTHSSETR_THSTRAILCTL GENMASK(15, 8) +#define PHYTHSSETR_THSZEROCTL GENMASK(23, 16) +#define PHYTHSSETR_THSPRPRCTL GENMASK(31, 24) + +#define PHYTLPXSETR 0x028 +#define PHYTLPXSETR_TLPXCTL GENMASK(7, 0) + +#define PHYCR 0x030 +#define PHYCR_ULPSEXIT GENMASK(9, 0) + /* --------------------------------------------------------*/ =20 /* Link Status Register */ @@ -130,6 +163,7 @@ =20 /* Video-Input Channel 1 Pixel Packet Set Register */ #define VICH1PPSETR 0x420 +#define VICH1PPSETR_DT_RGB16 (0x0e << 16) #define VICH1PPSETR_DT_RGB18 (0x1e << 16) #define VICH1PPSETR_DT_RGB18_LS (0x2e << 16) #define VICH1PPSETR_DT_RGB24 (0x3e << 16) --=20 2.51.0