From nobody Fri Sep 12 09:47:16 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 8116AC61DA4 for ; Mon, 6 Mar 2023 12:14:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230272AbjCFMOF (ORCPT ); Mon, 6 Mar 2023 07:14:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37648 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229710AbjCFMOB (ORCPT ); Mon, 6 Mar 2023 07:14:01 -0500 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC9481F4AD; Mon, 6 Mar 2023 04:13:59 -0800 (PST) Received: by mail-wr1-x433.google.com with SMTP id r18so8588550wrx.1; Mon, 06 Mar 2023 04:13:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678104838; 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=S69/h6nKwoVosQbtsPPYLPT1mnoRPmUaC8JxTN48O5Q=; b=DPFaSKJjfeU1zf2om9bxbD7cBqxQ6G8EGkxbSzxKSMGVXcoC8DZEixc3dwPDsZByCB oQeODWeTL9XeRPWRkxx3wjYTRTvF7Fl9vNyzbDxDaMMWZAEwmJssRrcg6vaOlm8qjw5W Tq8OM9+4/A5Q6WZYQ3imY7+sgUkHJqj5XyKXBbK1zWTKbOzn6RXdJ0fCrmmD4scD11gd m5PDewhJlPD++EewWB20tS6BoUsnXXP81nA0N+avy42I7EFZL4hyuBxPNHYdFDtBQ/mp 4v5xlpd6Hv98yNaBn4Gv6NmUc9VbQ37mla9y3Dmg9K9mg1AVSaN/LfusNDDLocO9VXrF ifvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678104838; 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=S69/h6nKwoVosQbtsPPYLPT1mnoRPmUaC8JxTN48O5Q=; b=TKQ3cUAfv6fQ5zwU/k2jCKtoVv4mgKs9/OkskiL3hmpxROiEj3fTR14eC1nOiqI9Bf HwG8BOvlRFwF68IVvg/Z01iJHshRWQSyUaSj66hyn0l7avY85aU4suXmmw1Qg4+M2XJD rzAtZDuLWxpW//ys/hhb+Gh1MsmJmUX70YumxzlORbbtbPcxtn3V5NhNn82BP8oIz3iK blEoxzEkznj80L4tT5uOmDx+RthPYXFracFnzpaRiUFTxReW8NnLa43Fh0NBweWuE2PX ZXaOg1xfhax+yhoSyb8sjD4pCLrAGU68pz2p109PX/K66v51jScZP8IgAuc//rw5OC6U OquQ== X-Gm-Message-State: AO0yUKUI/LuDmVahMGo85w6s8uPnokBn10d2X3psUTcJjhakcy4k8/hj 6GSu5ZEPZGFitow0v+wNg9XhypdWJFOXTw== X-Google-Smtp-Source: AK7set+daYgIxZAzibZ8FSFcP7EutPd2r+olIldnKo9OBJGohjyJIyT8qApZpNIRA4VTc/UgENsLbA== X-Received: by 2002:adf:fad1:0:b0:2c6:e7f6:49af with SMTP id a17-20020adffad1000000b002c6e7f649afmr6334270wrs.27.1678104838442; Mon, 06 Mar 2023 04:13:58 -0800 (PST) Received: from toolbox.. ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id n10-20020a5d660a000000b002c70ce264bfsm9814798wru.76.2023.03.06.04.13.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Mar 2023 04:13:58 -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 v3 1/3] arm64: dts: meson: gxbb-kii-pro: sort and tidy the dts Date: Mon, 6 Mar 2023 12:13:49 +0000 Message-Id: <20230306121351.1606360-2-christianshewitt@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230306121351.1606360-1-christianshewitt@gmail.com> References: <20230306121351.1606360-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 --- .../boot/dts/amlogic/meson-gxbb-kii-pro.dts | 31 ++++++++----------- 1 file changed, 13 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 5f2d4317ecfb..73ad0f5110f3 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts @@ -6,10 +6,10 @@ /dts-v1/; =20 #include "meson-gxbb-p20x.dtsi" - #include #include #include + / { compatible =3D "videostrong,kii-pro", "amlogic,meson-gxbb"; model =3D "Videostrong KII Pro"; @@ -18,9 +18,9 @@ leds { compatible =3D "gpio-leds"; led { 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 +34,8 @@ button-reset { gpios =3D <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>; }; }; - }; =20 - - -&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"; - }; -}; - - - ðmac { status =3D "okay"; pinctrl-0 =3D <ð_rmii_pins>; @@ -78,3 +62,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:16 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 0F82EC61DA4 for ; Mon, 6 Mar 2023 12:14:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230268AbjCFMOH (ORCPT ); Mon, 6 Mar 2023 07:14:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37752 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230282AbjCFMOE (ORCPT ); Mon, 6 Mar 2023 07:14:04 -0500 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B02B1EBF7; Mon, 6 Mar 2023 04:14:02 -0800 (PST) Received: by mail-wm1-x32f.google.com with SMTP id l7-20020a05600c1d0700b003eb5e6d906bso5036288wms.5; Mon, 06 Mar 2023 04:14:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678104841; 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=7p5DGlKwmRimZVfiR93bnlEzszSiteyjzg97cN2oOAo=; b=ohuzAEBj9rP7cgYi9TFIIVKq9iKrstPSWqplPOUpVgkFAPM1g0S+Owu+Q89uMSgZyU miyftmjCsKqdKyo3SShzaA5NMpP6fOBsBZmzDY8YUTs4idGsdwESoqfudXKnWmqHOg2T ID3Wj9DbFOB0LJ2HSDUSw/Xbqj81jDCLeh7SI8tirvEBnU5ASQssCraNjiJLQGr0HXiZ njR6J3rrTZhI2gUg/0kJe+hbCvsAnpteUwItyFuAxKfx4DUqRmPSWRe8Vq0ch6+7wfp+ KKyo/1m8vj0CewJ8I1ZsBWanvUKslJcI0m0V5YReDclx4fm4fgui9PmaoqFtVJQnvjg/ wElQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678104841; 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=7p5DGlKwmRimZVfiR93bnlEzszSiteyjzg97cN2oOAo=; b=olTeH/2X1uU16i6Q68TL6c7A6v+XKd7SPellDuyvaPnw62EcVxaqJPM75u/2R/eT4M rFUKs3vzbwl/uPaWMaW6jRrRWokKHacVPE5u6TP832Id5Veqeoya7lPS0AyeeKP5XgnQ PJV1+rdrdaQvU4wp8Z5Co8bx0ARwfMoM9jEyLxyhctcMYZO9Qly5MP5jfhY3G5Uza+PH 5CYt/DKHZSBu5GsCcaG1aTSvS846KEDey6r7b4ojuXig+ZYA7NR7iYn87VflaEAXxQlP 1wtYesmd7dWnrZtLB1b3S5f1hiCuwqlJ0ljQbEuIsbSnbwnX9sahSNfqnxxS3pgImKnI aMVQ== X-Gm-Message-State: AO0yUKXwv7pIjhG57SxGGqRUnmLdFEZe6cYYtkLA2S0XMbp7rev4Y5kN dVa0sZqO2q2DBBOz+ZSWFN0= X-Google-Smtp-Source: AK7set9QWbq9KwaBnJ+zVtHzm+bRIjEdMLdmdF747zrVXwb/zaVDARkqjvDvKsJqw+i4hzWGc8KyAA== X-Received: by 2002:a05:600c:35cf:b0:3de:a525:1d05 with SMTP id r15-20020a05600c35cf00b003dea5251d05mr7296373wmq.8.1678104840984; Mon, 06 Mar 2023 04:14:00 -0800 (PST) Received: from toolbox.. ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id n10-20020a5d660a000000b002c70ce264bfsm9814798wru.76.2023.03.06.04.13.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Mar 2023 04:14:00 -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 v3 2/3] arm64: dts: meson: gxbb-kii-pro: complete the bluetooth node Date: Mon, 6 Mar 2023 12:13:50 +0000 Message-Id: <20230306121351.1606360-3-christianshewitt@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230306121351.1606360-1-christianshewitt@gmail.com> References: <20230306121351.1606360-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 --- 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 73ad0f5110f3..a800e8955c4a 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts @@ -71,5 +71,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:16 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 54326C61DA4 for ; Mon, 6 Mar 2023 12:14:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230172AbjCFMOK (ORCPT ); Mon, 6 Mar 2023 07:14:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37888 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230301AbjCFMOG (ORCPT ); Mon, 6 Mar 2023 07:14:06 -0500 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0F36826853; Mon, 6 Mar 2023 04:14:05 -0800 (PST) Received: by mail-wr1-x429.google.com with SMTP id t15so8566126wrz.7; Mon, 06 Mar 2023 04:14:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678104843; 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=hqVGLCz75in4ibx0Afcg4VSjNSP/OXCd6v9qu5TVZNQ=; b=UoFXneCVw3bGVin62ZuU3ZlNMIfvK9/I1ysAfVmo5C5Z0o9FbzP1TAdGV4uIUCzyui 4AbPrA4kaIM1zPtbVtr1/FT/KE72xpST8yjXeLkZgnHG6r0oODNFs/K9RUW5wBIGx+Wn RkGJ97cTiT05VzMHN4cc/AqBhp05HB26Omzaw9ylxll2a/eEI1xFhyrvkHzyv1HFB81m tdQ79aFm8jVINdnzhks31IJE1Q+iyiFsWlOx/MXEhamJvuJLoLTdjtUYZrCYXrORLBco c7cdoOdne0cJV3xbLIX59zFZrzncvRZkD3F5i6Oheop7wQ0WvYfvjIgEw89YdVeaFpsl y1CA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678104843; 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=hqVGLCz75in4ibx0Afcg4VSjNSP/OXCd6v9qu5TVZNQ=; b=0FDD+jWKZEL98cSX/P8egE6BtS/19Bzra5J+aWoZMcQFWnkDfB2VmzfOn0RNYVOdzY 11PXmWkUjKqwGopLurTKfNa0utfKL3Rtnm2vP4mD3pnI+4eFyiMy6MwHFdPTtCznZADj q7fq6ta9DPS17S2wcJkKdA/Mv7bYXRA8BHDrFEhXF9vzonTBCHC857WRxYqBEN9V1i4l GTSsLP6vKeQeGtZa2UvJk8B1N0z1XhNQAniHokrAU+Vw0smWGThoqBCJxLUaeM+Z/QOV ULmmH9u4hu5zHKN9pgKzDa2azbnU6YwkVu4pL/vAiRflwPqvT4OsHrNTga/Pxxjrb0nr ho5A== X-Gm-Message-State: AO0yUKXwS9rR+cLiqNJWzUfmN25R13al8x/lW5KDAKGIM1SuT6Jm4xmB jv+nRzbI4rHGMh+zImGryg4= X-Google-Smtp-Source: AK7set/7CcyTILdEdpKMbdTF3pQOgOw0GbK+81e8lswCbjaUwLB8ONJL33rb0+oGH81XDMY8c+TzgQ== X-Received: by 2002:adf:f408:0:b0:2bf:d285:b787 with SMTP id g8-20020adff408000000b002bfd285b787mr7146208wro.56.1678104843493; Mon, 06 Mar 2023 04:14:03 -0800 (PST) Received: from toolbox.. ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id n10-20020a5d660a000000b002c70ce264bfsm9814798wru.76.2023.03.06.04.14.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Mar 2023 04:14:03 -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 v3 3/3] arm64: dts: meson: gxbb-kii-pro: add initial audio support Date: Mon, 6 Mar 2023 12:13:51 +0000 Message-Id: <20230306121351.1606360-4-christianshewitt@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230306121351.1606360-1-christianshewitt@gmail.com> References: <20230306121351.1606360-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 --- .../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 a800e8955c4a..e238f1f10124 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"; led { @@ -34,6 +42,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