Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp1013761pxb; Wed, 6 Apr 2022 06:44:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx6klKZF7s36ZHtJCjyNih+tkLhIt+wB10t11+VShZnieZfFD4zjYtaU613mxo3u5o/gAmH X-Received: by 2002:a63:d314:0:b0:399:53e4:2bfd with SMTP id b20-20020a63d314000000b0039953e42bfdmr7225825pgg.120.1649252661108; Wed, 06 Apr 2022 06:44:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649252661; cv=none; d=google.com; s=arc-20160816; b=aoGQ5FVnwYy74VjueKuxAiBkhinQIqZfZi5UpdF4aQv661KUCoVO9NydPuOg8KeERO 1eNsLmSgwx1ttXmxg691TSuo5t6ZIxIclc2bMDEqiPh7rJvCLw7mKy0AAh3SFZlhWx1b j2CTTwhJblWAGZT+pN9Z9rdN4xG2slhziegoL3zdUVuJkm0pR9DVkUl/QxS+MU9BCxY7 DdpGp0qi5bHUlkzTGW1/I7bPJWzvdRwYPlNG2SnUoSj6h1FcUYS1R596UihwrH0HVo96 KNrK4ja+bnbcbcRvk7ptE9YnFFzRN0b5VQ403UQ19Fw4ZtEfTNaaTls5ePFjPqccplUU WgAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ntaNhc9GFOaK6qvNYkeADOt6LFXmeXNMfmOid30aH2k=; b=cEWZumAH4VOUUYIyuuZhFjPvkga7Ojx4EXHrKRJGSNlksqJUBii3TamNjK2a17qL9A kRlI7JVz9NPe1I99GM34dG5gEDm7p5ywRJL/lxOZCTtxHrUA74Qop/jlZAso4LbRDo7o k7rAaz+s0wnqQWcipFr2sbG9moG60E01S7WpeObzdEsLk6IY5oTKECEEfK+TagULPxVx kRn9VmQ9J4ePwwaXs4k3vTrPG+P2hqxQ4CsjyNMGPc15gNQcx1OClRTdwYEY0YswD/v/ bRbaNZKSHHEG2PUjgfzlZnuAMeIesl8HYiOs3YxymV1Sw5Bh75TSi6N57dk7mOA0cph3 iPNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="M0um/HIX"; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id s13-20020a056a00194d00b004fa3a8dff83si15499183pfk.58.2022.04.06.06.44.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Apr 2022 06:44:21 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="M0um/HIX"; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id BEDD456FD3D; Wed, 6 Apr 2022 04:31:38 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1449005AbiDFAFH (ORCPT + 99 others); Tue, 5 Apr 2022 20:05:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39826 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349479AbiDEJtz (ORCPT ); Tue, 5 Apr 2022 05:49:55 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 18D5210BA; Tue, 5 Apr 2022 02:47:13 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id 8BFC9CE1BE5; Tue, 5 Apr 2022 09:47:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A5FDDC385A1; Tue, 5 Apr 2022 09:47:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649152030; bh=Z6OySrSX32Hkx5sPKsLlBhXghDamj+OXKiODTtxYEdk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M0um/HIXRXXFT6JJr7/KhJzlWSfueUvTLTzHo2553Egjkh2BeojZPn/8rj89ehWKd wjjYpXrhs9EtiD0oevHdvkQFIlY4gVw/aSuXDHys5NH7Rzg5AWWSSKNqzmUoslsPPr caI//vfSLkTADBOkxnpShsYIDtFBect3e/KCR9ZU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sergio Paracuellos , =?UTF-8?q?Ar=C4=B1n=C3=A7=20=C3=9CNAL?= , Sasha Levin Subject: [PATCH 5.15 630/913] staging: mt7621-dts: fix GB-PC2 devicetree Date: Tue, 5 Apr 2022 09:28:12 +0200 Message-Id: <20220405070358.722848056@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220405070339.801210740@linuxfoundation.org> References: <20220405070339.801210740@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arınç ÜNAL [ Upstream commit 5bc148649cf358d0cccf525452a4efbd4bc89a0f ] Fix the GB-PC2 devicetree. Refer to the schematics of the device for more information. GB-PC2 devicetree fixes: - Include mt7621.dtsi instead of gbpc1.dts. Add the missing definitions. - Remove gpio-leds node as the system LED is not wired to anywhere on the board and the power LED is directly wired to GND. - Remove uart3 pin group from gpio-pinmux node as it's not used as GPIO. - Use reg 7 for the external phy to be on par with Documentation/devicetree/bindings/net/dsa/mt7530.txt. - Use the status value "okay". Link: https://github.com/ngiger/GnuBee_Docs/blob/master/GB-PCx/Documents/GB-PC2_V1.1_schematic.pdf Reviewed-by: Sergio Paracuellos Signed-off-by: Arınç ÜNAL Link: https://lore.kernel.org/r/20220311090320.3068-2-arinc.unal@arinc9.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/staging/mt7621-dts/gbpc2.dts | 110 +++++++++++++++++++++++++-- 1 file changed, 102 insertions(+), 8 deletions(-) diff --git a/drivers/staging/mt7621-dts/gbpc2.dts b/drivers/staging/mt7621-dts/gbpc2.dts index f9b69091bfc0..6f6fed071dda 100644 --- a/drivers/staging/mt7621-dts/gbpc2.dts +++ b/drivers/staging/mt7621-dts/gbpc2.dts @@ -1,27 +1,121 @@ /dts-v1/; -#include "gbpc1.dts" +#include "mt7621.dtsi" + +#include +#include / { compatible = "gnubee,gb-pc2", "mediatek,mt7621-soc"; model = "GB-PC2"; + + memory@0 { + device_type = "memory"; + reg = <0x00000000 0x1c000000>, + <0x20000000 0x04000000>; + }; + + chosen { + bootargs = "console=ttyS0,57600"; + }; + + palmbus: palmbus@1e000000 { + i2c@900 { + status = "okay"; + }; + }; + + gpio-keys { + compatible = "gpio-keys"; + + reset { + label = "reset"; + gpios = <&gpio 18 GPIO_ACTIVE_HIGH>; + linux,code = ; + }; + }; }; -&default_gpio { - groups = "wdt", "uart3"; - function = "gpio"; +&sdhci { + status = "okay"; +}; + +&spi0 { + status = "okay"; + + m25p80@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <50000000>; + broken-flash-reset; + + partition@0 { + label = "u-boot"; + reg = <0x0 0x30000>; + read-only; + }; + + partition@30000 { + label = "u-boot-env"; + reg = <0x30000 0x10000>; + read-only; + }; + + factory: partition@40000 { + label = "factory"; + reg = <0x40000 0x10000>; + read-only; + }; + + partition@50000 { + label = "firmware"; + reg = <0x50000 0x1fb0000>; + }; + }; +}; + +&pcie { + status = "okay"; +}; + +&pinctrl { + pinctrl-names = "default"; + pinctrl-0 = <&state_default>; + + state_default: state-default { + gpio-pinmux { + groups = "wdt"; + function = "gpio"; + }; + }; }; ðernet { gmac1: mac@1 { - status = "ok"; - phy-handle = <&phy_external>; + status = "okay"; + phy-handle = <ðphy7>; }; mdio-bus { - phy_external: ethernet-phy@5 { - reg = <5>; + ethphy7: ethernet-phy@7 { + reg = <7>; phy-mode = "rgmii-rxid"; }; }; }; + +&switch0 { + ports { + port@0 { + status = "okay"; + label = "ethblack"; + }; + + port@4 { + status = "okay"; + label = "ethblue"; + }; + }; +}; -- 2.34.1