From nobody Fri Sep 12 09:47:15 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 70FB4C636D7 for ; Fri, 10 Feb 2023 17:07:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233009AbjBJRHe (ORCPT ); Fri, 10 Feb 2023 12:07:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47166 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232983AbjBJRHb (ORCPT ); Fri, 10 Feb 2023 12:07:31 -0500 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 981F371001; Fri, 10 Feb 2023 09:07:30 -0800 (PST) Received: by mail-wm1-x32c.google.com with SMTP id c4-20020a1c3504000000b003d9e2f72093so6756661wma.1; Fri, 10 Feb 2023 09:07:30 -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=NQNrZmksDBpl4fmmiFb/Stn0EUPB7bOOM5pqSh2sIdg=; b=K9+H+FQocIzMfZNKuklGWbpmfIcSkcfMPgfV0R+lz+Xq5Zr/VzEMBzwPaDjn+RHItO mBO/P/eoJeGODqHez1//UwZE4iHERL7pojFNnX0oNpvD3dy7jvpwcNI9dzxggsJcrs8A oaMxACDl+TqxvKbWFhlcommwAr3468rgaqK7hT1jlsa3TUvtJCfGOqa5yUbyo7P9qCqc uaZBj4sq/UqtiwsStybxxUYVbJ3bprbmpeDz1e1NG+TbwC9poYsGRQQKHtqgNUMrOC2C f585SPkuIXTnIz7ybtmHNpEeKAg/4N12wZYS5jk0zSVQ88/hL4RTqjFV3RX+Te+skeTY xpoA== 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=NQNrZmksDBpl4fmmiFb/Stn0EUPB7bOOM5pqSh2sIdg=; b=dRaLGN17AEA26sLFqoBwaaRT62TnT4/dbMQRup0Pk2TorPKpCh6TeDGYILZrTohA+V 8EORX8MaNhGkNt5yo7hyUqbTtUECHcj4ANgQUH2rr3QscKeR18IrABKmrid2Pq0KwQFf sG79tEXKVhy7uslAPAZBf0tLDM5WiKZfj0T6eY63JTT6RT9IL3jV4c9L8RV4BGF0gO/X /EsfmOBdbdqAUumGZ/BUvokQauoIlu+1mWUvT4liz8Nm6z76lbof8BuicBW4gAo84463 to+L8//ZtezEbRhq5HpWbwUqGgaNak1tVnDPkDc6OfsK7Kr8XsNkTpZ0VifJtqFMjbsw iwDA== X-Gm-Message-State: AO0yUKU+Dv6l22iORodAKs4K8vrJA3cz0zA0N5O0XBTYsl76qnq7Tsu8 IEOLlujseIjofrhxZ4waY7k= X-Google-Smtp-Source: AK7set8wwkdbVXURn6jECfIMn3SjAyn9dmGh59TJ91ZHx7A4gZB2kwBJkZGIHLfQu+3nOzwuBUzHGA== X-Received: by 2002:a05:600c:308a:b0:3dc:43a0:83bb with SMTP id g10-20020a05600c308a00b003dc43a083bbmr13629846wmn.3.1676048849132; Fri, 10 Feb 2023 09:07:29 -0800 (PST) Received: from toolbox.. ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id x7-20020a05600c188700b003cffd3c3d6csm5351531wmp.12.2023.02.10.09.07.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Feb 2023 09:07:28 -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 v2 1/3] arm64: dts: meson: gxbb-kii-pro: sort and tidy the dts Date: Fri, 10 Feb 2023 17:07:19 +0000 Message-Id: <20230210170721.1285914-2-christianshewitt@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230210170721.1285914-1-christianshewitt@gmail.com> References: <20230210170721.1285914-1-christianshewitt@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Alpha-sort the nodes, move the default line in the LED node to where it's normally found, and remove excess spacing. No functional changes. Signed-off-by: Christian Hewitt Tested-by: Ferass El Hafidi Reviewed-by: Neil Armstrong Reviewed-by: Martin Blumenstingl --- .../boot/dts/amlogic/meson-gxbb-kii-pro.dts | 32 ++++++++----------- 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts b/arch/arm6= 4/boot/dts/amlogic/meson-gxbb-kii-pro.dts index 6d8cc00fedc7..9bfdb54d912a 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts @@ -6,21 +6,22 @@ /dts-v1/; =20 #include "meson-gxbb-p20x.dtsi" - #include #include #include + / { compatible =3D "videostrong,kii-pro", "amlogic,meson-gxbb"; model =3D "Videostrong KII Pro"; =20 leds { compatible =3D "gpio-leds"; + status { gpios =3D <&gpio_ao GPIOAO_13 GPIO_ACTIVE_LOW>; - default-state =3D "off"; color =3D ; function =3D LED_FUNCTION_STATUS; + default-state =3D "off"; }; }; =20 @@ -34,24 +35,8 @@ button-reset { gpios =3D <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>; }; }; - -}; - - - -&uart_A { - status =3D "okay"; - pinctrl-0 =3D <&uart_a_pins>, <&uart_a_cts_rts_pins>; - pinctrl-names =3D "default"; - uart-has-rtscts; - - bluetooth { - compatible =3D "brcm,bcm4335a0"; - }; }; =20 - - ðmac { status =3D "okay"; pinctrl-0 =3D <ð_rmii_pins>; @@ -78,3 +63,14 @@ eth_phy0: ethernet-phy@0 { &ir { linux,rc-map-name =3D "rc-videostrong-kii-pro"; }; + +&uart_A { + status =3D "okay"; + pinctrl-0 =3D <&uart_a_pins>, <&uart_a_cts_rts_pins>; + pinctrl-names =3D "default"; + uart-has-rtscts; + + bluetooth { + compatible =3D "brcm,bcm4335a0"; + }; +}; --=20 2.34.1 From nobody Fri Sep 12 09:47:15 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 A6D9EC636CD for ; Fri, 10 Feb 2023 17:07:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232983AbjBJRHm (ORCPT ); Fri, 10 Feb 2023 12:07:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47566 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233014AbjBJRHj (ORCPT ); Fri, 10 Feb 2023 12:07:39 -0500 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 67FAD77BA6; Fri, 10 Feb 2023 09:07:33 -0800 (PST) Received: by mail-wr1-x42d.google.com with SMTP id o15so2402284wrc.9; Fri, 10 Feb 2023 09:07: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=NShXRZ//vQQKtuVXg+FNEbyRHYKUYaCN+nMk9xF7QT8=; b=JwUX0eWxUb22c/W1Rd79586QKOgA79JbHl85PxJ02XMrWaq8ajpRNZKj34tLSdRpZv hXsDQ7Ulpdr/XpbqCX3XtacFCLPbotVxFiUmFBg2pOihgiEvOkh/u3c7oYfV7kNloIgf eYBW+CqEQ+p7ykFl98rXNTYaJCDpe10b0iFh1/LBGBgQP60EVYIq+DaB9py8uXzAztvl /7aHWnwMcDlV1F/4CYOAzukoYY4JtGObuthixAncdXepCQMqKmf15yl55xi7e/arjPrF s6zc59yqX4EnJgFtYrbWVMutfcG+KNYE4QX+ZrVugh3sBZ9oPPosL10sizWl0nhMJ4Qx 6gMw== 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=NShXRZ//vQQKtuVXg+FNEbyRHYKUYaCN+nMk9xF7QT8=; b=rQjolyFyEHIJX7fyFBD7Tlderzf47xGRMR45mOjW+P6Vr3QEEAsPwZFv9yWR1ycEeD Cb9yhj4W2Rmbc4gRvxamDodlmFmmE5lp+XQHtH18qPN1k0RDIlm6gfjSsI0rAxbYRucn mKZZOp0oW3fxc1hnDAS/nqo4XmAy16+/j8CvUhpNiT0F/FlWzm6+g/2fMzdCYIzzmkFW hsFlxYsg8gsn4Wp6nJ3aj6EJN4SqwzoY/NZ/LVAr1iyg0rvf/QLkFe1/pLZsBOlZOAOR Bu39dllFweW7lnmh5MZDj3fmrPUOzMV1rJedkJkc+z+4jZmAMiN8O6uiOH7yPUNggNgY T4Lg== X-Gm-Message-State: AO0yUKXDXIaHE5ni0fxQFTgUDEWic6OJsXdVbOdzDwda7F41SW/WxaEF bKuwB9gB9LCeeddVzs2sfsY= X-Google-Smtp-Source: AK7set/zf30D4z7uo6XAFo0iaaixvySpn6xO4O7pHkonAWBs++Ll7qHK6srUdwjQKspCgca9vYhNlg== X-Received: by 2002:a5d:508d:0:b0:2bf:d776:1c97 with SMTP id a13-20020a5d508d000000b002bfd7761c97mr14126761wrt.43.1676048851945; Fri, 10 Feb 2023 09:07:31 -0800 (PST) Received: from toolbox.. ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id x7-20020a05600c188700b003cffd3c3d6csm5351531wmp.12.2023.02.10.09.07.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Feb 2023 09:07: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 v2 2/3] arm64: dts: meson: gxbb-kii-pro: complete the bluetooth node Date: Fri, 10 Feb 2023 17:07:20 +0000 Message-Id: <20230210170721.1285914-3-christianshewitt@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230210170721.1285914-1-christianshewitt@gmail.com> References: <20230210170721.1285914-1-christianshewitt@gmail.com> MIME-Version: 1.0 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 content to the bluetooth node to align it with the content used in (all) other GXBB dts files. Signed-off-by: Christian Hewitt Tested-by: Ferass El Hafidi Reviewed-by: Neil Armstrong Reviewed-by: Martin Blumenstingl --- arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts b/arch/arm6= 4/boot/dts/amlogic/meson-gxbb-kii-pro.dts index 9bfdb54d912a..435ae2aa404e 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts @@ -72,5 +72,10 @@ &uart_A { =20 bluetooth { compatible =3D "brcm,bcm4335a0"; + shutdown-gpios =3D <&gpio GPIOX_20 GPIO_ACTIVE_HIGH>; + host-wakeup-gpios =3D <&gpio GPIOX_21 GPIO_ACTIVE_HIGH>; + max-speed =3D <2000000>; + clocks =3D <&wifi32k>; + clock-names =3D "lpo"; }; }; --=20 2.34.1 From nobody Fri Sep 12 09:47:15 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 663C4C636CD for ; Fri, 10 Feb 2023 17:07:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233038AbjBJRHq (ORCPT ); Fri, 10 Feb 2023 12:07:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47580 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233026AbjBJRHl (ORCPT ); Fri, 10 Feb 2023 12:07:41 -0500 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0F70279B33; Fri, 10 Feb 2023 09:07:36 -0800 (PST) Received: by mail-wm1-x333.google.com with SMTP id bg26so4339645wmb.0; Fri, 10 Feb 2023 09:07:35 -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=/+tC+3M79LSCIIw5j8lDKYBrOpewHeq1xIre2CyKVA0=; b=TSvLq/yg83aGHSy29gBUVTTw8fyHTID5dLAVCWzS8+XE1Aheh+pwONXyZjNuVCF0gi +FUJcET3VPMjufgd17yOq1uwwv5tzTefspOSMXEZDWk4HNU5V9FGE5FglYQRzr2HNqU1 +k3wUQGH62K+0HW+3Rz1EMlm5T7oZY84J+oW5nqvP07wqnaQMvu9N0kC4x/cf+v4tiJH X04eN40qHjjZ9MNPEBCGKufOQnT2xoU+/a/BUIHUionClPb1Z9kyuC+FZCVp8d435gCz PfJdih+ZYs15D77erJ/AyM7zp0cpLUN/thyjk643G349BnTphFhERpzuY+3TFkW4TuI4 ucAw== 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=/+tC+3M79LSCIIw5j8lDKYBrOpewHeq1xIre2CyKVA0=; b=sv3TvD5ejAYDUFQXc5xJ3UI2emq/zrXslqqJZtA4472krkNVTZ0oPNMgjdchQk+52H dO9wukfOWMcMjU6urM4XTcNSNHGph3ABtPqPnVW4jm7pMtVr436Em7Ka/gJmML1K3Cwy nMIIBHA0P64o1UbwZhWCqnP3tck+ZEuCHt7UTpjl6uVq18Hr3IFOjB0BAtYIGaByBiMT rC2Ni0ZW6KF/G68a2uQG1plTUMEcMmBosL4De2l0wbrCWqpc0QdmdDdODoPvUNWw2KXD jSGyhpTPEcVrvwK+yaU2K3Rn/KUd5SLNi2OLRQkPPTZ2SeSopYKjkn/rE2UF8IaaquWL sTQg== X-Gm-Message-State: AO0yUKVtaL2HdzEkhTzSG7P5kt2LxaQrzJDQQEFzKu3f2qj8N3uSdu4T gu3nE+l121EI9IGGuvS1TGg= X-Google-Smtp-Source: AK7set+xFtoXhPW9GlnW+yzOi2G6h5E1IL8vgMQscZINpwWEiNTlw9KCHDpYZcfVbdLisQesB7NQMw== X-Received: by 2002:a05:600c:4496:b0:3dc:de85:5007 with SMTP id e22-20020a05600c449600b003dcde855007mr13352560wmo.21.1676048854683; Fri, 10 Feb 2023 09:07:34 -0800 (PST) Received: from toolbox.. ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id x7-20020a05600c188700b003cffd3c3d6csm5351531wmp.12.2023.02.10.09.07.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Feb 2023 09:07:34 -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 v2 3/3] arm64: dts: meson: gxbb-kii-pro: add initial audio support Date: Fri, 10 Feb 2023 17:07:21 +0000 Message-Id: <20230210170721.1285914-4-christianshewitt@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230210170721.1285914-1-christianshewitt@gmail.com> References: <20230210170721.1285914-1-christianshewitt@gmail.com> MIME-Version: 1.0 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 initial support for HDMI and S/PDIF audio output. Signed-off-by: Christian Hewitt Tested-by: Ferass El Hafidi Reviewed-by: Neil Armstrong Reviewed-by: Martin Blumenstingl --- .../boot/dts/amlogic/meson-gxbb-kii-pro.dts | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts b/arch/arm6= 4/boot/dts/amlogic/meson-gxbb-kii-pro.dts index 435ae2aa404e..a09340e9f73a 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 =20 / { compatible =3D "videostrong,kii-pro", "amlogic,meson-gxbb"; model =3D "Videostrong KII Pro"; =20 + spdif_dit: audio-codec-0 { + #sound-dai-cells =3D <0>; + compatible =3D "linux,spdif-dit"; + status =3D "okay"; + sound-name-prefix =3D "DIT"; + }; + leds { compatible =3D "gpio-leds"; =20 @@ -35,6 +43,58 @@ button-reset { gpios =3D <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>; }; }; + + sound { + compatible =3D "amlogic,gx-sound-card"; + model =3D "KII-PRO"; + assigned-clocks =3D <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; + assigned-clock-parents =3D <0>, <0>, <0>; + assigned-clock-rates =3D <294912000>, + <270950400>, + <393216000>; + + dai-link-0 { + sound-dai =3D <&aiu AIU_CPU CPU_I2S_FIFO>; + }; + + dai-link-1 { + sound-dai =3D <&aiu AIU_CPU CPU_SPDIF_FIFO>; + }; + + dai-link-2 { + sound-dai =3D <&aiu AIU_CPU CPU_I2S_ENCODER>; + dai-format =3D "i2s"; + mclk-fs =3D <256>; + + codec-0 { + sound-dai =3D <&aiu AIU_HDMI CTRL_I2S>; + }; + }; + + dai-link-3 { + sound-dai =3D <&aiu AIU_CPU CPU_SPDIF_ENCODER>; + + codec-0 { + sound-dai =3D <&spdif_dit>; + }; + }; + + dai-link-4 { + sound-dai =3D <&aiu AIU_HDMI CTRL_OUT>; + + codec-0 { + sound-dai =3D <&hdmi_tx>; + }; + }; + }; +}; + +&aiu { + status =3D "okay"; + pinctrl-0 =3D <&spdif_out_y_pins>; + pinctrl-names =3D "default"; }; =20 ðmac { --=20 2.34.1