From patchwork Wed May 28 09:22:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Walklin X-Patchwork-Id: 1642 Received: from fhigh-b7-smtp.messagingengine.com (fhigh-b7-smtp.messagingengine.com [202.12.124.158]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 83DC927603D for ; Wed, 28 May 2025 09:26:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.158 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748424367; cv=none; b=nsiQgXuzMDJlhpY/4JDbYXpulTbDAne0OoMDPSzRspeRl7clEK0ngIi3HGLpzHiyWPArWCo+GIjiZrdeq1YIGJBz3KOJ31NiIs4EVy9T+YksFk5zM40WtmvJT/37Q+Vdm9Q/Iwj7+ER6hZGdNhOtwdExfA1cDHHS9iTZFe9ENJ4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748424367; c=relaxed/simple; bh=XY1gV0lSHP/Zh5lUmNucIx81dJ3L3wDM+AR+kA1tql8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=j9Nf4PP8IUX4uS6Pl1JaYKXj1uMPqHAqby/6dUoUMcmP8sOhGumuRWGv0mTzcofI5d7IMrDrLLBWWmHkzAq5eDvYiGE8eH3zDxr2V4KryNYHX0/ydnvzl6YkQjWDVewQCKGa5MV0bcrhjFyrlLrXkrIkNRKKm7yzKDBgm/Xhb0A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=testtoast.com; spf=pass smtp.mailfrom=testtoast.com; dkim=pass (2048-bit key) header.d=testtoast.com header.i=@testtoast.com header.b=etNgrfp+; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=dr30cG0k; arc=none smtp.client-ip=202.12.124.158 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=testtoast.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=testtoast.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=testtoast.com header.i=@testtoast.com header.b="etNgrfp+"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="dr30cG0k" Received: from phl-compute-06.internal (phl-compute-06.phl.internal [10.202.2.46]) by mailfhigh.stl.internal (Postfix) with ESMTP id 3F0B525400C6; Wed, 28 May 2025 05:26:03 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-06.internal (MEProxy); Wed, 28 May 2025 05:26:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=testtoast.com; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm1; t=1748424363; x= 1748510763; bh=7jPRji7f+itML8q0+tbGPOwVQxf6bxrH9U7BpgdfIMA=; b=e tNgrfp+JHJG3t+SPmfAjZ4KFX7Y19kHx6nNuU88yVt/5gAaHmDSgOAkhlfSmZFCx QLWsu3IZTnrXbDluVSyeXHgrcNhFHvcLvYFvR9n37qASRKEMz7oQcrbIhwdP702s 5wSiG+kp6ELWnEUJFnjzkgY6eoe4OSCviVjIhJiQ/yC8xQPndZhtL4jm+gBg2T+D Rdhq3g18c7XJYNimmsToGz1BnUyq10JqUXTVmPb7viG/tLJrZvFyXTe6egKVRED3 /STD7VzkgseRaGM0mpCiutXVBaoqOY6bdeegXYGgk31aeqZrRWnZwigiJUg4lRnu ujclq6ojE+KN7oE4LuH7A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; t=1748424363; x=1748510763; bh=7 jPRji7f+itML8q0+tbGPOwVQxf6bxrH9U7BpgdfIMA=; b=dr30cG0kdUGcW0pI8 O3/NSUT07+FaDf0BCAmavU44hsW9s8FBjoGqzLapFz/ZOuG5IljXOH2B/PCg1TSK tQHymyyJe/9pJsVf7F3cyTYSnlVhIo+hAWcxp773Yz8jMhuCYZLzHrP2M0SpdU2J 6z1B6oQpuzO7vUPrrWy8HitX0Kc+4wyfoVhLuxg3O5GlH1iH4RWB63gGJUnpVJxx flcMeO2/w5G9w9mjas8L+YLhKGqWRT72QYLk1ogJxjA94BH6vBCSzk/WxwgVUW1f jIIANIkbBzPUzLPIdWdoup1jtNr65Y1p3DWsFxfQ7r5KAzDys1WSK7UR5QpoQFMm /X6Kw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtddtgddvvdekleculddtuddrgeefvddrtd dtmdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpggft fghnshhusghstghrihgsvgdpuffrtefokffrpgfnqfghnecuuegrihhlohhuthemuceftd dtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpefhvfevufffkffo jghfggfgsedtkeertdertddtnecuhfhrohhmpefthigrnhcuhggrlhhklhhinhcuoehrhi grnhesthgvshhtthhorghsthdrtghomheqnecuggftrfgrthhtvghrnhepffehieffgedt gfffjeetveegfeekleeileekveeuteffteetudffveegieeiheetnecuvehluhhsthgvrh fuihiivgepudenucfrrghrrghmpehmrghilhhfrhhomheprhihrghnsehtvghsthhtohgr shhtrdgtohhmpdhnsggprhgtphhtthhopedvgedpmhhouggvpehsmhhtphhouhhtpdhrtg hpthhtohepmhhrihhprghrugeskhgvrhhnvghlrdhorhhgpdhrtghpthhtohepfigvnhhs segtshhivgdrohhrghdprhgtphhtthhopehmrggrrhhtvghnrdhlrghnkhhhohhrshhtse hlihhnuhigrdhinhhtvghlrdgtohhmpdhrtghpthhtohepthiiihhmmhgvrhhmrghnnhes shhushgvrdguvgdprhgtphhtthhopegrihhrlhhivggusehgmhgrihhlrdgtohhmpdhrtg hpthhtohepuggrnhhivghlsehffhiflhhlrdgthhdprhgtphhtthhopehjvghrnhgvjhdr shhkrhgrsggvtgesghhmrghilhdrtghomhdprhgtphhtthhopehsrghmuhgvlhesshhhoh hllhgrnhgurdhorhhgpdhrtghpthhtoheprhhosghhsehkvghrnhgvlhdrohhrgh X-ME-Proxy: Feedback-ID: idc0145fc:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 28 May 2025 05:25:56 -0400 (EDT) From: Ryan Walklin To: Maxime Ripard , Chen-Yu Tsai , Maarten Lankhorst , Thomas Zimmermann , David Airlie , Daniel Vetter , Jernej Skrabec , Samuel Holland , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Michael Turquette , Stephen Boyd Cc: Andre Przywara , Chris Morgan , Hironori KIKUCHI , Philippe Simons , Dmitry Baryshkov , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, devicetree@vger.kernel.org, linux-clk@vger.kernel.org, Ryan Walklin Subject: [PATCH v12 8/8] drm: sun4i: de33: mixer: add mixer configuration for the H616 Date: Wed, 28 May 2025 21:22:13 +1200 Message-ID: <20250528092431.28825-9-ryan@testtoast.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250528092431.28825-1-ryan@testtoast.com> References: <20250528092431.28825-1-ryan@testtoast.com> Precedence: bulk X-Mailing-List: linux-sunxi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Status: O From: Jernej Skrabec The H616 (and related SoC packages sharing the same die) carry the new DE33 display engine. Add the mixer configuration and a compatible string for the H616 to the mixer. Signed-off-by: Jernej Skrabec Signed-off-by: Ryan Walklin Acked-by: Maxime Ripard Reviewed-by: Chen-Yu Tsai --- Changelog v7..v8: - Separate DE33 support and H616 enablement in the mixer. Changelog v10..v11: - Convert de_type enum to uppercase --- drivers/gpu/drm/sun4i/sun8i_mixer.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c index 13e712382010..31a8409b98f4 100644 --- a/drivers/gpu/drm/sun4i/sun8i_mixer.c +++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c @@ -799,6 +799,17 @@ static const struct sun8i_mixer_cfg sun50i_h6_mixer0_cfg = { .vi_num = 1, }; +static const struct sun8i_mixer_cfg sun50i_h616_mixer0_cfg = { + .ccsc = CCSC_MIXER0_LAYOUT, + .de_type = SUN8I_MIXER_DE33, + .mod_rate = 600000000, + .scaler_mask = 0xf, + .scanline_yuv = 4096, + .ui_num = 3, + .vi_num = 1, + .map = {0, 6, 7, 8}, +}; + static const struct of_device_id sun8i_mixer_of_table[] = { { .compatible = "allwinner,sun8i-a83t-de2-mixer-0", @@ -844,6 +855,10 @@ static const struct of_device_id sun8i_mixer_of_table[] = { .compatible = "allwinner,sun50i-h6-de3-mixer-0", .data = &sun50i_h6_mixer0_cfg, }, + { + .compatible = "allwinner,sun50i-h616-de33-mixer-0", + .data = &sun50i_h616_mixer0_cfg, + }, { } }; MODULE_DEVICE_TABLE(of, sun8i_mixer_of_table);