From patchwork Tue May 7 18:21:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 356 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 948AD3F066 for ; Tue, 7 May 2019 20:22:16 +0200 (CEST) Received: by mail-pg1-f199.google.com with SMTP id a8sf10769267pgq.22 for ; Tue, 07 May 2019 11:22:16 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1557253335; cv=pass; d=google.com; s=arc-20160816; b=O/xpCNs8I3cSY1lLRFd0aJVzK4BlhMKm30b3MgCNWm+FQLy7FLZhbVNfmr4mcADWN5 Xeiy7YRWFRbVNOlbkyIxvgIXZHKwsaRGhVPi3Bk8eyz9L1lbW+ikiF509+Oo6Zi8XNq3 QVOshtYDI75DRHC1yjAQNBZaCCD6wlFTnnfwfG9LCC5yUgt70yg4AY6hL2UfqQny6TuJ UREYeJHEfA5FK8n3E3tteHINg4NjWNO+LW+6ph2Abke4xKZpwQI7nZxPj7s3YueBvBai ZHweEwgAu0CdQeCdCYxzwpEmj8L6cq2VL1MqPaEibgeCbrkUbXk4jjOwywP4tg0+7gRE TsnA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=8WhLfdP1/nUSTl6VajXR8RtliYZq14Pj03yGjbAR9Mk=; b=rdDa06S6O2UesPaXiE+W6spnHJn/QxedhMDSO6DDv25tLLpnZaXSvFgbH5mLFE+E9f bFbGGJlLMMkh4OXSl7Hau5bT+q7cnnQJaBR3hW9/teBHe/Y7D7F9+F4SUPnxDNTfiSil +Y24GNgFaFXetRRwLpdse9n0VpDL/UBoarxj7WwgjMe3Asv0x/PWNRYrJwGUQ/oa+7sv ztJSTSfIyJoTbdsoUKqQzRxo4yYd2jbJKqV0ANVoyX2HcKc9xGUM+soZ+L/gWZJlLgT9 5e5yROVCp6tVPujst7md0i3Gya9pSPxCXRtLek2QqSkXaW+tkHMB0ORLcd+vAl/BC/ao GdKA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=Owbehs7j; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com 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:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=8WhLfdP1/nUSTl6VajXR8RtliYZq14Pj03yGjbAR9Mk=; b=jOycJ6EUbzpVkqVXVKFfsx2VwtTI8Lt+MWEaelixP8EuYPzO7/aMUpSrgfiQvUY9nk zceYFvr5KoqyTbah1TjwlHIs8FtI7MYw/Akd+xTcrlyLQ+iBIUaxNx3wOIJWZrC6NoFX SnpfcGxAF42yP+hWZ1C+Lno1MYqAmyB51CO3Y= 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:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=8WhLfdP1/nUSTl6VajXR8RtliYZq14Pj03yGjbAR9Mk=; b=p0qvDJrBT5SNyC1aXM/bPIK+/ZyOQDvJ09DG8NqTU/qJozEzNCmiUQIR9/A/b6vPwZ 2bjhKC/yrL6ZpxysxE/CylzSs6b+3x2NmNUn47jXV8SoloTVmqnmELysxWUJlfLMDIgU W7/Lc0kBXdPqblEFdzD4S0N9yPbed+aBoayfXPiApq/MZIqSs4fJCwTpttkeS5e2fysw ECgtjYkvdWXNn/Lbe5QaWO1skB31Eu1y1cdRPYI9KS46JP+5hQoEIqAgJSBMbFQ3LuDQ BWET3TiTNzWDBDrepMY/f3UoUrNevxTvsz+y7JLCHeGsU83y3iWe4ZojBGv539WHfKj4 51AA== X-Gm-Message-State: APjAAAVX/mhzZv7nSqME6sVs7TFVwFa668trmtTyUhZfxQh6YrmC9Ac0 zCLi3EicYRKAQvh2GNt0Csp9wTj/ X-Google-Smtp-Source: APXvYqzhAeuxDcVINvzUrKxd1rhlP7+Q4Q7USVQaRlsei0QrLKQ1HmbV2VPrPOE4gLbD4lbiZSxIkw== X-Received: by 2002:a17:902:b602:: with SMTP id b2mr41980411pls.293.1557253335090; Tue, 07 May 2019 11:22:15 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a62:b611:: with SMTP id j17ls186824pff.13.gmail; Tue, 07 May 2019 11:22:14 -0700 (PDT) X-Received: by 2002:a63:8449:: with SMTP id k70mr40941788pgd.53.1557253334767; Tue, 07 May 2019 11:22:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557253334; cv=none; d=google.com; s=arc-20160816; b=bs6pCg7QhOF/S41vXgdo3S/uWGJjMgSn+pDdPm3bAkfpzdymhlrIerPQBDowmcKhRK BZW821QNuVHX+ICpbf6pfm5mLDbV0CCsOCILvS901tQXXm1J9Szj/U3w9O3VZkickmgb dTN8KKyYt1hqqBvDN+JqP6MezcJsFDD2vFJ1Na3ZhaLF9PN4mg8Dpltt461ZGYI0D9f0 SkKSl5CX8qtLP4Ry2ujaXLgbyMWaQ6pOA7z7KF/gHCED6rMRMwZqHpYkzrrLyovxakTU w1aEaK6U0N4okSiRxQNBmNBlEXnffOobKIz1ptHsfaNHaJ2Wb88ldMiAJA/6oxyjIOHz JrWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=dWqy5cYXZHO1RCk8XLzza01Y9+Eq8ruW2tx9Pp/Tl7c=; b=cBX1cDg//frSh1zDFoZ8yK405yrndyxBYlB3IdWBjtXlBLZf/Ykaefz6lQGYPtsEHy /s5iWTxfMwyr/wwkXnlq5VEsxXYk3EOOnNIpVnUGhrlOhaUf6qxMkaRGZHkDHHAv0Kyn rrvrHmcbT9G6nZ71CKkDR7pZuGHmkaLxoLxNbgnPOYNBvFfPtRF12oWpUoiy6ZelJtqr 3DhOFF9dKVsxP/VGAgFZFEF04Uu7S2DqMkz/zf0slU6PJ8U4zdWgLjKIfqjZkbyt1fRD bUmNET7q823yfnrbPTY/48rdTF7Py4auRjj1qbAxBYssyQ1SK8xwlk4CxIsUCB9W56h6 fIuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=Owbehs7j; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id o77sor16286044pfa.60.2019.05.07.11.22.14 for (Google Transport Security); Tue, 07 May 2019 11:22:14 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a63:2c4a:: with SMTP id s71mr40634996pgs.373.1557253334499; Tue, 07 May 2019 11:22:14 -0700 (PDT) Received: from localhost.localdomain ([115.97.185.144]) by smtp.gmail.com with ESMTPSA id d15sm18491568pfr.179.2019.05.07.11.22.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 May 2019 11:22:13 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang , Akash Gajjar Cc: Paul Kocialkowski , linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, u-boot@lists.denx.de, Jagan Teki Subject: [PATCH v7 1/4] dts: Makefile: Build rockchip dtbs based on SoC types Date: Tue, 7 May 2019 23:51:49 +0530 Message-Id: <20190507182152.4254-2-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190507182152.4254-1-jagan@amarulasolutions.com> References: <20190507182152.4254-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=Owbehs7j; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , - Sometimes u-boot specific dtsi files are included automatically which would build for entire rockchip SoC, even-though the respective dtsi should used it for specific family of rockchip SoC. - Sometimes u-boot specific dts nodes or properties can use config macros from respective rockchip family include/configs files, example CONFIG_SPL_PAD_TO. So, it's better to compile the dtbs based on the respective rockchip family types rather than rockchip itself to avoid compilation issues. This patch organize the existing dtb's based on the rockchip family types. Signed-off-by: Jagan Teki Reviewed-by: Kever Yang --- arch/arm/dts/Makefile | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 8e082f2840..35cbbfabd0 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -65,16 +65,23 @@ dtb-$(CONFIG_KIRKWOOD) += \ dtb-$(CONFIG_ARCH_OWL) += \ bubblegum_96.dtb -dtb-$(CONFIG_ARCH_ROCKCHIP) += \ - rk3036-sdk.dtb \ - rk3128-evb.dtb \ - rk3188-radxarock.dtb \ - rk3229-evb.dtb \ +dtb-$(CONFIG_ROCKCHIP_RK3036) += \ + rk3036-sdk.dtb + +dtb-$(CONFIG_ROCKCHIP_RK3128) += \ + rk3128-evb.dtb + +dtb-$(CONFIG_ROCKCHIP_RK3188) += \ + rk3188-radxarock.dtb + +dtb-$(CONFIG_ROCKCHIP_RK322X) += \ + rk3229-evb.dtb + +dtb-$(CONFIG_ROCKCHIP_RK3288) += \ rk3288-evb.dtb \ rk3288-fennec.dtb \ rk3288-firefly.dtb \ rk3288-miqi.dtb \ - rk3399-orangepi.dtb \ rk3288-phycore-rdk.dtb \ rk3288-popmetal.dtb \ rk3288-rock2-square.dtb \ @@ -83,22 +90,32 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \ rk3288-veyron-mickey.dtb \ rk3288-veyron-minnie.dtb \ rk3288-veyron-speedy.dtb \ - rk3288-vyasa.dtb \ - rk3328-evb.dtb \ - rk3399-ficus.dtb \ + rk3288-vyasa.dtb + +dtb-$(CONFIG_ROCKCHIP_RK3328) += \ + rk3328-evb.dtb + +dtb-$(CONFIG_ROCKCHIP_RK3368) += \ rk3368-lion.dtb \ rk3368-sheep.dtb \ rk3368-geekbox.dtb \ rk3368-px5-evb.dtb \ + +dtb-$(CONFIG_ROCKCHIP_RK3399) += \ rk3399-evb.dtb \ + rk3399-ficus.dtb \ rk3399-firefly.dtb \ rk3399-gru-bob.dtb \ + rk3399-orangepi.dtb \ rk3399-puma-ddr1333.dtb \ rk3399-puma-ddr1600.dtb \ rk3399-puma-ddr1866.dtb \ rk3399-rock960.dtb \ + +dtb-$(CONFIG_ROCKCHIP_RV1108) += \ rv1108-elgin-r1.dtb \ rv1108-evb.dtb + dtb-$(CONFIG_ARCH_MESON) += \ meson-gxbb-nanopi-k2.dtb \ meson-gxbb-odroidc2.dtb \ From patchwork Tue May 7 18:21:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 357 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 9D9713F066 for ; Tue, 7 May 2019 20:22:20 +0200 (CEST) Received: by mail-pl1-f198.google.com with SMTP id d20sf9805373pls.15 for ; Tue, 07 May 2019 11:22:20 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1557253339; cv=pass; d=google.com; s=arc-20160816; b=m1xipFOApmP43XDIx6XzO0xdikEDwo96APgblfeDp0/bY9d4qkwKW+QcSpq2NsTPrq H0GSIJXvGynWBU4qVdIprMQ7d/dTAtIzPbXA221dQRgyR6Ui2vOT1287wAZtHYanL08O bEoZxqBpO5hQc8kjgVFIOk/ynUZxBC141swGQsTE4n3XAfHA6N9kpBsgjROuvjbc+m7N 39LoqEUGUj67xft6RAvicMvRfrQunBtSWdnYldQGq3oQAs05CIAnsStfBre3Cb+rxLDj CCz3FdZHE19gQPQbsgFAvipRTatZjwLWX/lF1qPTookmRA6HSpho7uWNvOfMq0+RFkbL hUmg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=c3EeZYt0nORRFv+2YuHH/t88R+ctRDbSYJQHlw4x6lk=; b=e1oE3IEv/ObIWVFsLVTBeGWc2d4xByEITWb+CTyw85vtvPj/mTlhWYdASIUox/B0mv Kuu1gOZYeFJgyh/VJp9mNjr3hcffz/Os7tuuzbdZLvMAF12Uc5l4N+tk2Z+jevyb9xdL uI5QCbHlBqmmWSXedhC5Et/k4oBvdyRfpGvhlzjH6gjKF7E0kSvLvEw6XmAVlu37Syqq hcJwdyZwcDEtR4SlukcXBM4hnTLYyX+1alxwDhSKn1pwASvweChEHSevtujhRMB4BG2J xTCbwyijk039dEjDOw3UuCtRArCPzgOw9zbQgeLOPEf/GxAaPF5ZAPfEHrP3qdHQzt2s VFEg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=DQ4GU8GT; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com 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:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=c3EeZYt0nORRFv+2YuHH/t88R+ctRDbSYJQHlw4x6lk=; b=lWXyQ9nNUu1sX1RIGZpNLC30Ow7Vq1AKdx1Opba02+lPvo04lsMw+PaxXUn3yxknM+ yA4RG9fP9d5u6XPDWm8IjuaIPwXDqOeqMezHjGZWciBPpxODnVGip9Ts9DU3B32NDq+k IwcZxFTK0c4RAsX42dlBWAyYRFTLSRWJkV+Xc= 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:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=c3EeZYt0nORRFv+2YuHH/t88R+ctRDbSYJQHlw4x6lk=; b=K/KwyISxTm1Rc94IjCMmPtcLxnaiYdgO0eErs9JD2GsKoCfjGbsEjiCEbKhc014znM EGBCJnAHZvwYHr2M3Q8a/jylQX0amD3oSeOMfAiXkgin+bCukpg5hU8B+TUJI2HYFWen CJ72gbkWYYFn5Lrt4OWUKHPfhV/80+TVLqujDiheMMJIdfG/smF+5Uy28eM5uzySHnM3 YX0Rzw+I4IbMF8bDKGbISnYePcS/5VJKm7ZE7A6n14Ch9lOD0boLNZOyjbzCtSTNCvpP iO2OdXSJmJXrP15WMfUOdggjfdpzgqTN2NwyjL05sXb8BfFyMWRb3IddvI2XqItWhmEM JeuA== X-Gm-Message-State: APjAAAVOqJiRmwAErVG0Xq7y1CBD2wZg+EnBr/8MzYIRSMyL5hceTXa0 PLhLndb10eTt+Mksfid1t/45Uiqx X-Google-Smtp-Source: APXvYqy0OhGMqNJKRuw8EAngMcltGXWLGjS1R0mVeAAGSF/4vusCjy9hkiai+UuPgw9vT7ea+1nMCg== X-Received: by 2002:a63:ed03:: with SMTP id d3mr16598425pgi.7.1557253339420; Tue, 07 May 2019 11:22:19 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a62:6a03:: with SMTP id f3ls1559988pfc.15.gmail; Tue, 07 May 2019 11:22:19 -0700 (PDT) X-Received: by 2002:a62:4d03:: with SMTP id a3mr1692096pfb.2.1557253339036; Tue, 07 May 2019 11:22:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557253339; cv=none; d=google.com; s=arc-20160816; b=MMPivyCEm/3iw6w+OLAtcyvFMsu3BLH9IaiyCqDH7KgjcriNlrI9p/RaUVeZYsXJMP 0bINZYF9JfJ1SZHO3oVW2hx2Ryk2P1KDYnxFPtpQ+l9OS/9hPp2Htw/Ts9VcM4DWifXf W6zXegcmVM3n8ZAQD+KjLA8UJzv9XBxMMDFEhijm9fTzUZjcu9xM7RxICH0wzGsO7eT8 lLMBtXRYABtg4Ftct0BnYOIB/QsDNJcgjyWXhQZ12RhuZFotFlDo+XGfKYoewpds7f2j FbxuQoSudxfSt2bDy3G8L1qoUzxhIfTvw/cV1L6DkfZMCQIQpfh5eKeIjkphUyncgo6h epwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=I3oK25qzqyp2gcaHrRbas53AaMxDcBHCsphtuUas6qI=; b=zyX9uzOy98l1ooZ+9aUmtFni3LPOawP/4gvgHKhJt34bLISvajyGBqP62jZCzw1Aiz 0re/RydHD4/y0LFsLjshvqsrH89r5Txo2HXPmYCQQuSowZ+5nVGhcli8SLUCrT05gVAp ePfaeEJbF5ePOICKiiEGyFIG1CeXwFF923jWttYqxe6AJpGfPV54mdnPvM1qqmhmW+Q+ Bh9ytSbpctRBmzRFRMnhAdqO7lcwZpC9MZ/FwP4wLy2jdw5jKZJmo6MGZtiPTeyABcxJ IntbS8NZbklsfsm6C1MjSQKuzY8wk5qpp+MLjYE+B2DPrIUgyMbfAqelYMzsacKLudqf Y0LA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=DQ4GU8GT; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id cl14sor16306075plb.30.2019.05.07.11.22.19 for (Google Transport Security); Tue, 07 May 2019 11:22:19 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a17:902:7c8f:: with SMTP id y15mr23012407pll.339.1557253338729; Tue, 07 May 2019 11:22:18 -0700 (PDT) Received: from localhost.localdomain ([115.97.185.144]) by smtp.gmail.com with ESMTPSA id d15sm18491568pfr.179.2019.05.07.11.22.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 May 2019 11:22:18 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang , Akash Gajjar Cc: Paul Kocialkowski , linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, u-boot@lists.denx.de, Jagan Teki Subject: [PATCH v7 2/4] arm64: rockchip: dts: rk3399: Add board -u-boot.dtsi files Date: Tue, 7 May 2019 23:51:50 +0530 Message-Id: <20190507182152.4254-3-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190507182152.4254-1-jagan@amarulasolutions.com> References: <20190507182152.4254-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=DQ4GU8GT; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Devicetree files in RK3399 platform is synced from Linux, like other platforms does. Apart from these u-boot in rk3399 would also require some u-boot specific node like dmc. dmc node has big chunk of DDR timing parameters which are specific to specific board, and maintained with rk3399-sdram*.dtsi. So, create board specific -u-boot.dtsi files and move these sdram dtsi files accordingly. This would help of maintain u-boot specific changes separately without touching Linux dts(i) files which indeed easy for syncing from Linux between releases. These board specific -u-boot.dtsi can be extendible to add more u-boot specific nodes or properties in future. Signed-off-by: Jagan Teki Reviewed-by: Kever Yang --- arch/arm/dts/rk3399-evb-u-boot.dtsi | 6 ++++++ arch/arm/dts/rk3399-evb.dts | 1 - arch/arm/dts/rk3399-ficus-u-boot.dtsi | 6 ++++++ arch/arm/dts/rk3399-ficus.dts | 1 - arch/arm/dts/rk3399-firefly-u-boot.dtsi | 6 ++++++ arch/arm/dts/rk3399-firefly.dts | 1 - arch/arm/dts/rk3399-gru-bob-u-boot.dtsi | 6 ++++++ arch/arm/dts/rk3399-gru-bob.dts | 1 - arch/arm/dts/rk3399-rock960-u-boot.dtsi | 6 ++++++ arch/arm/dts/rk3399-rock960.dts | 1 - 10 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 arch/arm/dts/rk3399-evb-u-boot.dtsi create mode 100644 arch/arm/dts/rk3399-ficus-u-boot.dtsi create mode 100644 arch/arm/dts/rk3399-firefly-u-boot.dtsi create mode 100644 arch/arm/dts/rk3399-gru-bob-u-boot.dtsi create mode 100644 arch/arm/dts/rk3399-rock960-u-boot.dtsi diff --git a/arch/arm/dts/rk3399-evb-u-boot.dtsi b/arch/arm/dts/rk3399-evb-u-boot.dtsi new file mode 100644 index 0000000000..7e2c57af22 --- /dev/null +++ b/arch/arm/dts/rk3399-evb-u-boot.dtsi @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Jagan Teki + */ + +#include "rk3399-sdram-lpddr3-4GB-1600.dtsi" diff --git a/arch/arm/dts/rk3399-evb.dts b/arch/arm/dts/rk3399-evb.dts index 9162f3dd50..a506e8da37 100644 --- a/arch/arm/dts/rk3399-evb.dts +++ b/arch/arm/dts/rk3399-evb.dts @@ -7,7 +7,6 @@ #include #include #include "rk3399.dtsi" -#include "rk3399-sdram-lpddr3-4GB-1600.dtsi" / { model = "Rockchip RK3399 Evaluation Board"; diff --git a/arch/arm/dts/rk3399-ficus-u-boot.dtsi b/arch/arm/dts/rk3399-ficus-u-boot.dtsi new file mode 100644 index 0000000000..eab86bdb30 --- /dev/null +++ b/arch/arm/dts/rk3399-ficus-u-boot.dtsi @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Jagan Teki + */ + +#include "rk3399-sdram-ddr3-1600.dtsi" diff --git a/arch/arm/dts/rk3399-ficus.dts b/arch/arm/dts/rk3399-ficus.dts index 4af0e4e383..4b2dd82b67 100644 --- a/arch/arm/dts/rk3399-ficus.dts +++ b/arch/arm/dts/rk3399-ficus.dts @@ -8,7 +8,6 @@ /dts-v1/; #include "rk3399-rock960.dtsi" -#include "rk3399-sdram-ddr3-1600.dtsi" / { model = "96boards RK3399 Ficus"; diff --git a/arch/arm/dts/rk3399-firefly-u-boot.dtsi b/arch/arm/dts/rk3399-firefly-u-boot.dtsi new file mode 100644 index 0000000000..eab86bdb30 --- /dev/null +++ b/arch/arm/dts/rk3399-firefly-u-boot.dtsi @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Jagan Teki + */ + +#include "rk3399-sdram-ddr3-1600.dtsi" diff --git a/arch/arm/dts/rk3399-firefly.dts b/arch/arm/dts/rk3399-firefly.dts index 46f2ffaf8d..a4cb64f8bd 100644 --- a/arch/arm/dts/rk3399-firefly.dts +++ b/arch/arm/dts/rk3399-firefly.dts @@ -7,7 +7,6 @@ #include #include #include "rk3399.dtsi" -#include "rk3399-sdram-ddr3-1600.dtsi" / { model = "Firefly-RK3399 Board"; diff --git a/arch/arm/dts/rk3399-gru-bob-u-boot.dtsi b/arch/arm/dts/rk3399-gru-bob-u-boot.dtsi new file mode 100644 index 0000000000..9edb8cf841 --- /dev/null +++ b/arch/arm/dts/rk3399-gru-bob-u-boot.dtsi @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Jagan Teki + */ + +#include "rk3399-sdram-lpddr3-samsung-4GB-1866.dtsi" diff --git a/arch/arm/dts/rk3399-gru-bob.dts b/arch/arm/dts/rk3399-gru-bob.dts index 0e3d91fc28..1ee0dc0d9f 100644 --- a/arch/arm/dts/rk3399-gru-bob.dts +++ b/arch/arm/dts/rk3399-gru-bob.dts @@ -7,7 +7,6 @@ /dts-v1/; #include "rk3399-gru-chromebook.dtsi" -#include "rk3399-sdram-lpddr3-samsung-4GB-1866.dtsi" / { model = "Google Bob"; diff --git a/arch/arm/dts/rk3399-rock960-u-boot.dtsi b/arch/arm/dts/rk3399-rock960-u-boot.dtsi new file mode 100644 index 0000000000..5256f6d3f2 --- /dev/null +++ b/arch/arm/dts/rk3399-rock960-u-boot.dtsi @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Jagan Teki + */ + +#include "rk3399-sdram-lpddr3-2GB-1600.dtsi" diff --git a/arch/arm/dts/rk3399-rock960.dts b/arch/arm/dts/rk3399-rock960.dts index 25c58b4261..7e06bc97e5 100644 --- a/arch/arm/dts/rk3399-rock960.dts +++ b/arch/arm/dts/rk3399-rock960.dts @@ -5,7 +5,6 @@ /dts-v1/; #include "rk3399-rock960.dtsi" -#include "rk3399-sdram-lpddr3-2GB-1600.dtsi" / { model = "96boards Rock960"; From patchwork Tue May 7 18:21:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 358 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 4A66B3F066 for ; Tue, 7 May 2019 20:22:25 +0200 (CEST) Received: by mail-pf1-f200.google.com with SMTP id 17sf10722249pfi.12 for ; Tue, 07 May 2019 11:22:25 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1557253344; cv=pass; d=google.com; s=arc-20160816; b=BnD4/vc9gIAYaM/5SQAMz3edMBp8sCODYTi9jXIQ8raV/iugy9sFj+pqhy/ZSG//hT joHSQAUhbUZ8R5b2TjrpGxGU2oAT6Q+/HqIyjxf15spexwu1bOpqCjEuvbAvYdNFsdit 6l47pHI+cOvtB5DNngm2Pvg900V2ZSwh2QBCwjZAadoTh6ZkqL0B8TFbgAG7O6rT03JH jk3rssCLEK1vEEh32sDojZbrE1HGNuC+wzrwI8E2yVXKh4ZB7dM1L6oitLJumOchRIWs e7HR4yjGvMQOnaXC0GVJj4d7qoNpBJKfZ0rpzFL8JpdCds4MUIhLKrGqeUHwkvMKYDgU BjVg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=j4GY1IHzBFJtHWmWANspoIY2/MH3j6XWyu7SfmnWQkI=; b=Gpm61Txlmv/TkGg4r4le08P5y9Trf4RIL+1lWK1H75hW20NppAlvlaxByFRA+Jd9xv mzCDI7d1AGQK/h/Z1DAJYrjFSNggLHEFxHn2P8uriUZWPl1qg6g95C6zUyHo/lxBrW20 6UXbvz1UO4RfdSJ8uCu7NlsVhjNGHQkr+wuTOrB3odoIECeuS1h2jM4axxyep0hIuGYl wsxIqdOmPq0JgyZJtFcaUgwFcT5/kQGQn3WxrbV2F0motdLFkVFTxC7GC8sfpQGvGRCZ Z3FYMibA9TqpEKeL6QQw4j0sG09XH2vVjNnGxioPbyr5junybM/o5C9gdwSQ5mVPTMbD PRZg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=cs1JhiQp; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com 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:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=j4GY1IHzBFJtHWmWANspoIY2/MH3j6XWyu7SfmnWQkI=; b=Kp6XCE3PvA/mm/imqZGYLRhpE5B/JbDs/o5aNG1gG9i1VQOm2YvHnPsCd6ggRvbOoA y2SDQTg1vlSxHITq/JviEJqIgwOFhHW3JlSE+XNnpL3e8t4AdI5qYDwI4CyKOjgdyatU KnYZVTUXzqB7q9bgcaUce77BEGClWAHOmy7vI= 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:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=j4GY1IHzBFJtHWmWANspoIY2/MH3j6XWyu7SfmnWQkI=; b=om3j82lrJLpc15ej99GeGhAkJuhT6dOCnhbfdFEYEyQ4M3shxxQ+zIA6uqiscTNq7F IiWQ0iFLGQfcMlBTK8YQe0YCKKtay1oi4VuaO97e/EJwE2c1tpnjATtNBwS2HPWCqTXf bBO3ePJanzhpY/nejsRS1QpY0JosTY8pWoTluJQcx0x5DUfH6hb9O5eBBFNBH0ixEX4U NdzUzu+gS7IC+Y2C91y5BV2UR8fr0fnExgcLHnW4XTjrEZWmn9uXIx4i9xMX2KX0ox80 P/wsrQyAvyOo6JVXJDsXUlKB/j5f5edxnFeYOVxFzlBameu07lCu+ct3Hq4F6GQIJox8 mXWg== X-Gm-Message-State: APjAAAU6XrbsjFFDahuf7Qms9QUArZK4PQU4U/lzkho2q9GTkh0UxuAj cCa1hfedaNJ7qyGWdw61lEV6h6PA X-Google-Smtp-Source: APXvYqz/HDiHBOl3YZjEjq+qD41SyF2uwpvUeEvDIolqIJbCTxq7D1O8/LinS88Z15f2Cl2iGL2lng== X-Received: by 2002:a63:c14:: with SMTP id b20mr40695782pgl.163.1557253344083; Tue, 07 May 2019 11:22:24 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a63:36cc:: with SMTP id d195ls1714369pga.6.gmail; Tue, 07 May 2019 11:22:23 -0700 (PDT) X-Received: by 2002:a65:6289:: with SMTP id f9mr3327481pgv.380.1557253343247; Tue, 07 May 2019 11:22:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557253343; cv=none; d=google.com; s=arc-20160816; b=n9tgvaREhCx8tfaM81avU4TyP616N0JN0LJrKIL0SmUu+yr0l+nUYRiYmgSiyRolFL iU1Ze0mP4+WalI1VD1AiLZpuW2AY3HnJ2AbpRtGnoSm/1i0R9qiWpPM6vXTIBWAmTOCH /oPOlVPRGfeIwKf1jkqksnIPaQ7YhXAIjzAwJx/M+TXw2ccjuAMV7MFwNWoICS2PgHz7 /K9oJ9asAFz7IWT0XSH+SeXoVhnvq4NZA+zJiEN+ngariBDPuDNXxSopsEl+Uqp2i9He ne875Xe5qzTGyJ+/Vo8vKtDRivVKjMvkpPPaVrgMxnT4cN+XFIS4nMpmarcm25tTmcsE PTcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=xl42gez31+v93o6g0rhaZH7Knkp5dAag+f3Jzth0yO8=; b=tDedE+CX8N+Et9Ulahp0Fk6QUrUzdT+IU/TB3drLElRL5ZtS2uuAdm112snSaoCRtX HhYHo0TlatFZjUpwncZP6xiI9JjThI6euq4AzejLoHeb7D4uO3RiajSuxwSeCVTdB7QL egR9vud21Y2R0CxO4LwwxbThR02z6Fezt4/VY59P7pXffbcvvgOE4i26Fvztfw2EFYtM XQy/0z9CJfnG6vHT2scLwMqgkWCNKSUEk6OF08F5gxAoGUiBmb28H2Ys9AX/1MohTnrt e5QKY5Ka2IYxYf6//FSQ02Glcq0OHLH3YemaEBFJqdK50ABIyKNZD4L2bu7lIBQ2QHGC 5jMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=cs1JhiQp; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id p7sor7338768pls.43.2019.05.07.11.22.23 for (Google Transport Security); Tue, 07 May 2019 11:22:23 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a17:902:d88b:: with SMTP id b11mr21313314plz.186.1557253342798; Tue, 07 May 2019 11:22:22 -0700 (PDT) Received: from localhost.localdomain ([115.97.185.144]) by smtp.gmail.com with ESMTPSA id d15sm18491568pfr.179.2019.05.07.11.22.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 May 2019 11:22:22 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang , Akash Gajjar Cc: Paul Kocialkowski , linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, u-boot@lists.denx.de, Jagan Teki Subject: [PATCH v7 3/4] rockchip: dts: rk3399-u-boot: Add u-boot, dm-pre-reloc for spi1 Date: Tue, 7 May 2019 23:51:51 +0530 Message-Id: <20190507182152.4254-4-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190507182152.4254-1-jagan@amarulasolutions.com> References: <20190507182152.4254-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=cs1JhiQp; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Add u-boot,dm-pre-reloc property for spi1, so-that the subsequent rk3399 boards which boot from SPI. This help to separate the u-boot specific properties away from base dts files so-that the Linux sync become easy and meaningful. Signed-off-by: Jagan Teki Reviewed-by: Kever Yang --- arch/arm/dts/rk3399-u-boot.dtsi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi index f533ed95eb..0786c1193a 100644 --- a/arch/arm/dts/rk3399-u-boot.dtsi +++ b/arch/arm/dts/rk3399-u-boot.dtsi @@ -6,3 +6,7 @@ &sdmmc { u-boot,dm-pre-reloc; }; + +&spi1 { + u-boot,dm-pre-reloc; +}; From patchwork Tue May 7 18:21:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 359 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id AB86D3F066 for ; Tue, 7 May 2019 20:22:28 +0200 (CEST) Received: by mail-pg1-f199.google.com with SMTP id h14sf10772747pgn.23 for ; Tue, 07 May 2019 11:22:28 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1557253347; cv=pass; d=google.com; s=arc-20160816; b=QQI46ez7Tbo+usz58Z2XwkAThVBJMGnWiaqxb3RQxdMHvY9Ds7qp5N+ujTVI5QMXpI S1J5EUpGEaeW0YLbrjTynZGRQq+oCBmZiHyFPQkbU8iw1OzhTiuDxKfw7bVRFSHQTCDU eq3nD/8WXjfpiG6cgDFpAOpK4TqnX8bdYjaO9E3gsnXFAI9N22XeRFsqTFYi83Qm0rMd 2MWXLhhkHepp8N+ZquLQWHwmNxkoz0xhWufFJyNdfbxHaQ8WHEN9Mb4LatDHLdWT/imT ZieaEtLkukT27TuJcLRiV9i7ahZgPJwLlM4WDpW3IH61jX3YBOaGmKcMKwW6LzvY5ZbB Bmuw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=eW1Ivl9i74+DO2C4f8eS+mVJpJnQvR7oCfLRT1/kXGQ=; b=nH3hakrnEMekx+4Yedin54ArMVHfyVIHNZZyxr2MtrieGT03TynANFcR4XhzfsdCP6 CDRn40+2t6Vw7qqezlonCWTQWwl/0wIDRsrEn0jBS438aGGjjKA2Q6Te4UyFXDos+z8b NmzzBD4rqfoBitNNXNdeJAEMzCUQZDjffUTzNSNtR7jq7AMUl2MvIEzdFQmVuABNUkZU 7IYjx6CquzbBwpLeUu16RzZjtSliTIoi9Luh0Ujnkw9/v4sBvxVUedNNO5Dg0dzhSrLf gbbK4j1cp7mPPzrf3iurQNPLDI6SsVqszyEian8N/AtXnjP5qdPOIZynF1Pdw0tiTeEh K/rQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=KEPQv+4N; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com 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:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=eW1Ivl9i74+DO2C4f8eS+mVJpJnQvR7oCfLRT1/kXGQ=; b=b2yeyur9y00O+TIlrJPrSeWHZURxZTUy9uvd2xUm30/vzo/u2pm7xgo7yAaTK1X0ct jy/N4W9vGvyhHyYCNxjb3mkHouK+sFv7Eal88XSvzQWywfovySz6MgZB0LtpA0SJkhD/ DKGuf/kYM02Bu5HDQklbaXCIHJOQb9TOGu5qU= 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:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=eW1Ivl9i74+DO2C4f8eS+mVJpJnQvR7oCfLRT1/kXGQ=; b=jka0aqMRRjMwPcpV85whePmvXjPhsaoWtuqhGRM2AFLWxMaoZlERhnen9ZzbYM0jpO KX82stxZBkvqRtqtVoU3JFcaq4FCwifFLVmDUZJbCFyPEWMP9j1l+EX57TsqPjALo1lT 8omPrP1aSBB7t8+dTfJMwtIznAHjKWo4zcDIo9aKNb6H5NfHh2/IU3UlJWj5uU4IUJBD OkdUUoCdlccdHPqRwO4U/WZ1KZfwkn+TPOwn7sfZd1+lfFpUQz0HjOhmFXybhB/UOqJr u8y2Sx9klRM+rYL6RUwMYmgNltHWh2WYixfRHE8CjZZBHrqgrLE8CNj+j4VCCguvluR1 HvjQ== X-Gm-Message-State: APjAAAXp+9KW7nGOjnrxGd3zGHsQQ+ShYh89nyY38o4vPGglJfIRys0B qh220UJ4eizxcTcyVCpDyVhv40Pw X-Google-Smtp-Source: APXvYqyy93PM8wocPJO6m/UFj+6OouTJHgcN9gT9oImz+WcwjbVUQqMXoVKz498i0NuhrT98u6tNpQ== X-Received: by 2002:a17:902:7247:: with SMTP id c7mr21757884pll.65.1557253347492; Tue, 07 May 2019 11:22:27 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:902:868e:: with SMTP id g14ls4292567plo.15.gmail; Tue, 07 May 2019 11:22:27 -0700 (PDT) X-Received: by 2002:a17:902:b10c:: with SMTP id q12mr42538059plr.254.1557253347120; Tue, 07 May 2019 11:22:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557253347; cv=none; d=google.com; s=arc-20160816; b=o/C0UxdGeKPe7wkcNp/R5Fao9dQFuZ6BJQq35Tq9BQVfszu7gyATjrlD/KLySpcfGB cjXcOIjMwXDI/iadWh1LI2F7MbaZT7rI9yTR7xJsfg19qY+dCy1M2NNn06Nespmnikhx W1GrrNOPuYKDeupuN0Zrgf9/cTd9ZFmAuqOaQnPMHkpIR+yrANjsoqJffFMz3hI78Q00 bfw+64rCHEJe+jiBlE0m/z3mQD0EbXUcxab764gza5I4iIrVUzTYs/wDnC6GDbOH2Z1m O1IfcqbqCNrHJNHF7lVGSVLkP2Jv+iEyj0/lpihvNRQlxAyeVad9B9SeV0xW6w1M/KpV rLPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=0KtfW3TKs04iSgV5KPgv8zThhCUdoKHESc98JGCWyiY=; b=AOHcW1JHvqaz/RjGYr7C6wnx4qdXPC12Gr020Gm/h7Qep6JPJzfFNuf68/vroh+ZNH uDd7ayYvEUe6yBzw5l8hQs3RH7NO5pARg/KvHIzAACcL+8NXNPryWEHLVp99RJwJ6FYF Mhsg2MfsiftXayoCt3cXtwZSnThTgYEBHszZA5+jD/wUW38CuAI2lqbdAc1Iin51psLQ a3EtM6tNIHevj9S+GPLnnY/n1vLgBfEwfpRzzyrZnDZJIoPcmjZ7K5F+7HbN7JlOR3Aq CcBj0WitN9G9fKP/T+XmOoRCr7qx8fMu8y13ga5mK24eq7X9rO9HzKfCMkTQPd0bmolW kpgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=KEPQv+4N; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id t10sor16724911plq.14.2019.05.07.11.22.27 for (Google Transport Security); Tue, 07 May 2019 11:22:27 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a17:902:7e4f:: with SMTP id a15mr5507082pln.205.1557253346781; Tue, 07 May 2019 11:22:26 -0700 (PDT) Received: from localhost.localdomain ([115.97.185.144]) by smtp.gmail.com with ESMTPSA id d15sm18491568pfr.179.2019.05.07.11.22.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 May 2019 11:22:26 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang , Akash Gajjar Cc: Paul Kocialkowski , linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, u-boot@lists.denx.de, Jagan Teki Subject: [PATCH v7 4/4] arm64: rockchip: dts: rk3399: Use rk3399-u-boot.dtsi Date: Tue, 7 May 2019 23:51:52 +0530 Message-Id: <20190507182152.4254-5-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190507182152.4254-1-jagan@amarulasolutions.com> References: <20190507182152.4254-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=KEPQv+4N; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Now we have - board specific -u-boot.dtsi files for board specific u-boot dts changes. - soc specific rk3399-u-boot.dtsi for soc specific u-boot dts changes. So, include the rk3399-u-boot-dtsi on respective board -u-boot.dtsi and drop the properties which are globally available in rk3399-u-boot.dtsi Right now rk3399-u-boot.dtsi has sdmmc, spi1 u-boot,dm-pre-reloc property and more properties and nodes can be move further based on the requirements. This would fix, the -u-boot.dtsi inclusion for evb, firefly, puma boards that was accidentally merged on below commit. "rockchip: dts: rk3399: Create initial rk3399-u-boot.dtsi" (sha1: e05b4a4fa84b65a0c8873e8f34721741fe2bc09d) Signed-off-by: Jagan Teki Reviewed-by: Kever Yang --- arch/arm/dts/rk3399-evb-u-boot.dtsi | 1 + arch/arm/dts/rk3399-firefly-u-boot.dtsi | 1 + arch/arm/dts/rk3399-gru-bob-u-boot.dtsi | 1 + arch/arm/dts/rk3399-gru-u-boot.dtsi | 6 ++++++ arch/arm/dts/rk3399-gru.dtsi | 1 - arch/arm/dts/rk3399-puma-ddr1600.dts | 1 + arch/arm/dts/rk3399-puma.dtsi | 2 -- 7 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 arch/arm/dts/rk3399-gru-u-boot.dtsi diff --git a/arch/arm/dts/rk3399-evb-u-boot.dtsi b/arch/arm/dts/rk3399-evb-u-boot.dtsi index 7e2c57af22..20910e744b 100644 --- a/arch/arm/dts/rk3399-evb-u-boot.dtsi +++ b/arch/arm/dts/rk3399-evb-u-boot.dtsi @@ -3,4 +3,5 @@ * Copyright (C) 2019 Jagan Teki */ +#include "rk3399-u-boot.dtsi" #include "rk3399-sdram-lpddr3-4GB-1600.dtsi" diff --git a/arch/arm/dts/rk3399-firefly-u-boot.dtsi b/arch/arm/dts/rk3399-firefly-u-boot.dtsi index eab86bdb30..67b63a8352 100644 --- a/arch/arm/dts/rk3399-firefly-u-boot.dtsi +++ b/arch/arm/dts/rk3399-firefly-u-boot.dtsi @@ -3,4 +3,5 @@ * Copyright (C) 2019 Jagan Teki */ +#include "rk3399-u-boot.dtsi" #include "rk3399-sdram-ddr3-1600.dtsi" diff --git a/arch/arm/dts/rk3399-gru-bob-u-boot.dtsi b/arch/arm/dts/rk3399-gru-bob-u-boot.dtsi index 9edb8cf841..726f396f32 100644 --- a/arch/arm/dts/rk3399-gru-bob-u-boot.dtsi +++ b/arch/arm/dts/rk3399-gru-bob-u-boot.dtsi @@ -3,4 +3,5 @@ * Copyright (C) 2019 Jagan Teki */ +#include "rk3399-gru-u-boot.dtsi" #include "rk3399-sdram-lpddr3-samsung-4GB-1866.dtsi" diff --git a/arch/arm/dts/rk3399-gru-u-boot.dtsi b/arch/arm/dts/rk3399-gru-u-boot.dtsi new file mode 100644 index 0000000000..7bddc3acdb --- /dev/null +++ b/arch/arm/dts/rk3399-gru-u-boot.dtsi @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Jagan Teki + */ + +#include "rk3399-u-boot.dtsi" diff --git a/arch/arm/dts/rk3399-gru.dtsi b/arch/arm/dts/rk3399-gru.dtsi index 4cdb4320b7..ca0fc391b2 100644 --- a/arch/arm/dts/rk3399-gru.dtsi +++ b/arch/arm/dts/rk3399-gru.dtsi @@ -545,7 +545,6 @@ ap_i2c_audio: &i2c8 { &spi1 { status = "okay"; - u-boot,dm-pre-reloc; pinctrl-names = "default", "sleep"; pinctrl-1 = <&spi1_sleep>; diff --git a/arch/arm/dts/rk3399-puma-ddr1600.dts b/arch/arm/dts/rk3399-puma-ddr1600.dts index 337e0eabb4..42763f82d0 100644 --- a/arch/arm/dts/rk3399-puma-ddr1600.dts +++ b/arch/arm/dts/rk3399-puma-ddr1600.dts @@ -6,5 +6,6 @@ /dts-v1/; #include "rk3399-puma.dtsi" +#include "rk3399-u-boot.dtsi" #include "rk3399-sdram-ddr3-1600.dtsi" diff --git a/arch/arm/dts/rk3399-puma.dtsi b/arch/arm/dts/rk3399-puma.dtsi index 319a610022..897e0bda85 100644 --- a/arch/arm/dts/rk3399-puma.dtsi +++ b/arch/arm/dts/rk3399-puma.dtsi @@ -647,8 +647,6 @@ &spi1 { - u-boot,dm-pre-reloc; - status = "okay"; #address-cells = <1>;