From nobody Sun Oct 5 23:45:01 2025 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (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 466A6253B42; Mon, 28 Jul 2025 20:14:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753733683; cv=none; b=G9u+oG6H06xAbwO4/qdKhUUyVBLR3XidrVVtt/A0TPwoM175h8nr1HZHlR+z//bIY8YXijJ+/bnsNhbIPGHYC/17Vu++REgoCd/xMcjVxQsp6upDxeBhHw3VqNB3yCDjGB1aEqxdkGTMAoqIlm9jd8XYBhmrNh9egClpbviP91c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753733683; c=relaxed/simple; bh=Xrb1i7MSE7FAk/A5GShKxAcPH/fBCaKJfypqdS/b5i8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dou8Pz72bNoNVio9DBVAIybexm/gXFNVp+ThzJaAu8uLxN7pYie7duJ4w81w8oKUdxJCy6LQC0ORiIFdTkx1oh5j+WLlf6F4ZtBdI+Q7c+v4FdoXIpjh4e6EUlyETa5nMF55ZlzYTPfkVaj/9vHBG3TTU7vEFdLZczbQY0uPMds= 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=Em7c94c9; arc=none smtp.client-ip=209.85.128.51 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="Em7c94c9" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-4561607166aso33961295e9.2; Mon, 28 Jul 2025 13:14:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1753733680; x=1754338480; 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=wMuXGDptpudzRDqlzxY9BCXwivqwkH1BJdjiQYZbTBQ=; b=Em7c94c9GD1XOSB6AymaEc4/xxvVS5hpxzMKCKRGnp/aL1kBaPEi5jZfiXmoHJH9KC A1V0SQDVRBV7sUfiOiLja1UVfLtAQFdEZIYWw1KMJ0K4Udfh5dJkFQJOdEE+74wW1XOi wESyQnI9lHSGA/0xXGF3YX6gYeaWWWIv2uacJb2sw3szmEX7rqXYzAff36zr5UQScwq3 Rqv/bSmMmyDKA7hMcrX4F53dm85CqEK/NLcHmxK+N7rm5pC8EqJarENkOFv4GkrH6KwT XB8/4LhcX+dl1DqLmUa5aV/k2dd7gnWPshQ9nWE9FEjFC+xUjyid8vyE9O/9/M0YqNMi XNBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753733680; x=1754338480; 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=wMuXGDptpudzRDqlzxY9BCXwivqwkH1BJdjiQYZbTBQ=; b=CeVuhP0OuB/IASB4ZUlIqQgsLjCCVSDc7oD5HNLdqEpHsOr32rIgmpa6yT6Hs9lu6/ ESUaZ9Q9dlBV5twDnknNLe/gvZoxEd51oehb2cfPHJamDoBGUZguCNkuvkmU4IEMtr8X W6XxM/Z6uUwwJ0sr7plsRHAey2fODiYLLDRBCHsW1rSxsAVCtYWqdeAAXuF53lVkMjbC /lG8wsq5YauuhK3VGdzNAoyPfFt8IXJ6ugMGOT7slYgMO/MsCOW732hPZARj9wq9lZlX 6Lz6Re9fzaRxg7/Q/G2pl23c2WMOTnpaowR1ywqG6pA1vpLs8yHlRc8WmZZ9AVXVoNTF b/yA== X-Forwarded-Encrypted: i=1; AJvYcCUFGp6UWa2jpmx1FXO+xP84LdsWkkbdL+0oV5r//p4qBmsSpoLldtbeCvSv0JM81lMXlf1QkBGmf8ht5klo@vger.kernel.org, AJvYcCUI+7zncsblOmJBaPRLM9FVpAYO7/OTzTSBfaxRqeAoZy09z9uegkie4vDdst193+9BsBdQhEwIkCb1@vger.kernel.org, AJvYcCXYoDLQkcdTfYvCM3f7NO3xIdwv3XkTjCBA+07o/Jt6i+nwqFLqfEZ/7R7P0aAQBXq7TCrNnFkBZWIQ@vger.kernel.org, AJvYcCXg2A5LydT5nVEoQLHkhBg8n9yBJEbGXXZsNnAJQ2g0TIqbvkkamZ6XwKneTNQWHRyfWmOKrps65VIfE7IpcP9tk9k=@vger.kernel.org X-Gm-Message-State: AOJu0YwelnLoNeDUzpKicJVmt5KwQxFpMv+rwYU9HW3JXMGqUIm3agLg G1r+3KnRxsohH/3kM6MgOQmgv3J6CGesAvFlN8zPrLnCb4lGXLnk21LP X-Gm-Gg: ASbGncvO/PbxbbZKv8ihWAm1hLXU2kE+d8ayJ/Eh/26LvgCm/RC8M3GJ7b95Nv/97ge l36DptpI01O+xn/yt/zfvXX7ucCMxeSRX8vr8ydC2ew9wlhdE9dJzNxjwQkyWHvd1uugf77ASKM nq4gSXxypB0vNfsLtcnTRerlavdemZ58/OGp5BfGNI5dhVqbJG/7RcMJlUyDBVCAEfBxD3FIwuC 1j64GzNViAEdSeWdgs/oOyWi5lXxrqRW4B8nM+5rIzfq4XE4vHJ/1Kj0LFnzQXy5OPzk7FKj1PS dm5iZsYEIjCVNoklRHMagY2crRtL44UoL7Rb2b8d1Q0EVi2lULgyawJJ56xIgRXQfsRFdIyATRA LWZXEH0ya5t58pNZJHZqiTTPQrNzgYXqtgFJmi6HOnv8bcxzTHzkAcDWIWzPW5PD3OSl0MNR/Ot DdMetqwfQ= X-Google-Smtp-Source: AGHT+IEnC8IoXVKoS4VI4Nn2RYIdFiuDczHhoY1pfwevf3WxCTPWE3ejH5RaK7+c9B064MgVYFHXvA== X-Received: by 2002:a05:600c:1e2a:b0:456:2832:f98d with SMTP id 5b1f17b1804b1-45876556361mr107218895e9.27.1753733680306; Mon, 28 Jul 2025 13:14:40 -0700 (PDT) Received: from iku.example.org (97e54365.skybroadband.com. [151.229.67.101]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b78889682bsm4317760f8f.77.2025.07.28.13.14.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Jul 2025 13:14:39 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Geert Uytterhoeven , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Rob Herring , Krzysztof Kozlowski , Conor Dooley , 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 v7 1/6] clk: renesas: rzv2h-cpg: Add instance field to struct pll Date: Mon, 28 Jul 2025 21:14:30 +0100 Message-ID: <20250728201435.3505594-2-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250728201435.3505594-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20250728201435.3505594-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: Geert Uytterhoeven --- 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.50.1 From nobody Sun Oct 5 23:45:01 2025 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.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 AFE8827877D; Mon, 28 Jul 2025 20:14:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753733686; cv=none; b=Uo97CaYnVv7gODvBdMofYXUi4Hzz5sG8/opS0WN+BtJQH7UG4YO13pm//OYI2Frk70T3ZBCH0B7tnxzmw7UYYe8wBP1sAAUyY839zRnQjRyvvgAv1zLPFYBrSGKyvgs2fod8b02lHvpwzhfgXFr2/DXaeG5Rfb6WldzIAi1h/Ns= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753733686; c=relaxed/simple; bh=kyV6hzxxOsLqyZ7HhySCZUcy4T163bZNkS8dibb1CdQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rpkvPf7Gt1IOEkouWgxSC8zMRmOX5YojeMNDZB5fdqcDkprXmpPxjlZ1GnFEoajcoZgw298oLxeSNHjWNZpSJ2Fez7fwL2RbesaUygB38EUyV19Vrn9aCIvBUiMBjuJnzktDCGlLHQ5t5kw/eqO1TlKfioxrRd6vWf8PTPAIUPU= 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=DlcCJITo; arc=none smtp.client-ip=209.85.128.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="DlcCJITo" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-451d7b50815so32137515e9.2; Mon, 28 Jul 2025 13:14:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1753733682; x=1754338482; 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=2v8P5zzZojXqdsS2T5towU0McwT+Ir9vWDLAjcCzSiQ=; b=DlcCJIToq+NmYS/DQoF6J2FfS8YCnZ4+Z9o/Wydk5MIXQp2HXja5TdFdwhcjLN7Zvc OVs8Af+SxwE0QnzJ0ewH2A2hDH5fMkDoFBH9IXD2DGpGG7FeEc39bUT5zrLKv2gPvz3C DM9GEFVdSB3Uovmbg5SSBv1TQbzPtKYJ+o+G/Krj3Br+AjGz8Ym+JHWea1epag93/9X6 DNfraRz/RIHEFFucq1uKJq+/rCli7mmHyguAlxxhoZu+QY4FvGFsrAo4nYuk5ZUP7vvi roTZEYW5TfxqQV/NGEET6qi6wJpv2o3PvvDtlyqH46M8IjPfGdpgj91K41A8eiUNG3kr TiWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753733682; x=1754338482; 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=2v8P5zzZojXqdsS2T5towU0McwT+Ir9vWDLAjcCzSiQ=; b=iBrzOpJGRiJP+Ev1Ej6jw374FMwxk71E5jsCrqtTpLVe6eMJ0jbyrUx/NMe5qpL6tn 7gylnN95nl4258bPnowDH+aYWrm12Uv4oBw/gRTdxoSZntZkN32+/4qIL1j7M7NhBGY4 NsXHqH5K17i5KSKyv2xoLYWZ0enOy8teUAegQUOkAP+TP/G5YNrYgVtreKAe3Vh6Sto0 ZNazcJRMT82CHnBv8u8B3e2C4baSXLJubNEHkK6f+pUWaGXyzsU4UYaoYaI8aSOWUA57 A5GX4Os92QzgZLxviDIlXaXB+CdVd1NxvsILDEDGpwJMIZZdQZ6t9MAx3L+S+FXNLVg4 ZqFQ== X-Forwarded-Encrypted: i=1; AJvYcCU5wn7c1AWZR6mJJZb3cXGlJ/6l1pnyoxZpxa3Xw4tEhau098tfl775oGZ1JeEFJyj/8+l3X6UvMpP6vVPe@vger.kernel.org, AJvYcCUh638E06qS1i0Cj3h0SWiJgSARK3cNgFVPp8kvc5XxlWc7o3hsd/fCnmoNf2JC7dYJVYusTqNQmRSn@vger.kernel.org, AJvYcCV/DmeVpLK1g5GfWkj3b2svz0+uQt/aRhjqb3USsicqeXQwKLTJwH/vTIsE+Eh1yapnsdZ2+36FCJBr@vger.kernel.org, AJvYcCXrgPzLukz7EZhTHb4EjIWEhmT5bTZaTCPRWX+1b947gCzsR1GZDUqPnHSYppGGfMe40fJSGVl2V8UZ7lNZ5D1Eh7w=@vger.kernel.org X-Gm-Message-State: AOJu0Yx3soHpWxK3M4RyA0OraGITdTRaLrZE60qXZZVN1z6A5QzQBK/O EbKagG6qdeRX1LggeDLBL+DsGHD4C/jMix4BnK/xutDsd8MQWmLMRirc X-Gm-Gg: ASbGncsGjeD+nRS3/oikSHu9+7fi97/b9h0zEo63oy+beLW3a3tyFH4guwMnQGWU81K XTG6nBZO+I9EkRTQvngY+RgL71h4fIHg5s6TAjHd0S0oUow8RE3svrJrvhJLguQOmB6qbwx9vaL K2JsYzanz3afK3h5rsw7IY4gK6ypox76aQTUJ4eKXFrY7p139PX1UykjAkFqMIUObnPkwUtuJCv yR2/+gbs46d1769oUiuPt6+EJjnNrGK2IzFN10KYOKSYcc3qbP8+bj5vZJ6yUpVxk94+jG0FdDW 14gqNP0kO6pmMHVT2d0XxgB1ImjnllGF+4BD3TIGkCH+0p9n0uZQklkCeND+Obi8rjVcQmhgbEz YfOc7ZKxvFroIDNvW8TWH/HAPIP5BsqlgmvzQF0rpiDsF0zuL++OZUr6GvjZ7VdeK/ZGfofF3zs 1mEZa8dAY= X-Google-Smtp-Source: AGHT+IFtv4I4ZzwIV1sv4tA4dGjWcL6THfbYJY5PWiwAMXgYyXsdeX9sJzRqeg62wqf54XbPWtTMuw== X-Received: by 2002:a05:600c:468d:b0:456:1846:6566 with SMTP id 5b1f17b1804b1-4587654e76fmr94289715e9.29.1753733681627; Mon, 28 Jul 2025 13:14:41 -0700 (PDT) Received: from iku.example.org (97e54365.skybroadband.com. [151.229.67.101]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b78889682bsm4317760f8f.77.2025.07.28.13.14.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Jul 2025 13:14:40 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Geert Uytterhoeven , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Rob Herring , Krzysztof Kozlowski , Conor Dooley , 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 v7 2/6] clk: renesas: rzv2h-cpg: Add support for DSI clocks Date: Mon, 28 Jul 2025 21:14:31 +0100 Message-ID: <20250728201435.3505594-3-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250728201435.3505594-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20250728201435.3505594-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: Geert Uytterhoeven --- 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 | 309 ++++++++++++++++- drivers/clk/renesas/rzv2h-cpg.h | 19 +- include/linux/clk/renesas-rzv2h-cpg-pll.h | 395 ++++++++++++++++++++++ 3 files changed, 712 insertions(+), 11 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 f468afbb54e2..2378cf92da5e 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,253 @@ 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 struct rzv2h_pll_dsi_info *rzv2h_get_pll_dsi_info(struct clk_hw *pl= l_dsi, + struct rzv2h_cpg_priv *priv) +{ + struct pll_clk *pll_clk =3D to_pll(pll_dsi); + + return &priv->pll_dsi_info[pll_clk->pll.instance]; +} + +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 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 rzv2h_get_pll_dsi_info(clk_hw_get_parent(hw), priv); + 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 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 rzv2h_get_pll_dsi_info(clk_hw_get_parent(hw), priv); + 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 +504,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, @@ -246,7 +526,8 @@ static const struct clk_ops rzv2h_cpg_pll_ops =3D { static struct clk * __init rzv2h_cpg_pll_clk_register(const struct cpg_core_clk *core, struct rzv2h_cpg_priv *priv, - const struct clk_ops *ops) + const struct clk_ops *ops, + bool is_plldsi) { struct device *dev =3D priv->dev; struct clk_init_data init; @@ -263,6 +544,10 @@ rzv2h_cpg_pll_clk_register(const struct cpg_core_clk *= core, if (!pll_clk) return ERR_PTR(-ENOMEM); =20 + if (is_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; @@ -589,7 +874,7 @@ rzv2h_cpg_register_core_clk(const struct cpg_core_clk *= core, clk =3D rzv2h_cpg_fixed_mod_status_clk_register(core, priv); break; case CLK_TYPE_PLL: - clk =3D rzv2h_cpg_pll_clk_register(core, priv, &rzv2h_cpg_pll_ops); + clk =3D rzv2h_cpg_pll_clk_register(core, priv, &rzv2h_cpg_pll_ops, false= ); break; case CLK_TYPE_DDIV: clk =3D rzv2h_cpg_ddiv_clk_register(core, priv); @@ -597,6 +882,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, tr= ue); + 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.50.1 From nobody Sun Oct 5 23:45:01 2025 Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) (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 A1EC427990A; Mon, 28 Jul 2025 20:14:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753733687; cv=none; b=ZoSS4ffB4NcC4Q+oVMfk/T8q+MjHdXcEvc6Ymh+OVbYeJZ+PfJi0JL7QGYmNQDAts+K7pRgiEIfXop5moQHgsuWMf9ckLO1jJ4iYDumCz4xpLoq0WcAlcCPB7pxNOOGLAOALpJISH8wgPz8Y2fuzC07BlAygFNxq1gOkX7SwHl8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753733687; c=relaxed/simple; bh=w2+izTsFTVqEsAp/6KI1JdfETTsfjda4feNcQe0X96o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DX9Nlo/gzjd8wudlseyLfI28QbwmLwbRwH0Q77nlAGER4fxNAsrkkqmhaNsdoOfVn1l7I5Nl5XcFH07YI4jYaiNKuJt7POCutCY/kEbt4yqQYsXlVdNEBA/pdZbtW8NGOlUks6HhbrolAktksjqciXBQx1L0w8uAAoNwzCupo04= 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=e00bjzvz; arc=none smtp.client-ip=209.85.221.49 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="e00bjzvz" Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-3b78315ff04so1521955f8f.0; Mon, 28 Jul 2025 13:14:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1753733683; x=1754338483; 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=MkHYiD3i1SrSr7+E4oq2bvObDBoDYbUYZAVu+lvAOW4=; b=e00bjzvzrZQsmZaEkMmKUryXJnAx2EyoOibtcVCv+m13wnk6DA6Xqo95CZ04N1y73b p3Tc1hYztVRwzHaMPzKtcop1KG/wRl5Neib0281/9PSXonrkWIwSLmRSBynEabNSg0pB /WDCQEiF9Xv+Eo1TYHVvfv3i/A0q2YHBkR8QTz4Spplb8LV6STTcu4zkqgaqw6UxcrLk J/ROl2gVuqUwjL4qyn7bBWBoHccTWJPnYut8EsnlKb9yxlw6go2EgqsV/YSf0nbdrEde K7SwJktGYrlzAM4djTsZN1YPSgifkz7EtZLMZ+ouvpEzqsHI+mePaU/kTi6KXWO2ptYu aT5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753733683; x=1754338483; 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=MkHYiD3i1SrSr7+E4oq2bvObDBoDYbUYZAVu+lvAOW4=; b=vNY1o8YAhZ0lnpfEoU/bozHj+nGWExMvOHxjrI6dX/bY+h7cutifkhhQF815IjBJKW L2tx6BSHlt1WCujG9SYBs9gKJ8Va/bPyTXsi+stlYqAf6NV1hnKM7M23Sf2lZ1WD2ETu JxOnpJYMBm7o8x7uqqZ4rPk6OAyvmUrQasimzFtUcIP05oB9hOc5Lu3BSwMRzTD+Yw4+ ovA/72m+TKvfLCbiAc3rUDBlbvPJsIOh6s2TmsLiU2KGCXaC2dFWsnprfAkLsFWbzfnI SzGcafXoUtVcVCczZQjDto9zXohmnurmWMV7gn71UM/zwNyj11LP2LrsoWRKNrrNV2Yu BiXA== X-Forwarded-Encrypted: i=1; AJvYcCU9Zjt/yWF8O7pO8k5fBSRPn3qU+rglqEmd8dvjSuoFN+hVNhf4ggVckcyWMxCS2fDXwKHY4VZ+afo8xyExaXMBdYU=@vger.kernel.org, AJvYcCUUeKrHBP7ZSFJNMJ+ZXRCYFcAm6vMY8euqmBGqsO0JTZfFkFBmfe1R9z5PkSzmAi97KMRPEIFfejXm@vger.kernel.org, AJvYcCUc6CSAfeDpy43n03PsgsAKvLaoYFD+A74QxbD6YO7vmS516JxuVB22blnufGmdZIq/Ca2bl+eq6NWa@vger.kernel.org, AJvYcCXnaz7JJjw+naRgUXXbqqJyQOdDT/FUjwTBvqmg6Fh+Cyjre3eMfdHanRMnhNFli1p/AJKiPvq7Iz82sbY8@vger.kernel.org X-Gm-Message-State: AOJu0YzMOSjA52z6RrFdmeOtWoDs8Kntfo2nmKQdgMvaZuvnj1ehwZOn ruLcu+RjjL5ilzzcLvLcGhla7/nLUOtpgFKQBXrtU77WWs4ty0bFwtZm X-Gm-Gg: ASbGnctan9DJIP0CDz9bE8eIoNwiSetnI0BBC85UAaj+lGaCuhEYSJ50/Cy4tXrAXaj t5gQtWuUYw+k16x+zMqRlx4oFZYm3sUXuGWteqKZpcKOwr7cH3zbuYCV4lu7cV8NcjjP8SbTugc XhXB9VAfqUkOSvq23uuZdoicwaP+xXg2cuIqSulU6WTZ0SimM3yJfT1BZSoFfOuj3gYUy72wRf0 5WOcIFwjB832qV8ynM1gw/a7vQKtmR66X2Dork1Aby2FRYDyGi9jwoaqP+Z186sPd2B75qjCRdS y/qxXyqRkzrz9WPhpSLhbd65qZ4RUX53szhMgAxmGecxZX5aMzAyrgLtIwlsupIhtMvFAueHk94 ksEmPi0E73I/apehOgWqAsfqR0Wg1KR3HVwTehwS6fI9PudCMFLnJoY9OhGODdL0cVARhnuuCLX glj7gdAXsvk1psgGmkRA== X-Google-Smtp-Source: AGHT+IG/aztDhPK7Ua27wB9s3qTvQ4IALYJZMczFxV1tvd/YGek5uJFSM0ONCaYufDufLZZZVhxoUQ== X-Received: by 2002:a5d:5d09:0:b0:3b6:c6b:e4e6 with SMTP id ffacd0b85a97d-3b776727319mr9732425f8f.11.1753733682845; Mon, 28 Jul 2025 13:14:42 -0700 (PDT) Received: from iku.example.org (97e54365.skybroadband.com. [151.229.67.101]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b78889682bsm4317760f8f.77.2025.07.28.13.14.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Jul 2025 13:14:42 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Geert Uytterhoeven , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Rob Herring , Krzysztof Kozlowski , Conor Dooley , 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 v7 3/6] clk: renesas: r9a09g057: Add clock and reset entries for DSI and LCDC Date: Mon, 28 Jul 2025 21:14:32 +0100 Message-ID: <20250728201435.3505594-4-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250728201435.3505594-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20250728201435.3505594-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: Geert Uytterhoeven --- 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.50.1 From nobody Sun Oct 5 23:45:01 2025 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (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 F0F8E27AC4B; Mon, 28 Jul 2025 20:14:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753733688; cv=none; b=P0ugfz1JhQNibd89SQ2keKLyqZ5ZjS94aCTGB0o3bwBDGhN06ALb1zZK3tTPjBLqXns1dvKrDGMmfS1v37Zdd/+sPgt+NJQYgSdMT3X3YV5DKtxBi3zt2UpvozNcUgUx+fQe0AX6uB/IqNIdDszTsNoYToBdo/+bWxzJkfawepw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753733688; c=relaxed/simple; bh=HGUOEyV8+2X94EwX9Kkc1Ik95YcKgkDvNbP6mNxsuYA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bC+T3qiPKvt2osjLGx1zwPTMXQ9nHDQruOd9nojnNkrILnn7k+Bhm9rysJ4+m9dC7jj5yjOSdoeORCFuNExwmjX3aSlw91zZuT3ufVGkum7+z7MA+LRJVcREJDnEXvtxrLXWyNu6TlXantttucqbIlvuZyUubQXHdYhYaSz3XlM= 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=F/i2e2BX; arc=none smtp.client-ip=209.85.128.46 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="F/i2e2BX" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-4563cfac19cso51539705e9.2; Mon, 28 Jul 2025 13:14:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1753733684; x=1754338484; 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=xsKr9U/Lsla7ASXIDbg0RnYrGFWyhEYxMUb3V5AUIYU=; b=F/i2e2BXSBXSWwC3NFUKVpQV5+Bg234x+0hKaDjr5MLZRn/JHZqciX3YWEoVSmsPN+ LhQd5iDpui0/0rwl67F7BWziu/E7gpexW1vxA8HhkZNw82k/9FAxiTjC9eIYihFI5XCM 8c9fNn+Du6PR0oezYn6bSuwwJMj/1wIe+pCgGSQtpaGNEaS+ABNJRSt/6iqeVqkF92fP 5ho0OJoqF28p7CD5NNs1zB+oiuDjTqpznXCZlv0pl26wJY7uQt7by/LIhd8oFpCW/Z3P V90L0BjfzT2lR5UP5kj3U670X4i5YwWr7nCgbIRlfsOpuROQchBlC6n0ftR7SuYggvuN /lkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753733684; x=1754338484; 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=xsKr9U/Lsla7ASXIDbg0RnYrGFWyhEYxMUb3V5AUIYU=; b=pPzRuDMw/nJDRfxvoVkLoW/5VGpJCuEW2VA3baNycBNsdaUTWOJ3YQvKaEiJmMYGRf DUFI3rnnbGpzQhmr/hnsctG26kInlWEfpuwPoTuEL/q4FrU+s8gK6YcofKnhuyKgcTgS mPR6/m7pkDKnOQq3y2wBUxhD4ZfPotP7g8lWvh8ckrYCj1LPvkcpN1/U9GnZI46J4qtC 48Q6czD4wjVEL/c0rGAsM7CgZ5N8s0aujSgvsVUoda1dv2qRXbNH1MPX6i3jHPxOFKv0 X2M6OFQyVLmvxc1ARIDU+Ebritb+czkwhUQVnQky0AdCY0UgEy0VjoWbhZTblrTqdydt Adog== X-Forwarded-Encrypted: i=1; AJvYcCUJKTksf3eIVn8CcIpmRoEcyoDCbYUJJ53t58kKKwMxrW0GdgIKoVySYAyFp/t+VfyTN4VdWuFzummZ@vger.kernel.org, AJvYcCUmvKgTKC2GtzsbRinZC8SS+rcc1Jg7ytZzkAe97Xjpd6yZx380WHVKTCf1YBx88chnY+2Tl0Haf/0w3o934rr2Xt4=@vger.kernel.org, AJvYcCVafq33UdcawfXlbC0fo+qtM/+1qZZCmmGxKR32hP5kJzdPn6Ah4+FXLfb6wjyeiiEXS9U49km5BMB/uSOe@vger.kernel.org, AJvYcCXSfqiTZ6MDjy1SuXQuv102ZKmKLlZlRlsXaXF55JgFYgpwRG517/C8YzaXA+Tghp3+QxostJfTNMJa@vger.kernel.org X-Gm-Message-State: AOJu0Yz6nXh6nFpWE9x8nZ07SdaQEejjBM0P4Txaw3vY7al7oIbnEshD w8LYdT8xup0EAW6Qxr8h8wAvOu1FGrGKqnOV+w84CVHjsqFI8b4HIfP2 X-Gm-Gg: ASbGncs0rW17dDLZRviK0nbAPMNAMfrAHGUFBifmn2ApT556j52mNCAKRpMcKONlh3h xfx2Nh/61BhdZaCVTyKOdE+48C1aC5drgaKm8n6NTm0R+La6VBFRVrXxJ6babU8RUXY2JwqvEwO BOy1arGa0cGMbn5FoXFHo9eDK/GInztzoWp9v9cQYFbSyopi0I8a4oGLfOqTupnkRCoRr8zpbb0 UI4qWEKnlbmh8fixMdgj8LJUd6FZTRT+cJE8mF+WHHVA6AP+HcG1FZ8HTnyZjwu5saXYyZayQhB VpNwByp23kWL1rzFCPjoqHf/A3m4OZ0Gvb4lVmBHSpUcJc0ke+dFEoEuCGzjWfO6mrg7VuWb+hK DsfSILoGcFj6sHc5CGliidecQmiCBqzioopCGwBRxT32PkOBco53B+GpQhbDv7Sq0+HvHmfqct8 qNKYJJQvQ= X-Google-Smtp-Source: AGHT+IEUuNcHOeAWdj0gIvB3GRqBx2ONsSi3vaEA4s1TNTEmWl2Fj7ZlUH8VSVsaLrvW0IJwWOHZwg== X-Received: by 2002:a05:600c:529a:b0:453:2433:1c5b with SMTP id 5b1f17b1804b1-45876307420mr106740915e9.5.1753733684061; Mon, 28 Jul 2025 13:14:44 -0700 (PDT) Received: from iku.example.org (97e54365.skybroadband.com. [151.229.67.101]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b78889682bsm4317760f8f.77.2025.07.28.13.14.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Jul 2025 13:14:43 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Geert Uytterhoeven , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Rob Herring , Krzysztof Kozlowski , Conor Dooley , 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 v7 4/6] dt-bindings: display: bridge: renesas,dsi: Document RZ/V2H(P) and RZ/V2N Date: Mon, 28 Jul 2025 21:14:33 +0100 Message-ID: <20250728201435.3505594-5-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250728201435.3505594-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20250728201435.3505594-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 --- 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.50.1 From nobody Sun Oct 5 23:45:01 2025 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (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 58C4C253B42; Mon, 28 Jul 2025 20:14:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753733689; cv=none; b=eWFsoWyYU+7spIJ3YqgCS/j0jyduct+zr3eSBNsORn3vbtDdDQ5FlmYolWsglOXoXZOhM6SjrZi61UJQBzl1OknLh+HDNohu7mQRE3SjjI8yEYx6UOs1Kh5viHw4nEtavscHGLrqb2TQce+zGsCDB9U/k6HX0uHDjLYSd5Xc3EE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753733689; c=relaxed/simple; bh=VDa6Ww5es21OuXNzuwa838dRcsERyK1kvOe32yrIczI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IZHBs8WVVIofzdJEudl6/IIEd0AP3F9FK3nKFqeaFlXChJJKTYHwXCeJOwBHagea6jnocFtiQAQbE87qpoBghOST8XdXTjDVeU661cO4yjtwwlsPJKN2IXHgPdwfmmKZnaUHDdCcNZwg4w+AHOs4plhqQFEewWNOV2yZQO1SL2M= 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=hg8282ac; arc=none smtp.client-ip=209.85.128.47 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="hg8282ac" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-45555e3317aso23675085e9.3; Mon, 28 Jul 2025 13:14:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1753733685; x=1754338485; 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=hxAOjHFcbAscdsMiUqjtn03BhEmL7+9NdefozGvlrp0=; b=hg8282ac73gocVa+Cu1H5pEjYAEVD+9re0nnAeHSj+USbC0Xfbx9qjd5xn4ePnrs/Q txwaG4YX/s06EXbLGflrZ2okpDFwEpgTWqnYQ/TyNI6EKi11fUt6LNeCpbVp20a9GB+m cBx3LkxylWkrc+AtXDY+HukgkLMIWvZ/Globz6Jmb0HA1yTuoTtuwYDEw05p2jQ7hA0o tC+8lZ4THnoC2dXlaaErHnj6mHnCURT6H7ZA1Zyf836rmTjRnvD4BGyvmSjUd3FqkWDY eosz+P/5bKqaI8ZkSR2rCzIyaYCdei2wf7FI4Mcz9XUVn2SikjwWoCsOB5H+uzIRilnd usTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753733685; x=1754338485; 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=hxAOjHFcbAscdsMiUqjtn03BhEmL7+9NdefozGvlrp0=; b=m4lUS/v2zMk6Er4e4JUe5ksy8LPrjvIZh0YRBeP38NC9Z1fMSJ7OE6SKu216f6qzhi AeXokk8E5q4Y9tG/0LJ4Fk97C/WjzULur9A9Ys9lOz/Z3GuKVJbrvnZ14/yEloUrabXK cSuP8iegh3rcfJCLi82zXbLSRAd9I1LJoxs3A9tf08CBCoAOUMD0cD0wHrBF9aOJoenb 2rXdnuap4e/3LdoRWE25PbbjBm9IrSIC/cLYZK70/MNqWtV5EYcuxi/+K14kume7+ZPX sNyPtYGVHPRX7jI9YZfJlBinf5PQVMdHH2eyazKEXAi5sPD53MjsIVlknWzUGW5rw5Lw rKBQ== X-Forwarded-Encrypted: i=1; AJvYcCUC6xLXtXN337N1R3PLqbEhe0xg3CIlrbX8JCPiEPwMjM3eU2/RbLsyfWM3yIGJzd5/wn6NbBX7afTJ@vger.kernel.org, AJvYcCV+dGYH3yncuzvWevk6oUS5n7V3eOWZRILj/l5U4UtkyM3ExDleum4FrcniQ6ADgAo+D+KyB5WFSFt8EqFx@vger.kernel.org, AJvYcCWZX5QTGKuVx51JgybsJTF6As6hQSFFFazTU6yuRLLqnRERPWQsjcXZbLJSWXCpKD0FMU4VbmmRcb1GS06ufmw1RjM=@vger.kernel.org, AJvYcCXO2VcEGmL6LzAQrHamgy6JvFivav0xcWi6T6p/S4SDEr4POLMfLHt4rdqfFiG0VJiR6PDws+AGsC/y@vger.kernel.org X-Gm-Message-State: AOJu0Yy1hQlUuNACZXGhVfP+E1+nfdOX+V356cdrNub3lJ4uzMh+vY3R z4wPsoBr2zXHYfvWFpfUjV8J7q3bnLyHre8jqF6fT1cHbm2U0EAd1NlY X-Gm-Gg: ASbGncsUtQttizo4alXBC2XfxpqMQlkgnn0X2HP2FMoraaV1pMXoHw4d8aVRCac/mAe t1NL+ERYNxzY+79YyEMrHo6voe1g5zzGE5LB58gDGrBHLmF4i4oYrr6myLXznfpCpiAkYf9q8WG KOj4suI7+lEgNaMV/XrYcHM3JlHfYITyC8SaenYUqLx3uEiuHyVs8FJoebR6Nb4FEW60BofU2NO k1qOdRGV6U1yXxTkPEcTxCfEc4r76Rdv88FIUb7W5ld1hO62zjVh7M8Ag+4bKaQBWLhXF/ngohX Te/IsczlSJrROGglwSY2BcYn0tbEYfxQSYNtBJ5kIAOie0DlFYhFFVyPqYPzuRlolqaoY2AtGg3 2VCWShKVcHUXpwka6jdgHQRi5dBSpUt4qxvVnXVC/EQa0QbHSRhoLytwdsyYYKisoz9v4btXn+L 9nK1Zogn4= X-Google-Smtp-Source: AGHT+IHxePFtXzvhlxVqqGYSh8DYWR1LshH8QoaIu397QtTtu7mtUAlEVRDZi3I5WSDEdMuelVhLpg== X-Received: by 2002:a05:600c:3514:b0:456:27a4:50ad with SMTP id 5b1f17b1804b1-4587667a7b4mr89215925e9.33.1753733685270; Mon, 28 Jul 2025 13:14:45 -0700 (PDT) Received: from iku.example.org (97e54365.skybroadband.com. [151.229.67.101]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b78889682bsm4317760f8f.77.2025.07.28.13.14.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Jul 2025 13:14:44 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Geert Uytterhoeven , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Rob Herring , Krzysztof Kozlowski , Conor Dooley , 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 v7 5/6] drm: renesas: rz-du: mipi_dsi: Add support for LPCLK clock handling Date: Mon, 28 Jul 2025 21:14:34 +0100 Message-ID: <20250728201435.3505594-6-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250728201435.3505594-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20250728201435.3505594-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 support in the RZ/G2L MIPI DSI driver via the optional clock API. This clock is required by some SoCs like RZ/V2H(P) for proper DPHY configuration, whereas it is absent on others like RZ/G2L. Introduce a new `lpclk` field in the `rzg2l_mipi_dsi` structure and conditionally acquire the "lpclk" clock using `devm_clk_get_optional()` during probe. This allows LPCLK-aware SoCs to pass the clock via device tree without impacting existing platforms. Co-developed-by: Fabrizio Castro Signed-off-by: Fabrizio Castro Signed-off-by: Lad Prabhakar Reviewed-by: Biju Das --- 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 f87337c3cbb5..893a90c7a886 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_optional(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.50.1 From nobody Sun Oct 5 23:45:01 2025 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (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 3864F277C8C; Mon, 28 Jul 2025 20:14:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753733690; cv=none; b=OUWGW9u/kkiyYOdicziwS5wHSITV6cGq8T+uXGt9EUEwEEy2nyIoAfooFspBT2Hs6Iwr/1VmMM5hnr/brs2sSLBT9zBrTDocOJwt7S2G7JajGRZRXEAs8tx14ZVPYGmPqEKBNnYY8m9gIavKkP2ZbCrk0IaIC6LDm/Buq+fRX5U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753733690; c=relaxed/simple; bh=m0C5AlXNdhcpYd+cWGwBkrpezffINSeH1cuO8xf9Ijs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OMgqJPSmpvW/wjRUGLZY4u6NA00/ChOgzeSP6sTwYWLRsmaEJZHYolHkagQ4bCQxKZwHLXVoKFOHWAWrLAU6+T81eVAKkFZW0GUPnxi5hWXaHJCAQGOWPL7brfTMZBRTP9j+/VuvxyIIC8z2nXmdWiEpLgn9RNek5ovLWZCC068= 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=kHcjXrse; arc=none smtp.client-ip=209.85.128.51 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="kHcjXrse" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-456108bf94bso27184525e9.0; Mon, 28 Jul 2025 13:14:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1753733687; x=1754338487; 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=/tbleMf1YcaanwyQ0ZgIskyWLraEiO1X8rJYm191K6U=; b=kHcjXrse0xKv2CtbdEF8H3TeCjFSssqXl2/Pz98ONEDX8bZ7meDVDUJymxsp2N3V5e M1EejYAMi2hwAH+/XP4prANDD1pfmNRWVN424yWfyR4dOLjlxUI7Aojr5p01Cce3yXdJ k8JU5cpsqm7/P/IuAQL/LiojkvkSo0m/kCZOV0wHM6slsKzQqS/kXK4cmP8NwHZ3VG/I h1XnCdZNQbMTbbl8o+2mRYV13hxizryjPMwcxbXRMi3TpG1IV+jtJK7WmY8C5ZyON4D8 2prISRW2zraXeLHcqQDuOhPbSyBpJFaCISH9nxUGQrJPDjGfzxgl8BAca6T7qGSjoU8t Zcwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753733687; x=1754338487; 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=/tbleMf1YcaanwyQ0ZgIskyWLraEiO1X8rJYm191K6U=; b=eQIUUyTb1AC3FLazG8LsEDZ1EIMo7Ezr2SO6jIMMS3SOKliS5yzaN7p2CCrTIZTQuz ebABrP5OmhyZNI5vEsVHsLQwxYAhtB80tCn/2GzjHCV0vZdhuqOY7otP3Aq37WcHWXi2 GKLOJqw80K2HIVHsDuAOfYHuqROFsfsrmkCeBP3EUnu9SYDzTrX3QiERKXbZtHF7C0l2 5chq4cv6OdtKuvstfbepgZS8WxPDdaYaq73VXxbKN+vXgezecSIEotwpi9lPAPgzGVpt tPDsWdjByTzleZeDrm/GzLBl9d0UW7d3v96AlGsYIadnbvWk0WH/DHp6Tw0dSehN8+rR zvFw== X-Forwarded-Encrypted: i=1; AJvYcCUyOT5rcfUs5z5ManiDAshVp1Va6svPJG3KyC3IHG0/PI0v17JhJO+1uOYsCLywFRrUe7MbMnQu8qRj@vger.kernel.org, AJvYcCVkE4QG+CS7DVzZu0X5T6i+UKtyDdcvjHHcJNWFtRefYPwL658dH7YeuRiOLOo+EqucWvv5J7zetaFusqzs@vger.kernel.org, AJvYcCXTmgOfZVBtuwoRgICZalb1S1giaNTAmgcbtQYD1aZuSAjNFURQRJJO1A6nsZ275mUabq21z1tFmEGWs/UV/+0bK2w=@vger.kernel.org, AJvYcCXmxcdndjZ8MSVrpJIVfs/ZmTzK612/3FnhvZnYviS9YxxfOuzq6g1dNPta/UQfrk1IWYsB5wsDy9xp@vger.kernel.org X-Gm-Message-State: AOJu0Yya2xNB+4piFHKFMYB37gGORFBUSpVDut5SKfhiDOu7IoCwoutN XoqfU+SFBjvvO+SDs65p49kHpoeBGsihdUSUYTTt61nBfMq+SYbAAi27 X-Gm-Gg: ASbGnctOXQEf7/GfEgRcGcbL+tARCAVpAiSqK51qpiI9v4CD5/TPO5vfQt8LphaLBVg l6vrsOOPLFzeGMhdq2mkT6vHrz4jtk+WXWPb2+3ihJsNQinG67ogATCx1mXUrf4rfybp9ZdMu6M 4ox9iEDFMeNfyBCnGgZNhU7ohMczEkBnpT95xWKHHr/+9nIDEnZSRCoyFnMGKm52dzc+1jJuUMi NwfItDwFs+dwRJRvX/i219oF42s7CIeX0fX5DBDsvvVgOKX2cTaropmPA2qyr2Mn/BxCsFc6Tt1 AYMzedvkitJl/6PRazSaXieQUrwddDIFFOq90YSzZPWErBuSzVf8pMp0DpU/Bryj27/WG+LcGGf H9/kPUVk4cqAIddLfceCmE9DrjugJGh7NIGFn5I40OTXtLZmKC8p9LuJvoIlZrW/wtPaSCVaTe6 klQqKxcqc= X-Google-Smtp-Source: AGHT+IFTiwPkBzOjxX9YrEIqSU/mnzFZN/2+59E0JCxOIKZ748pgV31oU7FODR/WbqK+fabc5RcFBw== X-Received: by 2002:a05:600c:4f05:b0:456:1e5a:885e with SMTP id 5b1f17b1804b1-45876303792mr123483445e9.3.1753733686540; Mon, 28 Jul 2025 13:14:46 -0700 (PDT) Received: from iku.example.org (97e54365.skybroadband.com. [151.229.67.101]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b78889682bsm4317760f8f.77.2025.07.28.13.14.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Jul 2025 13:14:45 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Geert Uytterhoeven , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Rob Herring , Krzysztof Kozlowski , Conor Dooley , 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 v7 6/6] drm: renesas: rz-du: mipi_dsi: Add support for RZ/V2H(P) SoC Date: Mon, 28 Jul 2025 21:14:35 +0100 Message-ID: <20250728201435.3505594-7-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250728201435.3505594-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20250728201435.3505594-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 DSI support for Renesas RZ/V2H(P) SoC. Co-developed-by: Fabrizio Castro Signed-off-by: Fabrizio Castro Signed-off-by: Lad Prabhakar --- 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 | 345 ++++++++++++++++++ .../drm/renesas/rz-du/rzg2l_mipi_dsi_regs.h | 34 ++ 2 files changed, 379 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 893a90c7a886..3b2f77665309 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,155 @@ static const struct rzg2l_mipi_dsi_timings rzg2l_mipi= _dsi_global_timings[] =3D { }, }; =20 +struct rzv2h_mipi_dsi_timings { + const u8 *hsfreq; + u8 len; + u8 start_index; +}; + +enum { + TCLKPRPRCTL, + TCLKZEROCTL, + TCLKPOSTCTL, + TCLKTRAILCTL, + THSPRPRCTL, + THSZEROCTL, + THSTRAILCTL, + TLPXCTL, + THSEXITCTL, +}; + +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, +}; + +static const struct rzv2h_mipi_dsi_timings rzv2h_dsi_timings_tables[] =3D { + [TCLKPRPRCTL] =3D { + .hsfreq =3D tclkprprctl, + .len =3D ARRAY_SIZE(tclkprprctl), + .start_index =3D 0, + }, + [TCLKZEROCTL] =3D { + .hsfreq =3D tclkzeroctl, + .len =3D ARRAY_SIZE(tclkzeroctl), + .start_index =3D 2, + }, + [TCLKPOSTCTL] =3D { + .hsfreq =3D tclkpostctl, + .len =3D ARRAY_SIZE(tclkpostctl), + .start_index =3D 6, + }, + [TCLKTRAILCTL] =3D { + .hsfreq =3D tclktrailctl, + .len =3D ARRAY_SIZE(tclktrailctl), + .start_index =3D 1, + }, + [THSPRPRCTL] =3D { + .hsfreq =3D thsprprctl, + .len =3D ARRAY_SIZE(thsprprctl), + .start_index =3D 0, + }, + [THSZEROCTL] =3D { + .hsfreq =3D thszeroctl, + .len =3D ARRAY_SIZE(thszeroctl), + .start_index =3D 0, + }, + [THSTRAILCTL] =3D { + .hsfreq =3D thstrailctl, + .len =3D ARRAY_SIZE(thstrailctl), + .start_index =3D 3, + }, + [TLPXCTL] =3D { + .hsfreq =3D tlpxctl, + .len =3D ARRAY_SIZE(tlpxctl), + .start_index =3D 0, + }, + [THSEXITCTL] =3D { + .hsfreq =3D thsexitctl, + .len =3D ARRAY_SIZE(thsexitctl), + .start_index =3D 1, + }, +}; + +static u16 rzv2h_dphy_find_ulpsexit(unsigned long freq) +{ + static const unsigned long hsfreq[] =3D { + 1953125UL, + 3906250UL, + 7812500UL, + 15625000UL, + }; + static const u16 ulpsexit[] =3D {49, 98, 195, 391}; + unsigned int i; + + for (i =3D 0; i < ARRAY_SIZE(hsfreq); i++) { + if (freq <=3D hsfreq[i]) + break; + } + + if (i =3D=3D ARRAY_SIZE(hsfreq)) + i--; + + return ulpsexit[i]; +} + +static u16 rzv2h_dphy_find_timings_val(unsigned long freq, u8 index) +{ + const struct rzv2h_mipi_dsi_timings *timings; + u16 i; + + timings =3D &rzv2h_dsi_timings_tables[index]; + for (i =3D 0; i < timings->len; i++) { + unsigned long hsfreq =3D timings->hsfreq[i] * 10 * MEGA; + + if (freq <=3D hsfreq) + break; + } + + if (i =3D=3D timings->len) + i--; + + return timings->start_index + 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 +489,150 @@ 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=3D hsfreq_millihz) + goto parameters_found; + + if (rzv2h_get_pll_pars(&rzv2h_plldsi_div_limits, + dsi_parameters, hsfreq_millihz)) + goto parameters_found; + + dev_err(dsi->dev, "No PLL parameters found for HSFREQ %lluHz\n", hsfreq); + return -EINVAL; + +parameters_found: + 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)); + fsleep(20); + + rzg2l_mipi_dsi_phy_write(dsi, PLLENR, PLLENR_PLLEN); + fsleep(500); + + return 0; +} + +static void rzv2h_mipi_dsi_dphy_startup_late_init(struct rzg2l_mipi_dsi *d= si) +{ + fsleep(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 +745,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 +1374,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 +1410,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.50.1