From nobody Wed Dec 17 22:45:43 2025 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (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 B560D18C338 for ; Wed, 26 Jun 2024 15:27:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719415665; cv=none; b=etdKNRF1jZ143dCgLUSe+n1PKdQisNbTM4upqi9WxCWvWnePGVDfEgwMOFMZ1oLm6gGe4oUP/wJQGIKB/6g7RdoeSU/8ocKA9w73/IFLDkwvBsMhaX4hgJt05wf0L+UpJ0a4UOtbmV6Do3fGalS198FncdgNHyo/nQnZafUmoBM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719415665; c=relaxed/simple; bh=7W0xkwII5/YTLpJlF9tb/ay7UeJGtcqeUNBnJaO04Gw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Afa1TdXHs9MHTaOxDNel5HhBpx2jevmVO76F2Ehleo+PH9YlxvDNZYDn4SMvRepNcsPmuVSU5x98R7qFG2wJ390aDXqzeGDWLcTbIPLY5o90S1/1AgodIJ5/SjCbDno5Ei4K/Di0bv80t6BtCXbMamjrQ48zwxWknwi3zSSgp90= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com; spf=pass smtp.mailfrom=baylibre.com; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b=ylPOhJhb; arc=none smtp.client-ip=209.85.128.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=baylibre.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b="ylPOhJhb" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-42249a4f9e4so50737915e9.2 for ; Wed, 26 Jun 2024 08:27:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1719415662; x=1720020462; 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=c8eDGzZ+IErnn0aKNGPDs0TY+0W/jTGDRNGvqdMq9Lg=; b=ylPOhJhbS8amTyePSnc6cQUNAET+MvPwMoUiAqimbOS/wG9SurMcqw5BxkGDkQ2T24 /D35+Tx3Bc/Mc5/If8vLVHdvARO+ZgVgvOuixNu2jhyPh5ylHiouZOiwAmDDCyN+Dax5 J2sZWPiSkV9u8rkkcgKvzJGdBz8Xq58ydyq7GoonCCKhaynARQAfd5G4K174lIroPD9j /6FlO/Z4Uzv7SgwDbLOQqvAc1A2ETdrDByV21SbJeW3MaQxFNsRO/pX76gV+pC/s6lqT kN8Ty+BHnPPEhLxmbEe4ni7W1n6PtkgAV0zOXEKcMqrr54uEy3oQxbWd4XQV00vUsKvY ee4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719415662; x=1720020462; 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=c8eDGzZ+IErnn0aKNGPDs0TY+0W/jTGDRNGvqdMq9Lg=; b=wYgnxBz8XdJ6+bLCmnIMEODWnaAVe02VyyisxT+IL8t+fEShaD57ZDVkuixcCGoPC/ 55XJZqsoDn21CZ5DabF90cBMU4AoUC6/Yr+ZuYKIESB+7jIEpKCMXcwQBK3XOnGNNNeV ikr967OTM77eLcq69ewoLYGfqEzSD2JWRi9bRo/KYzpR9Bc3crlvMWj6bg58NY01VGHm d8HLKp7LKo+T8Bd2sTUJscpyVJhohQ0MekDUr0GuIIoHDKyaDb0imvte4ucnX4KtrbHF /3B1sTQJiSnY8i/haggjsc7huY2rThKpnIh9Lgl99Ad9pOpMr+zIZYqvYhkese83h11r WSGQ== X-Forwarded-Encrypted: i=1; AJvYcCVZiSUEniy1Y6FqcasEd18+k0bKqip03eRPfOejQgNYL/gByg8oKyf+x/iYJb6Mc1LDC+vn8HJHlHX8aJ41t/wFk8aKB5yvuzwbRtIi X-Gm-Message-State: AOJu0Yxqfk+n27wkFYjTSIV1MesEhoXDNR2zfNW0U/mRtN0JiVrqnIbI iLBgvtLiNLT6fTzTyabLPbxZ/MbBgn2EoSzcE2spaZqnCTAXGwZup0UKOeJ5YoA= X-Google-Smtp-Source: AGHT+IHHnjS6+dJqx70WoQTYtvaGWcpY7e+5P/bQbgSAIxnlHIm5/9MX4ZlCOoXCOvUP9hGlPkhlVg== X-Received: by 2002:a05:600c:4496:b0:424:a578:fc5 with SMTP id 5b1f17b1804b1-424a5781145mr33388605e9.32.1719415662054; Wed, 26 Jun 2024 08:27:42 -0700 (PDT) Received: from toaster.lan ([2a01:e0a:3c5:5fb1:7be7:aef1:af9e:fff6]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-4249b4233b3sm42321675e9.0.2024.06.26.08.27.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Jun 2024 08:27:41 -0700 (PDT) From: Jerome Brunet To: Neil Armstrong Cc: Jerome Brunet , Kevin Hilman , linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org, devicetree@vger.kernel.org, Rob Herring , Krzysztof Kozlowski , Conor Dooley Subject: [PATCH 1/2] arm64: dts: amlogic: gx: correct hdmi clocks Date: Wed, 26 Jun 2024 17:27:30 +0200 Message-ID: <20240626152733.1350376-2-jbrunet@baylibre.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240626152733.1350376-1-jbrunet@baylibre.com> References: <20240626152733.1350376-1-jbrunet@baylibre.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Bot: notify Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The clocks provided to HDMI tx are not consistent between gx and g12: * gx receives the peripheral clock as 'isfr' while g12 receives it as 'iahb' * g12 gets the HDMI system clock as 'isfr' but gx does not even get it. It surely needs that clock since the driver is directly poking around the clock controller's registers for that clock. Align gx SoCs with g12 and provide: * the HDMI peripheral clock as 'iahb' * the HDMI system clock as 'isfr' Fixes: 6939db7e0dbf ("ARM64: dts: meson-gx: Add support for HDMI output") Signed-off-by: Jerome Brunet --- arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 4 ++-- arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/= dts/amlogic/meson-gxbb.dtsi index d8a386c31914..041c37b809f2 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi @@ -311,8 +311,8 @@ &hdmi_tx { <&reset RESET_HDMI_SYSTEM_RESET>, <&reset RESET_HDMI_TX>; reset-names =3D "hdmitx_apb", "hdmitx", "hdmitx_phy"; - clocks =3D <&clkc CLKID_HDMI_PCLK>, - <&clkc CLKID_CLK81>, + clocks =3D <&clkc CLKID_HDMI>, + <&clkc CLKID_HDMI_PCLK>, <&clkc CLKID_GCLK_VENCI_INT0>; clock-names =3D "isfr", "iahb", "venci"; power-domains =3D <&pwrc PWRC_GXBB_VPU_ID>; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/d= ts/amlogic/meson-gxl.dtsi index 82386feb5177..067108800a58 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi @@ -323,8 +323,8 @@ &hdmi_tx { <&reset RESET_HDMI_SYSTEM_RESET>, <&reset RESET_HDMI_TX>; reset-names =3D "hdmitx_apb", "hdmitx", "hdmitx_phy"; - clocks =3D <&clkc CLKID_HDMI_PCLK>, - <&clkc CLKID_CLK81>, + clocks =3D <&clkc CLKID_HDMI>, + <&clkc CLKID_HDMI_PCLK>, <&clkc CLKID_GCLK_VENCI_INT0>; clock-names =3D "isfr", "iahb", "venci"; power-domains =3D <&pwrc PWRC_GXBB_VPU_ID>; --=20 2.43.0 From nobody Wed Dec 17 22:45:43 2025 Received: from mail-lj1-f175.google.com (mail-lj1-f175.google.com [209.85.208.175]) (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 9B87D18C33F for ; Wed, 26 Jun 2024 15:27:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719415666; cv=none; b=de7nfMXTdigFW2yL4Dw2lojMxY5ZJ+guS6FEjNwglWfzgaB1LfdVPMluekUbCiVIw6rVaIUIcwHKecOBI+9yNWMcopcm6a/BkfmSxzmfFoTj398iHEfGV0iItThhtgC6VSZUIO/jxqTFJWEoFG0nyZ4jeKvDt1e2XF55NQXqiO0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719415666; c=relaxed/simple; bh=O5netpnGIBeIkw1M4/lf2Wc5bW6UoJ7ahYmew4h/C38=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Dlv175f10cMQWVwF8jLfquRtnScdd1vD7+0TZwfFXyb+lVuR20KTIOiejsmxIBTKAeo5HlpR7iaAUCw4NMvH6oK+cKFA4mvjB/hjbsaYmSdNpW3kexU54r2r3yU3BUuYpuMI4S250yi3DMk5wAKaOSd8txwiECOO+S9492THfe0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com; spf=pass smtp.mailfrom=baylibre.com; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b=DeM/izUp; arc=none smtp.client-ip=209.85.208.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=baylibre.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b="DeM/izUp" Received: by mail-lj1-f175.google.com with SMTP id 38308e7fff4ca-2ebe785b234so75420171fa.1 for ; Wed, 26 Jun 2024 08:27:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1719415663; x=1720020463; 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=Dli0klT0JrJmYvluyt71Tv2QHkdxPzzP+lnfxnwDHgQ=; b=DeM/izUppdzPcDHRyoi6epJc3EBTMR3KK0OR1i0NPSJQG7gER2S3jQbkc2Vr/IOJi4 Ie4c2Cpp5PMoNwdZtgGe1ENArYm9HuQtUIXozxveEmJG/3j96G4L95lTGQxRm1GVrnUF S3ISm0JJtddqbjwEidqbDNEKwkOOVoqcBg4ufQHOJ/RsyDp7OYJPImZp6zSK1ITXCzJj 2TS8d7CS8KyB5QnDB/G10q5k4AyPNEQkkEYv3eEpxd7GKMPpadBsKXvdHGTi1HTu1G2S +SIm0e0qjjb3I9KPHQrIJM1xBOT75LpQvGrr6irJO/xWJjHm7SMCOaH60UUlRUIjrUcW kCyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719415663; x=1720020463; 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=Dli0klT0JrJmYvluyt71Tv2QHkdxPzzP+lnfxnwDHgQ=; b=O3eDISvxFfukeY7GieYWVT+R21+lZoiv1oIIKOwrV/U5fRIIdehGXizGzWkvkhoBvh JQxnJW1Tfc71Mm+tNyIQEMFrNe4/c/fAl4v//1f1x+ykBCGRUaNTq3/Ip/Y34nExXOxJ GuxFX/Kz/rkdBCwgGqW2QdyGI4CYb26QkDUwJwuWw+j4VVOPijV9u7hIDIIUgHd34uv/ OvafUERF79V+oSUxXHBeCoO0eVEiq/2SYQkVzPiTR8znHffWG6kU6O00fj3+ksJW5w8L m0Nzc2GnEHLh0tVEjM9IGKlKHwdRazic69MLXD6fH3FzDPgVHApEZ62WkbeGkfdpnJF3 MADw== X-Forwarded-Encrypted: i=1; AJvYcCXy54bj6COwBsG8LOmdKuJKz7ZZWTdlyBvzy+JPEUMxFjNVnQpPhFugOVWXGlBzM+0ttKjhUXn5R3aATbgGi5/bsUjCavGzNTN+3FBY X-Gm-Message-State: AOJu0YxmiKUpWoledgcktWfv14vc3J+GJGmnq8KL6pFScmKu1h9tu0ph mSdmLEqIL3S6C+XD+2ZP4SLPXopHqCl6UQSxA7A6sBWLUYjN653bVV9GtZ8DeGk= X-Google-Smtp-Source: AGHT+IEeSTyXRJHUOnk6F/6DYuHl5N4ZmAN2SVMYbgd+QvOtm5zHfhjVMr2psCBRFiepsL77IbqapQ== X-Received: by 2002:a2e:9090:0:b0:2ec:5621:b9f2 with SMTP id 38308e7fff4ca-2ec5936fb3amr83095041fa.41.1719415662730; Wed, 26 Jun 2024 08:27:42 -0700 (PDT) Received: from toaster.lan ([2a01:e0a:3c5:5fb1:7be7:aef1:af9e:fff6]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-4249b4233b3sm42321675e9.0.2024.06.26.08.27.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Jun 2024 08:27:42 -0700 (PDT) From: Jerome Brunet To: Neil Armstrong Cc: Jerome Brunet , Kevin Hilman , linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org, devicetree@vger.kernel.org, Rob Herring , Krzysztof Kozlowski , Conor Dooley Subject: [PATCH 2/2] arm64: dts: amlogic: setup hdmi system clock Date: Wed, 26 Jun 2024 17:27:31 +0200 Message-ID: <20240626152733.1350376-3-jbrunet@baylibre.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240626152733.1350376-1-jbrunet@baylibre.com> References: <20240626152733.1350376-1-jbrunet@baylibre.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Bot: notify Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" HDMI Tx needs the system clock set on the xtal rate. This clock is managed by the main clock controller of the related SoCs. Currently 2 part of the display drivers race to setup the HDMI system clock by directly poking the controller register. The clock API should be used to setup the rate instead. Use assigned-clock to setup the HDMI system clock. Fixes: 6939db7e0dbf ("ARM64: dts: meson-gx: Add support for HDMI output") Signed-off-by: Jerome Brunet --- arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 5 +++++ arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 5 +++++ arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64= /boot/dts/amlogic/meson-g12-common.dtsi index 354f3c722b04..0c425af3174d 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi @@ -215,6 +215,11 @@ hdmi_tx: hdmi-tx@0 { #sound-dai-cells =3D <0>; status =3D "disabled"; =20 + assigned-clocks =3D <&clkc CLKID_HDMI_SEL>, + <&clkc CLKID_HDMI>; + assigned-clock-parents =3D <&xtal>, <0>; + assigned-clock-rates =3D <0>, <24000000>; + /* VPU VENC Input */ hdmi_tx_venc_port: port@0 { reg =3D <0>; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/= dts/amlogic/meson-gxbb.dtsi index 041c37b809f2..ed00e67e6923 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi @@ -316,6 +316,11 @@ &hdmi_tx { <&clkc CLKID_GCLK_VENCI_INT0>; clock-names =3D "isfr", "iahb", "venci"; power-domains =3D <&pwrc PWRC_GXBB_VPU_ID>; + + assigned-clocks =3D <&clkc CLKID_HDMI_SEL>, + <&clkc CLKID_HDMI>; + assigned-clock-parents =3D <&xtal>, <0>; + assigned-clock-rates =3D <0>, <24000000>; }; =20 &sysctrl { diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/d= ts/amlogic/meson-gxl.dtsi index 067108800a58..f58d1790de1c 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi @@ -328,6 +328,11 @@ &hdmi_tx { <&clkc CLKID_GCLK_VENCI_INT0>; clock-names =3D "isfr", "iahb", "venci"; power-domains =3D <&pwrc PWRC_GXBB_VPU_ID>; + + assigned-clocks =3D <&clkc CLKID_HDMI_SEL>, + <&clkc CLKID_HDMI>; + assigned-clock-parents =3D <&xtal>, <0>; + assigned-clock-rates =3D <0>, <24000000>; }; =20 &sysctrl { --=20 2.43.0