From patchwork Fri Feb 10 12:28:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 13135756 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 03B69C636CD for ; Fri, 10 Feb 2023 12:28:58 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=r+eEoNnadUz3zKUO/CbBlwP/yWE9C7wNP6at8RVLn+E=; b=CCLpOwHpX+DjGI TXVkLKb9qbxX5R9VdJYi4c3e486jyfbvwXNSMs1z4vdxUMQecJxEiHGBq7FIdz9++sjTk7i2pDDR+ ZzNu+jJVK5myKaH0Rm5mIlYJxfyDUeEAlJslRw6u6j2zEfxCA3bdCAjTKNU3YK6AiLGAKFXzg7ZCj 7qcgnWeF20B8hsf2KHTF79ez0pTCruz+vAiP+iAJ1zmYz0rPeMla3OzFA5r2entIbF1KX1j5ZwVrn kwcLMl+i9j4NMVoyUxNzvdkvGfz5GJoud8seQyMGoA88InU27VUwRxBV+PrTgNQCfI/GgQL5liF3m 37NZT42kSHBrZ9wu1wKQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pQSWE-005gSC-Fj; Fri, 10 Feb 2023 12:28:46 +0000 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pQSVw-005gI8-RC; Fri, 10 Feb 2023 12:28:30 +0000 Received: by mail-wr1-x431.google.com with SMTP id by3so3599039wrb.10; Fri, 10 Feb 2023 04:28:27 -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=96shaXIQtfSOpk1V2rzXl80X1bE5l20ZAqgUNK1DbvU=; b=RE/Wr27m9sEApv2s1qrJJM+eayomNFEo2RBl1PPDJP/TtxoFTGk/vOZuq/UuQ9mbLn vrTnandG9q62o+Su9jWdKwqY8MCX1PwwlgpnMz4DHlfvuA8VQTI7ha8vE7r14A0pu38D w0Xyhgh3KyR4QM5vjQ6Qayy4Jb/trLyjV0fSS03XVTGjmBHoZPgDccJKRlTK8e7Hlhyt e9b47bWYpGg3SQQ18aZyBt/BgSPt1D3nDpAB2kbGhp2nux5vPUpnhcvAFFaQYLRs0jkY 68keMPReixiEN4z2hjWy4AIeMR2LtbPlrA/YwYQs7Sz/rPDb7nCWySC0ecTPLr6rQqRm aOEw== 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=96shaXIQtfSOpk1V2rzXl80X1bE5l20ZAqgUNK1DbvU=; b=53pwf1l2+gssTPcex6PEL1v1aAK8oNSBIzE9NSlBBf6P+enyxKOCr02qwnoDmeOtpn uAFnn9rcpIrAYSDLQwiX9eQBxMP6iq6EX1S65PsKBBRj0dWUcun/cWz6PgF/3k5zAL5c zOk/CMMI2uPZUbMd6ffFMPgFHDMHcFxfiz2Q2C6UiIpaCYKDeFlfpP8BeyoAGfwXPca1 Xd92M5C4lJCRPZKqLbn9YgTqnlbqGXK5EEHw6Qoa5UOWiKI997AQjsDuhhVzPPzQhFAm bzQmCekcdQYkHfMrNoGcGgYvbsku7wKBiUbk9pLdGhX8PHSw3a++nMrX8BONPfH1pSNZ ZMLg== X-Gm-Message-State: AO0yUKVbjaxGWHkQiIfuTeHFgb3+n/jb0uSwsQ6k+8ZdZtYOSPnYp647 AMNKGPSjuE6X6iLnCBj9KnU= X-Google-Smtp-Source: AK7set+t0+m6XIrOzmtRzoIAnUN/GgzwO1HROtUPFwytx/bCrcDytT0e7JqMLb9G+nqozFSXrVjohQ== X-Received: by 2002:adf:f212:0:b0:2c3:f250:f217 with SMTP id p18-20020adff212000000b002c3f250f217mr14814903wro.1.1676032106485; Fri, 10 Feb 2023 04:28:26 -0800 (PST) Received: from toolbox.. ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id i8-20020a5d4388000000b002c5493a17efsm1540989wrq.25.2023.02.10.04.28.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Feb 2023 04:28:25 -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 Subject: [PATCH 1/3] arm64: dts: meson: gxbb-kii-pro: sort and tidy the dts Date: Fri, 10 Feb 2023 12:28:15 +0000 Message-Id: <20230210122817.1027765-2-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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230210_042828_899988_16F7F004 X-CRM114-Status: GOOD ( 10.46 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ferass El Hafidi Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+linux-amlogic=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 --- .../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 12:28:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 13135757 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 71D43C636CD for ; Fri, 10 Feb 2023 12:29:05 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=pT9aXbu0t6loUSZ1rwK8aQ+7bGijGqEDbFWa3Ks0JTc=; b=xJkGS8rwTfUKG+ CPuwtGiSdQ6waQliEMEHXqrOJN2JXQV3J9e2HE1WOxDLUfnlmM6Xy33K0wBwGjS551uQQ8sRqSt+2 mrDXAQ3VCgbLz8zl6rdf8q8jVnvEpG0cMrnsLx8xTBroHoGeWdE2Zm3VS+hhNgt3WEgrXKz79qMRh mc5d1lTuczYlSfLVzlyKaJct8HpFldG8iwJ1coeMKYjMkvOvtOXddKm7xzlN/89W66ZuMaY2Ah/18 h5rE/M96igBXUWS/AXpWg//S/mwvUahwOWd+tVZoxBuYy9eVPhAl1tsHpcp3aJK/6hZILL4nxW4t3 Oe8Dq/gFq9w8nT/pXbfA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pQSWN-005gX4-PU; Fri, 10 Feb 2023 12:28:55 +0000 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pQSVz-005gJV-BF; Fri, 10 Feb 2023 12:28:32 +0000 Received: by mail-wr1-x42f.google.com with SMTP id r2so4901955wrv.7; Fri, 10 Feb 2023 04:28: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=glqZSh8z1DjmHlU5auQAlpkpEjpKVs3OPkg4NeOXn1M=; b=apR+vpK19609mIwWsOVMpmcME0xNCu1tzifaKj/fHrxo5zHyutgJvE/y1iksbrWioU 7Eu/iZKcemFG1ii7R1VX7st0jR/wDAKE2UCdb6vqQWagGCzGDjsbVKSzbPZ7+plD7EN1 13gXeoHDz43EwIy/2hdWMgBAzEhTPJNo1wg3M3V6e9j+TtxlGGqFGtqXaLquELtkKbRc W1eAy/AtonsgvrUOJA+9JzkHrgiQ4UJsi8WKuDNub6aNo1HN6Pxn/uqc7v05T8JqNWmO wEwnEdRLZRReVNWt7hVuzSLTVtWXQQJJRGVQ9hf4vvr5CUFMlbql4QkfcF4uFFthQNYD dQaQ== 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=glqZSh8z1DjmHlU5auQAlpkpEjpKVs3OPkg4NeOXn1M=; b=fGNzdIpMHQ080J/XRvH+B7bEBa5XzMdeaxHRmrnV9uk8zGvuEiI3ePgrx9iD0RLXgm hnHqosDtpylbHOO2l+IOUB2cV1GBxHzgKsSapdg/ZOlhJJEc10/dFT4ncOudYyhWMudU ehbnGf00uE5NqIF7u3BPgcWqEMZXGXpf+1mWY8SSp0QTFRcDPYt6ybUyoRpQ93cCPuqR isO1S1Yhc09tNHVD5HAe4qkfmbfBRc7b+K47zDzX3CpuKfZuGdVJwxFJgEzya7bN3ca2 pRLTOWAXfoIlUdjVNj0jECWLtuc0dWFgzcpyVcDv1sPYaxr5CJwhnKQHwRVbDyOmziqf NwUA== X-Gm-Message-State: AO0yUKVBoxJJXppDEN+yebCFOTx93a10qJQsf8OW2Wjw9PsBoCyCgy61 5bA0wQ7nZiqK4XyIZz8TQUY= X-Google-Smtp-Source: AK7set/+DWrghsFar9DtLynYL/yBNRLOaDwUQHTKmG8xM5HBuG5OrBk4olLnD9KJF9UuRbz0+Pq6zg== X-Received: by 2002:a5d:4852:0:b0:2bf:d610:e49 with SMTP id n18-20020a5d4852000000b002bfd6100e49mr11802874wrs.16.1676032109400; Fri, 10 Feb 2023 04:28:29 -0800 (PST) Received: from toolbox.. ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id i8-20020a5d4388000000b002c5493a17efsm1540989wrq.25.2023.02.10.04.28.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Feb 2023 04:28: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 Subject: [PATCH 2/3] arm64: dts: meson: gxbb-kii-pro: complete the bluetooth node Date: Fri, 10 Feb 2023 12:28:16 +0000 Message-Id: <20230210122817.1027765-3-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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230210_042831_408711_F4282AD2 X-CRM114-Status: UNSURE ( 9.27 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ferass El Hafidi Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+linux-amlogic=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 --- 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 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: 13135758 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 39DEDC05027 for ; Fri, 10 Feb 2023 12:29:23 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=6yNtkUeYDFzypqDw4/fGQ97pcMcHHbIXAtkZoaxp1lM=; b=O/KFaC1xIMHQiK JH5fbg5rl3lOhIfZWBmTyXSCWc3TDzrHmsAd4Eta+Vmy9aTmELTgTQKxste/Z7mXH8rCCp62D9mLA coMq5f/Wj7WjZkTztW/k0vyBP/4Enl/23E3FF1cMLV12w74dEx4TMo3mR8tjbRFd+luLbal+iZPPA y8rOzRDVpT/iMwL87+Lda9tcEiiRqjvAkzFRtElWyBs/rsucY7KlWWmPgMczZVA623q87TBwGFtcj Lj+hWQt1/A2C3xdwXI+uqyTX4C8Z/rmW3CQaCJMYhuF+y+CMcoxn4Q8jH+Z9CKYBhIIhiGkS5bq8w W6jlF1j2ggLreWtRwSYw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pQSWc-005ggl-Je; Fri, 10 Feb 2023 12:29:10 +0000 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pQSW2-005gKg-AR; Fri, 10 Feb 2023 12:28:35 +0000 Received: by mail-wr1-x432.google.com with SMTP id y1so4925999wru.2; 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=Prc6X6vI9l0HiU1RzAKOkhmnjkjcFDvIp/Cj1INsORvEIiwR9DIdfsbu8yHPm0F21y 5CvUZaXb8QXvooE2a6AipOmM3VYo+EHsrLio6OmkkWn3GnPRvsQBewDsXf2WxuKHjzmW sCa+nQhCPENASYKesZzHJjmwADLSKmXT9RQPQJ8HpE3BTr8hlNtl8/3W6c1DzX095yIB 4JSpB9n6ffma2Sy1x7u3Xh/lw+NVtfmU3ezIlWl8RV+fbyf57l1fArtOVOGRnrTdwpcz thKoung1T4H0/mCjVGOezcDFigp4+QvbihMtIQx7SZVexceLcQ9D70MaeJkQkW6PEuWZ HTgg== X-Gm-Message-State: AO0yUKVPSEuCjbR6kFiuigpUUes7X8RAVX8BXbKfL4cU3oz2XA1uUEX4 pYzqxJsah0qsgPMHbU5VTYg= X-Google-Smtp-Source: AK7set+PSi1B1Ua/z60ldCA3JTes+hrolioO/IoKIlJPVXaE3QlJnMPN2LC35dlx3CQ9jKmN23Wn3w== 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 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230210_042834_384988_A5293DF4 X-CRM114-Status: GOOD ( 10.46 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ferass El Hafidi Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+linux-amlogic=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 --- .../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 {