From patchwork Sat Jan 4 07:36:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasily Khoruzhick X-Patchwork-Id: 13926125 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 30B84E77188 for ; Sat, 4 Jan 2025 07:43:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=q0utCftucvwNjjKL9gp7cLeehqJP0aygJTF/mR/QXhE=; b=wSydb4MbGZR5zPTdzEKfzd2FfE 6kPmwta7bIqQIBZ1gshGYAH2afXASfiGMGpgI+43VpyY+XR2srVT1HpUu/wnh6OMR8j4IIYXS7rK+ RXiMgCL/7+mQ5UmqXq1wND+L7EX7+ZiPna87MMRC7XOYNcmtsCoa8Crg5qh1kRGdihmBY5rNuxq6M sBNx762NTSkm5sINR78ZhUIbSag+B9nPOyz630KYmOq/vts1hO4vufIHB0E0w8yJmA+vpFbRcMz5g LYnLbem7Oog2eF+BVVlMDaoA6jTSnQDQkxCsTV15xKKPP1m7YaLjlm6M3hJ3bJQoowVHjWkZnYsUA n7+SP3hQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tTyoP-0000000EfLG-2Wqq; Sat, 04 Jan 2025 07:43:09 +0000 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tTym4-0000000Eey7-3Wuc for linux-arm-kernel@lists.infradead.org; Sat, 04 Jan 2025 07:40:45 +0000 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-2167141dfa1so177661965ad.1 for ; Fri, 03 Jan 2025 23:40:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735976444; x=1736581244; darn=lists.infradead.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=q0utCftucvwNjjKL9gp7cLeehqJP0aygJTF/mR/QXhE=; b=U39eo/NY4aJlvQI9pdFZJ6ZN/69/ROB9RcfpzYvIH6P1VVVJgzP6qHgvyd6xgWwbgP u6kUmRNu4s/Oz5gqGbjiHC9n9nsikWCnJrTz1J4Dzbr0OeBQahN4+2oph7pQmlsZZNmn xz0ncCtGk1A2WndsXd6j3zsw4A4lotEfT1d7FVtEnAe9EjmnTk2JsrEt5jC7cCoTfF/6 KS6yqqFQsRSP6LQysX8sOJ8I8s5nTU68FW0GlfkCAmBofN3jrLIgbK4yPbb+BGBdeBrc tSxiAzZlJpyDBORvpO8DmGwPTYQYD154BDscDCktabts9bD6V4fcZ1fNhpbtxFHB/JPs y+0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735976444; x=1736581244; 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=q0utCftucvwNjjKL9gp7cLeehqJP0aygJTF/mR/QXhE=; b=sagxc6hGbGvVMuQyOmJ8mDfTry7a3HIIHbftHx3yWLmSbDYGrz+rCCXaM9JVHdJEmR nBrsd3pU11q5Vkogd8CMCCVUetqocDLIWEPIH5oJkY0efIWmX5IjazN7AbDkNmQuXMNL BjJg81J2nZ9rYorF3+1/W/+dz60F19m7tUBN22ju1ciklWmkUab7NX2aVcJIsf5Ndgkw Pj9Flqda8Rr6/TdMsb12bQJ6jkrjKpEMiGQWoEspLV8J0fw59WxkcRa3Cla39xGPtH4i 1wTtMev/lCbuuz95oC9C4KzAngHkmzp9Ankf1HT3RfaWtWkRtll0qYOkjWawKRDijRU7 p14Q== X-Forwarded-Encrypted: i=1; AJvYcCU2ZoaoF1U6aU3TwKU3kg1zMTQ/8xZHmdlDNeaZzSwRe6cO19cnl5SCxXNs6yu6Op+aaok5lN/wdzyJqIxsjI+Y@lists.infradead.org X-Gm-Message-State: AOJu0Ywv8dSUnehsk4SvnpK1octXOv2M/pci563EILl8mYJjShKLIG2n Dy+jntrzXXlV6yU2Jll9p5z2Rf7RU90UOEvdfstfkwGXCHhPNEUT X-Gm-Gg: ASbGncuZVOVKd439/ey308jblantqwevtqh9JICeBEg2+gGqPOPhdvr5O6bTH+o2sSC cCPCeXjyT1dW+51sNX3PmAffKOHzgHCDOaVJoOfWxUUqgdtSjRRyQwYPApjtsL1uIhvTkWLS4gl hU1ruaQGEbjQgUknnMWbv2AS4jTKoZo6IoMXJ5ZvDjbnLKWEdYGYSDWYyq72TfsYa53QbRueSm1 HBr8XwvFb0nR2wJdEAgekduK561bSnG7u7NYSpH7QqVfbWmbQ== X-Google-Smtp-Source: AGHT+IG16aEsUt31gOxPdEHIOiEhly+PPdwAHUbVPWapyCabc4BBxAcFCsLxS2WeCaHdQrCno+H+/g== X-Received: by 2002:a17:902:c408:b0:215:758c:52e8 with SMTP id d9443c01a7336-219e6cd83eamr662739295ad.12.1735976443882; Fri, 03 Jan 2025 23:40:43 -0800 (PST) Received: from anarsoul-xps15.lan ([2604:3d08:7780:1ca9::398]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dca02b34sm256562565ad.252.2025.01.03.23.40.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jan 2025 23:40:43 -0800 (PST) From: Vasily Khoruzhick To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Michael Turquette , Stephen Boyd , Maxime Ripard , Roman Beranek , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org Cc: Vasily Khoruzhick , Dragan Simic , Frank Oltmanns , Stuart Gathman Subject: [PATCH v2 1/4] dt-bindings: clock: sunxi: Export PLL_VIDEO_2X and PLL_MIPI Date: Fri, 3 Jan 2025 23:36:57 -0800 Message-ID: <20250104074035.1611136-2-anarsoul@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250104074035.1611136-1-anarsoul@gmail.com> References: <20250104074035.1611136-1-anarsoul@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250103_234044_878130_B298414D X-CRM114-Status: GOOD ( 10.74 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Export PLL_VIDEO_2X and PLL_MIPI, these will be used to explicitly select TCON0 clock parent in dts Fixes: ca1170b69968 ("clk: sunxi-ng: a64: force select PLL_MIPI in TCON0 mux") Reviewed-by: Dragan Simic Reviewed-by: Chen-Yu Tsai Tested-by: Frank Oltmanns # on PinePhone Tested-by: Stuart Gathman # on OG Pinebook Signed-off-by: Vasily Khoruzhick Acked-by: Krzysztof Kozlowski --- include/dt-bindings/clock/sun50i-a64-ccu.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/dt-bindings/clock/sun50i-a64-ccu.h b/include/dt-bindings/clock/sun50i-a64-ccu.h index 175892189e9d..4f220ea7a23c 100644 --- a/include/dt-bindings/clock/sun50i-a64-ccu.h +++ b/include/dt-bindings/clock/sun50i-a64-ccu.h @@ -44,7 +44,9 @@ #define _DT_BINDINGS_CLK_SUN50I_A64_H_ #define CLK_PLL_VIDEO0 7 +#define CLK_PLL_VIDEO0_2X 8 #define CLK_PLL_PERIPH0 11 +#define CLK_PLL_MIPI 17 #define CLK_CPUX 21 #define CLK_BUS_MIPI_DSI 28 From patchwork Sat Jan 4 07:36:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasily Khoruzhick X-Patchwork-Id: 13926131 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DBE87E77188 for ; Sat, 4 Jan 2025 07:44:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=gI4bkaQLizbo3HOuEzTTJL5LyowGuTN5RlRxoRNNOp8=; b=XFt+6zZZ4Pi1BNaBIFMUkI2OMk 7/5vNY2MkAzbHFWYgRQK73W1l5Gi7gs1UWumV1g5t5kciZ/USX7Hk6a0d2jX/lBLX3EiVKM7uRphs pHVmPf0XIGRvgRPrEOPOBfv9kNEdpQ7NkxemgzmQ3ssfmc2sDhtGFm27gOReRVQKu7x/Z1Hxybbz1 AMUIqd1/5gz5F22NqyYmRd1gMZLlMM/NhPCTtS+n6massjw+4zuxKhM2TkuP6M0AzrQfyDEY2NKOj mOsZUYqjuPc0qcE1gbx+H6mvxT9PyWtTguQhsm4bZHUAyfaQh05mm5nQ3uzj7D4kPSLSoAtDb+UAq jv2AMHJg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tTypX-0000000EfQm-0vhL; Sat, 04 Jan 2025 07:44:19 +0000 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tTym5-0000000Eeyd-3oOj for linux-arm-kernel@lists.infradead.org; Sat, 04 Jan 2025 07:40:46 +0000 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-218c8aca5f1so228763965ad.0 for ; Fri, 03 Jan 2025 23:40:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735976445; x=1736581245; darn=lists.infradead.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=gI4bkaQLizbo3HOuEzTTJL5LyowGuTN5RlRxoRNNOp8=; b=D9xqgGEgtaKBp5R2GVDtlhUZvSD+7pXIUXsdiTuMWp6rbmUHrvigI3N0RFq43NPCU2 Q96R3MAx3U2zz0Dy//5E7wf2htql0Aj2pFNe98sDy1NmitYwUKC5P3wnzK/UarPWCTTP vEhjqhrSPToNkAEoAilOafWcvRKMvTb+SQObc8vhJU1+XsmX8l7o4Yfqyfu/RvzNPJeI IhekfHYxi8g3n2Z4IBv9CViwx3qWAn1+j/Igd8hI6++duCADlV+TWOMF+RbwAlBrWj/w zlRlhdnIqpScnRcV/zzwkSQ5wg4svKSlS785iHHLpJSyb6D7Ae5qz2vga8sSM7bj4tNS iyXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735976445; x=1736581245; 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=gI4bkaQLizbo3HOuEzTTJL5LyowGuTN5RlRxoRNNOp8=; b=fMMi4JypEDxdzqWgAOctBcZ/+qQd0yNGTxgObyCBQ9jS2ibbnvkrCef6jRT5GYbm0R YqqPPOtaqj6VvglPVSEYn4TT0NC6A1JXqu2WPzWlra+iyezVQYc2sLdHv8ZTlUHWQ4s3 yFMp+zOR7dI3qZB7UJ0EfoquvrzNXu5LJa8mIbMeYU5OQMA2Mp2J41kPFGT97jpFhJbE 1zsCTH88odCsSoHXQPfttCSkjsKOHuhEZmAxrLsFW6yesvq7CJVMRZYBl9ZQezFrDJs4 q8UZVe51DQxrzPwNcFDUZTI9HevZvAAVOcQ7MehpkGqVJs3W6mvi0xgncUardSqNeRwB stbQ== X-Forwarded-Encrypted: i=1; AJvYcCV/b3CuKA8IzTfgsICc17uNuLQPvm8wDZcd4rB2C966qoW5UfUqBKO8a+Qdq8APtWtD6uWnPVHtZMKfa5XFX+Yf@lists.infradead.org X-Gm-Message-State: AOJu0YwYu6F4+vq+PSp7pGs9dEllKqN75AIDLgIa9Sj7MKQxDtqnzafE Q8thTaZa6eNTOf5bgnzM+Fm9uqd0rxeeb5RL0IMRKuYTyC/f3Y2e X-Gm-Gg: ASbGncsmNMfNNnN37HbXelhqWh57pfj+2KCtVtp+jgc4ienmWox8x3jCEhvG0srz43n euqZXQ9c0mys+451lAO01x3DrJrWNvIrV+s40ZvoUPGp+TMsDKzpfkrRnoZ0wlp1e3PVCq3ihbU +Y9dL57l1uCWZa+mjPGvF3fH15ihfCbP4b2iMRxOERXoAI6bzdi55GthzG5mudqWza6X6McNVpK NXbWjYmCj5+FQAYJYGzUF7bNh+aOkqw4VfmvtniOxgz+z5z5A== X-Google-Smtp-Source: AGHT+IG0CS21q53dEVGA2oPLK2te0e5w/JAMFEKzZxo/+YczSEWdTkdKuJD2Fisbi6FzS2oAnAex1Q== X-Received: by 2002:a17:903:32d0:b0:216:6c77:7bbb with SMTP id d9443c01a7336-219e6e9fb45mr689469915ad.17.1735976444999; Fri, 03 Jan 2025 23:40:44 -0800 (PST) Received: from anarsoul-xps15.lan ([2604:3d08:7780:1ca9::398]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dca02b34sm256562565ad.252.2025.01.03.23.40.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jan 2025 23:40:44 -0800 (PST) From: Vasily Khoruzhick To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Michael Turquette , Stephen Boyd , Maxime Ripard , Roman Beranek , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org Cc: Vasily Khoruzhick , Dragan Simic , Frank Oltmanns , Stuart Gathman Subject: [PATCH v2 2/4] clk: sunxi-ng: a64: drop redundant CLK_PLL_VIDEO0_2X and CLK_PLL_MIPI Date: Fri, 3 Jan 2025 23:36:58 -0800 Message-ID: <20250104074035.1611136-3-anarsoul@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250104074035.1611136-1-anarsoul@gmail.com> References: <20250104074035.1611136-1-anarsoul@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250103_234045_945519_D4036440 X-CRM114-Status: GOOD ( 11.09 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Drop redundant CLK_PLL_VIDEO0_2X and CLK_PLL.MIPI. These are now defined in dt-bindings/clock/sun50i-a64-ccu.h Fixes: ca1170b69968 ("clk: sunxi-ng: a64: force select PLL_MIPI in TCON0 mux") Reviewed-by: Dragan Simic Reviewed-by: Chen-Yu Tsai Tested-by: Frank Oltmanns # on pinephone Tested-by: Stuart Gathman # on OG pinebook Signed-off-by: Vasily Khoruzhick --- drivers/clk/sunxi-ng/ccu-sun50i-a64.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/clk/sunxi-ng/ccu-sun50i-a64.h b/drivers/clk/sunxi-ng/ccu-sun50i-a64.h index a8c11c0b4e06..dfba88a5ad0f 100644 --- a/drivers/clk/sunxi-ng/ccu-sun50i-a64.h +++ b/drivers/clk/sunxi-ng/ccu-sun50i-a64.h @@ -21,7 +21,6 @@ /* PLL_VIDEO0 exported for HDMI PHY */ -#define CLK_PLL_VIDEO0_2X 8 #define CLK_PLL_VE 9 #define CLK_PLL_DDR0 10 @@ -32,7 +31,6 @@ #define CLK_PLL_PERIPH1_2X 14 #define CLK_PLL_VIDEO1 15 #define CLK_PLL_GPU 16 -#define CLK_PLL_MIPI 17 #define CLK_PLL_HSIC 18 #define CLK_PLL_DE 19 #define CLK_PLL_DDR1 20 From patchwork Sat Jan 4 07:36:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasily Khoruzhick X-Patchwork-Id: 13926132 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CB039E77188 for ; Sat, 4 Jan 2025 07:45:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=RemTwaYzBS1si26CVDrNGu9vkTiHrmOVmvsRlAFTpyQ=; b=EMOxqpth7E9T/mcuURw7i4jtDL hWKXGys+jJgSeTjJsrZBfrwsvSsHNSauMHGlhHt1xGXsUmWHsXTK4tVsI+XgNW+Z4OFSoBVXTZOVT b+v0wYk3w9likrquCxZQe4n7+rROhMZ7nSNr4vqqXN3FIZgfkCk1tFAxwSm3wbaEdRoGmMos1n6G5 pG4WT5u8XG7+4dDZ6vNLX4tv/MYxWMvT7Yj/FGibcv/hwG7XV/CcWYruunl8XGheCLr8qss1s3mP/ DvW7sLfgq4rkyLDMZmX9NgDzZPEpHzQLWtTbVG1Y354CLef8G1dfsdWg4hrsx6IZGAXwm+sfIOMTk ZPVtYNqQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tTyqg-0000000EfZj-3YMj; Sat, 04 Jan 2025 07:45:30 +0000 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tTym7-0000000Eez3-02Ta for linux-arm-kernel@lists.infradead.org; Sat, 04 Jan 2025 07:40:48 +0000 Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-2167141dfa1so177662355ad.1 for ; Fri, 03 Jan 2025 23:40:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735976446; x=1736581246; darn=lists.infradead.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=RemTwaYzBS1si26CVDrNGu9vkTiHrmOVmvsRlAFTpyQ=; b=UtaZUO1/QSgwvFGLq0oTs1xP6lVZCqy+A9A+DwNBszyooaPYUDpaQFZbU8RhqGbCqI X57hL5aUO5CcAsbD1z2gI3YsslmylK330n8zXxT4WOJq9jd3kqfn0RmaOoPxLPFbbxde yDB3W4Qyn4payvThWqQwpMG4xkxLXu5QUxCWehtcfPDWSgZFRLBOgsjdxejiunyXv1nk /WUWLrRK2PokcsaN3+JLt1lXfD7FBIUV2RXx4AaYlBfJ3PlWRzEuJShBlAFtD8jGFORb Oj9xXKuk+PXNegK/pCWHZB931gl6sRrua4+xHsS9fIZTjDxlCwjaGQTRnnAKXEHpKPyj h6oA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735976446; x=1736581246; 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=RemTwaYzBS1si26CVDrNGu9vkTiHrmOVmvsRlAFTpyQ=; b=uVZJ4zC/2r3pH3NmZBTXVj7f7TMJyA+Kfee5hvJaSpg1fsBi4fjnsfvnArH1LJJksW TfVqcBXgiHqjB/VFt2lovCLIFvoMgqnA0HHC+uNrVWk918XWMy12dpenY9wNEpYrPA6Z RMoRp/s0dkWxyDtMyly7luVxBduSmJOmmtzm1OfiJzQ4XzOQSfzx24qSDvNiA25V8osT 9OlYZlgaaIdleRJk/M3FKAFcn6skaOyN+yvJjVXy9UJvFzhpOANbmfKX+1jZKISBbeAX +2zakvYC8ExgsAab/pLJMv+aLVfuflEPAOMisD5V4UaERxRXke+ediHLuP8ECZ9iHimI ppOA== X-Forwarded-Encrypted: i=1; AJvYcCUdSL+RsaDGC54PDUla/7dcVNQOPfS4ryZSFex6xoqyEihTNlkunK2ggsaXFa+/d6MPyHxdHZt450dKooHTLwcI@lists.infradead.org X-Gm-Message-State: AOJu0YxMp8DlcEnsaUbHPF8wQMe50tDf1muKN+m8PzAm+nPUbzMvdUlj CcUT60J70jR4aAYxVh6jDb5eyL2JAYbdDvMiepHkMHmTLjGOPtb+ X-Gm-Gg: ASbGnctIjKd5KfzvhKJNqOUPHViG1YMzZmnvV5KOMQCt5ZwhOp3zMGx3n8YBrIn9iNQ feSky18+tTZJcm7zWqSs2cjKD8rbTnaXCfeiDZiPKYJBAnZwrklxWtLsnhWn2n+ptBcUE6QbqeB 1U7uK6eZShoF0TojAmn2xyRKhknq9jUOIfoPcsbeFG/ZJxtyaj6weZqyuoFhfUqMhqqR7WQmKSD 6Rijf7uGXkSZCPleUFvKpN+yBpLfHVHTbeBumTyZ0Bz5ziI6Q== X-Google-Smtp-Source: AGHT+IFzAL/sWxagDkVX/+NamzAgakEA8UUO4OYdQZ4vgwAgnJ6fLVP3LLXGLkf1UZM4Gkgyz98S+A== X-Received: by 2002:a17:902:e746:b0:215:a303:24e9 with SMTP id d9443c01a7336-219e6ca6c2fmr758900565ad.3.1735976446069; Fri, 03 Jan 2025 23:40:46 -0800 (PST) Received: from anarsoul-xps15.lan ([2604:3d08:7780:1ca9::398]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dca02b34sm256562565ad.252.2025.01.03.23.40.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jan 2025 23:40:45 -0800 (PST) From: Vasily Khoruzhick To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Michael Turquette , Stephen Boyd , Maxime Ripard , Roman Beranek , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org Cc: Vasily Khoruzhick , Dragan Simic , Frank Oltmanns , Stuart Gathman Subject: [PATCH v2 3/4] arm64: dts: allwinner: a64: explicitly assign clock parent for TCON0 Date: Fri, 3 Jan 2025 23:36:59 -0800 Message-ID: <20250104074035.1611136-4-anarsoul@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250104074035.1611136-1-anarsoul@gmail.com> References: <20250104074035.1611136-1-anarsoul@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250103_234047_045963_A254E650 X-CRM114-Status: GOOD ( 12.99 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org TCON0 seems to need a different clock parent depending on output type. For RGB it has to be PLL-VIDEO0-2X, while for DSI it has to be PLL-MIPI, so select it explicitly. Video output doesn't work if incorrect clock is assigned. On my Pinebook I manually configured PLL-VIDEO0-2X and PLL-MIPI to the same rate, and while video output works fine with PLL-VIDEO0-2X, it doesn't work at all (as in no picture) with PLL-MIPI. Fixes: ca1170b69968 ("clk: sunxi-ng: a64: force select PLL_MIPI in TCON0 mux") Reviewed-by: Dragan Simic Reviewed-by: Chen-Yu Tsai Tested-by: Frank Oltmanns # on PinePhone Tested-by: Stuart Gathman # on OG Pinebook Signed-off-by: Vasily Khoruzhick --- arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts | 2 ++ arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts | 2 ++ arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 2 ++ 3 files changed, 6 insertions(+) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts index 379c2c8466f5..86d44349e095 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts @@ -390,6 +390,8 @@ &sound { &tcon0 { pinctrl-names = "default"; pinctrl-0 = <&lcd_rgb666_pins>; + assigned-clocks = <&ccu CLK_TCON0>; + assigned-clock-parents = <&ccu CLK_PLL_VIDEO0_2X>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts index b407e1dd08a7..ec055510af8b 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts @@ -369,6 +369,8 @@ &sound { &tcon0 { pinctrl-names = "default"; pinctrl-0 = <&lcd_rgb666_pins>; + assigned-clocks = <&ccu CLK_TCON0>; + assigned-clock-parents = <&ccu CLK_PLL_VIDEO0_2X>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi index a5c3920e0f04..0fecf0abb204 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi @@ -445,6 +445,8 @@ tcon0: lcd-controller@1c0c000 { clock-names = "ahb", "tcon-ch0"; clock-output-names = "tcon-data-clock"; #clock-cells = <0>; + assigned-clocks = <&ccu CLK_TCON0>; + assigned-clock-parents = <&ccu CLK_PLL_MIPI>; resets = <&ccu RST_BUS_TCON0>, <&ccu RST_BUS_LVDS>; reset-names = "lcd", "lvds"; From patchwork Sat Jan 4 07:37:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasily Khoruzhick X-Patchwork-Id: 13926133 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 448EAE77188 for ; Sat, 4 Jan 2025 07:46:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=qIxbJ2OQHNBv+4wB0JZ4sOT/J/UNSOHviGNvJzFTzY0=; b=0bpDLgFwrWpSvejNWenZsMtAyb tM49z0/AHnEVUAFfsn1OzB7sxoqLD1Byf/Ttd+TEBfQo0Nu2rqUz/tmhiSeFoLlUC2nzQaQDVEcIL OPjPcxnxR+N7KjnjkJog52Bt2je9zp/OGgEmFhbbbyr4BJ/eP1OPRwzVBhaA2yCaeQCcFglSDq1rp RhiJTYn9CuuVjEsIalr0HFvnalB4pPK+prud6W4XO71PhRcinbq6l0GNC3PxXFKsoD9nCa4QMbezw +QrM5mHhXd2rcdUajpi8k+RljeCVmhKhQnbnaOg1waos2lnjZuttXRpupq8IxIvrD8kU3jxYFmzfN Ch5Ir18Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tTyro-0000000Efhj-1sBy; Sat, 04 Jan 2025 07:46:40 +0000 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tTym8-0000000EezR-0jzI for linux-arm-kernel@lists.infradead.org; Sat, 04 Jan 2025 07:40:49 +0000 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-216728b1836so162350415ad.0 for ; Fri, 03 Jan 2025 23:40:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735976447; x=1736581247; darn=lists.infradead.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=qIxbJ2OQHNBv+4wB0JZ4sOT/J/UNSOHviGNvJzFTzY0=; b=PwBB4SLyPM9LXEHdoX3Z1MhSPCHWOYmrhz0iAgigtYamkdIixQGYzeyKvo+DI1Ealu cHCTXPKR7CcA0lxlWazazD5GzPDgPFDNkqsJQR2lijv52YVHtgmnagdRONUYU7IvRsvg QkSxB24ROAJ6lPSP2SmW1ogd2ZmHz/UlPGBCLVyF/KFM8s7lvX7SjtxgZYNFJiT7VPIo ibcnw5RrwYU5Jf5nOH6rrZiBEDCloRdLSLXvuI+d7x+4bIHrozcEXp2FiPXR5yyLvlUO SpGRCH2JexFNfqdqkQHVmMfKIrctsQkKLJNXrG9hAIrA8OTOjtKIbTNS+F6sBaAvZMA/ m19w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735976447; x=1736581247; 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=qIxbJ2OQHNBv+4wB0JZ4sOT/J/UNSOHviGNvJzFTzY0=; b=JldCVtf4/LGZ0cy/3fGnTC9MvX2FD9GZhW0GBDbLn1Yp6UvPPONvJCTZD91k/TNcz1 E/e9C5k3XcGGM7qZV+o9qgBfAF4kbGHUBAUh50a4RTg9FKBx3VrTxzLhwL1mvwN2tRYE 4GcrCEP8HvnKYEVKp/m8biHePbgr6AN32EV+5rh9PlFakDQdXLfHLToFv0l/t3rsMRoV p6945ghKJrAxSn9Uod6qROupZVCvt3KQQ84oherQAj7+Vk3f8on36XxTlkGuW6G5O+aM JHntnbz8LYehbXf1c0PJDzHxAUrNRlzGLitJnw2zHpdIz0ZL9BhsTno4ir7frUvbbvVf Qc1w== X-Forwarded-Encrypted: i=1; AJvYcCWgfu4vKhaYkdqMBpAbGg5sj8yNIGrGBEILDBtczfUWsMd7zZe5XeGPlhWI59x+NdYBxOpPCCKbbMQ+PxUEdlNG@lists.infradead.org X-Gm-Message-State: AOJu0Yy92PGLD0hshc428c3pGALFDmEgYci2MsnWLsTfUFWcHZKAnl0a 6H4qc/K5iLvoY1pdPhY3EAtcTIKul0E8JclZroqy3F0Q4SY7B8lp X-Gm-Gg: ASbGncvhTIGXasBJxQCVVkUqeJxYCAeyCq01n1VFj1iWg2IgTOrWHYnf7M40su8SutD jOUSD6VpXS0Gu8amV1QlrlwI6CI2tMdsBb9Wl2savTWgjUygKmm9FcXcJUYECgGlAs54+vd/M0V ievaChsWXSLnQTee9043VkM2IxnNSmAPpOHx2L0diz1foUYdS2nnQl5dBSlVqrBNKYQKC17TP6B 7QXA2SrzAOioKnIRF4wPIUxrgvyWMQuLlVg8VrhJxyfCpfXCg== X-Google-Smtp-Source: AGHT+IGzouKoKcczOFE/BlEmlBfzMQU1FzvtTcHjF3vHVcWHcn0aI0SCAElSuL8sd9OBoHBrGue/Jg== X-Received: by 2002:a17:903:2449:b0:218:a43c:571e with SMTP id d9443c01a7336-219e6ebd140mr793188505ad.28.1735976447244; Fri, 03 Jan 2025 23:40:47 -0800 (PST) Received: from anarsoul-xps15.lan ([2604:3d08:7780:1ca9::398]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dca02b34sm256562565ad.252.2025.01.03.23.40.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jan 2025 23:40:46 -0800 (PST) From: Vasily Khoruzhick To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Michael Turquette , Stephen Boyd , Maxime Ripard , Roman Beranek , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org Cc: Vasily Khoruzhick , Dragan Simic , Frank Oltmanns , Stuart Gathman Subject: [PATCH v2 4/4] clk: sunxi-ng: a64: stop force-selecting PLL-MIPI as TCON0 parent Date: Fri, 3 Jan 2025 23:37:00 -0800 Message-ID: <20250104074035.1611136-5-anarsoul@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250104074035.1611136-1-anarsoul@gmail.com> References: <20250104074035.1611136-1-anarsoul@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250103_234048_213051_FC7A45B4 X-CRM114-Status: GOOD ( 15.80 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Stop force-selecting PLL-MIPI as TCON0 parent, since it breaks video output on Pinebook that uses RGB to eDP bridge. Partially revert commit ca1170b69968 ("clk: sunxi-ng: a64: force select PLL_MIPI in TCON0 mux"), while still leaving CLK_SET_RATE_NO_REPARENT flag set, since we do not want the clock to be reparented. The issue is that apparently different TCON0 outputs require a different clock, or the mux might be selecting the output type. I did an experiment: I manually configured PLL_MIPI and PLL_VIDEO0_2X to the same clock rate and flipped the switch with devmem. Experiment clearly showed that whenever PLL_MIPI is selected as TCON0 clock parent, the video output stops working. Therefore, TCON0 clock parent corresponding to the output type must be assigned in the device tree. Fixes: ca1170b69968 ("clk: sunxi-ng: a64: force select PLL_MIPI in TCON0 mux") Reviewed-by: Dragan Simic Reviewed-by: Chen-Yu Tsai Tested-by: Frank Oltmanns # on PinePhone Tested-by: Stuart Gathman # on OG Pinebook Signed-off-by: Vasily Khoruzhick --- drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/clk/sunxi-ng/ccu-sun50i-a64.c b/drivers/clk/sunxi-ng/ccu-sun50i-a64.c index 3a7d61c81667..ba1ad267f123 100644 --- a/drivers/clk/sunxi-ng/ccu-sun50i-a64.c +++ b/drivers/clk/sunxi-ng/ccu-sun50i-a64.c @@ -535,11 +535,11 @@ static SUNXI_CCU_M_WITH_MUX_GATE(de_clk, "de", de_parents, CLK_SET_RATE_PARENT); /* - * DSI output seems to work only when PLL_MIPI selected. Set it and prevent - * the mux from reparenting. + * Experiments showed that RGB output requires pll-video0-2x, while DSI + * requires pll-mipi. It will not work with incorrect clock, the screen will + * be blank. + * sun50i-a64.dtsi assigns pll-mipi as TCON0 parent by default */ -#define SUN50I_A64_TCON0_CLK_REG 0x118 - static const char * const tcon0_parents[] = { "pll-mipi", "pll-video0-2x" }; static const u8 tcon0_table[] = { 0, 2, }; static SUNXI_CCU_MUX_TABLE_WITH_GATE_CLOSEST(tcon0_clk, "tcon0", tcon0_parents, @@ -959,11 +959,6 @@ static int sun50i_a64_ccu_probe(struct platform_device *pdev) writel(0x515, reg + SUN50I_A64_PLL_MIPI_REG); - /* Set PLL MIPI as parent for TCON0 */ - val = readl(reg + SUN50I_A64_TCON0_CLK_REG); - val &= ~GENMASK(26, 24); - writel(val | (0 << 24), reg + SUN50I_A64_TCON0_CLK_REG); - ret = devm_sunxi_ccu_probe(&pdev->dev, reg, &sun50i_a64_ccu_desc); if (ret) return ret;