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: 64626 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1808934wrd; Mon, 6 Mar 2023 04:28:33 -0800 (PST) X-Google-Smtp-Source: AK7set+0B5Y5iMxEQGEz1Oo9qoKxWevwF7oAM82+r5HXREjjy24q8wj8QYNinjWK+qd8Ka5id9Qm X-Received: by 2002:a05:6a20:548a:b0:cb:e735:65a5 with SMTP id i10-20020a056a20548a00b000cbe73565a5mr14441986pzk.40.1678105713036; Mon, 06 Mar 2023 04:28:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678105713; cv=none; d=google.com; s=arc-20160816; b=V7NRuCTt/ZvXECrmDBqDBadJEJJNxMInbay6kWvAOiaOTheryzF2LWOP6wzO6IDrmV LvfaThiF7AkQY9j5WCJIZhkbRZBUxoNIIUTi9waM2DLMxYAzOjOnn4vlCYTpIUS9NarR DMPFPbA0DjFTWKE55OcflZdUumFG7krsvVpT4Hl6VA+VhTgp/bFCfTJcT+3/44hJKis0 tz0PtemD9OAwV+H/a1oyStc+X5JZiyw3P16+7wmQkI84QTYhA4aedsmDj3Jg5oexQXaZ fE7AaRgRss5QVVtHBSHwp89v2gFcojEQsV482cSz/zC5QsbktHAf4FrJSAwlDKTMCVgA QfXw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=S69/h6nKwoVosQbtsPPYLPT1mnoRPmUaC8JxTN48O5Q=; b=TondD8VQfweinr/PI3JLuwnubOitVe7goRTTmpRCGQ5vGEqmhdeeiI8cy+WOd0mb64 fT8w/fzr0rDu+2dBPL0JQ91tmYEIpvEzlYicR9Hx/JGycp0szdokKNoBuJydd/8y/IqW HP5wncyK6ND2lfk0m/2Ij3FmYCNh0i+VX0MVsfChm4OvAfIzDUh3b/0RthYAiRQVXCZc IhpYI8mdNp2pdD/UN458PB3NjlXN+NCD6R1/Ie81RjRgwG91FXwraXLh9qgSodhjywZ9 EDBz0xOisvho19CNCYpJsk0yvFfUyraPy/tcOwTyLKOJWSl2QH5PFX59KfUmtWbPyfYt N/pg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=DPFaSKJj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t185-20020a6381c2000000b004ccd057d472si8535155pgd.815.2023.03.06.04.28.20; Mon, 06 Mar 2023 04:28:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=DPFaSKJj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230287AbjCFMOE (ORCPT + 99 others); Mon, 6 Mar 2023 07:14:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37648 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229710AbjCFMOB (ORCPT ); Mon, 6 Mar 2023 07:14:01 -0500 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC9481F4AD; Mon, 6 Mar 2023 04:13:59 -0800 (PST) Received: by mail-wr1-x433.google.com with SMTP id r18so8588550wrx.1; Mon, 06 Mar 2023 04:13:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678104838; 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=DPFaSKJjfeU1zf2om9bxbD7cBqxQ6G8EGkxbSzxKSMGVXcoC8DZEixc3dwPDsZByCB oQeODWeTL9XeRPWRkxx3wjYTRTvF7Fl9vNyzbDxDaMMWZAEwmJssRrcg6vaOlm8qjw5W Tq8OM9+4/A5Q6WZYQ3imY7+sgUkHJqj5XyKXBbK1zWTKbOzn6RXdJ0fCrmmD4scD11gd m5PDewhJlPD++EewWB20tS6BoUsnXXP81nA0N+avy42I7EFZL4hyuBxPNHYdFDtBQ/mp 4v5xlpd6Hv98yNaBn4Gv6NmUc9VbQ37mla9y3Dmg9K9mg1AVSaN/LfusNDDLocO9VXrF ifvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678104838; 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=TKQ3cUAfv6fQ5zwU/k2jCKtoVv4mgKs9/OkskiL3hmpxROiEj3fTR14eC1nOiqI9Bf HwG8BOvlRFwF68IVvg/Z01iJHshRWQSyUaSj66hyn0l7avY85aU4suXmmw1Qg4+M2XJD rzAtZDuLWxpW//ys/hhb+Gh1MsmJmUX70YumxzlORbbtbPcxtn3V5NhNn82BP8oIz3iK blEoxzEkznj80L4tT5uOmDx+RthPYXFracFnzpaRiUFTxReW8NnLa43Fh0NBweWuE2PX ZXaOg1xfhax+yhoSyb8sjD4pCLrAGU68pz2p109PX/K66v51jScZP8IgAuc//rw5OC6U OquQ== X-Gm-Message-State: AO0yUKUI/LuDmVahMGo85w6s8uPnokBn10d2X3psUTcJjhakcy4k8/hj 6GSu5ZEPZGFitow0v+wNg9XhypdWJFOXTw== 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-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759621375760161953?= X-GMAIL-MSGID: =?utf-8?q?1759621375760161953?= 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"; + }; +};