From patchwork Fri Feb 10 17:07:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 13136027 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 801DFC636CD for ; Fri, 10 Feb 2023 17:08:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=hpTLFVhavoLqiZstsBpTnyMUyGG03lcFARFB3u3/z0w=; b=3WTsbIKbzKVF5l I0JuFtkH/WPSg2seywLIS9GKECQT7C5QwWpDzATm7hdZmqPxc6C7P1ZaASKzQN0dP2oykMyJKC4qE N0OT/PKqF1A/RURGaO/uhcYV6naGPwYkuKd68xzp7j1x5wfINURPOkySJoQw8iV4hlPkcFnq60EET bJuKLZQDuvLk2xksTK5LnFimMtiQ2pGr3pct4YujCbl6C4qvbdTcywgmrlbBZXSuKa8l1YOYd3oMc 4mGGhtsIpZMKKPFUdIhnQreVaDXPCST9KB0jCJwjognhFTUk50AmfWL3+Y8Us71kHrI72++nrWhAq oyHnGntxccvnpn504JEw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pQWs7-006fj0-RA; Fri, 10 Feb 2023 17:07:39 +0000 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pQWs1-006ffW-5a; Fri, 10 Feb 2023 17:07:34 +0000 Received: by mail-wm1-x32b.google.com with SMTP id bg5-20020a05600c3c8500b003e00c739ce4so4533258wmb.5; 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=2QFT1RWadQ0BAb0YyUIhPlIw/7WICszvnY7fkeZns8JcRcVcOFhSSxMv4PXdCPAAmf yRuviEoZkbkhYQ+7wCAGVTCcMsBOog5CqHpvpn7lrDGy5Xl5SdNmAwf6habFk/jzlyL0 y45ZXjM0/c2IpX1shWqaWkJgrm8B/I+VIkqwvN0qL9hVxeTrY3qXSJyU4LG/Hdbh6het KV2BnQJGRPn2jrzLjnFyl4ZEQSpgEjOMx7RoO3qA1ZpdRZ/grmcAS25BgScaXi4uizVt 6RM1Wcdg8Sc6YOwicqmBcoQgW1mEYF075Gz31jARbSYl4uSQAol4zSaoc5z5sJi5QMaI g1ew== X-Gm-Message-State: AO0yUKVPsACbWjYrLa70uXK3SDVZgMnFGkvQMc8oeN4V6ewnUV3h89Yk yYLmplVnMDS9bicLupLpOwg= 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230210_090733_244205_5FCFA3CF X-CRM114-Status: GOOD ( 10.40 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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/arm64/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/; #include "meson-gxbb-p20x.dtsi" - #include #include #include + / { compatible = "videostrong,kii-pro", "amlogic,meson-gxbb"; model = "Videostrong KII Pro"; leds { compatible = "gpio-leds"; + status { gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_LOW>; - default-state = "off"; color = ; function = LED_FUNCTION_STATUS; + default-state = "off"; }; }; @@ -34,24 +35,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 +63,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 Fri Feb 10 17:07:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 13136028 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 24F04C636CD for ; Fri, 10 Feb 2023 17:08:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ckVYr6bE46Jmj8wxm1RvAYpUwS7gfXKaeOPfdmvNxF4=; b=429qcu9RpN8Kok Wcp174Y3yGfemoRWt91hjeODSxF5ywURFuYf+uGFfDmRPvuoChyu4BKI8k40H83DQPdBhuKKpQXY7 8JK4ikPIpe/WJbqwRRI1xZBPU/Ag75R/XHHUYI55iTeMO6D6O0uLgAYcvhlDcBDcsfxZH9t+8TUYo zzEwTb3E03WR+U3U8TBBjOSfCMMNi8qqYRr4va1gNzPuUDLOrCnFV/BTZZc+wZwjtWOxfcgfCCwe/ pvz3kYYwpKyJ//V3f1rf1G7kkf7t+k6x46jFwuM8LnYKU+3rrMeCqtav1xiKlkpsUWpxW931hO9cG cGRYNYcOR4gVo6nz5Myw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pQWsG-006fmh-SJ; Fri, 10 Feb 2023 17:07:49 +0000 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pQWs4-006fgG-H2; Fri, 10 Feb 2023 17:07:37 +0000 Received: by mail-wr1-x430.google.com with SMTP id j25so5713890wrc.4; 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=yNx7Gz6dKaSH6R65yUH9AMFp0hrwiyd5lUJzIbjZkUd1hbtxmdttf7rRxSMug/+bHN h70zFGNHS5umzBQyKN97RDBBS7ouSKqPKyv3ImiJPATwmiyfDrDapv7OW+tIOUQsJzic t/2uYlqz05hEOB3dMiOSiCjhUN2CTckMqN0kAAYt4Gz4G97QyZmguQ3LoX1San6Pao30 OfQByLx4MlMU0nuPydYxn3tZVw87/eebXZaH+/OLmy3A88bSzz5n4YwERVKdgXyM4nlE Y1NAmNam+9Y1bun7+QAZIsVofamB+/HXOn7XbwFLj41VrkdoSPWJ8K9+EdkzGM78kxZl ZxoQ== X-Gm-Message-State: AO0yUKVb5T9f+Tm0CRXi1j95yVne55mTbTgihd2yMjD6mCuenbp56mr/ jAnRMV0GOeG2H12Qokn5SCM= 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230210_090736_602453_8D213770 X-CRM114-Status: UNSURE ( 9.11 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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/arm64/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 { 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 Fri Feb 10 17:07:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 13136029 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4698BC05027 for ; Fri, 10 Feb 2023 17:08:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=KEm+hEXwC2jTz8kaDdI61dgsrzoJX1IClBii8TjdJpo=; b=ftos9qgEyR6KVr 0E5eIGYB0tBpP7b9gnLRJD8Uh9MWbrBI3QVecURcrRaPijlYgmLEGYjWll7auhPb4VdzWBWO8qtbU Mu7Izxv3EZoKlV94e7aCh7+qHUOJiPPLyZkbG4OsqZQkmNyxQkCuQadMTiQguknOLFaqSgR3L2wcI sCyCaY/A9xIfOA/S7KBDXvyvhbyI1hIYqmJT/PjQH5naynNyEbfFERZYJnvxP3pHX/E6H1Jouak4g 9J6uwrv++xzIQqQkGJ7waEivteO3sZg4twdjKUdKhrimzsH9B+8aSGBjCLrPTvfNiFKRp68n880jL 6NMWH31Zmt2uY78ACJGQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pQWsP-006fqc-Ja; Fri, 10 Feb 2023 17:07:57 +0000 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pQWsB-006fhX-DC; Fri, 10 Feb 2023 17:07:44 +0000 Received: by mail-wm1-x332.google.com with SMTP id az4-20020a05600c600400b003dff767a1f1so4554815wmb.2; 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=qSeZHOsqCMRoTFp89K7h/BbqWNjeKQooUtc6KtsYNupNKk+GgNidMQsn3/vnkDhTpK H4/f2UVg4q7iVS6HRQ1jps+/pWdUu/UjSRXUbx5AmTB5Xb/c7PdW5el/BykZ+KucpJLN DHOOJRvbRef3fZzFcl7Lg3McQUKCt2s13ZKka4fnTMZmOaa3Uf+OPlrlopjOCCv+UIAG XgBNUCBhWbL53dmIKnMj7kvqfMEOYFqiX8emN+NmpHZVzjlDQgF7+UdTIuq2v2m5jOoX 90aDizI722E9JscG4cpN6M9HbYczPwvdfuDhGcFONZ04BipYH/F4F1lEMBO+lFOOBMn0 xFtw== X-Gm-Message-State: AO0yUKWbVq+aTv4+Ul11ojxTxSGINtzObMi+Aj2Lrlv+NzIFt4qMkfih kLX/0AW+QUONvzaUUXcJHex5TxHs79Kf7w== 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230210_090743_470747_D17BCED6 X-CRM114-Status: GOOD ( 10.55 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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/arm64/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 / { 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,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 {