From patchwork Mon Jan 23 06:55:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 645798 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 726D6C05027 for ; Mon, 23 Jan 2023 06:55:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230107AbjAWGzU (ORCPT ); Mon, 23 Jan 2023 01:55:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45308 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229455AbjAWGzR (ORCPT ); Mon, 23 Jan 2023 01:55:17 -0500 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2CB0B193EB; Sun, 22 Jan 2023 22:55:13 -0800 (PST) Received: by mail-wr1-x431.google.com with SMTP id r2so9797111wrv.7; Sun, 22 Jan 2023 22:55:13 -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=LugQgmyfqJAZM5MfDwY/veKinnwsgbPTEKVFTK+HiPA=; b=hfnH8EWTZxl/73vw/86Qzx02JPFf/H9VA4qPbkFVVCxMaKkrnld8AgUnT/Q71LGo+8 pJwoDDxA/chFkenXnlg2+iv6Of3oqA+vvC85iLnQl24JDALfPmddCIoT/pvDZCmba42e aLg0qsV0d/ZcDIzN1caw/7h5OhoZ+J/5900q5WIz9qjhFB/V+3m433Y/C+KeEVXVXfB2 906RjPZzqT52pA+U95AVEzBXinmEl60QMpJSSTIm0etYag8/HNtvGTUUKcp5+iZRvVGK PX2CY6VlxOz6YYPwm+NYD5shLB8q5+170gE38J/O3b9uacxt3zwIVhJsPI9QcqEGPIsO 5azA== 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=LugQgmyfqJAZM5MfDwY/veKinnwsgbPTEKVFTK+HiPA=; b=hi0moXZq0fZHbsMVAL9uIg8TQ10D50ES7aO9gcPMBcZi1i9l0SNbn7WXGbVQjCXb8D tL8tlCdx9fXBE62tg5qAm3yhDdZ9URdjFnzLHkWkE3V5zTZXvKwHteXIliw+vc09ikMj yRSBybhJQhRXYJkCUuCUZC67X1MGHJFkYLF7TxgsFLC15q8VJxEvA+juZLPNDdtLV+8W rGMbReQ25pAUJ+VHvDuuW8XJiA+39s0okFqIB/630X8pnMvJbzyKnVaLvrMa22IK9BDz 3fJRt+Bv6GbUUW/INiVSE+iO1tZrTTebmpt3awLp4I7x1G75mntoA1z6Iv6rXPrMnyZn st5Q== X-Gm-Message-State: AFqh2kozrY6qtGKm045vNOUrcGdFou+F8WmA5/qlkPivrx/oOD25Lm4i kwLc1175jj66kfg6AJLalsE= X-Google-Smtp-Source: AMrXdXvIp8ELatgU7oKdVRfUKO7qM5zVf4fqydlUFyU9ZXRmcrvc7eR8SpDf/crtuX1Xonz1xqKjaQ== X-Received: by 2002:a5d:5608:0:b0:2b6:daf8:52ad with SMTP id l8-20020a5d5608000000b002b6daf852admr14347847wrv.52.1674456911675; Sun, 22 Jan 2023 22:55:11 -0800 (PST) Received: from toolbox.. ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id az22-20020adfe196000000b002bddaea7a0bsm25948365wrb.57.2023.01.22.22.55.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Jan 2023 22:55:11 -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 Subject: [PATCH 1/3] arm64: dts: meson: add Broadcom WiFi to P212 dtsi Date: Mon, 23 Jan 2023 06:55:02 +0000 Message-Id: <20230123065504.2669769-2-christianshewitt@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230123065504.2669769-1-christianshewitt@gmail.com> References: <20230123065504.2669769-1-christianshewitt@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The P212 has a combined WiFi/BT module. The BT side is already enabled in the dtsi but the WiFi side is not. Let's enable the WiFi module. Signed-off-by: Christian Hewitt Reviewed-by: Neil Armstrong --- arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi index 05cb2f5e5c36..7055057d7942 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi @@ -125,6 +125,11 @@ &sd_emmc_a { vmmc-supply = <&vddao_3v3>; vqmmc-supply = <&vddio_boot>; + + brcmf: wifi@1 { + reg = <1>; + compatible = "brcm,bcm4329-fmac"; + }; }; /* SD card */ From patchwork Mon Jan 23 06:55:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 645797 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 E5A3AC54EB4 for ; Mon, 23 Jan 2023 06:55:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230236AbjAWGzY (ORCPT ); Mon, 23 Jan 2023 01:55:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45434 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230241AbjAWGzV (ORCPT ); Mon, 23 Jan 2023 01:55:21 -0500 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5FCDC1A480; Sun, 22 Jan 2023 22:55:15 -0800 (PST) Received: by mail-wr1-x430.google.com with SMTP id h16so9784686wrz.12; Sun, 22 Jan 2023 22:55:15 -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=2GVWHT8LMHCj7WTIetB8Hze7sdYKVKxQsoEuu2SrhJE=; b=XYLWS3YFEemtqCVqYvM+uFf+TWff8nPVApRa7jMz/b/taJLSCSVYCHPr5muYSsjEer yAX+Po4PAqBqDPGE4EeE0oIFRLz49C/sILJE2fUo5TEc57fRZt9qRgGUebHthw1rHD7g CA2cepQCzWVemGn6gkj5duDYJyslnjuU0m/2Ga0NnG966D5mkKAV1aJ00x7+Ob1mi2qZ kmIzIR25q3usNIRY0XRD8n/D9/XvXUWTTWt0EQ62XS2jjRSBPpNFKqpuXnvVFUsM4fKN jV8OHEJn6Z8YSGE+qTuFYtQPYGHd6FEnBzuXmjfL5CphB7i9dHQ2Fu4THz6hklSapUC5 ft9w== 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=2GVWHT8LMHCj7WTIetB8Hze7sdYKVKxQsoEuu2SrhJE=; b=X1KWbz1K0msn46rJaqxaToEIXtDuMJQuAvV+AdLODXPrDFUyuZQg7tT/z2fKpyffeu dADx65VG++x7xz734oeRmqVKEPu0EArvGSQKW5OdUBERS45v/Q9yjs57Fwp2EvTpNSP4 iAYi3Aawn5BPHVEL5yVmUgT8oxGvPSFbF6ov1mkwovX24fjoGFuNOVut8o0xUcFBu2q+ 232j4ZBe58FpjK+t3TBAzS6BWfoAWfqs7rBeYPh3CE1vpBnCmUa8xHMIupHVKu2F5YRG sRUySoy198wmuxRw2kZL1wcKc/LWGYBsw22Dgl+uLn2HsyaUs0YelhmFfaY8Y6PBSdSw cQbQ== X-Gm-Message-State: AFqh2kp1m512EUcif+ztenc/MdOoa9TPvTU7qAEQmcSHfeI6uGhmY86o 5pm+ITQAWzERmMrIkmzUok0= X-Google-Smtp-Source: AMrXdXt4pawslOEzxLqt8MDlQM4SuQ81Y2SJGvh8/1Fha6HZzFFYlcbi2z8s0Nn/a8ickF4mkNbOhw== X-Received: by 2002:a5d:6702:0:b0:2bd:e009:79cc with SMTP id o2-20020a5d6702000000b002bde00979ccmr27714202wru.53.1674456914067; Sun, 22 Jan 2023 22:55:14 -0800 (PST) Received: from toolbox.. ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id az22-20020adfe196000000b002bddaea7a0bsm25948365wrb.57.2023.01.22.22.55.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Jan 2023 22:55:13 -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 Subject: [PATCH 2/3] arm64: dts: meson: move pwm_ef node in P212 dtsi Date: Mon, 23 Jan 2023 06:55:03 +0000 Message-Id: <20230123065504.2669769-3-christianshewitt@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230123065504.2669769-1-christianshewitt@gmail.com> References: <20230123065504.2669769-1-christianshewitt@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Cosmetic-only change to alpha-sort the pwm_ef node. Signed-off-by: Christian Hewitt Reviewed-by: Neil Armstrong --- .../boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi index 7055057d7942..a150cc0e18ff 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi @@ -97,6 +97,14 @@ &ir { pinctrl-names = "default"; }; +&pwm_ef { + status = "okay"; + pinctrl-0 = <&pwm_e_pins>; + pinctrl-names = "default"; + clocks = <&clkc CLKID_FCLK_DIV4>; + clock-names = "clkin0"; +}; + &saradc { status = "okay"; vref-supply = <&vddio_ao18>; @@ -170,14 +178,6 @@ &sd_emmc_c { vqmmc-supply = <&vddio_boot>; }; -&pwm_ef { - status = "okay"; - pinctrl-0 = <&pwm_e_pins>; - pinctrl-names = "default"; - clocks = <&clkc CLKID_FCLK_DIV4>; - clock-names = "clkin0"; -}; - /* This is connected to the Bluetooth module: */ &uart_A { status = "okay"; From patchwork Mon Jan 23 06:55:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 646314 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 7782CC38142 for ; Mon, 23 Jan 2023 06:55:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230163AbjAWGzX (ORCPT ); Mon, 23 Jan 2023 01:55:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45430 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230134AbjAWGzU (ORCPT ); Mon, 23 Jan 2023 01:55:20 -0500 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 161B51A972; Sun, 22 Jan 2023 22:55:17 -0800 (PST) Received: by mail-wr1-x430.google.com with SMTP id t5so9830461wrq.1; Sun, 22 Jan 2023 22:55:17 -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=3OYHf6uBdRg2Pv0Tc1k0a2GUSIrlYLxSnMEevum5bpY=; b=KGpeEul2xiba3v1KsjCN8fEMjddcL2wnjP4/BtjA3jfdyeBt10wnp3ntC1kLE8Pxo1 pI+R/Gl49zXS/ULo6Ell/He88LvhBbXjs1uViXCx8ul+XcyZqRVEYjz592at9ufWB2W6 VUpKR7pDTkwr5wdj7kimOft3mfu9WugNfdvjM0QNZ6IGZE4TAuG92RCCh0QMrUuLVv3t Ztj9A1OkzS3sTNXa6yXUe8lsyIBWbvPqsbMnTY0ucPFg44jA11AMax6Z679wMP4j4v8s 8rrTN6/RsAQX3YVMRPl6aKBUz6cjdHV00x4gD2b80+ZtMdToHwjXxD/xv9pGgSD5xbhJ wGag== 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=3OYHf6uBdRg2Pv0Tc1k0a2GUSIrlYLxSnMEevum5bpY=; b=w7Xwf/P5Qn3IPVp0wFDWj5JViy0usrKL1hn73Q6NupIUrUnHZoJjyZZbqA48b+sezR eXn2WyAzjb5MSJA5lS9LuVk7MIk1IlVJfigrdaljLSfMqUTRRUINAoHAfEdnCFKm3rx0 J2v6MfgtWo9HAKCNSUFQ7jo3gtOaS5oHNtoKtrWKIxgTnIt+DuNfMS/TLSXc68Casr74 DknYMzeuQavA8AhPHVgPHr9x65SNXzPSLHyVevpoEuCzW24XwOM54Hmxvt8QUJa6ecrc 3lBsu0xq9llSDhNzXONmqHZZDQDRhgXcB8fqGrD4MaKQQsLgwZN3xCSYpwkCqIBQ68Yt aLvw== X-Gm-Message-State: AFqh2ko992/lzYSMB6YuxkXwPxmUI+K5MPz7AmFQRm2+blnxKu9t5J30 4G7/JLnc5Ln7Oj5xYcwHhKc= X-Google-Smtp-Source: AMrXdXsvxNmWMyKXfXak1lyV5JX7ANjEeRxt2fZqd75eEp91UqyI/xjA5bU7YPFAtl3LpapusGTfCw== X-Received: by 2002:a5d:6e8b:0:b0:2bd:d9b5:8191 with SMTP id k11-20020a5d6e8b000000b002bdd9b58191mr20903324wrz.61.1674456916457; Sun, 22 Jan 2023 22:55:16 -0800 (PST) Received: from toolbox.. ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id az22-20020adfe196000000b002bddaea7a0bsm25948365wrb.57.2023.01.22.22.55.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Jan 2023 22:55:16 -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 Subject: [PATCH 3/3] arm64: dts: meson: remove WiFi/BT nodes from Khadas VIM1 Date: Mon, 23 Jan 2023 06:55:04 +0000 Message-Id: <20230123065504.2669769-4-christianshewitt@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230123065504.2669769-1-christianshewitt@gmail.com> References: <20230123065504.2669769-1-christianshewitt@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The Broadcom WiFi/BT SDIO nodes are now inherited from the P212 common dtsi so we can remove them from the VIM1 board dts. Signed-off-by: Christian Hewitt --- .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts index bee51e29015b..2f88f78de5b7 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts @@ -220,21 +220,6 @@ &pwm_ef { &sd_emmc_a { max-frequency = <100000000>; - - brcmf: wifi@1 { - reg = <1>; - compatible = "brcm,bcm4329-fmac"; - }; -}; - -&uart_A { - bluetooth { - compatible = "brcm,bcm43438-bt"; - shutdown-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>; - max-speed = <2000000>; - clocks = <&wifi32k>; - clock-names = "lpo"; - }; }; /* This is brought out on the Linux_RX (18) and Linux_TX (19) pins: */