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: 13161038 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 0B669C61DA4 for ; Mon, 6 Mar 2023 12:15:09 +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=lr0jEEx8Kg5kq6JOa2HnsCv9J8PksM71e2OyugZXhO4=; b=wTge3ixBFidVXO 33gIIB9NR2IGZfPtvgekl3Z4EX33KA5+CKGXmlk2sdR32/rw4lkG8NGp4aInIoFo65ApkGmbus38J V+DuyB+3j3+CXPEkEGipicA/Wa+aI7YeV5oMd2Fkv1ZPnIRFDoOfCrYdTFjEUl5mfD9J8w8CYVUq6 mG9hfLwrbHN/UHkK8bcI7JN/MaoU4XiPYSijY1AJzY7Gvbc0sVVRoQ4m/hSry+KxSsCADExikLiU1 i403jQAIfQWvzvMzFZsv5ne7xw08fdycIGYTJ/Ll63g7HW6EQ5lhURGQea+cj2Hvv7vF58xHeQewC V9JhRXOT3SRVYTUWXj1A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pZ9jF-00CdV7-3w; Mon, 06 Mar 2023 12:14:09 +0000 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pZ9j7-00CdS2-J6; Mon, 06 Mar 2023 12:14:02 +0000 Received: by mail-wr1-x435.google.com with SMTP id l1so8529481wry.12; Mon, 06 Mar 2023 04:14:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678104839; 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=S95i+LmNw/puZMouSvSnWNrSP/xszWQqTztq5wkXbq4tfF0qMiVlDIrWG4jbYpe3lo S7G3a0ErCxlP8ObEtMp6+vA18ceffmMor8wWx6CfgLJSLIKLSckNmiTZr+Ie24oCPU2e F0//HXcY/CN+Jm0SsjdPpeR0a7+hekLa3MoBFvZ1C4/yz4hOVxUXyoZ2I/Zkg+Hp89eD rgbcaSqge3ig6eDGQYfTbDnWwaUlORuydKjgDwGRYSlUTvnzyxhQdC9RbgEz36E21eGS dvVBGACxjnk1shI4D86NLlTkIi5bGzlFNLUF5uK4Gv7kYPk4pHWkOeflVIoq5HVHX44M YkTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678104839; 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=fHRoR8t1XPDdRV6X2pMBYAC6tlXhYWs+nYiCNlDT030PNMaKfLWc7iUwlwuYkpk54a GfytIrsA85kEf7WUjTZ/RAy6DCg5Sipsrui2oEjB86TQopyAY8aNKJ1hJide8jYnUpzS 49CzirSt/jFNA++VNxCx/8sJiZbA+FjZFwirhxAW0hyBnwmUKBUdD7XutJ4tit/8OfFq 2P68eXXR2wUr0LbxhHzYrcwBFMq7XTwpJKyEdBg1HmY0omThJYic880TBV5Gc+C3ZCWB NiYJKqXHUS+MJkuBtxbhfA+QjX+Zv/STdqbrOg1jcdY4yRzFyQ4TB5zN8TaZfhhYgrVa FACA== X-Gm-Message-State: AO0yUKVxLsM2BXRk7sQdrcz56CxkPJvs6YnYaQ7Ji81o3oeqSKGAtp3t KmD8Q/jRmoqOLwa1LZWV5m0= 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230306_041401_718833_ED762EAC X-CRM114-Status: UNSURE ( 9.56 ) 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 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: 13161039 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 DB2EEC678D4 for ; Mon, 6 Mar 2023 12:15:13 +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=F7hWEuKpOxMsKG2tWnCfuMa1Q7b8A9qC4ghqberqV9s=; b=sIgAl72KBf0vPx oSfMeHyBs9kc2bFszst3tphC0a//ePkHChIwfomreW41JnpTc1LIGuAt8L3xZGDNKp1AGkQDpECpX QwVWX4spNoV35rRHKnkOhlCl48JhEg19pF9HcinwAW5Agzp5xI/tjTZc1bV6AVjfgspY/5qTdyCmm rFt5dHBXAIHU0fbH34Un8LehGJ9LQMi3EhX1At4g9e7C8zE/G8PCfD/cF0dnDaX2yfI1rOB17dD39 zuv2v/+xRSyUxFnFMT7nDhXxoEf8Yi9rQEiHGAbZ6MmN6zR+k8/iPBN9CxN7JPA6jQpmovqacIxiQ pxAIO7BwhXgZiwMOFi0Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pZ9jN-00CdXu-7P; Mon, 06 Mar 2023 12:14:17 +0000 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pZ9j9-00CdSO-0g; Mon, 06 Mar 2023 12:14:04 +0000 Received: by mail-wm1-x32c.google.com with SMTP id j19-20020a05600c1c1300b003e9b564fae9so8034275wms.2; 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=l5Q4R59DFDfZof44I0bgtHU+/dpFbGYAWkwCvF7ZAuRaiJ/fMx2yxPRcvTfSByt3Eh fI3+5XGicOwzBWy6VUqP5+ptgS/aCkMHtmzuvXwcH2L0XJz0UZ8w+j05NsClO4RSxdIt ilgTO1qYoQUofz+36cbFKetnh4b2fwZcHo8KbF4H8komUlUYK6B5MApnSmK5KkycvERb /wb2ftp+akCi/NPwm9kIOEy7A6wOuYKpQ7l6DUbO+pCNeUBoYIv/mW5O16Wtp8S5Gq96 qaf5hfLk7t3kQ3kMTLzTTMAp0GJJpDQ0f6euv0cLpUo7hCxUchElBG94u4bW4NiLnsDR JMbg== X-Gm-Message-State: AO0yUKUMY3Yze/ZDcy2GrpfI/biPNzvCMksKY9W8nz/dsfDcEtG8Zkw1 h2nRuLpO7XclX4/nE5I7Yno= 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230306_041403_098626_73F22989 X-CRM114-Status: UNSURE ( 8.53 ) 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 --- 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: 13161040 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 3469AC61DA4 for ; Mon, 6 Mar 2023 12:15:28 +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=E9QUBsa20AQafdmFvlN+S85kxuvkb/7ZUtwLCXMJsM4=; b=UAQYnk9JZqOhCN qRHH0hwP+VYjx/gV+0EmmCP/pEzvUUa9qsfPj7Abj4L4d4z11W1I3dt1gmO6S6VExO8IzFunBxSDm BHEoRGc4mBZ14oLO9Z99+Ciqf9cqlRQneJwZb4UDmyQsQakXozoW0x+vQrz7yRjovYy8R2OlD1EEf Y1RbEID1kiUoTe4on5HXBDil7G6rvZZzuVBmcLeuz3q2fuzg63dCJHw2Rq6b4LKERyD0MBbpl6Xkl 7q/wsl8YnGTHZBptJwmXHo2eKuaY9pW8rkUrQSwCATXWKrpXnt0pQsxm0oZ7jANzGitJ+lz6zWOMl Lb/mGMqXN8xaqKid68cQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pZ9jW-00Cdbh-JO; Mon, 06 Mar 2023 12:14:26 +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 1pZ9jB-00CdTG-4G; Mon, 06 Mar 2023 12:14:06 +0000 Received: by mail-wr1-x42f.google.com with SMTP id l25so8585880wrb.3; 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=aMU8b52BlOGGtGQD0e5I4l68DUXun8ZTF9c3xPOhRflixu732Ta5cvyiIycqVd3lyw oKHlnQkCow8i+po+WS3E47VskPZEKA94H8jAily3w7QRw+JwO5UT7/6h71lwDUDIXfQR h3ZxpmDM5ACcHKj+5N1l1F7lFrfqcEwDCVzzEn9M9dKKAbLTXlw8grE/MdweerpwKLz8 UWCP/ZE1ITUf9EFyMa8dNkM9CITOocCEaO2MQacX+a+1AI746xZUEF3KYEI0YXtG7n7Q 2gzMnixt5VG8xb80XS8tXg4CSfkRC59+RWl83Mnt2f5ClpG1OyXtBfSJBFYyQnKKmjXF u+vA== X-Gm-Message-State: AO0yUKVgUG3FYNOl1z/dN/Q7AnlmzCXCLIXsb0FiOuKrjzqIHYmZXmkN 7vy1p6VSFr1w2yz+QRFv2ng= 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230306_041405_193017_F672E902 X-CRM114-Status: UNSURE ( 9.97 ) 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 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 {