From patchwork Fri Feb 10 12:28:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 55410 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp924610wrn; Fri, 10 Feb 2023 04:32:39 -0800 (PST) X-Google-Smtp-Source: AK7set/CAsfhZYd2kAR/KUZPj6mnf3X6frT84myr64onb+Ap3tGv+vUNb0B8vHdE0r9it/FU7sAn X-Received: by 2002:a17:902:f2cc:b0:199:2932:6175 with SMTP id h12-20020a170902f2cc00b0019929326175mr12233607plc.20.1676032359186; Fri, 10 Feb 2023 04:32:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676032359; cv=none; d=google.com; s=arc-20160816; b=1Aq5oRC8HF4CTOMnFbg4+0kQyrGKWoKa8KkRkINYKjPDR0zZL1irsoie4ayk1bu1ka VI10d3nhbEJvJjM3WrXaZg5khMJcrWi7iMHOzHgi3QeZ5dX+MpNEj0DH9gl8rQkb5oQn a+hA5LFHy9q4t6ywMMyASCMS3GsyJeWMN3/SmLFo3sUxGEFccSEp076mR3GyFR2tshfy v5rVHF+bPk+v0YcCNTcf2fF5Rk0mmkfNz8Prcf5d/54nplMEofCdnJlzkWKFyemGrm/E AyDSMdgf0y7D74mKbgXOvzoez40R4R/mvV+w4vZj+bYSwMtEJH1uxcXWUBNFljIqotOT rNDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=aW+Xc6jE1tZtkbSgroI6jR5Bd20w7LEpIgHknzDS1U8=; b=s0tpbLjGjthx0lofRIl7PCS43typ2MYoFOTbCMzbgwD7PVbATtGvyszyGspEqhD1+i wPgdajdChSVW05gHS/htlAN2FiZiJRc/jGbqAvC6TwvoKv//KoCGatNdxdAcQnpVbWm+ tKFNiy6Gi7oe85A3afyzJH7N8jf4dhsJUrQeqxH0kU/oTX+K5L4s768n8Rs+3adCV3hb dqgBlVi/45i5PeIKBR5ZjmF7Juhri0yEE/wAFCTROjAOXr4XBnSzJNO9j2cpdPRe4R6L KdnDeEszVpLxniatw+9VZ99Q8w4ZAX4m06x0UtNbre42ifG5pMLDd+lxWlGPmqVYKok4 p1dg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=nWAYKV6n; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e2-20020a633702000000b004fb6d558e4esi390571pga.266.2023.02.10.04.32.26; Fri, 10 Feb 2023 04:32:39 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=nWAYKV6n; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231955AbjBJM2l (ORCPT + 99 others); Fri, 10 Feb 2023 07:28:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47140 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232024AbjBJM2f (ORCPT ); Fri, 10 Feb 2023 07:28:35 -0500 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 99A527359C; Fri, 10 Feb 2023 04:28:33 -0800 (PST) Received: by mail-wr1-x436.google.com with SMTP id ba1so4911292wrb.5; Fri, 10 Feb 2023 04:28:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=aW+Xc6jE1tZtkbSgroI6jR5Bd20w7LEpIgHknzDS1U8=; b=nWAYKV6nPw+ZVJ5IpixaLlHAfGLDGphE6F1LQ3m9IFP3j+y+uWtoutMtVXS33MQ0ss 8F1M+67S6rl+ysrnS472YxWaKk5cjH/I7A2unp2HbrdNdV42D0rb1y5Dd9MucYtQmIeR 73+jlFoMcp2/eeF+vXvktxkbOyZAj2RfOdNM9qfmuU3nCJjTBueK6GLqdXD7YUtk02Kq ztEPDa5hmAoW0EG3n4hpfxgDkKCAErU+aVXQwXH1Kdt0sRN4TRJpfIHqqDcFkQffkjFw bLDl/XA1Vn3Y9oiDRrLQwIYD52/RoG55WkS3d5HZqzHdL48lAyM/cmqfpf/PSNFISeMD XtOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=aW+Xc6jE1tZtkbSgroI6jR5Bd20w7LEpIgHknzDS1U8=; b=3LcoYs+1JmPL7tLkzgg3LF1E1jsvrDfYsA5asYjyA9XVdgo8Q6wQDzH9RIc3jzhIQE IUHuiaxlzp4CG1F/SFOzgPK0Z/ZIZWGB7f//Oo0ZY3Fn+dB1a5tEvwtcAqULvzANnmSm Wcjndtme8ca3aTKA5qkitMoqAyM+ty4Dl/50Q6T4wa3Lqmu9jg6ThQJzUO2G0SatMomK 3hTZon2RzMHJJ0r0BE9AdR/Ph9qbT6TSreTYkm3O1V3PIuFqlrXXKXOi0wpkx4d7y2Ib sHadqS4uCckkIyiDu3RFnkExXvJC5XRRijqThmBbyOHDIWGuhYZQHsySeUOuuD3fxl9o zmMg== X-Gm-Message-State: AO0yUKXAi9PgFh63JW2Wg8sW4t6zJlt3h4O7pn3y8O0RZDfjL5BVU92Q 51ATW2hQL4h7szWfHY/RAUQ= X-Received: by 2002:adf:ef84:0:b0:2bf:bac7:30d4 with SMTP id d4-20020adfef84000000b002bfbac730d4mr14227649wro.53.1676032112223; Fri, 10 Feb 2023 04:28:32 -0800 (PST) Received: from toolbox.. ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id i8-20020a5d4388000000b002c5493a17efsm1540989wrq.25.2023.02.10.04.28.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Feb 2023 04:28:31 -0800 (PST) From: Christian Hewitt To: Rob Herring , Krzysztof Kozlowski , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Christian Hewitt , Ferass El Hafidi Subject: [PATCH 3/3] arm64: dts: meson: gxbb-kii-pro: add initial audio support Date: Fri, 10 Feb 2023 12:28:17 +0000 Message-Id: <20230210122817.1027765-4-christianshewitt@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230210122817.1027765-1-christianshewitt@gmail.com> References: <20230210122817.1027765-1-christianshewitt@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757447306997549004?= X-GMAIL-MSGID: =?utf-8?q?1757447306997549004?= Add initial support for HDMI and S/PDIF audio output. Signed-off-by: Christian Hewitt Tested-by: Ferass El Hafidi Reviewed-by: Neil Armstrong --- .../boot/dts/amlogic/meson-gxbb-kii-pro.dts | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts index 435ae2aa404e..b6ee76011d82 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts @@ -9,11 +9,19 @@ #include #include #include +#include / { compatible = "videostrong,kii-pro", "amlogic,meson-gxbb"; model = "Videostrong KII Pro"; + spdif_dit: audio-codec-0 { + #sound-dai-cells = <0>; + compatible = "linux,spdif-dit"; + status = "okay"; + sound-name-prefix = "DIT"; + }; + leds { compatible = "gpio-leds"; @@ -35,6 +43,59 @@ button-reset { gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>; }; }; + + sound { + compatible = "amlogic,gx-sound-card"; + model = "KII-PRO"; + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; + status = "okay"; + + dai-link-0 { + sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; + }; + + dai-link-1 { + sound-dai = <&aiu AIU_CPU CPU_SPDIF_FIFO>; + }; + + dai-link-2 { + sound-dai = <&aiu AIU_CPU CPU_I2S_ENCODER>; + dai-format = "i2s"; + mclk-fs = <256>; + + codec-0 { + sound-dai = <&aiu AIU_HDMI CTRL_I2S>; + }; + }; + + dai-link-3 { + sound-dai = <&aiu AIU_CPU CPU_SPDIF_ENCODER>; + + codec-0 { + sound-dai = <&spdif_dit>; + }; + }; + + dai-link-4 { + sound-dai = <&aiu AIU_HDMI CTRL_OUT>; + + codec-0 { + sound-dai = <&hdmi_tx>; + }; + }; + }; +}; + +&aiu { + status = "okay"; + pinctrl-0 = <&spdif_out_y_pins>; + pinctrl-names = "default"; }; ðmac {