From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 06453C4338F for ; Wed, 4 Aug 2021 09:06:35 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3C69E60240 for ; Wed, 4 Aug 2021 09:06:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 3C69E60240 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1E41082DF0; Wed, 4 Aug 2021 11:06:25 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="TE10BLaA"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8FA7782DF1; Wed, 4 Aug 2021 11:06:17 +0200 (CEST) Received: from mail-pj1-x102b.google.com (mail-pj1-x102b.google.com [IPv6:2607:f8b0:4864:20::102b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8B1DD81280 for ; Wed, 4 Aug 2021 11:06:06 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jagan@amarulasolutions.com Received: by mail-pj1-x102b.google.com with SMTP id nh14so2038642pjb.2 for ; Wed, 04 Aug 2021 02:06:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=avvC7AFCOLkYXHXcEoBNIMq00Ab+KnVT47CDYaFg3cw=; b=TE10BLaA3EuPU/0jnW+R4ZufF/ZkrGhq/kTkJk7aA0n15x1PgSNbEU9Rrd2LGXgb10 lISQNwkOIjgRUerh2Ey1gAYZ7cVzpio53pholBqn/H2gR6A+beylHTRSrDLp3zy4cpWZ ZZQf1Pldt0z+H6SEBpKQXfq6bg9EYHVQlPqyc= 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:mime-version:content-transfer-encoding; bh=avvC7AFCOLkYXHXcEoBNIMq00Ab+KnVT47CDYaFg3cw=; b=qJ3HgfK46+Q3PfH+ovsYfKfgJ21oUz5Bz+Z5CU7FWasdmedfLmZBu4aMnDt9M/I4U3 vemyxY7qJt+ijwQFOo5syyWhyNfHUP6goGZaaJNd0rJ/jvKWBxfCWpC913SO1mJHkjNu 8bslK5NaHPGF8etJC733T+vel8CewIzRO0QgpVNeyXU82DiYoja92wIFI9PI1NKFekO3 UOweHBLhjYU8kKMyvUsB4Sm7LRuppRxQKJw4v6XPuy+KBDNbWUB4LoZa8KD/GgWKTalo JuNsLwczu3hZE61Av54kEX8u1nGgOhcORkBxjnBDJPp7mN5SR7r21uQ1E3qXcAbD9UUi toTA== X-Gm-Message-State: AOAM531ixtFub8YqiS8TA00n4cAUhQ2VFER+La3P+BgycJhZexhHBvM4 CsTDZo5jOXKvyAFSLN7jTJq5oQ== X-Google-Smtp-Source: ABdhPJwJltAYGYS3MgIlvUvryP7x5j8GghGJIl6LDc18MivRh1rvAi/U0jijiI9bz2v1UShuc3GWpA== X-Received: by 2002:aa7:8116:0:b029:346:8678:ce26 with SMTP id b22-20020aa781160000b02903468678ce26mr26260009pfi.15.1628067964848; Wed, 04 Aug 2021 02:06:04 -0700 (PDT) Received: from e-ThinkPad-E14-Gen-2.domain.name ([103.161.30.228]) by smtp.gmail.com with ESMTPSA id cu12sm5536169pjb.5.2021.08.04.02.06.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Aug 2021 02:06:04 -0700 (PDT) From: Jagan Teki To: Kever Yang Cc: u-boot@lists.denx.de, linux-amarula@amarulasolutions.com, Jagan Teki Subject: [PATCH 2/4] arm64: dts: rockchip: px30: Move dmc into -u-boot.dtsi Date: Wed, 4 Aug 2021 14:35:49 +0530 Message-Id: <20210804090551.90819-3-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210804090551.90819-1-jagan@amarulasolutions.com> References: <20210804090551.90819-1-jagan@amarulasolutions.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean dmc node is specific to U-Boot, it is always better practice to maintain U-Boot specific nodes into -u-boot.dtsi files in order to maintain Linux dts file sync compatibility. Move the dmc into px30-u-boot.dtsi, also add dmc node explicitly in rk3326-odroid-go2-u-boot.dtsi since it is using px30.dts. Signed-off-by: Jagan Teki --- arch/arm/dts/px30-u-boot.dtsi | 10 ++++++---- arch/arm/dts/px30.dtsi | 5 ----- arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi | 10 ++++++---- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/arch/arm/dts/px30-u-boot.dtsi b/arch/arm/dts/px30-u-boot.dtsi index 029c8fbd8d..bbed7dcde5 100644 --- a/arch/arm/dts/px30-u-boot.dtsi +++ b/arch/arm/dts/px30-u-boot.dtsi @@ -13,6 +13,12 @@ u-boot,spl-boot-order = &emmc, &sdmmc; }; + dmc { + u-boot,dm-pre-reloc; + compatible = "rockchip,px30-dmc", "syscon"; + reg = <0x0 0xff2a0000 0x0 0x1000>; + }; + rng: rng@ff0b0000 { compatible = "rockchip,cryptov2-rng"; reg = <0x0 0xff0b0000 0x0 0x4000>; @@ -20,10 +26,6 @@ }; }; -&dmc { - u-boot,dm-pre-reloc; -}; - &uart2 { clock-frequency = <24000000>; u-boot,dm-pre-reloc; diff --git a/arch/arm/dts/px30.dtsi b/arch/arm/dts/px30.dtsi index b6c79e7ed3..e892d3b5a5 100644 --- a/arch/arm/dts/px30.dtsi +++ b/arch/arm/dts/px30.dtsi @@ -151,11 +151,6 @@ interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>; }; - dmc: dmc { - compatible = "rockchip,px30-dmc", "syscon"; - reg = <0x0 0xff2a0000 0x0 0x1000>; - }; - display_subsystem: display-subsystem { compatible = "rockchip,display-subsystem"; ports = <&vopb_out>, <&vopl_out>; diff --git a/arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi b/arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi index 00767d2abd..93bc399087 100644 --- a/arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi +++ b/arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi @@ -7,13 +7,15 @@ chosen { u-boot,spl-boot-order = &sdmmc; }; -}; -&cru { - u-boot,dm-pre-reloc; + dmc { + u-boot,dm-pre-reloc; + compatible = "rockchip,px30-dmc", "syscon"; + reg = <0x0 0xff2a0000 0x0 0x1000>; + }; }; -&dmc { +&cru { u-boot,dm-pre-reloc; }; -- 2.25.1