From patchwork Wed Aug 2 17:45:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 130056 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp656776vqx; Wed, 2 Aug 2023 11:46:29 -0700 (PDT) X-Google-Smtp-Source: APBJJlHfiPN+tWCku87TCCjfheAr3uHu1Vvyr9dQOxupSivk8zwE7q2gMFeRUVa6D08YuWs9omoD X-Received: by 2002:a05:6a21:718b:b0:138:60e:9bb with SMTP id wq11-20020a056a21718b00b00138060e09bbmr16025203pzb.28.1691001988856; Wed, 02 Aug 2023 11:46:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691001988; cv=none; d=google.com; s=arc-20160816; b=Z9vm5GamErv4wXsoH0OyFcKJWoop4wWPyfVOYAV+pLJPPuUog9QQAY9HByWEWftVN7 LlOvEzkuLksH/Cgp7aIdkDAaI/G/1Uc+XF2StP9cjlOzEn6TpesYSv3JuJSJn8S/+rB4 eu1bIdpgNqGibRIYUxT2y5Q0/pkQ8qb/Pk338Yy0L492SdFfsnStXpI1DwK93IhqY748 TsxWx0q0uzl0U/00Sukngo8qvORwX3Z2o+/esss6OHB5S9clHy9HocYCW8M5AGbkPr5b cCtYctg8Q2cw+eBwgGA1j7DdjGLSBEtSfRcYq+p88Iadsw6F8xvuLgPD3Y3ROPibNyPu 3Vbw== 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=glW8XPVt7oMKxhOeu7i3M3uUMr4N6Y9fptPIL5+joKc=; fh=878OLI05L9osNW8108hv37bieiY2kkkgXUhCMqaYoVQ=; b=w67PrcLp5qFe0FlkkiXCZRbb3On4sa2h1H3g4HAMxrUoXAOT/UqR4+clpQk2BUF2c/ DhEK1SfNNbRB/7Lp50xFMewDmbb6E9Ah/B9wgKQl7FNozQnXphRqWfQYO/xyYZgXnwwK IK1NpgGUAqAZzEaWPHyb9oJLnWN3WAqMIAw760ZREqZRKtaYONibc/U4cE/vOY9man/z B86331moBor4rR7rydB4ohKo7GazDgZgMw46fJIICOuNdNC+YesOAqJ9oi3GdMAMBCeD vsEkj/3tAFkO7b/Oq3HEO/8Rz5532NbsR5mPzHXGUgiqoIYqwg0fUF8UG+2Rp06FOx00 VfWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=hnCeiSFK; 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=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cb8-20020a056a00430800b00670ab28fac3si11175777pfb.378.2023.08.02.11.46.16; Wed, 02 Aug 2023 11:46:28 -0700 (PDT) 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=@ti.com header.s=ti-com-17Q1 header.b=hnCeiSFK; 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=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233804AbjHBRqH (ORCPT + 99 others); Wed, 2 Aug 2023 13:46:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229597AbjHBRqC (ORCPT ); Wed, 2 Aug 2023 13:46:02 -0400 Received: from fllv0016.ext.ti.com (fllv0016.ext.ti.com [198.47.19.142]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8D13010C7; Wed, 2 Aug 2023 10:45:32 -0700 (PDT) Received: from fllv0035.itg.ti.com ([10.64.41.0]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 372HjOAH057394; Wed, 2 Aug 2023 12:45:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1690998324; bh=glW8XPVt7oMKxhOeu7i3M3uUMr4N6Y9fptPIL5+joKc=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=hnCeiSFKYp9VujW8xmGat7eu8mf4tAze74TRTL8F3v4Bx3Ro5xHHpVNfwSabxRr1Z DzUUXMbH59CPGpnmF2NRpc2y07ydHKuo/LaiWNouJdMqoWR3uiPWGDSloWx2HpipAJ gS2Qb1C3reA1m92pP/2Er7Hiepq/9NTUSwDSiQMY= Received: from DLEE114.ent.ti.com (dlee114.ent.ti.com [157.170.170.25]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 372HjOGO102357 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 2 Aug 2023 12:45:24 -0500 Received: from DLEE107.ent.ti.com (157.170.170.37) by DLEE114.ent.ti.com (157.170.170.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Wed, 2 Aug 2023 12:45:24 -0500 Received: from lelv0327.itg.ti.com (10.180.67.183) by DLEE107.ent.ti.com (157.170.170.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Wed, 2 Aug 2023 12:45:24 -0500 Received: from fllv0040.itg.ti.com (ileaxei01-snat.itg.ti.com [10.180.69.5]) by lelv0327.itg.ti.com (8.15.2/8.15.2) with ESMTP id 372HjN0e027307; Wed, 2 Aug 2023 12:45:24 -0500 From: Andrew Davis To: Nishanth Menon , Vignesh Raghavendra , Tero Kristo , Rob Herring , Krzysztof Kozlowski , Conor Dooley , CC: , , Andrew Davis Subject: [PATCH 2/3] arm64: dts: ti: k3-am64: Merge the two main_conf nodes Date: Wed, 2 Aug 2023 12:45:20 -0500 Message-ID: <20230802174521.236255-2-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230802174521.236255-1-afd@ti.com> References: <20230802174521.236255-1-afd@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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: INBOX X-GMAIL-THRID: 1773144101631603573 X-GMAIL-MSGID: 1773144101631603573 There are two nodes representing the same register space, this looks to have been created by some merge or copy/paste error. Remove the second instance of this node and move its children into the first instance. Signed-off-by: Andrew Davis --- arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 42 ++++++++++-------------- 1 file changed, 17 insertions(+), 25 deletions(-) diff --git a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi index d3dd8c426dada..e27eb2e585f14 100644 --- a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi +++ b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi @@ -44,11 +44,28 @@ main_conf: syscon@43000000 { #size-cells = <1>; ranges = <0x0 0x0 0x43000000 0x20000>; + chipid@14 { + compatible = "ti,am654-chipid"; + reg = <0x00000014 0x4>; + }; + serdes_ln_ctrl: mux-controller { compatible = "mmio-mux"; #mux-control-cells = <1>; mux-reg-masks = <0x4080 0x3>; /* SERDES0 lane0 select */ }; + + phy_gmii_sel: phy@4044 { + compatible = "ti,am654-phy-gmii-sel"; + reg = <0x4044 0x8>; + #phy-cells = <1>; + }; + + epwm_tbclk: clock@4140 { + compatible = "ti,am64-epwm-tbclk"; + reg = <0x4130 0x4>; + #clock-cells = <1>; + }; }; gic500: interrupt-controller@1800000 { @@ -203,31 +220,6 @@ main_pmx0: pinctrl@f4000 { pinctrl-single,function-mask = <0xffffffff>; }; - main_conf: syscon@43000000 { - compatible = "syscon", "simple-mfd"; - reg = <0x00 0x43000000 0x00 0x20000>; - #address-cells = <1>; - #size-cells = <1>; - ranges = <0x00 0x00 0x43000000 0x20000>; - - chipid@14 { - compatible = "ti,am654-chipid"; - reg = <0x00000014 0x4>; - }; - - phy_gmii_sel: phy@4044 { - compatible = "ti,am654-phy-gmii-sel"; - reg = <0x4044 0x8>; - #phy-cells = <1>; - }; - - epwm_tbclk: clock@4140 { - compatible = "ti,am64-epwm-tbclk"; - reg = <0x4130 0x4>; - #clock-cells = <1>; - }; - }; - main_timer0: timer@2400000 { compatible = "ti,am654-timer"; reg = <0x00 0x2400000 0x00 0x400>;