From nobody Thu Dec 18 09:50:24 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4F08CCA0ECC for ; Mon, 11 Sep 2023 21:26:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241732AbjIKVRt (ORCPT ); Mon, 11 Sep 2023 17:17:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44402 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242524AbjIKPqA (ORCPT ); Mon, 11 Sep 2023 11:46:00 -0400 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B6E40127 for ; Mon, 11 Sep 2023 08:45:54 -0700 (PDT) Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-403004a96eeso25256465e9.3 for ; Mon, 11 Sep 2023 08:45:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1694447153; x=1695051953; 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=wtIhAxbGVK+7yj4SNMHYOQFab9XtJv/AFRYvoUE3Ztg=; b=fPs3jz9CNOYH604bpS2KaaS3ABUXJqD1nd4/6yGz19t0g647vHHgsoZnOOMyxm0Qgy PAhbxEDQTpiegYlylCmFUuLBAf4G5IJmcNrRuqSBIwQ9pndFt6yBZkS1A3xYIBJvy3i6 IA5zIJNN7uWg2SIZ9aONjmnkJ3g5lnzBm2DyiZBF7VXVINsDNB+mKwv6UnDvsLxAbqmb vVtb075jFGL63+yj2PqihMsA2tX3/r4UwUtK1qz4O6t5TSM1MFoQtsupCCAZZKF68Ilq 00YWkKthAkz1KnXNyy+aGtCZH4juJgcpzfDHI4PH15FLEjBuSEvH3MduYTnkZqkQmRPM kT4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694447153; x=1695051953; 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=wtIhAxbGVK+7yj4SNMHYOQFab9XtJv/AFRYvoUE3Ztg=; b=FJlIor7bO9PjB8nIabHWFxEQnM9k6yneianqOVqHSxjST4l6w+vsOqGFpHVHiFDt0B 7B/iqTLhFmoJazuJdvRWDmRE6lYxLXKvazCNW2dDzpQzaXPXCaOgDAyz8e2bs1bEraks hzm5FvUIsVg12wQdUr04rQd2IQ03T5vwC0S7CH4RYx3jWqe/gDRmEheIJxAFUbCVK5Lh bRh1l4RWYyYAN+d3uXD/b+yvPrv+NifKyBEyDpxxwx8SpDNm0bzrY62lvyoOaFuMdz1j irdcEGzxW2YjhTqplyhWyRzkHdTAf7l0XsbVcLa95giBEDP8cbjcPPVTvXxsztYDZelj UFlQ== X-Gm-Message-State: AOJu0YwrLvIdfkHJb0ZmuRcz+y5gzV8YY/xmfmHArcIY6UHn8ijmvL1n Sb6xIBPUi/KlYsQnws0ws+mi0g== X-Google-Smtp-Source: AGHT+IFlHuDGD4y/pkzGSIaXA5xLAwU8gajS0add0DHyT1XivNj62MdgH/kpwUyCyIHaYB4pZmxRlw== X-Received: by 2002:a05:600c:b4e:b0:3f8:fac0:ad40 with SMTP id k14-20020a05600c0b4e00b003f8fac0ad40mr9105096wmr.29.1694447153244; Mon, 11 Sep 2023 08:45:53 -0700 (PDT) Received: from toaster.lan ([2a01:e0a:3c5:5fb1:55be:8f7e:5f59:7ed1]) by smtp.googlemail.com with ESMTPSA id q12-20020a05600c040c00b003fe539b83f2sm13616255wmb.42.2023.09.11.08.45.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Sep 2023 08:45:52 -0700 (PDT) From: Jerome Brunet To: Neil Armstrong , Kevin Hilman , Krzysztof Kozlowski , Rob Herring , Conor Dooley Cc: Jerome Brunet , Christian Hewitt , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org Subject: [PATCH 1/5] arm64: dts: meson: u200: fix spdif output pin Date: Mon, 11 Sep 2023 17:45:37 +0200 Message-Id: <20230911154541.471484-2-jbrunet@baylibre.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230911154541.471484-1-jbrunet@baylibre.com> References: <20230911154541.471484-1-jbrunet@baylibre.com> MIME-Version: 1.0 X-Patchwork-Bot: notify Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" u200 outputs spdif on GPIOAO_10, not GPIOH_4 which is used for the LCD panel. Fixes: cfae4eadb7cd ("arm64: dts: meson: add audio playback to u200") Signed-off-by: Jerome Brunet --- arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts b/arch/arm64/b= oot/dts/amlogic/meson-g12a-u200.dts index 2878e3ad7de2..8fa17a62534c 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts @@ -396,7 +396,7 @@ &sd_emmc_c { }; =20 &spdifout { - pinctrl-0 =3D <&spdif_out_h_pins>; + pinctrl-0 =3D <&spdif_ao_out_pins>; pinctrl-names =3D "default"; status =3D "okay"; }; --=20 2.40.1 From nobody Thu Dec 18 09:50:24 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A2EE1CA0ED4 for ; Mon, 11 Sep 2023 21:31:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347943AbjIKVZ1 (ORCPT ); Mon, 11 Sep 2023 17:25:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44420 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242527AbjIKPqA (ORCPT ); Mon, 11 Sep 2023 11:46:00 -0400 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 97CB8CE5 for ; Mon, 11 Sep 2023 08:45:55 -0700 (PDT) Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-401187f8071so29246435e9.0 for ; Mon, 11 Sep 2023 08:45:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1694447154; x=1695051954; 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=3bdQljBM9G3jopTFDsO9g16l4ONvm8vQqmOSRCzAnEo=; b=p/lQDiEE6RtEeQ6xzME5pJZJEoG1FqEPwkevKvh8oOPCxkEI/UzbIdoWyd/f5+ET4x YiJ+sbrES87AmSgNmrICKuK0fl3CzLg9iRXlB5NptNe4PHzTb5B0hmWZ8bCHzJcdNdy/ t3Tnfw1sUb1hUWFRoey8PJpyNed6SQIePQLYI31eZuE8PJTfPbIL6+WjKDfr8Yahcd0V MOCkC5kV46dNa9y8CGzkaEPf/qEyRp2I+ROTBndt+uFHZcu/GrieKSrLrCbChAmwAAiv vjyNT8eV9g7OLECNs4lyg3e4C/lt5obxHCBy6nya9uCcoGrO8yxDFNxDpmxLoLAWU/ZM QYVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694447154; x=1695051954; 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=3bdQljBM9G3jopTFDsO9g16l4ONvm8vQqmOSRCzAnEo=; b=F3RvkGE6JEmuqRsWlm9CUp5QR5zeUt4abQiA/Kgw1CGksDwtOGJxuQiUyP9LY1f9UA F7aXZCK2+5XP30if27628MTgTnavExFL6JihrLdOJ9xTBtKSsekBOXNPS9NBJoRNowMa Mf57a9oG3xu60Jp8nxNcSQEdHURkTS5+Uc4YiUWIdJ7zkTk/ckp5R4k3ExSuOy2OJVcQ bxOFjCku9VQB8LCP1bZK+7TzZEfFpKpxyFzLI/Gc0vLZNO2y8oECwUJp30ZxGnA9IJDw 6e31dPo/75sTrzof3xzAgYa0TQegZ7Ds/KZbL6quu0kuu4Qt/BMO6Eo54BcKFxjPDdh1 j0AA== X-Gm-Message-State: AOJu0Yxk7qwu7y9D8uyGtSRdfokWHbBJ66wK7wf6AtfVcinZ+jPIwCSP N6O2OFsJRU2oGLEeHvhKSN4b+Q== X-Google-Smtp-Source: AGHT+IHSlCpiA67RcBqWVu/yNJspToPqKhBDsN+U4vD1E3RtnOz9o0ZpI5rtn7YZWGnKnmMXksiGeg== X-Received: by 2002:a05:600c:49a3:b0:3fb:f0b2:20eb with SMTP id h35-20020a05600c49a300b003fbf0b220ebmr22361wmp.1.1694447154131; Mon, 11 Sep 2023 08:45:54 -0700 (PDT) Received: from toaster.lan ([2a01:e0a:3c5:5fb1:55be:8f7e:5f59:7ed1]) by smtp.googlemail.com with ESMTPSA id q12-20020a05600c040c00b003fe539b83f2sm13616255wmb.42.2023.09.11.08.45.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Sep 2023 08:45:53 -0700 (PDT) From: Jerome Brunet To: Neil Armstrong , Kevin Hilman , Krzysztof Kozlowski , Rob Herring , Conor Dooley Cc: Jerome Brunet , Christian Hewitt , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org Subject: [PATCH 2/5] arm64: dts: meson: u200: add missing audio clock controller Date: Mon, 11 Sep 2023 17:45:38 +0200 Message-Id: <20230911154541.471484-3-jbrunet@baylibre.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230911154541.471484-1-jbrunet@baylibre.com> References: <20230911154541.471484-1-jbrunet@baylibre.com> MIME-Version: 1.0 X-Patchwork-Bot: notify Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The audio subsystem will not work if the audio clock controller is not enabled. Fixes: cfae4eadb7cd ("arm64: dts: meson: add audio playback to u200") Signed-off-by: Jerome Brunet --- arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts b/arch/arm64/b= oot/dts/amlogic/meson-g12a-u200.dts index 8fa17a62534c..2380d237d220 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts @@ -286,6 +286,10 @@ &cpu3 { clock-latency =3D <50000>; }; =20 +&clkc_audio { + status =3D "okay"; +}; + &cvbs_vdac_port { cvbs_vdac_out: endpoint { remote-endpoint =3D <&cvbs_connector_in>; --=20 2.40.1 From nobody Thu Dec 18 09:50:24 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 96424CA0ED5 for ; Mon, 11 Sep 2023 22:09:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1358018AbjIKWHY (ORCPT ); Mon, 11 Sep 2023 18:07:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44452 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242532AbjIKPqB (ORCPT ); Mon, 11 Sep 2023 11:46:01 -0400 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 837E3CFF for ; Mon, 11 Sep 2023 08:45:56 -0700 (PDT) Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-403012f27e1so25391985e9.1 for ; Mon, 11 Sep 2023 08:45:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1694447155; x=1695051955; 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=epwO+SStz9NM69htgYjFNbJ+1k8dChdarhPRbsLmIPo=; b=aife+QWN03Sh84BKbqtuIsAV5UvR53QgqFEV89J9jlLYH+nLlv79ANNYzkSDwyvGr8 95pwhu6SPIS63xmpRsdwh4YwWpII5MsvxdNdDqclYr6YSUw35Njhpy7gri2vUStKnFup 4GhunOhpfBk0i2EN54rg8e/pXzEV0lj2H7UJZquKkHpx0JQ1ilNVysdnrD6sUw18rfmf gSl2p2gEEWf5VM+Px6G+RR4CWEaypxBSwwTk21+HCnA01/AuRhfOgxPmzTXF2GmyE5lH YByogjk7v59UXy6vSNYE3WjSrLuw1yB+wraW1uF4VJNDZiAeFr43XYicYg6aPwbsQsQz +sHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694447155; x=1695051955; 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=epwO+SStz9NM69htgYjFNbJ+1k8dChdarhPRbsLmIPo=; b=fi1NQnSqGE1nCLbFYLvjXKCIylTPv3+ocK1KnfIt2kAKs6GCM75pgmQ2zoMy6mF8qF lM3HM+M5YclYPH0I41IYu+MkPx8nMXKP36SNK8yFPGiqpe4pK1hZzPYaV659WPP6j8rY UVUD05IOATzZy7vPoR05lVragQBYIyVh3ZLhAoGkVTbvBwbq7+loYPPpT6nhN7xNqvc5 +wMgs11eifM0gNfAdpoK7iy7CALYhYddQO1s15kXpVok/xXq5ibXHNGRcZuSRyUFVSAU R+ZamRhm/opK9R9aR6ykrYSNYoSm4XLbTi9WToF4YVPfw3v7ofupVBv3FHdCYAeew5Xp SZzg== X-Gm-Message-State: AOJu0Yw5qRUgwovDHVFuG3jET3bkB7ujOXJT8ky0UPsBANCHQQVf99EL tlHEOPAwMBfvNGF2/M7lxRfPIg== X-Google-Smtp-Source: AGHT+IH/l9YhTMJ8R87Jn4M26LwWErmp/fMinm+HkJON+GjKiZqfQ57rUyoelo8qX83HND/gSYm4Tw== X-Received: by 2002:a05:600c:228f:b0:401:c338:ab94 with SMTP id 15-20020a05600c228f00b00401c338ab94mr9099563wmf.29.1694447155036; Mon, 11 Sep 2023 08:45:55 -0700 (PDT) Received: from toaster.lan ([2a01:e0a:3c5:5fb1:55be:8f7e:5f59:7ed1]) by smtp.googlemail.com with ESMTPSA id q12-20020a05600c040c00b003fe539b83f2sm13616255wmb.42.2023.09.11.08.45.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Sep 2023 08:45:54 -0700 (PDT) From: Jerome Brunet To: Neil Armstrong , Kevin Hilman , Krzysztof Kozlowski , Rob Herring , Conor Dooley Cc: Jerome Brunet , Christian Hewitt , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org Subject: [PATCH 3/5] arm64: dts: meson: u200: add spdifout b routes Date: Mon, 11 Sep 2023 17:45:39 +0200 Message-Id: <20230911154541.471484-4-jbrunet@baylibre.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230911154541.471484-1-jbrunet@baylibre.com> References: <20230911154541.471484-1-jbrunet@baylibre.com> MIME-Version: 1.0 X-Patchwork-Bot: notify Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" spdifout B remains untested as it can only feed the HDMI controller, which does not support spdif ATM. Still if the u200 has spdifout b, the routes to it should be set. Fixes: cfae4eadb7cd ("arm64: dts: meson: add audio playback to u200") Signed-off-by: Jerome Brunet --- arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts b/arch/arm64/b= oot/dts/amlogic/meson-g12a-u200.dts index 2380d237d220..921b62c5ab33 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts @@ -166,7 +166,10 @@ sound { "TDM_B Playback", "TDMOUT_B OUT", "SPDIFOUT IN 0", "FRDDR_A OUT 3", "SPDIFOUT IN 1", "FRDDR_B OUT 3", - "SPDIFOUT IN 2", "FRDDR_C OUT 3"; + "SPDIFOUT IN 2", "FRDDR_C OUT 3", + "SPDIFOUT_B IN 0", "FRDDR_A OUT 4", + "SPDIFOUT_B IN 1", "FRDDR_B OUT 4", + "SPDIFOUT_B IN 2", "FRDDR_C OUT 4"; =20 assigned-clocks =3D <&clkc CLKID_MPLL2>, <&clkc CLKID_MPLL0>, --=20 2.40.1 From nobody Thu Dec 18 09:50:24 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 374C8CA0EC6 for ; Mon, 11 Sep 2023 21:48:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353698AbjIKVsH (ORCPT ); Mon, 11 Sep 2023 17:48:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44468 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242533AbjIKPqB (ORCPT ); Mon, 11 Sep 2023 11:46:01 -0400 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 64BB2FB for ; Mon, 11 Sep 2023 08:45:57 -0700 (PDT) Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-401b3ea0656so49013715e9.0 for ; Mon, 11 Sep 2023 08:45:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1694447156; x=1695051956; 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=w8GmnivYIya/kXsBEnAOi5/Fi2lHPHk3tyJN33w5ic4=; b=MdFBr7kuYpRk46PzUng5XfTQtMhFRQxb7PZcy4EkbiX1GyUq2TByswGx5SfNOBmIF0 QITv7kS+Iep0XRHcnT2j4UYugK1qBZx0D7570nyXIaSerpJqlpGgDh49OFJ5KEyC1ANu m8U8iFwng0y0xg7jGdzFg+YJLKkhorid2YhHS1sdL4XEzgKrnUYswHiWGvfzKeuggSqD C/AF9AYAw6e5ssM5qTxAXeepH23TMNEVTcuuvJaLlQ9vBbNDt3oltY/Gn000ivSaQaKI fp4oq5yHTTUuz3QedWbU5L1OQFe4YZrWY82yt7x18JUY685Mdrj90cmMxnvwXytoWBs5 hbGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694447156; x=1695051956; 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=w8GmnivYIya/kXsBEnAOi5/Fi2lHPHk3tyJN33w5ic4=; b=QMkO5ciXvOYh+0gtYu33Bw587RX3lx9nLyb0cypi26/VbPm+m401C1F1DVMLpPi5ca Ulfw5QPd6v4m53ZnH7zYM+u31iSpR3Cv01PI04aNMarq7/ZjpI3zVcICY67GFenqf12L sKtn+k8vHHYH1nEST0DN/aTOHzHAMEN1BiOwPXP6PiFZQpALGNSpUeaaynIzmrY7iAf8 m8IHa/+YmtdZwnJWKPjmEj5gTzLYWjTKFbD0Zg/tcI5Sk3/bomSTNN8YJ+bzoaRgb6w/ 9G9iK/wC0d0bAdPefuuwULKsJclEa2EdLclCDt2a6qXVokEvRoSIZ2e45zQdo9fF4dHC QQqQ== X-Gm-Message-State: AOJu0YwkUm0PoLO+bZGaO7RPRcWzCfIFpyZ0mzWD7e5z8h4ahNOAqoA4 JsBgInP587h7p6ZjwITkWxmwww== X-Google-Smtp-Source: AGHT+IEOdC6N4yffuUJH7WsfrdAEJ+HeWUa6KJ6KGJQUIHAReIzAkUYcbtQ2ckSxfrRuPEHZZd+3aQ== X-Received: by 2002:a05:600c:2294:b0:401:b204:3b98 with SMTP id 20-20020a05600c229400b00401b2043b98mr8950146wmf.19.1694447155928; Mon, 11 Sep 2023 08:45:55 -0700 (PDT) Received: from toaster.lan ([2a01:e0a:3c5:5fb1:55be:8f7e:5f59:7ed1]) by smtp.googlemail.com with ESMTPSA id q12-20020a05600c040c00b003fe539b83f2sm13616255wmb.42.2023.09.11.08.45.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Sep 2023 08:45:55 -0700 (PDT) From: Jerome Brunet To: Neil Armstrong , Kevin Hilman , Krzysztof Kozlowski , Rob Herring , Conor Dooley Cc: Jerome Brunet , Christian Hewitt , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org Subject: [PATCH 4/5] arm64: dts: meson: u200: use TDM C for HDMI Date: Mon, 11 Sep 2023 17:45:40 +0200 Message-Id: <20230911154541.471484-5-jbrunet@baylibre.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230911154541.471484-1-jbrunet@baylibre.com> References: <20230911154541.471484-1-jbrunet@baylibre.com> MIME-Version: 1.0 X-Patchwork-Bot: notify Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" On the u200, TDM B is wired to the onboard AD82584F i2c speaker codec. This makes TDM B a poor choice for the interface dedicated to HDMI which uses 4 i2s lanes. TDM A is not a good choice either as it is connected to the SDIO wifi/bt chip. TDM C is not used externally by default, which makes it a better choice for the HDMI interface. Signed-off-by: Jerome Brunet --- arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts b/arch/arm64/b= oot/dts/amlogic/meson-g12a-u200.dts index 921b62c5ab33..da66e2e1dffb 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts @@ -159,10 +159,10 @@ vddcpu: regulator-vddcpu { sound { compatible =3D "amlogic,axg-sound-card"; model =3D "U200"; - audio-aux-devs =3D <&tdmout_b>; - audio-routing =3D "TDMOUT_B IN 0", "FRDDR_A OUT 1", - "TDMOUT_B IN 1", "FRDDR_B OUT 1", - "TDMOUT_B IN 2", "FRDDR_C OUT 1", + audio-aux-devs =3D <&tdmout_c>; + audio-routing =3D "TDMOUT_C IN 0", "FRDDR_A OUT 2", + "TDMOUT_C IN 1", "FRDDR_B OUT 2", + "TDMOUT_C IN 2", "FRDDR_C OUT 2", "TDM_B Playback", "TDMOUT_B OUT", "SPDIFOUT IN 0", "FRDDR_A OUT 3", "SPDIFOUT IN 1", "FRDDR_B OUT 3", @@ -193,7 +193,7 @@ dai-link-2 { =20 /* 8ch hdmi interface */ dai-link-3 { - sound-dai =3D <&tdmif_b>; + sound-dai =3D <&tdmif_c>; dai-format =3D "i2s"; dai-tdm-slot-tx-mask-0 =3D <1 1>; dai-tdm-slot-tx-mask-1 =3D <1 1>; @@ -202,7 +202,7 @@ dai-link-3 { mclk-fs =3D <256>; =20 codec { - sound-dai =3D <&tohdmitx TOHDMITX_I2S_IN_B>; + sound-dai =3D <&tohdmitx TOHDMITX_I2S_IN_C>; }; }; =20 @@ -412,11 +412,11 @@ &spdifout_b { status =3D "okay"; }; =20 -&tdmif_b { +&tdmif_c { status =3D "okay"; }; =20 -&tdmout_b { +&tdmout_c { status =3D "okay"; }; =20 --=20 2.40.1 From nobody Thu Dec 18 09:50:24 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 345B9CA0EC6 for ; Mon, 11 Sep 2023 21:21:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345149AbjIKVPp (ORCPT ); Mon, 11 Sep 2023 17:15:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57342 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242539AbjIKPqD (ORCPT ); Mon, 11 Sep 2023 11:46:03 -0400 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7AFDE127 for ; Mon, 11 Sep 2023 08:45:58 -0700 (PDT) Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-402c46c49f4so49515735e9.1 for ; Mon, 11 Sep 2023 08:45:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1694447157; x=1695051957; 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=cSIzaGY4JTGWQViW6JO82zhUaR3rfht5CJdLlOs6lcQ=; b=ozHdDp991UdVNd+uAa4UswhG3Y5KdOcj/MrJUzT+mWfILc/zixDwhsINbrPRv6dA+D A8nJR+jDWhZIg3TjoJnFJBtfGQWK41f8xRMNSNm9ihm3S1nGcd6CN+cUSiE0BxdN/8uv yQLJTIoWvhqvSdltBkoauUuWXpq1DhFzElTtgG97izwO2Gj0PXWeQMwD6gii4l8CeGEY IJ45cBXUw+ODgZBCKKo3ODYyoa7xEvkF/260odw2u9DSB+8unGlgsIPRBqjvgA4ac2ZC UoqcgK58b+h93wU4vUoCae1oS6TnLlbPVtqlgfzzKBD2j5lTANy3PveH+4YcA07hznpc Ybcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694447157; x=1695051957; 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=cSIzaGY4JTGWQViW6JO82zhUaR3rfht5CJdLlOs6lcQ=; b=YY+lxX1lS+OGul0+wizAWP5IaW/2z4khVRbUU7pwx7AYiL+gee8pPpcaXHMbFoXRcj //QRwTk6taqRHN+YZyBgqKeMjXthsYu6+DdzRo2KO69mYAQr/EtijrghjPITKM/8eYXa 5SbDMLgJb1d1kQilZtmI75fheyG+i5GgCehEoh15fkEzObJj6btKtd5xWAMbllQrk2kL KTYa/M9dqXsqRjve1WAcW1VmzqpqoqArbCRHiliPcX7OBtwGrs/5ymg4vgD/RZjYKQoT vibhguByMVTA2wdq1LPKEHyEyvptwffeCgEES4GQ6p+mpNu7od4D3EPzM0c+JgxCUThw HchA== X-Gm-Message-State: AOJu0YyxAoQKbe5NYOw1O6i3Fd9iNKCT+CXTrqqt17ll0mrcFuiy4S/E zdljDhYTBxo9kzU3GgsMOiH83Q== X-Google-Smtp-Source: AGHT+IGhLPBA7FSbST65jTdBOh+qXxiGny/m9t3mksHt37rJQNayJyIdmGOMbsoTZtN+Egf8qMpPjA== X-Received: by 2002:a05:600c:204c:b0:401:23fc:1f92 with SMTP id p12-20020a05600c204c00b0040123fc1f92mr8964501wmg.25.1694447156746; Mon, 11 Sep 2023 08:45:56 -0700 (PDT) Received: from toaster.lan ([2a01:e0a:3c5:5fb1:55be:8f7e:5f59:7ed1]) by smtp.googlemail.com with ESMTPSA id q12-20020a05600c040c00b003fe539b83f2sm13616255wmb.42.2023.09.11.08.45.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Sep 2023 08:45:56 -0700 (PDT) From: Jerome Brunet To: Neil Armstrong , Kevin Hilman , Krzysztof Kozlowski , Rob Herring , Conor Dooley Cc: Jerome Brunet , Christian Hewitt , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org Subject: [PATCH 5/5] arm64: dts: meson: u200: add onboard devices Date: Mon, 11 Sep 2023 17:45:41 +0200 Message-Id: <20230911154541.471484-6-jbrunet@baylibre.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230911154541.471484-1-jbrunet@baylibre.com> References: <20230911154541.471484-1-jbrunet@baylibre.com> MIME-Version: 1.0 X-Patchwork-Bot: notify Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add missing audio devices found on the u200 PCB. This includes * Lineout connected to the internal DAC * SPDIF input connected to a coaxial socket * TDM input decoders allowing output loopback * TDM A and B output encoders and interfaces TDM A and B link format is set by the related external codec. Internal audio DAC can hook to any TDM output. This change does not include support necessary the optional the speaker and PDM Mic headers Signed-off-by: Jerome Brunet --- .../boot/dts/amlogic/meson-g12a-u200.dts | 228 +++++++++++++++++- 1 file changed, 218 insertions(+), 10 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts b/arch/arm64/b= oot/dts/amlogic/meson-g12a-u200.dts index da66e2e1dffb..9abe37b5b227 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts @@ -9,6 +9,7 @@ #include #include #include +#include =20 / { compatible =3D "amlogic,u200", "amlogic,g12a"; @@ -19,6 +20,22 @@ aliases { ethernet0 =3D ðmac; }; =20 + dioo2133: audio-amplifier-0 { + #sound-dai-cells =3D <0>; + compatible =3D "simple-audio-amplifier"; + status =3D "okay"; + enable-gpios =3D <&gpio_ao GPIOAO_2 GPIO_ACTIVE_HIGH>; + VCC-supply =3D <&vcc_5v>; + sound-name-prefix =3D "10U2"; + }; + + spdif_dir: audio-codec-0 { + #sound-dai-cells =3D <0>; + compatible =3D "linux,spdif-dir"; + status =3D "okay"; + sound-name-prefix =3D "DIR"; + }; + spdif_dit: audio-codec-1 { #sound-dai-cells =3D <0>; compatible =3D "linux,spdif-dit"; @@ -159,17 +176,71 @@ vddcpu: regulator-vddcpu { sound { compatible =3D "amlogic,axg-sound-card"; model =3D "U200"; - audio-aux-devs =3D <&tdmout_c>; - audio-routing =3D "TDMOUT_C IN 0", "FRDDR_A OUT 2", + audio-widgets =3D "Line", "Lineout"; + audio-aux-devs =3D <&tdmout_a>, <&tdmout_b>, <&tdmout_c>, + <&tdmin_a>, <&tdmin_b>, <&tdmin_c>, + <&tdmin_lb>, <&dioo2133>; + audio-routing =3D "TDMOUT_A IN 0", "FRDDR_A OUT 0", + "TDMOUT_A IN 1", "FRDDR_B OUT 0", + "TDMOUT_A IN 2", "FRDDR_C OUT 0", + "TDM_A Playback", "TDMOUT_A OUT", + "TDMOUT_B IN 0", "FRDDR_A OUT 1", + "TDMOUT_B IN 1", "FRDDR_B OUT 1", + "TDMOUT_B IN 2", "FRDDR_C OUT 1", + "TDM_B Playback", "TDMOUT_B OUT", + "TDMOUT_C IN 0", "FRDDR_A OUT 2", "TDMOUT_C IN 1", "FRDDR_B OUT 2", "TDMOUT_C IN 2", "FRDDR_C OUT 2", - "TDM_B Playback", "TDMOUT_B OUT", + "TDM_C Playback", "TDMOUT_C OUT", "SPDIFOUT IN 0", "FRDDR_A OUT 3", "SPDIFOUT IN 1", "FRDDR_B OUT 3", "SPDIFOUT IN 2", "FRDDR_C OUT 3", "SPDIFOUT_B IN 0", "FRDDR_A OUT 4", "SPDIFOUT_B IN 1", "FRDDR_B OUT 4", - "SPDIFOUT_B IN 2", "FRDDR_C OUT 4"; + "SPDIFOUT_B IN 2", "FRDDR_C OUT 4", + "TDMIN_A IN 0", "TDM_A Capture", + "TDMIN_A IN 1", "TDM_B Capture", + "TDMIN_A IN 2", "TDM_C Capture", + "TDMIN_A IN 3", "TDM_A Loopback", + "TDMIN_A IN 4", "TDM_B Loopback", + "TDMIN_A IN 5", "TDM_C Loopback", + "TDMIN_B IN 0", "TDM_A Capture", + "TDMIN_B IN 1", "TDM_B Capture", + "TDMIN_B IN 2", "TDM_C Capture", + "TDMIN_B IN 3", "TDM_A Loopback", + "TDMIN_B IN 4", "TDM_B Loopback", + "TDMIN_B IN 5", "TDM_C Loopback", + "TDMIN_C IN 0", "TDM_A Capture", + "TDMIN_C IN 1", "TDM_B Capture", + "TDMIN_C IN 2", "TDM_C Capture", + "TDMIN_C IN 3", "TDM_A Loopback", + "TDMIN_C IN 4", "TDM_B Loopback", + "TDMIN_C IN 5", "TDM_C Loopback", + "TDMIN_LB IN 3", "TDM_A Capture", + "TDMIN_LB IN 4", "TDM_B Capture", + "TDMIN_LB IN 5", "TDM_C Capture", + "TDMIN_LB IN 0", "TDM_A Loopback", + "TDMIN_LB IN 1", "TDM_B Loopback", + "TDMIN_LB IN 2", "TDM_C Loopback", + "TODDR_A IN 0", "TDMIN_A OUT", + "TODDR_B IN 0", "TDMIN_A OUT", + "TODDR_C IN 0", "TDMIN_A OUT", + "TODDR_A IN 1", "TDMIN_B OUT", + "TODDR_B IN 1", "TDMIN_B OUT", + "TODDR_C IN 1", "TDMIN_B OUT", + "TODDR_A IN 2", "TDMIN_C OUT", + "TODDR_B IN 2", "TDMIN_C OUT", + "TODDR_C IN 2", "TDMIN_C OUT", + "TODDR_A IN 3", "SPDIFIN Capture", + "TODDR_B IN 3", "SPDIFIN Capture", + "TODDR_C IN 3", "SPDIFIN Capture", + "TODDR_A IN 6", "TDMIN_LB OUT", + "TODDR_B IN 6", "TDMIN_LB OUT", + "TODDR_C IN 6", "TDMIN_LB OUT", + "10U2 INL", "ACODEC LOLP", + "10U2 INR", "ACODEC LORP", + "Lineout", "10U2 OUTL", + "Lineout", "10U2 OUTR"; =20 assigned-clocks =3D <&clkc CLKID_MPLL2>, <&clkc CLKID_MPLL0>, @@ -191,8 +262,52 @@ dai-link-2 { sound-dai =3D <&frddr_c>; }; =20 - /* 8ch hdmi interface */ dai-link-3 { + sound-dai =3D <&toddr_a>; + }; + + dai-link-4 { + sound-dai =3D <&toddr_b>; + }; + + dai-link-5 { + sound-dai =3D <&toddr_c>; + }; + + /* Connected to the WIFI/BT chip */ + dai-link-6 { + sound-dai =3D <&tdmif_a>; + dai-format =3D "dsp_a"; + dai-tdm-slot-tx-mask-0 =3D <1 1>; + mclk-fs =3D <256>; + + codec-0 { + sound-dai =3D <&toacodec TOACODEC_IN_A>; + }; + + codec-1 { + sound-dai =3D <&tohdmitx TOHDMITX_I2S_IN_A>; + }; + }; + + /* Connected to the onboard AD82584F DAC */ + dai-link-7 { + sound-dai =3D <&tdmif_b>; + dai-format =3D "i2s"; + dai-tdm-slot-tx-mask-0 =3D <1 1>; + mclk-fs =3D <256>; + + codec-0 { + sound-dai =3D <&toacodec TOACODEC_IN_B>; + }; + + codec-1 { + sound-dai =3D <&tohdmitx TOHDMITX_I2S_IN_B>; + }; + }; + + /* 8ch HDMI interface */ + dai-link-8 { sound-dai =3D <&tdmif_c>; dai-format =3D "i2s"; dai-tdm-slot-tx-mask-0 =3D <1 1>; @@ -201,13 +316,17 @@ dai-link-3 { dai-tdm-slot-tx-mask-3 =3D <1 1>; mclk-fs =3D <256>; =20 - codec { + codec-0 { + sound-dai =3D <&toacodec TOACODEC_IN_C>; + }; + + codec-1 { sound-dai =3D <&tohdmitx TOHDMITX_I2S_IN_C>; }; }; =20 - /* spdif hdmi or toslink interface */ - dai-link-4 { + /* spdif hdmi and coax output */ + dai-link-9 { sound-dai =3D <&spdifout>; =20 codec-0 { @@ -220,7 +339,7 @@ codec-1 { }; =20 /* spdif hdmi interface */ - dai-link-5 { + dai-link-10 { sound-dai =3D <&spdifout_b>; =20 codec { @@ -229,16 +348,38 @@ codec { }; =20 /* hdmi glue */ - dai-link-6 { + dai-link-11 { sound-dai =3D <&tohdmitx TOHDMITX_I2S_OUT>; =20 codec { sound-dai =3D <&hdmi_tx>; }; }; + + /* internal codec glue */ + dai-link-12 { + sound-dai =3D <&toacodec TOACODEC_OUT>; + + codec { + sound-dai =3D <&acodec>; + }; + }; + + /* spdif coax input */ + dai-link-13 { + sound-dai =3D <&spdifin>; + + codec { + sound-dai =3D <&spdif_dir>; + }; + }; }; }; =20 +&acodec { + status =3D "okay"; +}; + &arb { status =3D "okay"; }; @@ -402,6 +543,12 @@ &sd_emmc_c { vqmmc-supply =3D <&flash_1v8>; }; =20 +&spdifin { + pinctrl-0 =3D <&spdif_in_h_pins>; + pinctrl-names =3D "default"; + status =3D "okay"; +}; + &spdifout { pinctrl-0 =3D <&spdif_ao_out_pins>; pinctrl-names =3D "default"; @@ -412,14 +559,75 @@ &spdifout_b { status =3D "okay"; }; =20 +&tdmif_a { + pinctrl-0 =3D <&tdm_a_fs_pins>, <&tdm_a_sclk_pins>, <&tdm_a_dout0_pins> ; + pinctrl-names =3D "default"; + status =3D "okay"; +}; + +&tdmif_b { + pinctrl-0 =3D <&mclk0_a_pins>, <&tdm_b_fs_pins>, <&tdm_b_sclk_pins>, + <&tdm_b_dout0_pins>; + pinctrl-names =3D "default"; + status =3D "okay"; + + assigned-clocks =3D <&clkc_audio AUD_CLKID_TDM_MCLK_PAD0>, + <&clkc_audio AUD_CLKID_TDM_SCLK_PAD1>, + <&clkc_audio AUD_CLKID_TDM_LRCLK_PAD1>; + assigned-clock-parents =3D <&clkc_audio AUD_CLKID_MST_B_MCLK>, + <&clkc_audio AUD_CLKID_MST_B_SCLK>, + <&clkc_audio AUD_CLKID_MST_B_LRCLK>; + assigned-clock-rates =3D <0>, <0>, <0>; +}; + &tdmif_c { status =3D "okay"; }; =20 +&tdmin_a { + status =3D "okay"; +}; + +&tdmin_b { + status =3D "okay"; +}; + +&tdmin_c { + status =3D "okay"; +}; + +&tdmin_lb { + status =3D "okay"; +}; + +&tdmout_a { + status =3D "okay"; +}; + +&tdmout_b { + status =3D "okay"; +}; + &tdmout_c { status =3D "okay"; }; =20 +&toacodec { + status =3D "okay"; +}; + +&toddr_a { + status =3D "okay"; +}; + +&toddr_b { + status =3D "okay"; +}; + +&toddr_c { + status =3D "okay"; +}; + &tohdmitx { status =3D "okay"; }; --=20 2.40.1