From patchwork Mon Mar 6 12:13:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 64626 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1808934wrd; Mon, 6 Mar 2023 04:28:33 -0800 (PST) X-Google-Smtp-Source: AK7set+0B5Y5iMxEQGEz1Oo9qoKxWevwF7oAM82+r5HXREjjy24q8wj8QYNinjWK+qd8Ka5id9Qm X-Received: by 2002:a05:6a20:548a:b0:cb:e735:65a5 with SMTP id i10-20020a056a20548a00b000cbe73565a5mr14441986pzk.40.1678105713036; Mon, 06 Mar 2023 04:28:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678105713; cv=none; d=google.com; s=arc-20160816; b=V7NRuCTt/ZvXECrmDBqDBadJEJJNxMInbay6kWvAOiaOTheryzF2LWOP6wzO6IDrmV LvfaThiF7AkQY9j5WCJIZhkbRZBUxoNIIUTi9waM2DLMxYAzOjOnn4vlCYTpIUS9NarR DMPFPbA0DjFTWKE55OcflZdUumFG7krsvVpT4Hl6VA+VhTgp/bFCfTJcT+3/44hJKis0 tz0PtemD9OAwV+H/a1oyStc+X5JZiyw3P16+7wmQkI84QTYhA4aedsmDj3Jg5oexQXaZ fE7AaRgRss5QVVtHBSHwp89v2gFcojEQsV482cSz/zC5QsbktHAf4FrJSAwlDKTMCVgA QfXw== 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=S69/h6nKwoVosQbtsPPYLPT1mnoRPmUaC8JxTN48O5Q=; b=TondD8VQfweinr/PI3JLuwnubOitVe7goRTTmpRCGQ5vGEqmhdeeiI8cy+WOd0mb64 fT8w/fzr0rDu+2dBPL0JQ91tmYEIpvEzlYicR9Hx/JGycp0szdokKNoBuJydd/8y/IqW HP5wncyK6ND2lfk0m/2Ij3FmYCNh0i+VX0MVsfChm4OvAfIzDUh3b/0RthYAiRQVXCZc IhpYI8mdNp2pdD/UN458PB3NjlXN+NCD6R1/Ie81RjRgwG91FXwraXLh9qgSodhjywZ9 EDBz0xOisvho19CNCYpJsk0yvFfUyraPy/tcOwTyLKOJWSl2QH5PFX59KfUmtWbPyfYt N/pg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=DPFaSKJj; 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 t185-20020a6381c2000000b004ccd057d472si8535155pgd.815.2023.03.06.04.28.20; Mon, 06 Mar 2023 04:28:33 -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=DPFaSKJj; 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 S230287AbjCFMOE (ORCPT + 99 others); Mon, 6 Mar 2023 07:14:04 -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-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 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?1759621375760161953?= X-GMAIL-MSGID: =?utf-8?q?1759621375760161953?= 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/arm64/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/; #include "meson-gxbb-p20x.dtsi" - #include #include #include + / { compatible = "videostrong,kii-pro", "amlogic,meson-gxbb"; model = "Videostrong KII Pro"; @@ -18,9 +18,9 @@ leds { compatible = "gpio-leds"; led { gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_LOW>; - default-state = "off"; color = ; function = LED_FUNCTION_STATUS; + default-state = "off"; }; }; @@ -34,24 +34,8 @@ button-reset { gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>; }; }; - }; - - -&uart_A { - status = "okay"; - pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>; - pinctrl-names = "default"; - uart-has-rtscts; - - bluetooth { - compatible = "brcm,bcm4335a0"; - }; -}; - - - ðmac { status = "okay"; pinctrl-0 = <ð_rmii_pins>; @@ -78,3 +62,14 @@ eth_phy0: ethernet-phy@0 { &ir { linux,rc-map-name = "rc-videostrong-kii-pro"; }; + +&uart_A { + status = "okay"; + pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>; + pinctrl-names = "default"; + uart-has-rtscts; + + bluetooth { + compatible = "brcm,bcm4335a0"; + }; +}; From patchwork Mon Mar 6 12:13:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 64625 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1804774wrd; Mon, 6 Mar 2023 04:18:18 -0800 (PST) X-Google-Smtp-Source: AK7set/ONiafuTO9oYKlwn25KsnRHTnfqU2Cpd9VS5+fbkUxrC0PQO8nmWYE433fWpVzH3qiPSbP X-Received: by 2002:a05:6a20:7fa5:b0:cc:ce95:7db5 with SMTP id d37-20020a056a207fa500b000ccce957db5mr10989464pzj.57.1678105097870; Mon, 06 Mar 2023 04:18:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678105097; cv=none; d=google.com; s=arc-20160816; b=efFndDlHBSSzh2okkPF9sM2t84+8h1+qTW5LkooqnYBPYli60PUFT2P2/YGBmyMCbj DamrP+B8JzEbnPIJEtI9i8ymiDAF2p/JmQ6EOpFJ/dPtsGEMiPFtCm/HmSSazvA3+I8m Qtuxv+BPYpNT6OGpx1KzqbHkKsdUhpg8R4317hM8myDLa2QmD70KmQdH/KOZCtSH2bWt Wrqr3ClY/1QQWOzlf0sTFQc2Tr+gDpNoEZiF5m+lw6ZWjLWhoNRk8d/MIYXxAG16D/PW i83e22R5dwQj48lSfHjdacqmwUjYJscEUr5Fg/dDkyVeLDR5fQ478NcuO5MBFE6u/cs8 cWuw== 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=7p5DGlKwmRimZVfiR93bnlEzszSiteyjzg97cN2oOAo=; b=IVgBYVrRbvFNitpp5W0N18ZWOnOu+T5RxLf28AfYR2eXQJNnccd6CVyXhJoNdoqKD+ j/JY70hwPsCRPmMEkJffylZXayartngxBnKhT8KWxeaKKuaJXMn70RzJVs1sa+rsIx0k 0xrVuFAcEw4EvG2XTNVoUcbopDrNBcDxXWtJsUxKFQvejPu//ZD40IQ2Z1N3tShkEWxc DtwHuRYL9bMq2zxsqxshbgRPmmCn2QJGqtVCqayJLB4MlmpfNUMXghkBkO9MQgCh/Q3U 5PYTQBEECdFO8Fxi1hlLDOsm9AQk7nH2Vs0MQ75pKdoB6YzWnw+7Nfw5LIf2zO5Ll/z3 aj5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=ohuzAEBj; 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 w69-20020a638248000000b005075581074bsi203655pgd.446.2023.03.06.04.18.04; Mon, 06 Mar 2023 04:18:17 -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=ohuzAEBj; 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 S230305AbjCFMOH (ORCPT + 99 others); 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-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 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?1759620731202382557?= X-GMAIL-MSGID: =?utf-8?q?1759620731202382557?= 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/arm64/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 { bluetooth { compatible = "brcm,bcm4335a0"; + shutdown-gpios = <&gpio GPIOX_20 GPIO_ACTIVE_HIGH>; + host-wakeup-gpios = <&gpio GPIOX_21 GPIO_ACTIVE_HIGH>; + max-speed = <2000000>; + clocks = <&wifi32k>; + clock-names = "lpo"; }; }; From patchwork Mon Mar 6 12:13:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 64627 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1808946wrd; Mon, 6 Mar 2023 04:28:36 -0800 (PST) X-Google-Smtp-Source: AK7set/QjC4ElMqlwTiPLFovng52nGzBjQRJcZV/fnppBtiLzBq88IGDccy+oYPUX5J4Skw1+F6u X-Received: by 2002:a05:6a20:144c:b0:cd:272:fd3f with SMTP id a12-20020a056a20144c00b000cd0272fd3fmr12607554pzi.25.1678105716609; Mon, 06 Mar 2023 04:28:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678105716; cv=none; d=google.com; s=arc-20160816; b=XLQygOiGZb7T7Ve2lhDENoTPNOcPvphBOh04AAIyrrdwFurcBzzp+OxeqnxVKd7KXQ DQ2bHdA5V/FDKixRClciWOBd6Znlp3Zwz255NEDAtOYNSUX4FDZfMeDWw9/ybDKHcmDd 403TXGXQvclxuS0NLNOLNlRsasVPt0qzqLGA9qgkvUNsglk5O6ne2Di0e945zcM+kt2D VQhv53ujO1xLhMBMnhvzxuIlEI+7UQnMfSzsIzXtvQ3391rcJkxA68HGBOrO/13StdfB iKP3Ug40EcwoSl7KgqphUlbusoeAOljrsj06JqZgqUV24xdcm3oFtFzs21SaV0ioSDgD n3RA== 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=hqVGLCz75in4ibx0Afcg4VSjNSP/OXCd6v9qu5TVZNQ=; b=JyZROnCLemPkWQx5XlIe7obx0wv43Oqjn8mdNl0IPKUgiq9TJ4myG+vQhZCeztsOHu FOJGQeWPlaoaoVNabW8iA5/7N6XnY3QuRJ5CLDZXHZON5hlYqpzjG/3McrXiLfp5/zh0 hRNx6StXaG+6UN71gWq7JaFRGXEqy40XhBOhHfZOweRFbVrcAICANoqCJrTi0k+uC5wn QqNIbAD0h3SPuXT1DHICpqfJNL8HrFa1tAaZqBT6w70Vs7CgXQ/EFc2S8iHu2w3p8nHx bOvEROpMYw9jnL5TEx4Ul01WsacKagSQmo/2VFnanpynPgUTzqTD3/+2DaOrJYFE/EBX W5iw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=UoFXneCV; 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 w8-20020a63f508000000b004fc2aebe0easi9654663pgh.865.2023.03.06.04.28.24; Mon, 06 Mar 2023 04:28:36 -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=UoFXneCV; 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 S230283AbjCFMOK (ORCPT + 99 others); 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-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 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?1759621379635441737?= X-GMAIL-MSGID: =?utf-8?q?1759621379635441737?= 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/arm64/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 / { 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"; led { @@ -34,6 +42,58 @@ 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>; + + 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 {