From patchwork Sat Jun 23 19:38:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 10483835 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BBC7860532 for ; Sat, 23 Jun 2018 19:39:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5B6A5286C5 for ; Sat, 23 Jun 2018 19:39:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 503C4286FE; Sat, 23 Jun 2018 19:39:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CFEBC286C5 for ; Sat, 23 Jun 2018 19:39:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=Hb+noYGwerJx6JE3wxWcABR/5GzGmQ3evnDGlKwsWL8=; b=rJ9Hs8dY63eJO/Ib6sej6V1aMJ hFqIN3InbkBYHMAlyLEGeExU38iPmj9MbLRNccXiaflFF/tIeZ/BxW49D1bpu7bhag3gYvblKF2NN Z6j/88+4ZG8/bM7HzZDMVpAC4vqeBAcuAptnDZrb/mQlmPRExd7r4xulZOp7s9oo4OmO0ffh0cKy+ 0BUlxxSzzd1pIuEMT+ubnVkUmsV7L6S4RtMLQrjiH7UQ7frC24fT4kethEbpIdAQpRyMZLsYn3Ino F2DHJxlHR0yfwXa7QrLB6AXDFlkGDtivBfPpRCfBhixLCdZarzAYXNA5iTJjZUiQdw9hmXCs3QJTU xriuY1+A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fWoN9-0004wm-34; Sat, 23 Jun 2018 19:38:59 +0000 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fWoMx-0004pd-Hq for linux-amlogic@lists.infradead.org; Sat, 23 Jun 2018 19:38:55 +0000 Received: by mail-wm0-x242.google.com with SMTP id u18-v6so1449600wmc.1 for ; Sat, 23 Jun 2018 12:38:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ooiIBoch3XJBI0huuRsEdXz/vJC/dGGCgascF9+PbbY=; b=vCVVijpxXFsA+A0HkMh+YEygFEkwi4yz3jpHRrzKovAacvyHbBaFnzJU+MEwi52+fh C6GO/AapP9lXkE1oiahlK7wKVvftCtmBplplcHw0d5V9T9AH0fw1Ov36iaIRUQqYCrvO Cf0uTs6300C3p99VCpTZZZDj6AcbTHRKtvBF3hxh61ZuPkGc2m2hN3q8CeOsLUZxeMuk vDwAbT3iJ3Qmo0B0uoHTU5HtL0QsxOurdArjrsiod3Or0QKwfrpbj5oI0ufMHMpaNLG4 jybOSY7xfx9aKroYVjdnrhPjBNPf1P4xg7OI7+d4+nVJRSUtAyZnqAxLTyb5KYgghpxg 8Jog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ooiIBoch3XJBI0huuRsEdXz/vJC/dGGCgascF9+PbbY=; b=p+Y5AOhkUX5uAArab8hbeQZTC83K/g17QytlDwVrxTcwBj32wjPM4NEnr2mYtit4kK q/IaDgn13yy2mJNV3RNEAS3fP/9N59etaKQHVHZXHhD+P+vcxdiBJrsqC5nvU3xFUDVh EixtZLH43pqNz/18ARCSbhodib4WdZNQ2sKNevB1PLYOGQF4AM/MZ2YfhxlBztAjCgv2 fDVlA7+xxCBWK+zIseaYG6AHSBBr7+I0276DyXJoBciI+8/hU0RxsZ9XR70kUdSfQHCF l3ZsG0XB1Kh0Ytg0p5YwIZaZsvQpNiTuE+2myq5iLZkcg3T2Soem9LYVBq60GFjgXj2Y 9iCA== X-Gm-Message-State: APt69E1o4x9Ya+qOBKTBU++HFgnOcOuvOjSm4v0YGwf9sVWaqIWkat/e Ye5qJwNZVE5zDgM8henz9G2JTMnx X-Google-Smtp-Source: ADUXVKKd0UAKteWLhtgxHD+rKL75ftsbEw6gV3xBOl2nvubE5Lc0VbTqx/EROCVfAxPt6ThFBYirZg== X-Received: by 2002:a1c:d287:: with SMTP id j129-v6mr4760728wmg.106.1529782715383; Sat, 23 Jun 2018 12:38:35 -0700 (PDT) Received: from blackbox.darklights.net (p5DD9B561.dip0.t-ipconnect.de. [93.217.181.97]) by smtp.googlemail.com with ESMTPSA id q77-v6sm5413632wmg.25.2018.06.23.12.38.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 23 Jun 2018 12:38:34 -0700 (PDT) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org, khilman@baylibre.com Subject: [PATCH 1/1] ARM64: dts: meson-gx-p23x-q20x: move the wifi node to each board's .dts Date: Sat, 23 Jun 2018 21:38:28 +0200 Message-Id: <20180623193828.6047-2-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180623193828.6047-1-martin.blumenstingl@googlemail.com> References: <20180623193828.6047-1-martin.blumenstingl@googlemail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180623_123847_639749_5065145C X-CRM114-Status: GOOD ( 13.28 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: carlo@caione.org, Martin Blumenstingl , narmstrong@baylibre.com MIME-Version: 1.0 Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP meson-gx-p23x-q20x.dtsi is currently used by five boards: - Amlogic P230 and P231 (which should be identical, apart from the external RGMII PHY on P230 whereas P231 can only use the internal PHY) - Amlogic Q200 (identical to P230 but with an S912 GXM SoC instead of a GXL S905D SoC) and Q201 (identical to P231 but with an S912 GXM SoC instead of a GXL S905D SoC) - NEXBOX A1 (based on the S912 GXM SoC) The Amlogic P230 board uses a Broadcom BCM4356 SDIO wifi chip. Since the other Amlogic reference design boards are very similar it's safe to assume that these also use a Broadcom based SDIO wifi chip (which is also how it was configured in meson-gx-p23x-q20x.dtsi). However, NEXBOX A1 comes with a "longsys LTM8830" SDIO wifi module, which is based on the "Qualcomm Atheros QCA9377-3(QCA1023-0)" chipset. Thus move the wifi node from meson-gx-p23x-q20x.dtsi to each of the four Amlogic reference board's .dts files. There are no devicetree bindings for the QCA9377 SDIO wifi module yet, so nothing is added to meson-gxm-nexbox-a1.dts. Fixes: f51b454549b812 ("ARM64: dts: meson-gxm: Add support for the Nexbox A1") Signed-off-by: Martin Blumenstingl Reviewed-by: Neil Armstrong --- arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 5 ----- arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts | 7 +++++++ arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dts | 7 +++++++ arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts | 7 +++++++ arch/arm64/boot/dts/amlogic/meson-gxm-q201.dts | 7 +++++++ 5 files changed, 28 insertions(+), 5 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi index 01616982af0d..765247bc4f24 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi @@ -172,11 +172,6 @@ vmmc-supply = <&vddao_3v3>; vqmmc-supply = <&vddio_boot>; - - brcmf: wifi@1 { - reg = <1>; - compatible = "brcm,bcm4329-fmac"; - }; }; /* SD card */ diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts index 9c5be060fd5e..15014faa2ab2 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts @@ -100,3 +100,10 @@ remote-endpoint = <&hdmi_connector_in>; }; }; + +&sd_emmc_a { + brcmf: wifi@1 { + reg = <1>; + compatible = "brcm,bcm4329-fmac"; + }; +}; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dts index 80a231476b80..92c425d0259c 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dts @@ -19,3 +19,10 @@ phy-mode = "rmii"; phy-handle = <&internal_phy>; }; + +&sd_emmc_a { + brcmf: wifi@1 { + reg = <1>; + compatible = "brcm,bcm4329-fmac"; + }; +}; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts index 432f7a435fba..73d656e4aade 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts @@ -71,3 +71,10 @@ interrupts = <25 IRQ_TYPE_LEVEL_LOW>; }; }; + +&sd_emmc_a { + brcmf: wifi@1 { + reg = <1>; + compatible = "brcm,bcm4329-fmac"; + }; +}; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-q201.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-q201.dts index 8d132b17514a..d02b80d77378 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxm-q201.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-q201.dts @@ -19,3 +19,10 @@ phy-mode = "rmii"; phy-handle = <&internal_phy>; }; + +&sd_emmc_a { + brcmf: wifi@1 { + reg = <1>; + compatible = "brcm,bcm4329-fmac"; + }; +};