From patchwork Fri Feb 2 13:05:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 769190 Delivered-To: patch@linaro.org Received: by 2002:adf:9bca:0:b0:33a:e5bd:fedd with SMTP id e10csp898058wrc; Fri, 2 Feb 2024 05:06:19 -0800 (PST) X-Google-Smtp-Source: AGHT+IEc1+537joMZ0GlDr35oo7q1eLDS/vTb2V3Eva2iqN+1p6/R32Ke63cEdlZIzJfqQW0i1Oh X-Received: by 2002:a05:600c:1989:b0:40f:b37a:a7ee with SMTP id t9-20020a05600c198900b0040fb37aa7eemr6227580wmq.41.1706879179032; Fri, 02 Feb 2024 05:06:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706879179; cv=none; d=google.com; s=arc-20160816; b=CiCJ1Ks1KiI4PIRQL07KVUrvDEyhSqzOmAkqUfrG+/mu4idM7NLDD8lKqgfERT8/ip TlrLbHFVaAq0rXfbrJuHiP+xWCOw9KoMG1N7zYgGUmIfTlJkG8bUuVUE2Yxjcx3TYq27 p2mPeIbAsqy9sEj23hj1YEw5i3Of4XRKomfWReocjv+LnlLy8id4WCy2eYoPpg4MYy3s QLOJou/o6yyxOx2uZdMnJdvbC//XURG3WoaaxZPT/fRa9zT0D7YxulACGsckiTSQ8fxO 8YApBSDQA5ZtjJi2X9nci9dZcmJmr8OG161iDnC8ANBxXGXW/Ayg+4+UUkIk54dSfN9y esew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=sfNK3eknAcYyOfZsqNMY4CG6zYLXXInt8BiOHB+Nmcs=; fh=ing+V1TiNOgD/MvxTZ7rORmEhEmNlpVYAf+Xfx5ubXw=; b=0bJKyYbjXT1Fi54Oc8vY/mqiHeiTeLBJETkz+XrL02x7pA+dEsrnJ+iBcXShihiKOM yPflpswGBwB2W5Os5tTI4Dc9+24gO1K/IcFW/QWiHEEs+FNv6hIqkEFvZy0QGqC0Q2co exJGRwrBLS8MxJ6SndXhaFN7uuGtDf3FbO80cLtZmHhC3UWaRR8ASjUF5tqS6wxntLl+ Ex8hLp0POoAO+EK3s7tuxRQB7x4WISNPhKoel2BiZ+cjF1VC4vw3k+sf8QF7f0+j5KL8 VE6m0LNVWQhI2qovxcZHenheW39Q2EBnhFiPeokir2+9962hhT7WPCzYpLumaNR0/ViH OtYw==; darn=linaro.org ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DnWHIQkU; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org X-Forwarded-Encrypted: i=0; AJvYcCVLCcGpnfbaeP7eKFnuUzXSMEvJPpQLrApm195PnJpSb8zzIXac81R2qsQUxJu4iVnmmuqsyUmsA3t7QtIvnjiZ86K8oxDTR5un9idUvU9qp0ivncMiVAzLY9UjMTejqGiVPwiXA9+tDi+eWPkeePsmKUw7cwvuVndwYeHVf1vy2Xe5kVaS9Ir409ASnnm/gSvQQujFaIYlHGFhiOPZyFSC0K3OmCfxxnj19uT5ub1/5OinrRyEhcmlBMtAFseIvnqzV3mpZQUiq8xfAoVv0rtHlPPURYMdgf4gtD6mBzT9VXEwPBsSa8vzEKUHqcXb77s77L5rfWlMIgGHod9+fQViOYl5e//ZrKAxoc2xZ0v4EsbCpMLAbi8v65kJoYWhwf5/y8VVMZw0xll5Zr+p9bqilzj2PAM9segwByg34zfPn8SOp7HQwKdUALIgzE2bx4RHsMQ7/DxcCZuoVCDdgbMn80dNoNPQJcG3sIXzPnTdYDCZ5j4wz4SI/OhhSpeCrQc+UcCzBxY93qNZRpUwdON5vuAqCIydbPjx+r8SKGQ7FMGBp9iKrF7K2pnY/jxqdh5ZpK+I7sxU/qETwJMkyOMgFkV2PpIATUt/8X3fCDcXt4GljOQqeJA21sbo5Y2hmrOn0cbpF+l6PdMqsxxAfjoWJKDkdka78PIluYRvXvkjL+ON1V74pyj1otdQnXrRCW7R76RAa30AARjs/I+uHg2FJM5IcXvRzYF2HRwfe9+IqFpx0EMaTM547sXFFCr54GeXjMGbQspx/Y+8cukGVqyOZ1KsdVG8RhNv0/8MQnS3H82S6wk6MPZex/44TF2GlFRsRgbeCE623A== Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id m27-20020a056000181b00b0033b13a4e14dsi976178wrh.577.2024.02.02.05.06.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Feb 2024 05:06:19 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DnWHIQkU; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4545287CA7; Fri, 2 Feb 2024 14:06:12 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="DnWHIQkU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 35C8787C7D; Fri, 2 Feb 2024 14:06:11 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: * X-Spam-Status: No, score=1.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_SBL_CSS,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.2 Received: from mail-pg1-x52d.google.com (mail-pg1-x52d.google.com [IPv6:2607:f8b0:4864:20::52d]) (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 D3A3087C7B for ; Fri, 2 Feb 2024 14:06:08 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sumit.garg@linaro.org Received: by mail-pg1-x52d.google.com with SMTP id 41be03b00d2f7-5ce2aada130so1866752a12.1 for ; Fri, 02 Feb 2024 05:06:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706879167; x=1707483967; darn=lists.denx.de; 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=sfNK3eknAcYyOfZsqNMY4CG6zYLXXInt8BiOHB+Nmcs=; b=DnWHIQkU5RaFgemPUprkUMQ/lUoq5X3IGlzsnxgiSvFgLJQxYkhtrNHQtGCc/SGp9y R9nUw073Om9auVVacSnkKHl/J+33/zqItZ0hUKaGPsR+gb9oQ7Dpc2sa5Z4wJZJtw8r+ QwyYvwG6ru1BhSVH9gpNyZifaUyKYbJJ/CdHr1Z89XfEw6h2leQiX3894P1rVW3urnVe rWrlUi8ANilKZz8Khru8l04dyavPNQLvo0HWl7Us6CNbQzXbzkhVrqdXgx1t8R7qLoYh JRCY0FYGB+O2Urxk/cQHBSLbBd7YPwdM4o73yoXYZGY8XqVtKlxUELslduFfhKT66Ve/ zJTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706879167; x=1707483967; 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=sfNK3eknAcYyOfZsqNMY4CG6zYLXXInt8BiOHB+Nmcs=; b=ZiLsYyZJgnuEiyEpcXpZj/CgYzj07cl5M810nnPtbuBHA7nAqSJv3602sm6C2QkyGO /HkCfspbXOFZhlkbx9HNvaWTqHikVGKdCUvUPnaFrCn9lNqpDPxI1kHpVgsaBov+cc8t dNwc8ubIDFJp7iwMsWDIbQWhd2zoHG88cDKRnUeBWENtPmKuHLZf+IXJSRlPQ5Wu4tH2 RR62j9cUzsomMOP0uXjVO/QW0IwKY0Tfzb4lTgLP9RaOQUQ88QXikfKHAMC1c/1Xf+zg k6y/W5XqRVqv4I3VpSw8mQTBMXo0iPmTFZMcW3evO6XsySh2k1oZf4AfCGvKW5hNCI2Q /ORw== X-Gm-Message-State: AOJu0Yx6bOZcebZFUkler/QS4hhmgk6mE0Ci9an5yeMB53Ib5cFj6uLL b4QbTIAxnJ/V4RD0m+B6XvGGp7pYM4EJR6kNgBqvXqrMUd+GCat4VfWbWQjnlLbFBUwLJbDWkCo rnys= X-Received: by 2002:a17:902:d2d1:b0:1d9:8222:e723 with SMTP id n17-20020a170902d2d100b001d98222e723mr236050plc.26.1706879166794; Fri, 02 Feb 2024 05:06:06 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCVteO+wGyE7gcguaCKkECiv/k47QJKRmESOXPQ/DkoxXiuP0bq5B+JuJL1tLWpitcuaV/nDETbi1762oxkPmlwwouOSnd1bHvHmFwHOxVb3yBWvu7gqxj8Kti8Yvdim7xlWxHpJTJ4uFFwgw061lMR6NMVY3CPDrku0Bjo7+lXctc4N2YuMjpcUem8dISpVdyIwuYqjlwKd3Sos6riOLmcYpQ090fYPJFEPsz8mKmbuPyrwY0rNJFNsqiG7cU6lVbhiQawgLFo2i2o6N1CwkSMepUjrjZMwSut104qhgll6CuY4rvcOEKGj90+prh6SqstYvMa+Mjx4BLtMA35AeCrRIUwJrBeVeSroRhznKYQobyMSkwTDxsGYnwxG2Mw7ro2Lmkiziu7oKLB0MDaPK+xoOGeXmAzxNzbB3RpNOgvb2Wv8zbnmZvXZaL4d/u2kUweamMhwNTBSTPFzZPZhekT+RtayaiiOW8MToSS6FAeuRgEClmxVHRzfciIhwas6+TSPnAC62bMS79ESOc6WU/Ok923zidvqhKa8w9LoLmNUaa1apKLOWS+PTohULjoEaWhMXbwRLxQDMZJyuy9+LHCdiVl2mvTwxLT4sIQo2N2vG6+1VEoBs2Mp/9Fnv/YOohTd7z50L8UO0p2hbSy9MwzL7YWzhvmWhuE3cXYwCx/xZ5q0zDYeia4tuT3wc9/B59i+CqK00anqxzdH2dcxxMrKmm4maW76EORLjsVhvOfkNghX1wHKb57vuUqOWZVJxTCvZ84b/9ZPPnV9ncXR3XBDN4Ahw+VI3DNYX+Gel+5GtDvDytnKplMqwDBNVVrrcfqpK+f/65R636b/XG2GSBiRQm/BgFvVBOM242Rp32K4YlTNyeybWbwzsgRGoyXu8pCJ0yp/QV/wDEnmS3oyc/BYkooxeNLzQ/dm Received: from sumit-X1.. ([223.178.213.44]) by smtp.gmail.com with ESMTPSA id q23-20020a170902edd700b001d923684323sm1542407plk.195.2024.02.02.05.05.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Feb 2024 05:06:06 -0800 (PST) From: Sumit Garg To: u-boot@lists.denx.de, u-boot-amlogic@groups.io, u-boot-custodians@lists.denx.de Cc: trini@konsulko.com, sjg@chromium.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor@kernel.org, neil.armstrong@linaro.org, caleb.connolly@linaro.org, ff@shokubai.tech, daniel.thompson@linaro.org, dgilmore@fedoraproject.org, pbrobinson@gmail.com, ilias.apalodimas@linaro.org, b.galvani@gmail.com, xypron.glpk@gmx.de, michal.simek@amd.com, seanga2@gmail.com, rasmus.villemoes@prevas.dk, peng.fan@nxp.com, jh80.chung@samsung.com, rfried.dev@gmail.com, marex@denx.de, mibodhi@gmail.com, bb@ti.com, mark.kettenis@xs4all.nl, festevam@gmail.com, nm@ti.com, andre.przywara@arm.com, Sumit Garg Subject: [PATCH v5 01/11] CI: Exclude devicetree-rebasing subtree for CONFIG checks Date: Fri, 2 Feb 2024 18:35:24 +0530 Message-Id: <20240202130534.1051438-2-sumit.garg@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240202130534.1051438-1-sumit.garg@linaro.org> References: <20240202130534.1051438-1-sumit.garg@linaro.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.8 at phobos.denx.de X-Virus-Status: Clean Since devicetree-rebasing is an external repo with its own coding style, exclude it from Azure and gitlab CI CONFIG checks. Reviewed-by: Tom Rini Reviewed-by: Ilias Apalodimas Reviewed-by: Simon Glass Signed-off-by: Sumit Garg --- Changes in v5: - None Changes in v4: - Switched subtree to be imported as dts/upstream sub-directory rather than devicetree-rebasing sub-directory to better suite U-Boot directory structure. Changes in v3: - Picked up review tags Changes in v2: - excluded gitab CI config check and added commit description. .azure-pipelines.yml | 3 ++- .gitlab-ci.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index e2646783ee62..1d73215afbae 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -65,7 +65,8 @@ stages: # have no matches. - script: git grep -E '^#[[:blank:]]*(define|undef)[[:blank:]]*CONFIG_' :^doc/ :^arch/arm/dts/ :^scripts/kconfig/lkc.h - :^include/linux/kconfig.h :^tools/ && exit 1 || exit 0 + :^include/linux/kconfig.h :^tools/ :^dts/upstream/ && + exit 1 || exit 0 - job: docs displayName: 'Build documentation' diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 278a2e2bbf31..8bfbadd6c89f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -161,7 +161,8 @@ check for new CONFIG symbols outside Kconfig: # have no matches. - git grep -E '^#[[:blank:]]*(define|undef)[[:blank:]]*CONFIG_' :^doc/ :^arch/arm/dts/ :^scripts/kconfig/lkc.h - :^include/linux/kconfig.h :^tools/ && exit 1 || exit 0 + :^include/linux/kconfig.h :^tools/ :^dts/upstream/ && + exit 1 || exit 0 # build documentation docs: From patchwork Fri Feb 2 13:05:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 769191 Delivered-To: patch@linaro.org Received: by 2002:adf:9bca:0:b0:33a:e5bd:fedd with SMTP id e10csp898168wrc; Fri, 2 Feb 2024 05:06:29 -0800 (PST) X-Google-Smtp-Source: AGHT+IGjRM4M9ZxJ7wBJ5WSHvJaiYaJVH7oMphyb+JBL2n0cTlgRTSfdTBssiU0PlgNURy7bTAvY X-Received: by 2002:a5d:65c5:0:b0:33a:e8fd:f43 with SMTP id e5-20020a5d65c5000000b0033ae8fd0f43mr1232696wrw.6.1706879189384; Fri, 02 Feb 2024 05:06:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706879189; cv=none; d=google.com; s=arc-20160816; b=X8pCLRichN6jYoHT/ZNJZvG5ft9+kY4q17TKxD/v4MvEaV/I+Hwb+CfYKJnzw4rA7w 5IcquBHmSf/eCfLUJjppcb2rYa8U+sXtLXCmweiM6cuTIaDiimVWrziRVr/9n6vUgd+Q y8tCoXTmH/nVbwFY3ne70rJ4PhHZaR8nhXtahuaeR9QQgPYuoZWgasGeXGHZuWTer7/E /89a81fviwxJ1EBhGDC8YpgMOnE5j6kJF3TrUuBbeSQZM+mh+1CIBRiX2unZdYfRdxIx VjKEE8jfD0qwdaYzXUX9WX3qvY2GgIz99el8CT4EYrHIo2yLe4cnrEm+j/7DiE2X+hI1 kK4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=U8g6RRoRdXOFs+ZSWxtC9YsX9A3Xm32YH3XAA1dA0hA=; fh=DFNiAn6ry7JUEhW54rypkl8EGu/ACgpdh2hfor60/ec=; b=ZPM43O4ev+JkWxQrZQ+aO7NvVZM23ipG9UfbPARo45+E39FiOirg8w+hKEklXc38yc HTPt5e9uRwqUYvYEQX9EiN7V+bthxmfV/jG3Ckxfg8RYSU/k0FFImv6x68i7Gp3RV9pt 7/nEv0UCLWL4MTVJxR4+RnRldtlOEAc6KdEHx/L/u4D9aOjNAuqYw4Ock7KTv5S7MGX+ LOh9NiSQhPf5zAH/zZH5u9h7HpfMlqifmJx3Jf20v5PowCwYyCtZzkFi8LdgLhVWwPJD qvse/0lYMHyvkb1FGhlowK3OuAMYk5XU0BU0m4VYvOwwxD5gQ4zzdbodYeobMvwhFxnW XV4Q==; darn=linaro.org ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YcHt+IHQ; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org X-Forwarded-Encrypted: i=0; AJvYcCWV323s4azM0EtWNiWc9vSiMynJYMQJ2hJ2h8VTLpZURCsDrssQBqvjSx/B+8/5cB1Tu5s6g1C2A0YyIFuWYD+lYeMFMVORgt4HHZbNyrE+LVXPMrRcVTFA+WJ045oTQoXj+E4elTfdDezIqmJLpo7v6N6byyMeb0BbriniU9wstSSLY22PAYXBtUhYo03LlBIwyQJdTLxCzGmQFG7VT9Y/Q9Qzgy4c6sr4ZdDdtEHPRPthjRcJP4kJDv/jsREDPWxyHAZCBovdzvgviZq2hUXjIgeUrKIKA5plUO/X7k1xP3PIgHtfU7F8Bupr6O2JULj0+LjwfvlQJiQaS5hz8LO7XZlzLFkLIbObxDVsp3hieWHdv9edSdlPcebpmWB71gCqsCJ5JnGbpOJ0wPBuWBBUJ/9v2DkthjaAG+dJ6KMafMM6UEehCOt2xunUiW49ykbolOEmtAlAR3TsTbw7RjS0rTNbAFxqKfBfJlyepXrwMrNNWwlB5QAR3SYqjj/KL7hfAShAPYBLNa2vHeW0ZKX6Lmjp6bLFFE9yIObW9rp1Xy1+zyjjLlpCFluPdwxkAEJdmSshHhhYxHvsS70Rjw/d6/z0Z8hPBL753OXOKLnWagh2AcHqM+ShCC/QFxtn/BIznDjbsrHTIwdgR7Ybyn5SkiMYLGCYxHJ2Ll3Y1BGkDLdULi48i3UyXmPXDthQihBE0lF2IGloZUhwD4FxxDciAz9I3JQs+xc0TNZssURQPgAG9C5dANyg5mg2yaRxzfGARZP60gQNKfn+6EJPj0/ZfgMY9QRdQ2DqNfhMn37eCZh8clO1wWEIJqdm7aN7q/s3sUzoQs8XTg== Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id x14-20020a5d490e000000b0033b0725641bsi1005183wrq.72.2024.02.02.05.06.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Feb 2024 05:06:29 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YcHt+IHQ; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E5B9287C9A; Fri, 2 Feb 2024 14:06:22 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="YcHt+IHQ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CF67287CA4; Fri, 2 Feb 2024 14:06:21 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: * X-Spam-Status: No, score=1.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_SBL_CSS,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.2 Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) (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 B765687C7A for ; Fri, 2 Feb 2024 14:06:17 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sumit.garg@linaro.org Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-1d958e0d73dso6187715ad.1 for ; Fri, 02 Feb 2024 05:06:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706879175; x=1707483975; darn=lists.denx.de; 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=U8g6RRoRdXOFs+ZSWxtC9YsX9A3Xm32YH3XAA1dA0hA=; b=YcHt+IHQYIEYvISEiuqCY7cS9BVle5yxHDfYg5RKjHWmSU3aI6KFabtMpG1iNZZuzw HTrBXVWiFy1Ewi/aIY4mnGbrBD5pwfISgfYUVWwjBq6XtjrpdOSlSIFFj3pg8ubGSct7 U/O8ij1+KNhP3j4B6z9JQDQbDbCle9N5ccJ1C8mUhoguD/I4+PpdoZXEMgnA+lsUr/dY hVk/J5Er44YYb8cN4uJcjSafpjpy5EyG6sMxv4eWKditgmtSQ6mNmip49J8YBWfxxMhX xJsUrr5TtYj6B7IE9/qoQXSP5ievdBUgcNVUMmBKsaocX4gWCMyfuOTU71UdxbWhTku3 +7gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706879175; x=1707483975; 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=U8g6RRoRdXOFs+ZSWxtC9YsX9A3Xm32YH3XAA1dA0hA=; b=tzAyz3QsuRWtxdfHE8fScStmv+i8wYPRPcFQ59FTkA9Yae9Aq9J8IIqyNgJ6/KZpfr PT/SDC/M8CWLofVIH3WLU8yeQHk/f03va1RUpRYmuy7i9AFxA5OOSPDhalq1LWk1fBUY rpkwTi4ZvxQwAS28MuoIiWyRG2HYAgohdYS3/cbwqt2QFS4Oybl17OBilXEtKkdUjtwE +gDalUDYVFGjYDey2Ib/9pQV9Vs1r2uusKkCkyox6uvgMp5mj9eGhqFf3FU4KB3JIYYg Tlco7tCJ1GfucHpo/vMSIz6pYCpsNLrVI6xICDa2eNHCFH6JtD2/P09kClE+Ehha+UHr kf7A== X-Gm-Message-State: AOJu0YyPw1ZrXW6uZYZrnUKk4EquL7seLuANuNmC7laly6ha6BI4Rmem QcSHm1gJ3Z+qskSwYiLQAsiVNw5M6S7f3eIDVTzDiiXiI1/GW73r5H+qKaJ9FVVm97frkro7LcS vjWA= X-Received: by 2002:a17:902:ea0c:b0:1d9:6c71:19aa with SMTP id s12-20020a170902ea0c00b001d96c7119aamr3386984plg.13.1706879175616; Fri, 02 Feb 2024 05:06:15 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCVIBRRlDpg9elRWLYWHll4dUe4CQdF7GRppqQ0mylUOs/aCpAEe0E+fivShFUFTSDRAY7rzrit/kTOlZ6kUsdH/0aZzti7ahxRuy8Ju3qwDn8fPPA+D5Y0l37ia+kbbgljT95HJe96LtElFpWrEdVhqGfAM19Mfchs96J63nxfSRWys6uR2WI4QTUqQ/pqa3pjTBFMBtW7oTcZPaXk1cTMF7Z0jXM+e+1w8tju7bYVmfaahplL14+mzBj4Alombzx8OB4CnlnV0dcu07oIOUxcJpCJL9MIR1WVMyLqHJzC8jVAkFCo72AYCozuzHtRhubfX4Gn31sHuTlsV2mWI6cBJ9JsJs5bdmKjQy+5ftX+k5ijJuqmKx0D2X3te2aQ/9BALwRTWl+qQbFRtGvlo8GGyPDKwZY508ZFTh2ImSqbZyYRx/USll/VTepymMeaMgKYlmtm3JQu13jnwoVtMtWCrHo8IJ4DKgScFc4qC7wGVpybdQM0NYcm1DSW56sDsiKaszXbG9gfoXA4xIz3lzqc5/+IPoXxypXdKRSqa1ATomBWEzqsIoL/gcXyFF8Y0sFvsQjSpN4Fi5OSI1AGeJsGlQ/ozjizeJ4rmCeTihpaxVg0oqYL6xD0MoiW/mwiLl6kcHX3l3IHYqAIknY4ab9/bcxXHi9elf2eMxj+8h0KxxVK+NC7zntXy08JJWMgimCk64DXoO+h/eFfQNdOaV+XCPdIelUl0gkZnasZcF6j20BhLdiyisqITvKRvYLQyK4svsJzvYB8X6Ac4HhSkRkVDFyz+m6aHyvIljEHcguOaL8B1446tmNSr/XKy8hM9RJQ2pgwk3po8qsIfpc0h7gsdf8Gl0SEVx2wRFz7OonvKE/HX1tWVj487TZfA7miv/2RBYlxP6Xhfl2BVhzwIFUfv8K/hxpSxy4sI Received: from sumit-X1.. ([223.178.213.44]) by smtp.gmail.com with ESMTPSA id q23-20020a170902edd700b001d923684323sm1542407plk.195.2024.02.02.05.06.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Feb 2024 05:06:15 -0800 (PST) From: Sumit Garg To: u-boot@lists.denx.de, u-boot-amlogic@groups.io, u-boot-custodians@lists.denx.de Cc: trini@konsulko.com, sjg@chromium.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor@kernel.org, neil.armstrong@linaro.org, caleb.connolly@linaro.org, ff@shokubai.tech, daniel.thompson@linaro.org, dgilmore@fedoraproject.org, pbrobinson@gmail.com, ilias.apalodimas@linaro.org, b.galvani@gmail.com, xypron.glpk@gmx.de, michal.simek@amd.com, seanga2@gmail.com, rasmus.villemoes@prevas.dk, peng.fan@nxp.com, jh80.chung@samsung.com, rfried.dev@gmail.com, marex@denx.de, mibodhi@gmail.com, bb@ti.com, mark.kettenis@xs4all.nl, festevam@gmail.com, nm@ti.com, andre.przywara@arm.com, Sumit Garg Subject: [PATCH v5 02/11] Makefile: Add support for DT bindings schema checks Date: Fri, 2 Feb 2024 18:35:25 +0530 Message-Id: <20240202130534.1051438-3-sumit.garg@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240202130534.1051438-1-sumit.garg@linaro.org> References: <20240202130534.1051438-1-sumit.garg@linaro.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.8 at phobos.denx.de X-Virus-Status: Clean This adds the build infrastructure for checking DT binding schema documents and validating dtb files using the binding schema. Here we use devicetree-rebasing subtree to provide the DT bindings. Along with that adapt dts/upstream/Bindings/Makefile to align with old U-Boot Kbuild infrastructure. Dependency: ----------- The DT schema project must be installed in order to validate the DT schema binding documents and validate DTS files using the DT schema. The DT schema project can be installed with pip:: pip3 install dtschema Note that 'dtschema' installation requires 'swig' and Python development files installed first. On Debian/Ubuntu systems:: apt install swig python3-dev Testing: -------- Build dts files and check using DT binding schema: $ make dtbs_check Optionally, DT_SCHEMA_FILES can be passed in with a schema file(s) to use for validation. This makes it easier to find and fix errors generated by a specific schema. Note, at this point dtbs_check is an optional build target as there are many warnings generated due to custom DT properties used by many platforms in u-boot. It is expected with these checks that compliance with DT bindings to take place. Once that's done it can be added to CI builds to remain compliant with DT bindings. Reviewed-by: Simon Glass Tested-by: Simon Glass Signed-off-by: Sumit Garg --- Changes in v5: - None Changes in v4: - Switched subtree to be imported as dts/upstream sub-directory rather than devicetree-rebasing sub-directory to better suite U-Boot directory structure. - Incorporate build fix to adjust Bindings Makefile rules to old U-Boot Kbuild infrastructure. Changes in v3: - None Changes in v2: - None Makefile | 20 ++++++++++++++++++-- dts/upstream/Bindings/Makefile | 6 +++--- scripts/Makefile.lib | 17 +++++++++++++++-- 3 files changed, 36 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 3afe314679cd..c7e5e0384af3 100644 --- a/Makefile +++ b/Makefile @@ -1158,12 +1158,28 @@ endif @# disabling OF_BOARD. $(call cmd,ofcheck,$(KCONFIG_CONFIG)) -PHONY += dtbs +PHONY += dtbs dtbs_check dtbs: dts/dt.dtb @: -dts/dt.dtb: u-boot +dts/dt.dtb: dtbs_prepare u-boot $(Q)$(MAKE) $(build)=dts dtbs +dtbs_prepare: prepare3 + +ifneq ($(filter dtbs_check, $(MAKECMDGOALS)),) +export CHECK_DTBS=y +endif + +ifneq ($(CHECK_DTBS),) +dtbs_prepare: dt_binding_check +endif + +dtbs_check: dt_binding_check dtbs + +DT_BINDING_DIR := dts/upstream/Bindings +dt_binding_check: scripts_dtc + $(Q)$(MAKE) $(build)=$(DT_BINDING_DIR) $(DT_BINDING_DIR)/processed-schema.json + quiet_cmd_copy = COPY $@ cmd_copy = cp $< $@ diff --git a/dts/upstream/Bindings/Makefile b/dts/upstream/Bindings/Makefile index 3e886194b043..e799963a599d 100644 --- a/dts/upstream/Bindings/Makefile +++ b/dts/upstream/Bindings/Makefile @@ -47,9 +47,9 @@ quiet_cmd_mk_schema = SCHEMA $@ rm -f $$f define rule_chkdt - $(if $(DT_SCHEMA_LINT),$(call cmd,yamllint),) - $(call cmd,chk_bindings) - $(call cmd,mk_schema) + $(if $(DT_SCHEMA_LINT),$(call echo-cmd,yamllint) $(cmd_yamllint),); \ + $(call echo-cmd,chk_bindings) $(cmd_chk_bindings); \ + $(call echo-cmd,mk_schema) $(cmd_mk_schema) endef DT_DOCS = $(patsubst $(srctree)/%,%,$(shell $(find_all_cmd))) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 1ca84195c997..f82b3169e874 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -356,8 +356,21 @@ endif dtsi_include_list_deps = $(addprefix $(obj)/,$(subst $(quote),,$(dtsi_include_list))) -$(obj)/%.dtb: $(src)/%.dts $(DTC) $(dtsi_include_list_deps) FORCE - $(call if_changed_dep,dtc) +ifneq ($(CHECK_DTBS),) +DT_CHECKER ?= dt-validate +DT_CHECKER_FLAGS ?= $(if $(DT_SCHEMA_FILES),-l $(DT_SCHEMA_FILES),-m) +DT_BINDING_DIR := dts/upstream/Bindings +DT_TMP_SCHEMA := $(objtree)/$(DT_BINDING_DIR)/processed-schema.json + +quiet_cmd_dtb = DTC_CHK $@ + cmd_dtb = $(cmd_dtc) ; $(DT_CHECKER) $(DT_CHECKER_FLAGS) -u $(srctree)/$(DT_BINDING_DIR) -p $(DT_TMP_SCHEMA) $@ || true +else +quiet_cmd_dtb = $(quiet_cmd_dtc) + cmd_dtb = $(cmd_dtc) +endif + +$(obj)/%.dtb: $(src)/%.dts $(DTC) $(dtsi_include_list_deps) $(DT_TMP_SCHEMA) FORCE + $(call if_changed_dep,dtb) pre-tmp = $(subst $(comma),_,$(dot-target).pre.tmp) dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp) From patchwork Fri Feb 2 13:05:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 769192 Delivered-To: patch@linaro.org Received: by 2002:adf:9bca:0:b0:33a:e5bd:fedd with SMTP id e10csp898304wrc; Fri, 2 Feb 2024 05:06:40 -0800 (PST) X-Google-Smtp-Source: AGHT+IGMbzevt/ev9691rHCkb89gUO5wFKpVLK+Mb7j/S6MKVNV0wT45SrwgZoBqlgZ9wjLQnDFP X-Received: by 2002:adf:f208:0:b0:33b:24c:acdf with SMTP id p8-20020adff208000000b0033b024cacdfmr3579471wro.16.1706879200078; Fri, 02 Feb 2024 05:06:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706879200; cv=none; d=google.com; s=arc-20160816; b=xx3dCJ/Rigb8gnxmliTicFrgjCOV5oUJE6bwZHgOinfR9ALsoz2sh+vWxdfpARmBFn zbyoX75asYvlUngiLar7/6qGysYpCTZf2U9GGA1yQP2WN1rwVt+7GViOEtqmwPgLvAXx zC6eHbZgKld3nDEH8l9C1dJEAe1zhCYeRlwhC1v2qm/UvVqRUBvlbvchRSBUAo3j0l6d CPeRW0RQgucWOurDJyqsAnqZsN3561QhUCNGvehw8UU08jQMMQncsDtTL5l2Wx/Cq6XP CedXlpC8i+oU5Lif2J8iak4KQqfmHVqXxq+f9TEvIk/dLfmPx6TwMT+qvwxKtY/+GK4K 4u5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=XZ2DFBwhO2WYJwi8rn6sF84aQnhnxv9yyY/a8AQ1ExY=; fh=iR5lyjDn2LRDKNxY6KytScDIFai4wi9AIluksJdcCqY=; b=QORWiSPQ4dkF84BsIqIi10METKAlZ09jAXBefq1/MxD2H1MZvYrEaxLEkZroMhp186 X7vQnMshmIQMjb/TVRYtLLRyKu7lV3kt7LDfKPEo1A7juMGXEHXaoLO851xCH/ezdnlc OAQM+vhRpZM4nAylrBbhseVgQXiGZqT+VJJlHD0xJ7yjzOBF55PjBrlv1QhQ4Ww49oV4 ixsrGXxl4L1esBYwzteT5/nQG+7zKBKO1AsilCP+NqeiN7QNr/IWtrHtig+fwCgVztfI FGkx5T4id12frQPsCH2bwQ71i0vJ2JiTPicu5fSjIFv/dW/2VA6icnQsCfasHa4KoXCD CF3A==; darn=linaro.org ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Bh5L8SzY; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org X-Forwarded-Encrypted: i=0; AJvYcCVxgo9WKiVMuBCRhodxdUJgtRDBqwJnSjBUWJ2MULh50FON9jY90slL7Mal5gIjF0ANNuUMOPsFVdy/B+Y6l92v/SJ69C5mLkFGA1V6yuSq507Vgnk007KKhWySP3cs6UZtUMZWk1Mrq7tsnMUgO4qDw8r85Mw647q69H5gh+UwHkNw47+mSrNZJSNNQXEOQarc/Ovczivs8T8TiYTpC0p5cUnkV3jQyi2YNPD/zlP0O1W5mi5iKg04ddmZVNdRy6rwmor5R0nZ0GSzFOlJu8+egAXgKH6g7X5Mo9rlTky6MjWdmoYOBkfNknVaBM689ljlLV3L2zQVB1lFLolCuiJWhVvqIHw0cXJnwUmSYVy1OaZjd9lxkslCal9PwFOmYPGI8F5O/+WQkEBbqBbyadT5iclwhKIuLO1OLH7HGYxsnIqmPPvZ3Gpi+UCEmDgJdvBj5KgHP7BXjJTjwLiQBQu7aO+kO5HaHrImfkWEyjgpyHpjKyv/RSv5rEDCb24Ax8Dj9A5m4ZsSEdr+yX+vDMhgSNUh2wWuv7uNJ2yX8d5w17T4eGOS4qsM0HLr+SHlqnCdHpLLdUw+4KkiudKhpnC51dvMQUHnBfc4wJWUVdUZvRgyt6NcAbXnLy8SXgQpzSceso2x0Ra8+c6dZuXcWFUne4Zr1eOi1+iAVLavzfIOGrTYaaRym7zlP2APBcH2+4ZRe9ZhAiLMmNN8aKyd9zU9xE/wWJlDjJM56uKI8xVwRo9gxHfukzFL/3PAbFCBm4gfaxjl7eDxsQhkq4ETUw3XOfYn0KZd+1dWmBa+VnVuDRhwSy04sRjawht37IwlFKE+QaG+GUdLEA== Return-Path: Received: from phobos.denx.de (phobos.denx.de. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id a4-20020adff7c4000000b0033b1aedc088si991008wrq.578.2024.02.02.05.06.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Feb 2024 05:06:40 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Bh5L8SzY; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 79F3187C7B; Fri, 2 Feb 2024 14:06:31 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="Bh5L8SzY"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A0FFD87C7B; Fri, 2 Feb 2024 14:06:30 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: * X-Spam-Status: No, score=1.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_SBL_CSS,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.2 Received: from mail-pf1-x430.google.com (mail-pf1-x430.google.com [IPv6:2607:f8b0:4864:20::430]) (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 7F11187C78 for ; Fri, 2 Feb 2024 14:06:26 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sumit.garg@linaro.org Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-6de24201aa6so1296022b3a.2 for ; Fri, 02 Feb 2024 05:06:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706879184; x=1707483984; darn=lists.denx.de; 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=XZ2DFBwhO2WYJwi8rn6sF84aQnhnxv9yyY/a8AQ1ExY=; b=Bh5L8SzYBTXzf+Ehgjt0h8pO5s+rfbPxfCM0sfGPQ8MpHxRTcboOXtn5fA7KP2TTb2 C/BSfF1JiIa1fgtnXXd2VvWuYkvRsM37Vcv5Tw+6e0GgRAbOnSob+vZnUJIzH6UY5qyB zNyn+7KfTtEcMhgFwIyDHHahxlsn73gDqdVSA0w8WOlcya83qy82e7luBONWjmzz4U9K +W4WRNoqrROzC+XVt1OrIGdyH2AVyzS2owAoZGXSdnOAkaSr/gsuYx6ZHOoPTHJO3kOh vtXsOQIkm3zDZaiY0rYhaI192ThbScP1WaPtQA5bAhZJ27lxpN5f5/x2JG1jRnXVSEdZ 5TKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706879184; x=1707483984; 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=XZ2DFBwhO2WYJwi8rn6sF84aQnhnxv9yyY/a8AQ1ExY=; b=HAEEhJVr3VOWe7CjWOaXbkwgfbJfNCQ26rrzCtAZTXwd2BFcaxnZ9GntvkvzLfzrFV 1KcDtkBfA5gj8rPlgtSgnK6I8nJij6bf97FpoG2Gei8Awy/4XtiZkFMTXsKXFx4nPQyg Qg6bYl+VIdWa+DKtELt/hMoxUv/IOhhEOQ923Dd6hQUfGTIetsbE4z0Ni1srPxgmixz+ PuW86AQof4LogZauSUDA3BeCqFW/okphjQvwfJk7KITzstbHPLCSVV8qIXWX/nBvCB9O ygKzNVO0UaZOtrBFtwlUVET9+yru2E3TT20tSkr1u8pyj6/amCb2FgfiZPqE98ExAetm nqRg== X-Gm-Message-State: AOJu0YxTAdbdR/045hB5NBxdFfUuOwo67pfi7ERtDCZVrO5x96XAZvV2 jkGMYb2fnS0bDsdRWuG5w4dAS8TWt1rp9x2d4IlvGyiQzCxWCNCVJCHLExAPCMuM0RbdO6Jon5Q n9Gg= X-Received: by 2002:a17:903:11d1:b0:1d4:47d4:82b4 with SMTP id q17-20020a17090311d100b001d447d482b4mr9306724plh.15.1706879184573; Fri, 02 Feb 2024 05:06:24 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCXWkBIJI0LFF3IR1B6s/yaV5wIJYWIvViRHOE4id0GtC7iYCqfYI3s9RmVOdq8h3rIU8Kaob8LvdVzBDFX4og+dW3nFti9uwE3zkjK0YsPJzqfc6MFP343xYECDkCdMui/Vc24RfiEctEVWagq8Jy0w+zQ/V+X3EwvO3T2JyTLhQQHcAWQC8jcAMB39bQ+1NBCbsSkr99/ZWDN7yop/90zJ7ULpfZ124IpKdj1vrWFXuHoyQNwR7YDU6B2FKLkGQlsR6BhSH6y/ApMNRNIh5S6IhZzl98J9HF7rvLmMwm+VEqUxUEOBsgzz9N6zBq+qNm0+71W9IR5fOMypl12iyoFXUkeZm6O8wNJlnVXXDLzzZNcmnxrPselrOGr8W4FwcCsnbvTGIP7fo/J33Bf8s75wy9hLYVfScDh0+jVrGYQihTd3eSoRcG3YUfpJDsQC0klb4zLHgwE2nelHlrLVqVwPHZLcUYtbljCj/KTuypCZyoyRQ1/ArEMpz6Kga+oK/PZtdGK550naS+NaR1u0z+rIgJM3SIMf41j1ZCst1JRt6ELi8X6z2V4ypvqIq/vcDrzM4Et9ZOKgckmKDVKQj5wQz1w50CEUy37bB1BA2hNClEB+T7iOITH7b4WOpqY7GaJhyDAj9pvRA/syac7UaImRt53S1cbMlG1IqPcGiPt6ebNseHmUdMj5hFUvyyy3UI2Y6Hu9LnxAzxwvAC9BzfPLrnExIrEYJIjlTE8vsP1uZsZQMi2w4k38ZXcCQELpFo+Mtb9rKeH4WZsAdBy5RFXwm6bmvQdfNThrxtZHL3jCYky3XdsJpTqV/w4yEGcyM7V+Xaq9khxruo8yLVv5UQtCIxQGPMjuDH1dUs91nODKa30Fz/zKe6Fp17HSJQ5Vf1R7rX2+s+Ef9I38rO2l8jjOTN1QMmqtZ3di Received: from sumit-X1.. ([223.178.213.44]) by smtp.gmail.com with ESMTPSA id q23-20020a170902edd700b001d923684323sm1542407plk.195.2024.02.02.05.06.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Feb 2024 05:06:24 -0800 (PST) From: Sumit Garg To: u-boot@lists.denx.de, u-boot-amlogic@groups.io, u-boot-custodians@lists.denx.de Cc: trini@konsulko.com, sjg@chromium.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor@kernel.org, neil.armstrong@linaro.org, caleb.connolly@linaro.org, ff@shokubai.tech, daniel.thompson@linaro.org, dgilmore@fedoraproject.org, pbrobinson@gmail.com, ilias.apalodimas@linaro.org, b.galvani@gmail.com, xypron.glpk@gmx.de, michal.simek@amd.com, seanga2@gmail.com, rasmus.villemoes@prevas.dk, peng.fan@nxp.com, jh80.chung@samsung.com, rfried.dev@gmail.com, marex@denx.de, mibodhi@gmail.com, bb@ti.com, mark.kettenis@xs4all.nl, festevam@gmail.com, nm@ti.com, andre.przywara@arm.com, Sumit Garg Subject: [PATCH v5 03/11] scripts/Makefile.lib: Statically define *-u-boot.dtsi files location Date: Fri, 2 Feb 2024 18:35:26 +0530 Message-Id: <20240202130534.1051438-4-sumit.garg@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240202130534.1051438-1-sumit.garg@linaro.org> References: <20240202130534.1051438-1-sumit.garg@linaro.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.8 at phobos.denx.de X-Virus-Status: Clean Allow u-boot to build DTB from a different directory tree such that *-u-boot.dtsi files can be included from a common location. Currently that location is arch/$(ARCH)/dts/, so statically define that common location. This is needed for platform owners to start building DTB files from devicetree-rebasing directory but still being able to include *-u-boot.dtsi files. Reviewed-by: Tom Rini Reviewed-by: Simon Glass Reviewed-by: Ilias Apalodimas Signed-off-by: Sumit Garg --- Changes in v5: - None Changes in v4: - Incorporate fix to resolve rk3399 migration issue reported by Simon. Changes in v3: - Picked up review tags Changes in v2: - s/UBOOT_DTSI_LOC/u_boot_dtsi_loc/ scripts/Makefile.lib | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index f82b3169e874..fe2a0aadc417 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -159,18 +159,20 @@ cpp_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(UBOOTINCLUDE) \ ld_flags = $(KBUILD_LDFLAGS) $(ldflags-y) $(LDFLAGS_$(@F)) # Try these files in order to find the U-Boot-specific .dtsi include file -u_boot_dtsi_options = $(strip $(wildcard $(dir $<)$(basename $(notdir $<))-u-boot.dtsi) \ - $(wildcard $(dir $<)$(subst $\",,$(CONFIG_SYS_SOC))-u-boot.dtsi) \ - $(wildcard $(dir $<)$(subst $\",,$(CONFIG_SYS_CPU))-u-boot.dtsi) \ - $(wildcard $(dir $<)$(subst $\",,$(CONFIG_SYS_VENDOR))-u-boot.dtsi) \ - $(wildcard $(dir $<)u-boot.dtsi)) +u_boot_dtsi_loc = $(srctree)/arch/$(ARCH)/dts/ + +u_boot_dtsi_options = $(strip $(wildcard $(u_boot_dtsi_loc)$(basename $(notdir $<))-u-boot.dtsi) \ + $(wildcard $(u_boot_dtsi_loc)$(subst $\",,$(CONFIG_SYS_SOC))-u-boot.dtsi) \ + $(wildcard $(u_boot_dtsi_loc)$(subst $\",,$(CONFIG_SYS_CPU))-u-boot.dtsi) \ + $(wildcard $(u_boot_dtsi_loc)$(subst $\",,$(CONFIG_SYS_VENDOR))-u-boot.dtsi) \ + $(wildcard $(u_boot_dtsi_loc)u-boot.dtsi)) u_boot_dtsi_options_raw = $(warning Automatic .dtsi inclusion: options: \ - $(dir $<)$(basename $(notdir $<))-u-boot.dtsi \ - $(dir $<)$(subst $\",,$(CONFIG_SYS_SOC))-u-boot.dtsi \ - $(dir $<)$(subst $\",,$(CONFIG_SYS_CPU))-u-boot.dtsi \ - $(dir $<)$(subst $\",,$(CONFIG_SYS_VENDOR))-u-boot.dtsi \ - $(dir $<)u-boot.dtsi ... \ + $(u_boot_dtsi_loc)$(basename $(notdir $<))-u-boot.dtsi \ + $(u_boot_dtsi_loc)$(subst $\",,$(CONFIG_SYS_SOC))-u-boot.dtsi \ + $(u_boot_dtsi_loc)$(subst $\",,$(CONFIG_SYS_CPU))-u-boot.dtsi \ + $(u_boot_dtsi_loc)$(subst $\",,$(CONFIG_SYS_VENDOR))-u-boot.dtsi \ + $(u_boot_dtsi_loc)u-boot.dtsi ... \ found: $(if $(u_boot_dtsi_options),"$(u_boot_dtsi_options)",nothing!)) # Uncomment for debugging @@ -190,6 +192,7 @@ dtsi_include_list += $(CONFIG_DEVICE_TREE_INCLUDES) dtc_cpp_flags = -Wp,-MD,$(depfile).pre.tmp -nostdinc \ $(UBOOTINCLUDE) \ -I$(dir $<) \ + -I$(u_boot_dtsi_loc) \ -I$(srctree)/arch/$(ARCH)/dts/include \ -I$(srctree)/include \ -D__ASSEMBLY__ \ @@ -328,7 +331,7 @@ cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \ echo '$(pound)include "$(f)"' >> $(pre-tmp);) \ $(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $(pre-tmp) ; \ $(DTC) -O dtb -o $@ -b 0 \ - -i $(dir $<) $(DTC_FLAGS) \ + -i $(dir $<) -i $(u_boot_dtsi_loc) $(DTC_FLAGS) \ -d $(depfile).dtc.tmp $(dtc-tmp) || \ (echo "Check $(shell pwd)/$(pre-tmp) for errors" && false) \ ; \ @@ -354,7 +357,7 @@ ifdef CONFIG_EFI_CAPSULE_AUTHENTICATE dtsi_include_list += $(capsule_esl_dtsi) endif -dtsi_include_list_deps = $(addprefix $(obj)/,$(subst $(quote),,$(dtsi_include_list))) +dtsi_include_list_deps = $(addprefix $(u_boot_dtsi_loc),$(subst $(quote),,$(dtsi_include_list))) ifneq ($(CHECK_DTBS),) DT_CHECKER ?= dt-validate From patchwork Fri Feb 2 13:05:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 769193 Delivered-To: patch@linaro.org Received: by 2002:adf:9bca:0:b0:33a:e5bd:fedd with SMTP id e10csp898397wrc; Fri, 2 Feb 2024 05:06:51 -0800 (PST) X-Google-Smtp-Source: AGHT+IHnJT+14jo/d7YDIuamqCYbaBQdHPWHrnLUja/MsWFH9XUgjq33wutAygTafSVGNqBe0c2h X-Received: by 2002:a5d:6047:0:b0:33b:27c2:188b with SMTP id j7-20020a5d6047000000b0033b27c2188bmr373205wrt.19.1706879211012; Fri, 02 Feb 2024 05:06:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706879210; cv=none; d=google.com; s=arc-20160816; b=UCzRJtcb4MxRNoAOWFm+yM1e0MprS584IFU28I1H/l7+HP0XVwVIF2ZF98kJD3SHCC 91svE5gbq3HPDRaGT7MpUKnNSzUTzjcY1+SWgklySLpI7N2odGGsqk753oVQj1YCVLcH tls/QM+igS45CL+3z3ol6W5C+ZMWAxGoq6xvLURH3m1OCbLRWU2PgC07ofQFfVoIUqMX Owsqd4x39vObUiqy1G0dx8pzGwV4soZuGRjiLbxZd4n9GbA0jtSp4fXDfn2d7FdW2Y85 lrc/gKFG58XiFTmjQEqqMehj4soI3O9a13F7+VdkGnSs4b+EmVSwpuL8k4FbldE7amZh jHsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=FZyRiozEVbTqo9oMcq8lbIwXjVNaeje4ktcNZtXFrQE=; fh=DjMgA6y5pvK8D2MVWLrvVZXm+kqZpkCJqKuuhYpCU2o=; b=fAldEb0zgAyXlQk0cenX7RUSqFQQJK1speQuSuUBx3IKv9TMGezIh2j/vdVzezRU7b FSxoMvT+kgTZteNFH13/xeA7TJ0RFe2UlBHmbD/FZvzT8c+EEE+xSACizEUSXonxFzWZ 76QD6Xy4vqzXatDGznFwAWHcxDQ4VkDv7WQNAOuT3wSIcTRTlymnoJRaxxkZEpcpGNp3 0cyqX6zUVy8vJZuTv9HD2Ihp0rfokz4lgrRoP8bvmq9FlE4+P9waceX1lk021nfU9Cv0 /ZCQNedvdbh6hC2dt5bNg6CqF1Zvh7OOWE6wwuYcgnzMjQ/CeuJW7x2VeogkADgA8QJ+ p2Aw==; darn=linaro.org ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GvYf9K70; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org X-Forwarded-Encrypted: i=0; AJvYcCUDAZA434bXMj/FYs2TKVANkMJrDTpJJnVdD4cn4VP7M650eU7L7p0mkP7C2kFJOqD59PfeY6NcgpaBqNMrdutHvf3HsLHzME6kI46lsT2nrPZ8d9/zqfaJfGIXHirUGEIyzE+xTGmL6kfTn7x40fBOiGSBmEKvd/unuXoxc9pDwEgDo+8oMhAUXZFIP5cg8oRuoZgl0U+ugJZg1XPsSajmopeBWwaLLKlc9XxqA6KkzpoMqg1DWYVh6n1fKv0+31LGzxYTsD/AMasObWuOV+DDLPjNoBlzZwQ8ntyDLG2/UJMYMXbRqQ4Qt7qWSLybfvIXd8k6aWWGY6blKP+VlElwvPIaKmsSVrwm77M/2yDnsXpShJCFPta2caom1a70DxPqdOxik2Iqmfvr3NRbVgVnY31kZmG2btXSvqGfn1cwYPL0hqFhdkxd74sg8MDMAncD00R4CpjxGTS7w0Ym4+1eXIa61HormjBkW4WGUDK6eE+Y4Zk6VIj6ac24LrU1sGaGNuflD1y+FqFzHHNtFZX56mz3LhU+ENSEr6RjfXsXPaao2+hWZf1dfY2csY3hZzCGNHgoEW0Ycvt784bIqPMhpQem+g6nsPmgHOjrUfl781SOmzn23O8NI69gk84KOQdrOzu19kdS9C1DfX3BEsdGVyAE7bJf5rlEJfsPGMa3PKY4f67iaCa2vVKmDsNSh7EAMeMb2i5epHp8nhLxFI3odooCUHweACfLd+k5YiAf/jzLcbENcD04IdPF6rDVpPnGLZeilftiaMGovmNASa4GILerzLbXCWaHHf+72/I2vhArRbPjI5NkKoykM0FINWOlGrFPZQ4WKw== Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id s14-20020adff80e000000b0033b1d367542si918331wrp.406.2024.02.02.05.06.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Feb 2024 05:06:50 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GvYf9K70; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E092587C7D; Fri, 2 Feb 2024 14:06:38 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="GvYf9K70"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B393C87C78; Fri, 2 Feb 2024 14:06:37 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: * X-Spam-Status: No, score=1.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_SBL_CSS,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.2 Received: from mail-pl1-x634.google.com (mail-pl1-x634.google.com [IPv6:2607:f8b0:4864:20::634]) (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 7487387CE3 for ; Fri, 2 Feb 2024 14:06:35 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sumit.garg@linaro.org Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-1d8dc0172d7so13712385ad.1 for ; Fri, 02 Feb 2024 05:06:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706879193; x=1707483993; darn=lists.denx.de; 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=FZyRiozEVbTqo9oMcq8lbIwXjVNaeje4ktcNZtXFrQE=; b=GvYf9K70H+qTbcWIP121nwgMiEIvBcrPpk2xZYhr8pCVItPNQV/oCg6twTvVSD08r1 j4ygAz5UDkHKPpOTvmDraSQgyzQYtZq4T8RbIVe3vqsbzRfzMm9syD2D8NZLn0JN+opl eNWhjWI5zzE1TER2+Vf4WStZKnouICk0KwA9Rsqb+9HVmJ46z9dzaSdZ263pcZVL9xUH LU2QaDUvYSJdC10M1W0Jbq8pDDdl4gu7g5gcC+mkNg712N1rE/JkEVCeMaBJhfrgMhLh 26SBLQTbCv96p1mN4NyGJd9GR9d8Yp8lwCpc7SCEhAprEbZAKfB9PYTM2iTdtuADTlpP Ilmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706879193; x=1707483993; 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=FZyRiozEVbTqo9oMcq8lbIwXjVNaeje4ktcNZtXFrQE=; b=u5lS7olEeXshAxzmbBxqceXdvBxTAQU5C6VvUL9lZB0GO4YYVZcGP334FfvkrhD4tp 0js9R9BLxKqTsYaIIOX3W/QuFRHBsQM6bvsy/L9vNfLPb7YcmtwCNZP8W6Wi0MTwirRE qop+ANgLpcBuv8c6U7pa2DjbF1nQKeQRbJf6WZVl08sXX/a7EgXv5UB0RqYYH6xUNMzQ UTx133WZDej8mxqCyFEq9sjbmapIzbJAqWGHZjHKevIWIplkUTH4I4DLEA+u/6g6JdTz nVISxfIHbEOC9A40OV3CrC0is9poM8cBAAJRxGrCJmjIHb3LBVe0XD9UPQE++u7RlT+F Qj/w== X-Gm-Message-State: AOJu0YzKQ95kRL5LPI5K3Bxr8hnJn0qA619qcIRhKboNXeTqZNMVhXkR F5BWTudUm2pZ30K1KwVPxwOdg0cJbZ4tvyqhJNA7UWvCyYUU+X3Cjm29Af0r75NN69EFFLGLvl7 sBZQ= X-Received: by 2002:a17:903:192:b0:1d9:46a4:117d with SMTP id z18-20020a170903019200b001d946a4117dmr8192321plg.30.1706879193494; Fri, 02 Feb 2024 05:06:33 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCXi0fm+FqzHl3LFcHTWX0TP7Z2vJCxh+u4cCKtgSOWuVDpQz+vsMKvCc+YzitlbQG3YiTwivsje1lVqfpURyyPbVrXXPkmIkIcP9aLu30OHpHyRceBOOCtDc/83UdJU0CqDKzlv7LwF1VvEP637OIMJUvAW3yV540Fz112nrgmRWJFZfuuOMsvQt0kSYFCmizOgdi9bM1pis2VSTLjCcRrvIn4+xiOxE10avcikXu6cth7hTiaxetAB0U3GI9V3ZLvfUiK4aEkAswJtlWakDY1w2PCuyDWaEFfC9wgW8IW8Ebr0IJvHTTYc/G6zZLTte48o3UpiDfnub1Jzah1t3N9grwbJr7YHAnuBTNfJAnRzQF9QC2i4a3JnSjbdBaOUyqTRB0Al4JE3pnJrXnJ2DHH1A1d6+5jamUKiAQFrEw9n62MB8en9TeQrIjJvOnlMXu3K+olu1+4kRDX8bgmFxLW0nwOR6zoXNE5oJ3NECHCGJWgkB4CMe9pll7BR2VGaTe7RGmWV+BSLhblyowByEcLtZ1Zk+aKIhtqIpfQC3ZCLhy9HJizWuDeVeJ5/ED2iUEz3bpLDvf0ELlut39aFNcTCHcgVNc/uE4y6aLg68BrhBFRZf+Y6TVUIgLwo5bG76Lv+9iP9d7ZkybokpcdTOwHmAx898etUxgXCE02PmdB+d3h+cHcEBJWoOD0WUWcZ0NEuMdyYNacsJ5KZEU1TflfHA1/lVfJoKTNt3NYemdKpWqUPyY+WjnQbwtrR7XfKL0hsYOdG+c+j7C2koRs5xmqZS3DT1TzuRM7zQT5SeaF4Ygksa6ZG9E+HwHJBCaDuzwa1w9vtq8muctlgo83LR0eq2hVysrgsdrbzPk23Nvjf0cgUI57MA/sPTpRlEk9f9yL7G4d0IjW3wjglDOHPYsRQxKeOS94bws/G Received: from sumit-X1.. ([223.178.213.44]) by smtp.gmail.com with ESMTPSA id q23-20020a170902edd700b001d923684323sm1542407plk.195.2024.02.02.05.06.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Feb 2024 05:06:33 -0800 (PST) From: Sumit Garg To: u-boot@lists.denx.de, u-boot-amlogic@groups.io, u-boot-custodians@lists.denx.de Cc: trini@konsulko.com, sjg@chromium.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor@kernel.org, neil.armstrong@linaro.org, caleb.connolly@linaro.org, ff@shokubai.tech, daniel.thompson@linaro.org, dgilmore@fedoraproject.org, pbrobinson@gmail.com, ilias.apalodimas@linaro.org, b.galvani@gmail.com, xypron.glpk@gmx.de, michal.simek@amd.com, seanga2@gmail.com, rasmus.villemoes@prevas.dk, peng.fan@nxp.com, jh80.chung@samsung.com, rfried.dev@gmail.com, marex@denx.de, mibodhi@gmail.com, bb@ti.com, mark.kettenis@xs4all.nl, festevam@gmail.com, nm@ti.com, andre.przywara@arm.com, Sumit Garg Subject: [PATCH v5 04/11] Makefile: Allow upstream DT subtree to provide DT includes Date: Fri, 2 Feb 2024 18:35:27 +0530 Message-Id: <20240202130534.1051438-5-sumit.garg@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240202130534.1051438-1-sumit.garg@linaro.org> References: <20240202130534.1051438-1-sumit.garg@linaro.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.8 at phobos.denx.de X-Virus-Status: Clean Allow platforms to reuse DT headers and dtsi includes directly form upstream DT subtree which will be frequently synced with Linux kernel. This will further allow us to drop corresponding DT includes copy from U-Boot tree. Also, since the DT includes from upstream DT subtree are done after DT includes from U-Boot tree, so it shouldn't cause any conflicts. Tested-by: Bryan Brattlof Signed-off-by: Sumit Garg --- Changes in v5: - None Changes in v4: - New patch to reuse upstream DT includes by U-Boot as per Brian's use-case for TI K3 SoCs. Makefile | 3 ++- scripts/Makefile.lib | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c7e5e0384af3..996a43c8624a 100644 --- a/Makefile +++ b/Makefile @@ -835,7 +835,8 @@ UBOOTINCLUDE := \ -I$(srctree)/arch/arm/thumb1/include), \ -I$(srctree)/arch/arm/thumb1/include)) \ -I$(srctree)/arch/$(ARCH)/include \ - -include $(srctree)/include/linux/kconfig.h + -include $(srctree)/include/linux/kconfig.h \ + -I$(srctree)/dts/upstream/include NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index fe2a0aadc417..fbcaf335f9aa 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -189,12 +189,17 @@ dtsi_include_list = $(strip $(u_boot_dtsi_options_debug) \ dtsi_include_list += $(CONFIG_DEVICE_TREE_INCLUDES) # Modified for U-Boot +upstream_dtsi_include = $(addprefix -I, $(srctree)/dts/upstream/src/ \ + $(sort $(dir $(wildcard $(srctree)/dts/upstream/src/$(ARCH)/*/*))) \ + $(if (CONFIG_ARM64), \ + $(sort $(dir $(wildcard $(srctree)/dts/upstream/src/arm64/*/*))))) dtc_cpp_flags = -Wp,-MD,$(depfile).pre.tmp -nostdinc \ $(UBOOTINCLUDE) \ -I$(dir $<) \ -I$(u_boot_dtsi_loc) \ -I$(srctree)/arch/$(ARCH)/dts/include \ -I$(srctree)/include \ + $(upstream_dtsi_include) \ -D__ASSEMBLY__ \ -undef -D__DTS__ From patchwork Fri Feb 2 13:05:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 769194 Delivered-To: patch@linaro.org Received: by 2002:adf:9bca:0:b0:33a:e5bd:fedd with SMTP id e10csp898526wrc; Fri, 2 Feb 2024 05:07:02 -0800 (PST) X-Google-Smtp-Source: AGHT+IEEVKXSFSJxdB2nT14NFE1f7UwM4ON1yL7tL9Vt3OzpHXfUlOTJk5O/86n2qCoZZbc5Ha0h X-Received: by 2002:a5d:4087:0:b0:33b:232f:63f7 with SMTP id o7-20020a5d4087000000b0033b232f63f7mr979602wrp.31.1706879221940; Fri, 02 Feb 2024 05:07:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706879221; cv=none; d=google.com; s=arc-20160816; b=kCfME5CtOCJ+SaghZOSYTFwY9e7dqQ1OFLrvfiR+kYA6d5AoyF9u28DOLq3QXAzlKX 2uw3X0a3fO29RGoFMQhfp7idKHoOxklXEUMgDum/YCP/b4FrPUzwAyrGAaQ0hzQRldtx ucFI5bO4V+pz79cLLbiOBC4+yWSOgz+E12yVqdhaBvZa/TMEkuymEypdBoY/Jf7X8cyM jOWDafnxae9+BYzkv2RCDipaF2VfZjeTgu8fwbtupd/wqZsODP8/tj42TJqWmV6gYshf 7B1ZNLR/Ap9fKY+qTtuaPWgGZOpa7W2Oqo3m8TtCSY80AVBmVm48Z5ksrheVnUdIfvbI Avaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=+qDjnivRKsvwROoQdnvXoqkuqFStziPIQgGfS9OTLn8=; fh=rK1PerB2ZRyax/rALciKO/HL69ryntvUbB5kXB7gYDg=; b=lnCvn2yN2hXMhWrgmKQ6NeYZO6UqKi5N1pM03ADekQ1nBp3+5gw0A2rgJ24gGzrupd MP6JuXeQ1NGDEu+KvsWcZtjh5YCf8bj0bIxjkSfHNItFNVVl1C9aEJjdCuR35+gfwJ0G WDAxPTPz1YE+1EI0xckUHSxzbzcx/iSz2+mgAWKIo9PiGpwHYCt9rQ5LlKbX+/cj3rUa O9T+KxX8llQGZ+a4OgzmBSfnJ6Nuik8YgjYg1JFoC2cpHNpM8mGrdMA4meq+m7Bf9kQk KOaIH7jl0e1XC1I9R43EZ3ilQQoP5JYIrix/Y2N4MZUqJfrGnmj/pXQZ6HdZTBjO33f0 MBKw==; darn=linaro.org ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Zd+0mAcU; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org X-Forwarded-Encrypted: i=0; AJvYcCUSWdBmsFzHRZp0Az1kqICo/AuO6fM9mVSoSHfP35p8WHrFumAlPFN454g4Du6cf+Y9BuInbbjgu7ADlKA4RMLzbyPDEVJqvPDRYC924uqjIh7kCeXMt5l589yzNpHe+73Vg7/JwzGKp1aay/PRTGh1rYOEwlZJ1otBPd4n6sTIgb8FHSVNmMwK3wSwJbKbyUsKhBCbc4TIpkNhNda3y+FPoHrn+voWAIQIgtD1FdAIHAQpNcMGYuiG6/BB+P+7xdbT+b8gYNSywhhz4gG7kvkaTb3wDr18tS+2NRBYTQAc11JJRDqahWo08gSFPSq0oTZz8PLchfP9DT7ZF8Ql/PN2x8unLSeFu/Ciro0k9hGtTBR/ApmdlIrzuWt1a+Ti81uxQPyH2HJ0GqNL2GhF+ByZqywUu6jwD1RSTXDoFhQbjqwJ2tQOaJKBwJtyjr7Y7vBESoV1liWXXmfF6qpQV4ZWnF8TSeWPP4DQQL/ozTkx4RBd+zq2NUFW+lt5uhNGkwxMjZvz8qCrm/KneAaMy0QMzabqJV+eRbnKwZHXGYBLhsDpsY1sCsZAqySjJ4O0PcKvzuoc5wElm0ME+XienLLj4CaFbODIrlU+e7IgSEVXGHR9sr7oXsZk1+/OEj+bTJYqrSdUZTbwZsmD/3Eqgz5hH6smrVfBCeAVWyo8AglONafpjX7LNwuRtChNReZ5n5ke02HlJPjgK95aL+zFB2Hz3yVBnAu1hT4k7xgUMey0/r7ApGXYFRSgsmrhl56gIHfzyr/ccKGYGT1/hOq+YI2HU/s6pahSBdm6AAL55Hm0QZjTPZDfpwfKOKWOq8A56BTC1Q2gMkop7w== Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id x5-20020adfec05000000b0033b1cb8900bsi992123wrn.337.2024.02.02.05.07.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Feb 2024 05:07:01 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Zd+0mAcU; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8813687CE3; Fri, 2 Feb 2024 14:06:47 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="Zd+0mAcU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EE2C887CC2; Fri, 2 Feb 2024 14:06:46 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: * X-Spam-Status: No, score=1.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_SBL_CSS,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.2 Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) (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 5AD0C87CDB for ; Fri, 2 Feb 2024 14:06:44 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sumit.garg@linaro.org Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-1d953fa3286so12635145ad.2 for ; Fri, 02 Feb 2024 05:06:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706879202; x=1707484002; darn=lists.denx.de; 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=+qDjnivRKsvwROoQdnvXoqkuqFStziPIQgGfS9OTLn8=; b=Zd+0mAcUro47orIoehtSkqa5SrAa5Igg1qTZZ+4JziAPB9Ke4BR4qes24fsFqEgLbu UHjW1RSn4tq0u+sJnl1rFHb82iugOupDg/rSWoYgLdbaaVHFaJOBnB5krsTcWYaabafB dpR+WY43+ERe2ZHATpTg0oMC1bhlNPmsvsgz+YyAOgCPYYMG7zO+jX5OHZSiV8phev1I jfNkYsjg0qOueCHu9TfrUuKBjH/BOLxInPS8vLmWQEy89sbAn9X1jlCxLXqgYz9ZBbeG LUl3BI24MP3hVibznMRxooBJKsAjf1wmEJxPZXG/FmVE6MJuWgkHBXhZnM2y4hfCntKL 20GA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706879202; x=1707484002; 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=+qDjnivRKsvwROoQdnvXoqkuqFStziPIQgGfS9OTLn8=; b=rgqALYZw9gm8h4V7xxCdmcME6DzhaVEKlgFjUT9MAiE86uYxOfJCXUpdsBI3OWFvTh OFTeYROoZPGoeQ0wgFBEo2I/sWA6gMHgUUPkDcRQS0dOnOJJWNbhj/dVykSLXUrpHslQ tEjIBvIxEz7/hpT8gHjRKagFk7hN3szWv3MgnqB8A7NXpyAEMk3JMCnWdMFgiLgVhV4S 4SPpDsETEeyFxv7TqprbId8MTVXDsb8CU9wHAubXZrmTpygjJ1fEJsHDCBvRi3ZQufWP kDLc6WYofKW0vN+6G6w/NnEF3H+sd7qBKYP99qQ/EocOS8gFOpZlF1XRBCmI81pR62jR /qgw== X-Gm-Message-State: AOJu0Yz/fceZmEoIqrhaKA+MaRHGzeWHn2QzkDd5Yz/odUhA8ryOb4wC vtLcPOtR47U5LcMEEli9JkKaVsMMLllQzlPmM68hSn1F18dV4OmJGD5Nx7P3jB8MWXnIzBOU/nM kkVI= X-Received: by 2002:a17:902:6b8a:b0:1d8:e4b8:95dc with SMTP id p10-20020a1709026b8a00b001d8e4b895dcmr3939566plk.41.1706879202358; Fri, 02 Feb 2024 05:06:42 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCVhnbO/rYc72GUn/ukejTU+MFVRZQu1uAcNBgMxZa0ew1k/IA03LYq7PAJiWgFC6ZfjehveubYmL2vYN9EEB9hXb279cIPnaY0Uv3w9TbNUC1Gd15qhuJkGwBgoXqTBwNtMdhhYLKWRSCikK7v8IGS+Jxadr2At2NBQFcigsjRgpzdw+x5B8ZTI76byXZ2PsdxFywkzUKW3G24nuo4ej6UkUSVjqimPNJWn5ubRiiUlGQJ+tTXSTuTmkgaPKSYBJGJ5F6oslMi7HTVaiPGsKPBpicXYDEufcIJwycMay72QVzAqmXWZ2NG/5+OI5qqccsbsyBuAxTUHVKPTvvtCw3k1fQQz/VPVgLPjxhjuP04sHYrtD+dZCZ35GKXpzoGx+M8Rays+zuAuLrN27ptQ9CwRIBs81RNO2orFSvBAdB/MqqQAN8R/wszJAZjFUCno5dJ72QMKaf0uJXFjrkPn1dbBN1pKbAcj41RnWZH6GqKvIkVGwg57R2wdgiKnGxTdUPZ+igiFZQqNfJM+dBVaZsDDOWp70Emw/1Z984MKUjhI6MIvGiz1DnZ0bIQtSzk8nBAVfnG/EbS3r4gicq/7JQS0IM9hry7TS7d2fN/m44VOPdzMIcCMczI/4wzlMpXbf8LHqtpPSbM17+4ZRa9vGGR3A090o5OK9qFwEWtV/k2Z3Omehqy3Lkf3S+/1ku7KLJAd2y1rV21uxZm8htZsdpabzX5HXr9FKaRovCMCI4P4PjFZZ9oEBqY+RX0WvGA3GOyETQiMncnTyU7i0eQ6imjqvOCDCYdqUoXSy7DLyPDrTjbaMzxUudOM9WfAofSoK99gW2i/CZJ6e0yXpA7yqjcpB3Qvns0j7FV0H3mgfwdstIm3w8L5S2chD5Z/wqZwhbg6JVvAM5J9QkACvGbZtcVqG/rXw85SuUh2 Received: from sumit-X1.. ([223.178.213.44]) by smtp.gmail.com with ESMTPSA id q23-20020a170902edd700b001d923684323sm1542407plk.195.2024.02.02.05.06.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Feb 2024 05:06:42 -0800 (PST) From: Sumit Garg To: u-boot@lists.denx.de, u-boot-amlogic@groups.io, u-boot-custodians@lists.denx.de Cc: trini@konsulko.com, sjg@chromium.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor@kernel.org, neil.armstrong@linaro.org, caleb.connolly@linaro.org, ff@shokubai.tech, daniel.thompson@linaro.org, dgilmore@fedoraproject.org, pbrobinson@gmail.com, ilias.apalodimas@linaro.org, b.galvani@gmail.com, xypron.glpk@gmx.de, michal.simek@amd.com, seanga2@gmail.com, rasmus.villemoes@prevas.dk, peng.fan@nxp.com, jh80.chung@samsung.com, rfried.dev@gmail.com, marex@denx.de, mibodhi@gmail.com, bb@ti.com, mark.kettenis@xs4all.nl, festevam@gmail.com, nm@ti.com, andre.przywara@arm.com, Sumit Garg Subject: [PATCH v5 05/11] dts: Add alternative location for upstream DTB builds Date: Fri, 2 Feb 2024 18:35:28 +0530 Message-Id: <20240202130534.1051438-6-sumit.garg@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240202130534.1051438-1-sumit.garg@linaro.org> References: <20240202130534.1051438-1-sumit.garg@linaro.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.8 at phobos.denx.de X-Virus-Status: Clean Allow platform owners to mirror devicetree files from devitree-rebasing directory into dts/upstream/src/$(ARCH) (special case for arm64). Then build then along with any *-u-boot.dtsi file present in arch/$(ARCH)/dts directory. Also add a new Makefile for arm64. This will help easy migration for platforms which currently are compliant with upstream Linux kernel devicetree files. Signed-off-by: Sumit Garg --- Changes in v5: - None Changes in v4: - Switched subtree to be imported as dts/upstream sub-directory rather than devicetree-rebasing sub-directory to better suite U-Boot directory structure. - Added a note to OF_UPSTREAM Kconfig option. Changes in v3: - Minor commit message update Changes in v2: - s/DEVICE_TREE_LOC/dt_dir/ and s/U-boot/U-Boot/ dts/Kconfig | 16 ++++++++++++++++ dts/Makefile | 17 ++++++++++++++--- dts/upstream/src/arm64/Makefile | 14 ++++++++++++++ 3 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 dts/upstream/src/arm64/Makefile diff --git a/dts/Kconfig b/dts/Kconfig index 00c0aeff893b..09789d3e18b3 100644 --- a/dts/Kconfig +++ b/dts/Kconfig @@ -85,6 +85,22 @@ config OF_LIVE enables a live tree which is available after relocation, and can be adjusted as needed. +config OF_UPSTREAM + bool "Enable use of devicetree imported from Linux kernel release" + help + Traditionally, U-Boot platforms used to have their custom devicetree + files or copy devicetree files from Linux kernel which are hard to + maintain and can usually get out-of-sync from Linux kernel. This + option enables platforms to migrate to devicetree-rebasing repo where + a regular sync will be maintained every major Linux kernel release + cycle. However, platforms can still have some custom u-boot specific + bits maintained as part of *-u-boot.dtsi files. + + Note: This option should be set in Kconfig, for the SoC as a whole. + However, newer boards whose devicetree source files haven't landed in + the dts/upstream subtree, they can override this option to have the + DT build from existing U-Boot tree location instead. + choice prompt "Provider of DTB for DT control" depends on OF_CONTROL diff --git a/dts/Makefile b/dts/Makefile index 3437e54033db..d6c2c9daf31d 100644 --- a/dts/Makefile +++ b/dts/Makefile @@ -10,10 +10,20 @@ ifeq ($(DEVICE_TREE),) DEVICE_TREE := unset endif +ifeq ($(CONFIG_OF_UPSTREAM),y) +ifeq ($(CONFIG_ARM64),y) +dt_dir := dts/upstream/src/arm64 +else +dt_dir := dts/upstream/src/$(ARCH) +endif +else +dt_dir := arch/$(ARCH)/dts +endif + ifneq ($(EXT_DTB),) DTB := $(EXT_DTB) else -DTB := arch/$(ARCH)/dts/$(DEVICE_TREE).dtb +DTB := $(dt_dir)/$(DEVICE_TREE).dtb endif $(obj)/dt-$(SPL_NAME).dtb: dts/dt.dtb $(objtree)/tools/fdtgrep FORCE @@ -41,7 +51,7 @@ $(DTB): arch-dtbs PHONY += arch-dtbs arch-dtbs: - $(Q)$(MAKE) $(build)=arch/$(ARCH)/dts dtbs + $(Q)$(MAKE) $(build)=$(dt_dir) dtbs ifeq ($(CONFIG_SPL_BUILD),y) obj-$(CONFIG_OF_EMBED) := dt-spl.dtb.o @@ -65,4 +75,5 @@ clean-files := dt.dtb.S # Let clean descend into dts directories subdir- += ../arch/arc/dts ../arch/arm/dts ../arch/m68k/dts ../arch/microblaze/dts \ ../arch/mips/dts ../arch/nios2/dts ../arch/powerpc/dts ../arch/riscv/dts \ - ../arch/sandbox/dts ../arch/sh/dts ../arch/x86/dts ../arch/xtensa/dts + ../arch/sandbox/dts ../arch/sh/dts ../arch/x86/dts ../arch/xtensa/dts \ + ./upstream/src/arm64 ./upstream/src/$(ARCH) diff --git a/dts/upstream/src/arm64/Makefile b/dts/upstream/src/arm64/Makefile new file mode 100644 index 000000000000..9a8f6aa35846 --- /dev/null +++ b/dts/upstream/src/arm64/Makefile @@ -0,0 +1,14 @@ +# SPDX-License-Identifier: GPL-2.0+ + +include $(srctree)/scripts/Makefile.dts + +targets += $(dtb-y) + +# Add any required device tree compiler flags here +DTC_FLAGS += -a 0x8 + +PHONY += dtbs +dtbs: $(addprefix $(obj)/, $(dtb-y)) + @: + +clean-files := */*.dtb */*.dtbo From patchwork Fri Feb 2 13:05:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 769195 Delivered-To: patch@linaro.org Received: by 2002:adf:9bca:0:b0:33a:e5bd:fedd with SMTP id e10csp898637wrc; Fri, 2 Feb 2024 05:07:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IHaLchEjfKKnRo/khFHw7LSi8fCEIQBdURt0PreaF2KVXpv2Li2zA3HSEi3UoQCm8KT1aoq X-Received: by 2002:a5d:4f0c:0:b0:33b:274e:af5 with SMTP id c12-20020a5d4f0c000000b0033b274e0af5mr350861wru.60.1706879233302; Fri, 02 Feb 2024 05:07:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706879233; cv=none; d=google.com; s=arc-20160816; b=CMW7Zk50Oq8jx0358W/0mc2iI89jJ0IVbh1LYdd9PSxZeNcrl0OC01KBhkjNrzHMQB ItpPvfEls7lOy+fmBjgTqfkEIwMPRQxptLe6b0zFw1ShObUlipKx12J6GGpK9OqSw5LF wXvAeOdfMAf5vw3vH110Kvy6cdRWk9IUJBeebWDmY2leyX6fgVH6fz6JEgUByJw4rrCB hoHEKbgSXyGdhIhO+3DMQ4EprbvUNpPzMAihj5JIMAFzi1NkuHbXv65ATP0YMZObWsJw sSuh5hJJAb+CyXujgxxNOWHAHE95T3/7Q9znS8KoXy2G17rwL7zdWe0/tQXalKqF5fcy g9nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=pIWKFZ/4450JPhylLYbfBEMghCwNKQs4YCs3cXu+m2M=; fh=QL/pc0yRuwqf6h1obGA3r0++C6iEGOFulM8mkviq7EI=; b=QxIXH24sdxcn5sfiENDbKcDQFY2tChE1iSMFFGZ9AWUXLObR80cdEBN0B2zVck7gOl uwR6zPfZ7aCil7VFxqXT3BfMmZf3lMUIm369eENLwUmfH0tOTWI10pJZnO/eBNa1+aUc n1sTVucBsXPuxdME1SMetJD40AammeQ+mwCt7I3V5LDWjFP/iVqZB21y4zuFjRJ85RXz A0/qjCBeAfc0QcQfbkNd2WFHrftNZKkUp2PWkflNdNYyTB9u5dwSRpDG5t/atXZ2dMS+ dFjeN2WyTdtVWm/dpJSCtrH9P9SCrmwVOwFhvvO19JCwcfoB+mmvD4hYmiLDhcsCJjmJ f9SA==; darn=linaro.org ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IJuXdyrD; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org X-Forwarded-Encrypted: i=0; AJvYcCXwX1AJQfulFDsk4wq9EafH3WnfjCi027yLaYVRVnV9spq48mc7aChl67fcET3pIY3Vllk/f7mQc6EQz+gA0IDGjdDCtkeM0RBoaUAfNGmECxbpBOHJd0BNm/mwTzVVB6QFv+ULKFMAN9NgooiM9haFmDYoa2OrxLHzQcES5+sQMl15/Qtcqyv5W6v8Hrf4IN8lZP+LF4SICUsZl38RVF0IZ7L/VtKJ3v7Ssa2gknkiN4P5TN7cVwEkewtYl9hzKV0YgPtXLWvw+5zfITxyqZk8wY2iA5OFn67aUR7gu61YvqHQObt40kVTZ7ncZSBOK9scWCv0PpaxeJ1KejiwR6psVlpz9ewFH7sdNzxHln1c5xi/S524k4Evg1u03lJLTNpP2S3RBXhMpaGI3vKkd7ePwBMK7gonZa2KUrnXXxfaibrqWAhELC9AGQnuJMmqlD/Ce1A0nIfLF7EuGAkK2swxOItx4u75EgL5IeVSgCIwPqX5vYVYncC1pN3YGZBpZmRI/NIVe3ICHchXTDMHyEEExr2eYSQlYOnw7DI16shN0sAzeUoS/uvJNnuJN4/lTD8PZAuvRcRMAu5FJ1uXlBthBx/m4EF1Aoo1XKeTBfN4U5VxrIvqpjXmnENd6OGUP7m7gc7ISnZzqdqW3SxNEBGOX2D6CefSbiJQtUnFndk9vWj0KiYc5vHYMytKlXnsZBdxTA+dqTAulMJOxEFRCZZStqSZOvOCFkAVo/wQr30lcyTtIg57z7Kup9IiYAWN3LktyPUYncYr+bmmXzzVuI9KPhp6gYjN12ScehqHBjgH9q1Ej0cTnaMlCHDvDCshMxohXGO3TB1c6Q== Return-Path: Received: from phobos.denx.de (phobos.denx.de. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id q4-20020adfb184000000b0033ae78fe185si972751wra.1004.2024.02.02.05.07.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Feb 2024 05:07:13 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IJuXdyrD; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1CC9C87CCF; Fri, 2 Feb 2024 14:06:59 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="IJuXdyrD"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4D00787CA7; Fri, 2 Feb 2024 14:06:57 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: * X-Spam-Status: No, score=1.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_SBL_CSS,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.2 Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [IPv6:2607:f8b0:4864:20::631]) (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 4F90987CC2 for ; Fri, 2 Feb 2024 14:06:53 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sumit.garg@linaro.org Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-1d94323d547so17171765ad.3 for ; Fri, 02 Feb 2024 05:06:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706879211; x=1707484011; darn=lists.denx.de; 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=pIWKFZ/4450JPhylLYbfBEMghCwNKQs4YCs3cXu+m2M=; b=IJuXdyrDCG8W97IsSkPQf/Wat0r6+lQrHtCOej2wRw+4LxadOfotqc71aGCVu1yzZh +6UsZmy6K0DpGeal5vQmvtFEPF9bCegxIXD70NlM6MYhWXv+Xs9ZKvZqPr2FBNiB6czG nX8nZngmaKML4F/S//hhOXGI2+KCEdWtnt1uDP2sKHzrif2Jzl+YELHhGpQG30PRsGw8 6GALDaIF0Ai49S8cQWSKAy+x3nRLAU/d7r3ryrQzkB5qpYOLlBFtL7sF/AooNrwSib6l MDzKx49T+sS1nyecTaKfkKdIEIuHpx7+HzZUeE3S7hJAFqEmfKu/4zvCHL95FGUXlUYt Cf5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706879211; x=1707484011; 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=pIWKFZ/4450JPhylLYbfBEMghCwNKQs4YCs3cXu+m2M=; b=Kol7131eb4+eLwzMXfpfEbZMzHbCCIK7sKCY2iRwi0MjuMe0hu40EdyP/NdxrL5m5O OgSli5KzK5oaCLke/O/1h8ddbZiaZuegvV/4Yz8WRqvxPumduXxMm0kxxXdizqgWe00J FTxJDpGedS8Zgw5o86CX22e0Jjr0Wa2rU2Sy09xHoOHillr9K4AjP6V7nShVodYhW42M Lxsy1mA5NquLW5/7U9Xto0F79i2tUihe7fCtU7cYkDEiq5L/O1BKDskolWCXePg/h1Z5 raeiqtvxZfwplVnqJd+64fdRRVgNaiKWdG8yOKkbjIikIU0dz4Hh+xlzj/YbID/XpdOC xNEw== X-Gm-Message-State: AOJu0YzE31lPjPURSpT/F9I9oEGDsi5m0bVlRY5WI8E7cykkMg9AOaTY an72ErLglsVeSigiSzGwCz56AmkTNS2XjIJZGkCe0moJdlzx29lCRtmDDhtx03P+OH/heRf6uvL 1s0s= X-Received: by 2002:a17:902:f545:b0:1d9:232d:4c1c with SMTP id h5-20020a170902f54500b001d9232d4c1cmr2418373plf.52.1706879211266; Fri, 02 Feb 2024 05:06:51 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCX2EqLG43e+RV1Y5OIBc35XBwDkabQurHUKrnQjDF1MN7G9Y6RgjBzZDm6LaNc9+ZGSTaLI4iF4jM7DYbP/2jzmD1bAeTvqT664ApSxqcx/Ddt6GT22+RlNMHv0IWcDPq4/C2ycLlf6Q1Qh30TEOdBo5bHpy6RolRGzBtphFsVPXZBtzBov1+96SWV/hXQUIKusU8TQxtDLcNj98jRykOyPfrkYeYxrjUy9XZKC4dTss3NtbEr/IcouomhI99Z2M+tBvQbzpG/KnC49m64pKaz3mhe8eVLCJUa1b4iAssgSHEWItl22xSRszT1loac0p+TIksiyN4M0LY0NtjMJ1KQ4pBp5vQlwW0p7ILiG76nHuo9uFXrz3F2dvEjThAMHGdz1JCS95Hv5Z1ouLhX2XDnam5QD0IhGMnEcZIUp8zkm4PvcK1Rz3W1nMjwxrlyzNHgYjsTGjw2Ckc6T7E+4+CA1NNqAP+B24FJA5LvW7m1/YpKAyMJkPJb0zBM6nqQWfX3ZUdXYfrciyPyGFo8qAf9xeuIJ7PGPmSTtjQnEh40pxvNN5+RRatd4sIFIAgAAMVIrx8ZMr2D2LHMeCkWT5QK1ZJlF9+phbbnfW8F7mqk0ncmdh+jo+pRTPuWb/k4GiPMAgjAVbgw8u5gq9wgZw4/kbigPJvBGDGYq+AnWd8TaX3dYEiCFJFX43Z13iOnTD1bs60p43UzZ3TecGzMSaLrHvWpZRQkbVFk23OCWg+9f+taFzKbb92wRzvHMqPlqRZjdM39nIWmlzSbhno5TIRT576tint9FwpTb5cGWvwz/0hhDeVHb18P/XLPTo5X+nGbM1R8qtWUBFrwuWyrZHDYqltW/dzY3hr9xfpsvfBtpaSCRaL9X2mfaIFqsJBqAeSI7nLs8WhW5QrKMr5i//3V5QcuYXzDHsphn Received: from sumit-X1.. ([223.178.213.44]) by smtp.gmail.com with ESMTPSA id q23-20020a170902edd700b001d923684323sm1542407plk.195.2024.02.02.05.06.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Feb 2024 05:06:50 -0800 (PST) From: Sumit Garg To: u-boot@lists.denx.de, u-boot-amlogic@groups.io, u-boot-custodians@lists.denx.de Cc: trini@konsulko.com, sjg@chromium.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor@kernel.org, neil.armstrong@linaro.org, caleb.connolly@linaro.org, ff@shokubai.tech, daniel.thompson@linaro.org, dgilmore@fedoraproject.org, pbrobinson@gmail.com, ilias.apalodimas@linaro.org, b.galvani@gmail.com, xypron.glpk@gmx.de, michal.simek@amd.com, seanga2@gmail.com, rasmus.villemoes@prevas.dk, peng.fan@nxp.com, jh80.chung@samsung.com, rfried.dev@gmail.com, marex@denx.de, mibodhi@gmail.com, bb@ti.com, mark.kettenis@xs4all.nl, festevam@gmail.com, nm@ti.com, andre.przywara@arm.com, Sumit Garg Subject: [PATCH v5 06/11] dts: Add script to uprev dts/upstream subtree Date: Fri, 2 Feb 2024 18:35:29 +0530 Message-Id: <20240202130534.1051438-7-sumit.garg@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240202130534.1051438-1-sumit.garg@linaro.org> References: <20240202130534.1051438-1-sumit.garg@linaro.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.8 at phobos.denx.de X-Virus-Status: Clean dts/update-dts-subtree.sh is just a wrapper around git subtree commands. Usage from the top level U-Boot source tree, run: $ ./dts/update-dts-subtree.sh pull $ ./dts/update-dts-subtree.sh pick Signed-off-by: Sumit Garg --- Changes in v5: - Added support to cherry-pick fixes in subtree update script. Also, used https:// instead of git://. Changes in v4: - New patch to add script dts/update-dts-subtree.sh as per Rob's comments. dts/update-dts-subtree.sh | 45 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100755 dts/update-dts-subtree.sh diff --git a/dts/update-dts-subtree.sh b/dts/update-dts-subtree.sh new file mode 100755 index 000000000000..b781bf710025 --- /dev/null +++ b/dts/update-dts-subtree.sh @@ -0,0 +1,45 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0+ +# +# Copyright 2024 Linaro Ltd. +# +# Usage: from the top level U-Boot source tree, run: +# $ ./dts/update-dts-subtree.sh pull +# $ ./dts/update-dts-subtree.sh pick +# +# The script will pull changes from devicetree-rebasing repo into U-Boot +# as a subtree located as /dts/upstream sub-directory. It will +# automatically create a squash/merge commit listing the commits imported. + +set -e + +merge_commit_msg=$(cat << EOF +Subtree merge tag '$2' of devicetree-rebasing repo [1] into dts/upstream + +[1] https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git/ +EOF +) + +remote_add() { + if ! git remote | grep -w devicetree-rebasing + then + git remote add devicetree-rebasing \ + https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git + fi + git fetch devicetree-rebasing master +} + +if [ ! -z $1 ] && [ $1 = "pull" ] +then + remote_add + git subtree pull --prefix dts/upstream devicetree-rebasing \ + $2 --squash -m "${merge_commit_msg}" +elif [ ! -z $1 ] && [ $1 = "pick" ] +then + remote_add + git cherry-pick -x --strategy=subtree -Xsubtree=dts/upstream/ $2 +else + echo "usage: $0 param1 param2" + echo " param1 pull or pick" + echo " param2 release tag [pull] or commit id [pick]" +fi From patchwork Fri Feb 2 13:05:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 769196 Delivered-To: patch@linaro.org Received: by 2002:adf:9bca:0:b0:33a:e5bd:fedd with SMTP id e10csp898740wrc; Fri, 2 Feb 2024 05:07:25 -0800 (PST) X-Google-Smtp-Source: AGHT+IE0mSHFXWVwC5ynYKPXgxJ+PrBUzW/ijc1vppRP0bOe6jDXkj91e7pResRYT4G2pe/bDaX0 X-Received: by 2002:adf:fec8:0:b0:33b:1130:6d37 with SMTP id q8-20020adffec8000000b0033b11306d37mr1452179wrs.13.1706879245006; Fri, 02 Feb 2024 05:07:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706879244; cv=none; d=google.com; s=arc-20160816; b=BVyrIwzQIPGPc3JJg6eHwx6p0bDiyggVjBi+QdnUiCKcVW+UjxNSSvowrTmdnhaqEs rce4z0WSvP12+iSE9qpc68F4bKLxmJ2J2wbTn0q99yQO/BsVeFQNlWlVgcMFrD2kKlqS iAKMMCfnS5XDHqZLi6lho1F45HOy1fNUws5Rvf5jiu2loTvf1z3+2CLjf6SFnP+Bim0t CJ++lDkeTB5SrAcexYY61ilBubItjP79AxPaoYnsloXmgrBqRhY2ogpH9hpKgKq3FHLC 0OIZwYgNCBYwvzgoh1q7OFXES4LTX2c3j8ZLxVfdTYPKPgJ06iZAq2OZEufT3mPPIFed Xelw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=xD1luGAP2JCOy74S0Dvk++4XEGenbMM27aVFBieuLJA=; fh=n/C99fz7aCgO0b5BziauH1EhUWtRTDf/SvQ54j+FE2Y=; b=hKyYd6R4RViPB1W2hC9EDLiokwxv/JJazMdGWvLig+z5BeMW/NGKxZyN5W07YYaZz0 PAYsX7GDRYxIJ9t7TJeuZE7L8SBldGAzZQQ0oFiGTHJ9sn5gvF8+Ia5ReNjCqiNr8+F3 e1YOf3Z/ujnHLQHDzS13r89WOXG4X7f7yaL0J3ud861a97Cld2qvG73D+2SRF8dDHe2o zQd8n+DspdFapnt5Ada9sc7RknjxbztYRS5EaPPmOjpZTwpdTjRigDDUje0JRq1Zj3DR PxO2h78P3fGAWT6GB+Ckhm9OvCabw2RlT9aQhF4v5LAY1BV4Q8EmESjYDhTxaO25nKny D82g==; darn=linaro.org ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=M1Fb4IUO; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org X-Forwarded-Encrypted: i=0; AJvYcCVtIlqzTi12TRHwL89d8iNz7scoy28k5eKb+Xz5c18HMcW4cwddO1Zl3s9q+5LTW43ONFDzUKWGtwCHCM8SUtc1GKasV882TJxxRHV2/azVeIuRj0vitFI/3CfTCGbSG000UAOTNUdonOsOnDqS1IhC73VoEFpSNUKcYAg+GleHktOg0WjkXoBuEVz9EmskrDHCEzv7avRHo1x5UAjv7Mu+DZTohy70xi81LuJN8ImKsigiHwE/eKnRXVcQmZciLCEcRIPcqnPAO37NntigcwBGSAtDCxZW0HdToujI7jSK90lvnH2WrhX+emGxeCiPgmF1JP9TI7Qoihj3uCig4nlE+NAyJrgg6f9pESstKTAUDNYv0LdhaJJyWhOFbnuA0vGjCOoHRPK8PzPPFi4KO8eQbrKlNc5h1aPViH3qI6Om1UmZjL7T14cSM4RdzRkXKehTArmoH9+ujhlr/U6tYJP7JtnrLR2vXl8foZZRnboeMuep8FZVqYYcp2ObZ7qSPrLz8L7MaKd9zRLsiQpxRXqSFKzKOq6Gmcmd1ao8KNh7jm5zhgSwPYmv5vuBdX+FEUQttFzA+ddkG998TnXM/GRvKAjHldIDur79AvcmD1xclBDkHNHn4qlJ2Z3QN7iIe5xiBBlly2/INjKVyZdhd85JDCPjHctmFZE71qW1CDxISUJAq7E1DwdaPH90X23b66fv6pZ+246wjB6hWsvd+HsIO1hKLUZVbiSFHcFBJeHvd19fkD9KFaVCdt2ignspMoE5prpsodAnB6Vnqcb85gva4lc5DFBsS1X9ZAASb0Ps3szT+6ghXjxSGtfS6cNPqp34szN9rW8Qlg== Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id m10-20020a056000024a00b0033afe81695esi947573wrz.45.2024.02.02.05.07.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Feb 2024 05:07:24 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=M1Fb4IUO; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AC0AE87D0A; Fri, 2 Feb 2024 14:07:07 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="M1Fb4IUO"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8522487C9A; Fri, 2 Feb 2024 14:07:06 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: * X-Spam-Status: No, score=1.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_SBL_CSS,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.2 Received: from mail-pl1-x62d.google.com (mail-pl1-x62d.google.com [IPv6:2607:f8b0:4864:20::62d]) (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 46AD087C9A for ; Fri, 2 Feb 2024 14:07:02 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sumit.garg@linaro.org Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-1d780a392fdso17313265ad.3 for ; Fri, 02 Feb 2024 05:07:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706879220; x=1707484020; darn=lists.denx.de; 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=xD1luGAP2JCOy74S0Dvk++4XEGenbMM27aVFBieuLJA=; b=M1Fb4IUO9EQxmfu/dNixVH1Y1dIauenB2gZbyWmAr5hvzI2PU8rdOGtN+FcGuEUway /bZrJnQ35luWPfUYrwuXZMfe6ZduhV35mKFlqkbLk8F5pgUDAdYlv0tm+npWzq7RTor1 netMaRq4JwWwRyA6SG0+TS8oTUfFzRzhXzxqGdD5QF3MkVNisNAB9WReP3o1FJKLBTUO kA6A5wZmFGFx0pSbBpXI6c+s98XoN7u/ux8CY4UJ4jVDO6Wh/U3oa4q9sr1ac1KpTA9X wuTqFYKosSX9qsNzVsUIoJ3hG8Ly9JStNdwVxb2YZjKy+Z3egtCi+Xe3YZHIq2DX43AB fcVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706879220; x=1707484020; 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=xD1luGAP2JCOy74S0Dvk++4XEGenbMM27aVFBieuLJA=; b=arBUVeNtbt8VcXmIbVd7tM541PR3GRkK2DdsgZW5RqRyXN+qcBrV9wm9n5K1P1HefU /PQ9JwDvz2edX939PZQsk1ooeDUYEXbU1Zg5GbByacuUDvhMsyJZwV+6MgDFm9E1INCx Fxk242wduOS6Qft1MzF33vUezYVGBa9JRw+b9RN5Z+42Dqzsq+PJE+RnO06HzbdY8qC2 m2C/BwRhtNM/vvaT8vULtgv9Ece6EbxY2V1/pg18CWxmuYxhpk9ZdwmNo59bdGV33oB/ mTLiFqRS+LKjOH7gSV8ZeDpkVyH+9cF+WqM6T9QjwRoNhGVdKL6WmlSCMlu9+s4ni3VT WRZA== X-Gm-Message-State: AOJu0YzZ6/rl93Ne6TbMcGkGHvdHr4Hv06tTwHNJ+AnaEERt8FEVm5Cz dfLdJrCJeCFHVZaVuArLPjqs4O9zRM+hUzh9J2LMdakJotHkkwwOnXjZ+CM2GlppPGLeSqQ/U38 J+7s= X-Received: by 2002:a17:902:eac6:b0:1d9:4834:e1b8 with SMTP id p6-20020a170902eac600b001d94834e1b8mr4840345pld.33.1706879220138; Fri, 02 Feb 2024 05:07:00 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCXTEyYtgLa9bgrvREoGfi4WDLkto38OjMK0aMxBfQGKUZlbI9gj6a9P3nuvJGrDXXl/5g9BGUsqoU7v3LUWuISPAt94MTuh7d5wIvbcsIF847aZcbcI0Duu86EJIYJJVclRAZDkmw6oL0xvR+PckRpRbGBwskkwkaU3MCTKKSRZ+NIW45Ik1+xoKBB/adEsR/qILKwBTTAgK49ae8Lbgx+MwOITiQIoZcWnLqc8OXoRzioKrIQADK2i5F/aEAty5L6EqpH6X0Ijj8rEY0nTayKaAj9KUyQhFPMDyAVMQh1jRhDkeQBdQeVncOSR1qx+nCnbruXlzLVNaBmY/rvE9zzYnO5fyvrmRduEJMc4SGNky5G43lyhVQpIb9VgtMInFl5OTFLiVb4CGGeKFkjG+3GMfTe+U/4ZofJyQo1v5heGuyAce/RaE/vWmEyEAhrT5syfGx8gKSybY/VN1W13ksurTViXwBKp3kTfMeceJSouah7+JlQ4pDSIdd58+6yCt2MW0rGRlYkaT398cfTD/MX+tNEW1HXq1pF23Mw06Mo+MH5UME1x0tNU73x91Wp9gNnIu4Iy/1CMUOfQD6DHZK7vX+X4T8HnHu+PHlvLQ0zdCpWkhpkHe0NTvqzt2lXNWXB+jXC97VW8WJrcPSWuALlL58aAne9cEWBQbnKMVYouj05EK6sRAZdTW2mHFGWoWCqeyzgIstVQcuQkGg0K+Mtdpo5YmkzLu+uKh3By7PgAhqxMDOpGc4TA2xxfSJtOBXY3sJP8ZxSx+cqdNX3mPFiIqu0bnsjgNHfzaQafFq0FqnNAdoJ7RvRaMQVpG+dGDmrcH5xbEqalaXybyYviGMmLidkgXt2QH3ARo4aR0vyE7hOBLOjon/kd7cknPCDltb9ZgmrOE2x5jt3yvyz1o2l1gfvS5tVXiaiQ Received: from sumit-X1.. ([223.178.213.44]) by smtp.gmail.com with ESMTPSA id q23-20020a170902edd700b001d923684323sm1542407plk.195.2024.02.02.05.06.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Feb 2024 05:06:59 -0800 (PST) From: Sumit Garg To: u-boot@lists.denx.de, u-boot-amlogic@groups.io, u-boot-custodians@lists.denx.de Cc: trini@konsulko.com, sjg@chromium.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor@kernel.org, neil.armstrong@linaro.org, caleb.connolly@linaro.org, ff@shokubai.tech, daniel.thompson@linaro.org, dgilmore@fedoraproject.org, pbrobinson@gmail.com, ilias.apalodimas@linaro.org, b.galvani@gmail.com, xypron.glpk@gmx.de, michal.simek@amd.com, seanga2@gmail.com, rasmus.villemoes@prevas.dk, peng.fan@nxp.com, jh80.chung@samsung.com, rfried.dev@gmail.com, marex@denx.de, mibodhi@gmail.com, bb@ti.com, mark.kettenis@xs4all.nl, festevam@gmail.com, nm@ti.com, andre.przywara@arm.com, Sumit Garg Subject: [PATCH v5 07/11] doc: devicetree: Align documentation to use Kconfig options Date: Fri, 2 Feb 2024 18:35:30 +0530 Message-Id: <20240202130534.1051438-8-sumit.garg@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240202130534.1051438-1-sumit.garg@linaro.org> References: <20240202130534.1051438-1-sumit.garg@linaro.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.8 at phobos.denx.de X-Virus-Status: Clean Since U-Boot switched away from manual CONFIG_* defines to Kconfig options, align devicetree documentation accordingly. Signed-off-by: Sumit Garg --- Changes in v5: - Fixed inappropriate documentation update. Changes in v4: - Separate patch to align documentation to use Kconfig symbols instead. doc/develop/devicetree/control.rst | 48 ++++++++++++++---------------- 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/doc/develop/devicetree/control.rst b/doc/develop/devicetree/control.rst index 11c92d440f4d..9a0cb90336df 100644 --- a/doc/develop/devicetree/control.rst +++ b/doc/develop/devicetree/control.rst @@ -29,7 +29,7 @@ a number of similar boards with different peripherals, you can describe the features of each board in the devicetree file, and have a single generic source base. -To enable this feature, add CONFIG_OF_CONTROL to your board config file. +To enable this feature, select `OF_CONTROL` via Kconfig. What is a Flattened Devicetree? @@ -81,12 +81,8 @@ Failing that, you could write one from scratch yourself! Configuration ------------- -Use:: - - #define CONFIG_DEFAULT_DEVICE_TREE "" - -to set the filename of the devicetree source. Then put your devicetree -file into:: +Set up "" when prompted for `DEFAULT_DEVICE_TREE` by Kconfig. Then put +your devicetree file into:: arch//dts/.dts @@ -94,24 +90,24 @@ This should include your CPU or SOC's devicetree file, placed in `arch//dts`, and then make any adjustments required using a u-boot-dtsi file for your board. -If CONFIG_OF_EMBED is defined, then it will be picked up and built into +If `OF_EMBED` is selected by Kconfig, then it will be picked up and built into the U-Boot image (including u-boot.bin). This is suitable for debugging and development only and is not recommended for production devices. -If CONFIG_OF_SEPARATE is defined, then it will be built and placed in +If `OF_SEPARATE` is selected by Kconfig, then it will be built and placed in a u-boot.dtb file alongside u-boot-nodtb.bin with the combined result placed -in u-boot.bin so you can still just flash u-boot.bin onto your board. If you are -using CONFIG_SPL_FRAMEWORK, then u-boot.img will be built to include the device -tree binary. +in u-boot.bin so you can still just flash u-boot.bin onto your board. If Kconfig +option `SPL_FRAMEWORK` is enabled, then u-boot.img will be built to include the +device tree binary. -If CONFIG_OF_BOARD is defined, a board-specific routine will provide the +If `OF_BOARD` is selected by Kconfig, a board-specific routine will provide the devicetree at runtime, for example if an earlier bootloader stage creates it and passes it to U-Boot. -If CONFIG_BLOBLIST is defined, the devicetree may come from a bloblist passed -from a previous stage, if present. +If `BLOBLIST` is selected by Kconfig, the devicetree may come from a bloblist +passed from a previous stage, if present. -If CONFIG_SANDBOX is defined, then it will be read from a file on +If `SANDBOX` is selected by Kconfig, then it will be read from a file on startup. Use the -d flag to U-Boot to specify the file to read, -D for the default and -T for the test devicetree, used to run sandbox unit tests. @@ -145,7 +141,7 @@ Build: After the board configuration is done, fdt supported u-boot can be built in two ways: -# build the default dts which is defined from CONFIG_DEFAULT_DEVICE_TREE:: +# build the default dts which is selected by DEFAULT_DEVICE_TREE Kconfig:: $ make @@ -198,8 +194,8 @@ As mentioned above, the U-Boot build system automatically includes a `*-u-boot.dtsi` file, if found, containing U-Boot specific quirks. However, some data, such as the mentioned public keys, are not appropriate for upstream U-Boot but are better kept and maintained -outside the U-Boot repository. You can use CONFIG_DEVICE_TREE_INCLUDES -to specify a list of .dtsi files that will also be included when +outside the U-Boot repository. You can use `DEVICE_TREE_INCLUDES` Kconfig +option to specify a list of .dtsi files that will also be included when building .dtb files. @@ -213,14 +209,14 @@ The full devicetree is available to U-Boot proper, but normally only a subset 'SPL Support' in doc/driver-model/design.rst for more details. -Using several DTBs in the SPL (CONFIG_SPL_MULTI_DTB) ----------------------------------------------------- +Using several DTBs in the SPL (SPL_MULTI_DTB_FIT Kconfig option) +---------------------------------------------------------------- In some rare cases it is desirable to let SPL be able to select one DTB among many. This usually not very useful as the DTB for the SPL is small and usually fits several platforms. However the DTB sometimes include information that do work on several platforms (like IO tuning parameters). -In this case it is possible to use CONFIG_SPL_MULTI_DTB. This option appends to -the SPL a FIT image containing several DTBs listed in SPL_OF_LIST. +In this case it is possible to use SPL_MULTI_DTB_FIT Kconfig option. This option +appends to the SPL a FIT image containing several DTBs listed in SPL_OF_LIST. board_fit_config_name_match() is called to select the right DTB. If board_fit_config_name_match() relies on DM (DM driver to access an EEPROM @@ -247,10 +243,10 @@ architectures. It is important to understand that the fdt only selects options available in the platform / drivers. It cannot add new drivers (yet). So -you must still have the CONFIG option to enable the driver. For example, -you need to define CONFIG_SYS_NS16550 to bring in the NS16550 driver, +you must still have the Kconfig option to enable the driver. For example, +you need to enable SYS_NS16550 Kconfig option to bring in the NS16550 driver, but can use the fdt to specific the UART clock, peripheral address, etc. -In very broad terms, the CONFIG options in general control *what* driver +In very broad terms, the Kconfig options in general control *what* driver files are pulled in, and the fdt controls *how* those files work. History From patchwork Fri Feb 2 13:05:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 769197 Delivered-To: patch@linaro.org Received: by 2002:adf:9bca:0:b0:33a:e5bd:fedd with SMTP id e10csp898848wrc; Fri, 2 Feb 2024 05:07:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IEz7OL+vKC+jPMT5ZZ2+qaEFkZaDCAKlgwzyww71d9u7ofZVttvM5oB0SVvtuOv7H6yDOjq X-Received: by 2002:a05:600c:1d95:b0:40f:b33a:a6f8 with SMTP id p21-20020a05600c1d9500b0040fb33aa6f8mr439915wms.18.1706879256355; Fri, 02 Feb 2024 05:07:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706879256; cv=none; d=google.com; s=arc-20160816; b=wEJMBgI6LrBr/1aCzQQGHGmdB3ph8oi0LtCEVmYW5WmmWxq12qL40mTK1UBPsdwuJC myafCsBPCvKkwcpZWDkKHLqMapjW3b58RLx32Ak+vrooOSk/GkHSWiA89orCLp+ZSapV 1eOcDUmvA7YaV6UvQUsOCcgy8iyGZM4qHN4EHDnJ/SW8BJXj/oLmt7Tn/x/84NxWi3Wb 6RSvt2gWThrWzS/e2zbcRU65grI1XlhGkG/9GvhOmsSxsNBdXJkQKsaRMGA09SKtpnhe bdAy6ZnVf7IDTfvkCmjqHJl1Cc7DIvd6JMizeYVjdfnhqJmvai225s9hDlvb/wcuFZoN qVXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=jTp7WRmJjSv/n60Wl5ntm7/E/DeVXPBvn58BiICXmBY=; fh=sT0VP70zEcxiLSL1Wck/vxpQhb+gqQ+sTNJawe21uT4=; b=r6BeJj+mn3LG54RYmEGqIa5qwl84MlQpd+Lkfuo+rIt+qhrRV3SrYR1aGUUalwAV1H LJhdk6zwSgJnBZMdR+8UL4toff2mnMdVvDYg6tFFgMfFeePW+2dGxvzTpFOQHtWjh7zl RPjQsyHxMd46bahIKKwGcMTx7huuZUzuJa6p2plz0TYzU2qYdNayWaXGU5r5WCLh/Bz1 GqodCPL29TCYcUjWWis++XDVBifT0hWEttVaImKTxKXSZfC4VxbTk53lcufUccm9z9ce rhEWbjmCD+Vf9YVTKrxy7cT/dqh1PmBEs+/NNj8bcUiwOqttNSXRuNJGzq6Ik3FjpOzd ZhlA==; darn=linaro.org ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=w8VMDsv9; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org X-Forwarded-Encrypted: i=0; AJvYcCX6HLwCtf5mw6w5cuog8IjavOf9qQsyZdVrWClHV3WBvBfVS7RcU51t+p2/RAgT5dqkU9KTjJWnWMIfDVdcNX6dqSC/9NRZUirJ0Nui5klDElj2HXpAS70IcjA1D5+U++uqiMorYrshkHz4EDn2EC9ctpZVhXNhCieqghE5jQHVsLXUmtsppjs4XhwadbncPx8i+gyVV1K5lpXaaG+Mu53PFAqpZtPEddttK05kWoCNhgtylxsW3kwSCT2MvhV8ALwJLLvJCFQb9zh+PBWhUPV6rnPiHALJ6rCRWO6141dHUa23x+qx1kc+j7JsiD72Rm+2cT41j+eXIxfm1tTqBeMQ+pTc989tsU+MpZ6S2D1/AQhSV2LFQob3xZLtrnceS+gzaupcgryIdlTMi9A4SjQk5z4TBewg8i0qDkapPJTIU2ZwhErH3xq6jU8aAyORKFDtQHeJwfDaCftL7BrhstM6wP8AnetU7b1QJZt/pTWm2iPbj2SEOPzv4yuWJcFFCaIvb57sr7qHXjM2VxjqfZR0QFaNjZSH0JAe6BSKjF1YaA2fQ8Gdy1NJDkmx8h91HDaizoBzzkBg015rWS1KRUL5ULkWGTi0ez1CD2VkG89ZTNwI4Aj9EBt9QZQLD+P7u/j8+UV/zNUz6yg3BDcoXyjegV+k1mApC0NyetstZ92XuWADlaGx2XyQsrGLgp7RKjG8Fn8nh8HL4K8Rh4JL0fGikJ4uM8PRNEelpYPtla6ZXIG1I2/YfjUCzaNzEgv72Ghk4KOdrQWSL5E0DkXMbckl4qHOlby/zI5CcSt8cKXdkW8/lbe1USTwttzQTj79YXnEblXPoWmnGA== Return-Path: Received: from phobos.denx.de (phobos.denx.de. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id p18-20020a056000019200b00338b7c401e1si1011401wrx.919.2024.02.02.05.07.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Feb 2024 05:07:36 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=w8VMDsv9; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6A60687C7B; Fri, 2 Feb 2024 14:07:15 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="w8VMDsv9"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CCD3387C78; Fri, 2 Feb 2024 14:07:14 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: * X-Spam-Status: No, score=1.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_SBL_CSS,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.2 Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) (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 146AA87C7B for ; Fri, 2 Feb 2024 14:07:11 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sumit.garg@linaro.org Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-1d958e0d73dso6195805ad.1 for ; Fri, 02 Feb 2024 05:07:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706879229; x=1707484029; darn=lists.denx.de; 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=jTp7WRmJjSv/n60Wl5ntm7/E/DeVXPBvn58BiICXmBY=; b=w8VMDsv9m5vTLpbBX8BPKDdpnFS55wuTDAUYDUVm7srTwyP5HF4vFl7Q2vxilAid7Y PveyO3oPeTee7pEWVoSjlYoqB7F8mmGVksPqlvtye3u3VPvENa86sAigpOujHRBY+jkH l5eS2EV5ebeyrARbp5JZAQGsr2/IIcTdEhKo2H3Obxc8pxpPHqtOgKIZfgC3P3swva6p 5Mwk5M2HD3gYHNJEGWp9O7v5lOzVQ6h8OJZowp9QoncrZuyVdarNc5ZvuXDF7TPxHln/ 9wBs/dNbOWWVlIgPcgPzbt0A0opA6R6onc0t8FUNKa7k2nqbFLPTz3tXEVPzaBwsqMGS 5Y0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706879229; x=1707484029; 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=jTp7WRmJjSv/n60Wl5ntm7/E/DeVXPBvn58BiICXmBY=; b=Gk1yjlJzSiBWhWnQMv6i7e6IzsJM+TdN2n98cF0OSrgxAkGAxUzWxap1DNqFp877qT 0ouVbv/G2GC33niKdrTbP9fPVmQggUHUDZri5s4tRlADWQBz5LYEUl1tYqW6kmSgJu+w WpZcZqwcpUyN2bO6faxEcVamHcCxwJPk7Ph1+6Bkd7tekhvqWYMNxoIno3dTV02gc+dG x4lchfk/WsgATC6pSUXC48vfAxaIWoUH1TdbX28nLXRfzfBQp2Sa6gOStTcB3DEgxHix EMgVJ6vwSbj5QT3tuygmly5cw/77lUvTViX/m/nnrAPPD9dyx7nrePhgBPhQt09uJH2A douA== X-Gm-Message-State: AOJu0Yye7Q+gSiQ+L1y4txw0c3iZz3pW0p3PwFOjDzpuLAzQbIW3fVz6 7dzMGHDF/tRMk2gOvNym+uXzmENxOijRNlnOfp2gTuS9fsvOsY/S982X/MqMXy/CNPf82qLJ61q R1aU= X-Received: by 2002:a17:902:d50a:b0:1d9:14ac:239e with SMTP id b10-20020a170902d50a00b001d914ac239emr3106630plg.28.1706879229011; Fri, 02 Feb 2024 05:07:09 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCUCVh4VbLLEkIhOkafzpd9YeTCzlbdN33k/NRZq/mX/4+M/meqk98jthCxIty6CrFWL0PkotnvVU87fRv+EsXF1r9WvcD4dicUo/AWKR6tYh/cBomCnah/F+x5CxL6ZbciZiUI6FSPxO+y1dTrl09jx9/WNurAvPfeQKzAO/dU5GDwshfFTvX8F6blr5dCin1l8KWuNRCX2pBxy8/b7tDwxyu8hclyPhPRsFz8he+dtk2/YndOThDpg7mtCXpO1qxBQ5LRFlL6TLmK5v5xZqzsoKyV0to1/FkVFOTlctxPDvuErGD9axIpzOZDv1fTj4opVrL7I2PLIKVIpGgg7HUB9YHQSX7ymrBf94sADlWrNqsvdlQUSQgfQN6L4wswGPUcRzgdDdcKeOziNPshwOZuumsZs92e7qouDFzvcsQ953ch7Wr7nUH7DV6By/jy+8p04MH+6RpzqgfjdLE3jtNmqJdGaX/xjJV7Rechw6zngO3CbRDKp5LKM1qJlSo1fTOX5N+tSeGtPfCDcggB6i0kaR6zGWQs770szS2sB0Vz0gte+lVPofQI+xcJD/L3dWVC7ettX9GQObP2z7IOgOj84B8ZCj9eaB13Wmt3GQTONn6np+F8BwamFZHVIzz9EPyOSvBygYexRxKaYDmB3FwBBvNqobAxxtti1Ca1EBxXErvk2jnHtfloYqzm7ZxbbxOvF8etFHvpSW9UwIF7ECss9myY5WH1or70z2yx/I3JXPj3Wf4AnhyW7AmJrTCB0SXxbFtT2vk4uaQzRi09YwswQjzfo8ZWAK6RI9uxjhTSy/dHGpbKapteLDAp8qGhQHJcxOwA9Z0HWOIvOmxSoKuAicj2C/JSqSYt7fXc8IKbIcdjna8QSPgmqesgn8dsp6FaApzqn56cvDu3IeATTgPu6VBGCbwp5rH+N Received: from sumit-X1.. ([223.178.213.44]) by smtp.gmail.com with ESMTPSA id q23-20020a170902edd700b001d923684323sm1542407plk.195.2024.02.02.05.07.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Feb 2024 05:07:08 -0800 (PST) From: Sumit Garg To: u-boot@lists.denx.de, u-boot-amlogic@groups.io, u-boot-custodians@lists.denx.de Cc: trini@konsulko.com, sjg@chromium.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor@kernel.org, neil.armstrong@linaro.org, caleb.connolly@linaro.org, ff@shokubai.tech, daniel.thompson@linaro.org, dgilmore@fedoraproject.org, pbrobinson@gmail.com, ilias.apalodimas@linaro.org, b.galvani@gmail.com, xypron.glpk@gmx.de, michal.simek@amd.com, seanga2@gmail.com, rasmus.villemoes@prevas.dk, peng.fan@nxp.com, jh80.chung@samsung.com, rfried.dev@gmail.com, marex@denx.de, mibodhi@gmail.com, bb@ti.com, mark.kettenis@xs4all.nl, festevam@gmail.com, nm@ti.com, andre.przywara@arm.com, Sumit Garg Subject: [PATCH v5 08/11] doc: devicetree: Updates for devicetree-rebasing subtree Date: Fri, 2 Feb 2024 18:35:31 +0530 Message-Id: <20240202130534.1051438-9-sumit.garg@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240202130534.1051438-1-sumit.garg@linaro.org> References: <20240202130534.1051438-1-sumit.garg@linaro.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.8 at phobos.denx.de X-Virus-Status: Clean Encourage SoC/board maintainers to migrate to using devicetree-rebasing subtree and maintain a regular sync with Linux kernel devicetree files and bindings. Along with that add documentation regarding how to run DT bindings schema checks. Signed-off-by: Sumit Garg --- Changes in v5: - Document how to cherry-pick fixes from devicetree-rebasing tree. Changes in v4: - Switched subtree to be imported as dts/upstream sub-directory rather than devicetree-rebasing sub-directory to better suite U-Boot directory structure. - Since we now have v6.7-dts tag available now, so switch subtree to that from its beginning. - Clarify subtree uprev schedule as a separate documentation section. Also, fixed documentation typos. Changes in v3: - Replace CONFIG_* with Kconfig options Changes in v2: - s/U-boot/U-Boot/ doc/develop/devicetree/control.rst | 117 ++++++++++++++++++++++++----- 1 file changed, 97 insertions(+), 20 deletions(-) diff --git a/doc/develop/devicetree/control.rst b/doc/develop/devicetree/control.rst index 9a0cb90336df..4440d4b82c6a 100644 --- a/doc/develop/devicetree/control.rst +++ b/doc/develop/devicetree/control.rst @@ -1,5 +1,6 @@ .. SPDX-License-Identifier: GPL-2.0+ .. sectionauthor:: Copyright 2011 The Chromium OS Authors +.. Copyright 2023-2024 Linaro Ltd. Devicetree Control in U-Boot ============================ @@ -22,12 +23,11 @@ for three reasons: hierarchical format - It is fairly efficient to read incrementally -The arch//dts directories contains a Makefile for building the devicetree -blob and embedding it in the U-Boot image. This is useful since it allows -U-Boot to configure itself according to what it finds there. If you have -a number of similar boards with different peripherals, you can describe -the features of each board in the devicetree file, and have a single -generic source base. +The U-Boot Makefile infrastructure allows for building the devicetree blob +and embedding it in the U-Boot image. This is useful since it allows U-Boot +to configure itself according to what it finds there. If you have a number +of similar boards with different peripherals, you can describe the features +of each board in the devicetree file, and have a single generic source base. To enable this feature, select `OF_CONTROL` via Kconfig. @@ -68,8 +68,14 @@ a binary file. U-Boot adds its own `fdtgrep` for creating subsets of the file. Where do I get a devicetree file for my board? ---------------------------------------------- -You may find that the Linux kernel has a suitable file. Look in the -kernel source in arch//boot/dts. +Linux kernel Git repository has been the place where devicetree files along +with devicetree bindings are stored and maintained. There is devicetee-rebasing +(dtrepo_) which maintains a forked copy of devicetree files along with bindings +at every Linux kernel major release or intermediate release candidates. + +U-Boot maintains a Git subtree for devicetee-rebasing repo as `dts/upstream/` +sub-directory. You may find that the `dts/upstream/` sub-directory has a +suitable devicetree file for your board. Look in `dts/upstream/src//`. If not you might find other boards with suitable files that you can modify to your needs. Look in the board directories for files with a @@ -78,17 +84,38 @@ modify to your needs. Look in the board directories for files with a Failing that, you could write one from scratch yourself! +Resyncing with devicetree-rebasing +---------------------------------- + +U-Boot regularly sync `dts/upstream/` subtree whenever the next window opens +with the next available kernel major release. `dts/update-dts-subtree.sh` script +provides a wrapper around git subtree pull command, usage from the top level +U-Boot source tree, run:: + + ./dts/update-dts-subtree.sh pull + +If required it is also possible to cherry-pick fixes from devicetree-rebasing +tree prior to next sync, usage:: + + ./dts/update-dts-subtree.sh pick + + Configuration ------------- -Set up "" when prompted for `DEFAULT_DEVICE_TREE` by Kconfig. Then put -your devicetree file into:: +Traditionally, U-Boot placed copies of devicetree source files from Linux +kernel into `arch//dts/.dts` which can be selected via setting +"" when prompted for `DEFAULT_DEVICE_TREE` by Kconfig. - arch//dts/.dts +However, it has become cumbersome over time for each SoC/board maintainer to +keep devicetree files in sync with Linux kernel. Therefore, SoC/board +maintainers are encouraged to migrate to use synced copies from +`dts/upstream/src//`. To do that enable `OF_UPSTREAM` for the +SoC being used via Kconfig and set up "/" when prompted for +`DEFAULT_DEVICE_TREE` by Kconfig. -This should include your CPU or SOC's devicetree file, placed in -`arch//dts`, and then make any adjustments required using a u-boot-dtsi -file for your board. +This should include your CPU or SOC's devicetree file. On top of that any U-Boot +specific tweaks (see: dttweaks_) can be made for your board. If `OF_EMBED` is selected by Kconfig, then it will be picked up and built into the U-Boot image (including u-boot.bin). This is suitable for debugging @@ -155,8 +182,9 @@ ways: Adding tweaks for U-Boot ------------------------ -It is strongly recommended that devicetree files in U-Boot are an exact copy of -those in Linux, so that it is easy to sync them up from time to time. +With `dts/upstream` Git subtree, it is ensured that devicetree files in U-Boot +are an exact copy of those in Linux kernel available under +`dts/upstream/src//`. U-Boot is of course a very different project from Linux, e.g. it operates under much more restrictive memory and code-size constraints. Where Linux may use a @@ -169,8 +197,8 @@ constraints are even more extreme and the devicetree is shrunk to remove unwanted nodes, or even turned into C code to avoid access overhead. U-Boot automatically looks for and includes a file with updates to the standard -devicetree for your board, searching for them in the same directory as the -main file, in this order:: +devicetree for your board, searching for them in `arch//dts/` in this +order:: -u-boot.dtsi -u-boot.dtsi @@ -199,6 +227,54 @@ option to specify a list of .dtsi files that will also be included when building .dtb files. +Devicetree bindings schema checks +--------------------------------- + +With devicetee-rebasing Git subtree, the devicetree bindings are also regularly +synced with Linux kernel as `dts/upstream/Bindings/` sub-directory. This +allows U-Boot to run devicetree bindings schema checks which will bring +compliance to U-Boot core/drivers regarding usage of devicetree. + +Dependencies +~~~~~~~~~~~~ + +The DT schema project must be installed in order to validate the DT schema +binding documents and validate DTS files using the DT schema. The DT schema +project can be installed with pip:: + + pip3 install dtschema + +Note that 'dtschema' installation requires 'swig' and Python development files +installed first. Please, refer to the GCC build documentation for installation +instructions :doc:`../../build/gcc`. + +Several executables (dt-doc-validate, dt-mk-schema, dt-validate) will be +installed. Ensure they are in your PATH (~/.local/bin by default). + +Recommended is also to install yamllint (used by dtschema when present). On +Debian/Ubuntu systems:: + + apt install yamllint + +Running checks +~~~~~~~~~~~~~~ + +In order to perform validation of DTB files, use the ``dtbs_check`` target:: + + make dtbs_check + +It is also possible to run checks with a subset of matching schema files by +setting the ``DT_SCHEMA_FILES`` variable to 1 or more specific schema files or +patterns (partial match of a fixed string). Each file or pattern should be +separated by ':'. + +:: + + make dtbs_check DT_SCHEMA_FILES=trivial-devices.yaml:rtc.yaml + make dtbs_check DT_SCHEMA_FILES=/gpio/ + make dtbs_check DT_SCHEMA_FILES=trivial-devices.yaml + + Relocation, SPL and TPL ----------------------- @@ -260,8 +336,9 @@ used it before Linux (e.g. snow). The two projects developed in parallel and there are still some differences in the bindings for certain boards. While there has been discussion of having a separate repository for devicetree files, in practice the Linux kernel Git repository has become the place where -these are stored, with U-Boot taking copies and adding tweaks with u-boot.dtsi -files. +these are stored, with U-Boot taking copies via devicetree-rebasing repo +(see: dtrepo_) and adding tweaks with u-boot.dtsi files. .. _dtspec: https://www.devicetree.org/specifications/ .. _dtlist: https://www.spinics.net/lists/devicetree-compiler/ +.. _dtrepo: https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git From patchwork Fri Feb 2 13:05:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 769198 Delivered-To: patch@linaro.org Received: by 2002:adf:9bca:0:b0:33a:e5bd:fedd with SMTP id e10csp898989wrc; Fri, 2 Feb 2024 05:07:48 -0800 (PST) X-Google-Smtp-Source: AGHT+IE7KakRB54lMHXROLvI7wZNjyuGsurXDTUoF9lLa367O/xa22Dn0guk9AdknyvUDTBeic0z X-Received: by 2002:a05:6512:15e:b0:511:3c06:9360 with SMTP id m30-20020a056512015e00b005113c069360mr58588lfo.22.1706879268216; Fri, 02 Feb 2024 05:07:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706879268; cv=none; d=google.com; s=arc-20160816; b=BII3ZZl3GJkLQx50WdUK6aMs5Fvi+v2Yi/I3z4n483r/075UdhAiKQqeIqqLUQ0bpS yM03kJ6xeiB9zBTHToz+prkngD+OcJbjHEL4hU1NY0srGtEQz7QOoBMX06Vq2HmO6b4b YoFD5Z0J9re9vDe6FqsjOGSXDZp1EviP9eXuHTiv9tMdSWPRqFnUxQ3YAFgBPODrgmRH fvY8u6m5p2ZgG7KXlD9nllYzcqUPz7aL9YvGDaOH+fITd6LAQo5pJmDQ3wQPSsXjS53E SAQBl1UAn1SA250Rl07NPu7QnwAJcHs+dCsAgqIGdgNJ2aWQyatgX6lEo8U+7ByZbJVm 6WRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=/uOqA2o+JoYPimkWZdK+MDHHE0G6ZoGW+csrPHpPpJA=; fh=nPv3RPD3BFgMsSbpLuYdGpl5GSDlDm/m4WOyUQV/Z5g=; b=P0GuE/6kSGYGZ5828fmwXGcJ1P8JWIpkmO21fJISiLE+iqo9ZDJO0JVQ0+ZLMzVJuP DovMZFoeN+CBejrfBIhechnD6sobQgpGWgKd/ZXHisKoZPEjysI94ICg8PH3fUubBSWU WQAODO1LyUF7ghKJTvg0T5Vt9dLehutO50ruFfI2B3O1I/UV8iBmgRVySrxnneVNvk7X LIwoYQK4I8WQwug7PUgd1WLI/OKV4QRDwcZRe/YJwXaTxvI/TtOtdI9HCVWeQRfvW53p HbRgNYV/aMnU52nqogo36ura4nAdrM6jNhGCjxBuqB42V+V0+lUmSyJJ22rWbVmzLdhk c0eQ==; darn=linaro.org ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NtqUXtld; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org X-Forwarded-Encrypted: i=0; AJvYcCUqsHLj0b/A2uLM6ltGYQnc2OqYnAlhRj9ScS02z7a0DLCMVB+KLraiIAHpghueWj8nRD7gOvNjnGmjAldQ4VDy7MS8ZdEe54+mGSG/4bFh50Ut3VOvgbHsdytUc8lTZxw5W6fb5sxkOR3xDe9vMIfORmz2bxBs60P/3Sq9OuBoHWEwP3S2ewVPYDp0189NyydIT4jhUeRFj1bf1Wn6sBvNZj00RLoegVKyeJvDTpxzg3yY6GdNfzcdY/Cprk8tJdCOyZ09X09O8buRzbcpvCga6aUxc+P7Jf+Ns6P2tL3Z3BUV2RlnB2SIWaVCFaCz+S+lPAK7mANKXrNcy9vWwaw3whYydFP3QPQQSj/fDXPAu3Ygn+j+bQAUz3EDHfeWbE7bKelvcsRGtf6Lmwl76uuwxIL//KXleb8PfhB7Yrh88tIuDaBtBNZYlwnGCiNDyc00PnfS2flveTBm35RiVTT10lmGBmXP2PO8SrvcnxZuUS50BiBWnYrbW7HfVSqtppdHgbSr6XzjzRu+t2t7KWg4mu6Sh1XFiQUsr01BVDkr5QTSTirzQsRyyFHwI3rHiEzX9vP3LbJADtcSLJhnA2AyjUXEZtl338xwUM8v975a9ZptmHRbRueBWxwTskB+sdE9QvqqqEu0bPk5UU6yfigNbkN0qCDlWPYio3/G0W3LAliRn1iT9WtF61Q/O61L1o1VnoXH0/GW+SmfzGE87pDbOgUxPubqkfAj89qN0BCiudLRyOXv778Xljg0zyWj9M5FLeB1RA9jWKH832LEK84P+IHGL+drYYZmcLjCLWNXAP9nGWucq4oeLZGQByfNQGG81vvkSjgATw== Return-Path: Received: from phobos.denx.de (phobos.denx.de. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id u15-20020a05600c19cf00b0040fafb9f523si1155586wmq.179.2024.02.02.05.07.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Feb 2024 05:07:48 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NtqUXtld; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D95EB87CF6; Fri, 2 Feb 2024 14:07:23 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="NtqUXtld"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4739487CF6; Fri, 2 Feb 2024 14:07:22 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: * X-Spam-Status: No, score=1.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_SBL_CSS,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.2 Received: from mail-pl1-x62d.google.com (mail-pl1-x62d.google.com [IPv6:2607:f8b0:4864:20::62d]) (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 AFFAB87D2E for ; Fri, 2 Feb 2024 14:07:19 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sumit.garg@linaro.org Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-1d932f6ccfaso16510665ad.1 for ; Fri, 02 Feb 2024 05:07:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706879238; x=1707484038; darn=lists.denx.de; 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=/uOqA2o+JoYPimkWZdK+MDHHE0G6ZoGW+csrPHpPpJA=; b=NtqUXtldKt/UIHRSCPxgHzbnvO0aiub04+agyGQoHhucHnZEuL8iHkCTpKCpZu6Wli OIgx+gCIEyA3jvvB5HjmBCQE7psbUUE8XqcuXNfI+4ewlx+31Tg1npLhUiHZ9KeviUGm AHSazwc8K9qbabGoJs5Ln1Yl8DLm7IX8unOeW6y0iRC6e6wr6eUsONNwI0e6aMcfHpiF W6ZFsVA03C5+whggRggLLR13y+wrQOUGPFw+SmUEfvveqQVt3sCo77XtRw5EcBKkZrLO 5oCffBxBmB+8exViVpNSryF+PNTlenE5NJ2yKx2t9S5TQfyq2Ai7kfOE5IP5NrQXFenS 0LPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706879238; x=1707484038; 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=/uOqA2o+JoYPimkWZdK+MDHHE0G6ZoGW+csrPHpPpJA=; b=WojLmnlSYpzKfmVYighiMQ5EOSK5rcGVSVvQD+tiUrQgeYe1TrBFtefRSr0gRezz7F QAB83FyVIQt3FPZn2XQNyF2vnaUXDOH4bkDLQnA+h5wadZeNDVvXje7WL+2nfHw8SuET JUGDPeQ9M8E+98YtFxD/N7XohXNPvmuYQY+cK4hGf8Nm3c2BxSOkQ+0AzIjKAlYHbv5q EieG2jJqim4iAaeBGO7B1EvFnbdXhcO9/dozYW08SvNJuB6ecx9Qsad/NCgzDhHbarxJ VnvVkB6HnwllbQFqONKYoJCiaTHfzHygWjJMxcEe07V1REDCcZWVqkMBd5RADCBbuSuC 53rA== X-Gm-Message-State: AOJu0Yxb1pe+eTI8Lc6HKqAuCm21pg4gqpYEc8gf48TRIv9MSi0hxi82 OY8ttMhRLTLg6rn91qjePgXqDixgj2YQYRi+6A6TUUYMUYLctjUc0k1iQ5rBFJ0vAKvT58ieNgk jPEk= X-Received: by 2002:a17:902:f7c9:b0:1d9:4ee9:4d8c with SMTP id h9-20020a170902f7c900b001d94ee94d8cmr5014589plw.18.1706879237858; Fri, 02 Feb 2024 05:07:17 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCXFocORMJix+4USu3VDgUDJuoi6JqDH54U/ZJ4FDIIGeLhxJlRYm66CAhCf41+TXsBqTWRYE8EA68F56WN8YVmN3hZX2OTH/L+sc1U2WMIlJQQfkD5Q45P2z0gkqm6UM8vq5xb4nvmWX/O2QrydCq7FhxL/Dy6dK3fBMXrHKAK6F8UTymlOZkCGX0pv8nC3cLr/tbujnwt0rJkrDnPsr34AIVrDyvj6rOqllH1cj04Pbtd3/skJ3ib72FtQoMDf0H6bp/SktdnkC8boXJQsyxsQXKVIA6zkvO4XZS+k8aPp1n8CDk2w7iCQw3yU9snXKZkKrT9KsSQHlv90KQ+vaismLoDiUzkqsXwLWQe6pz4zu8qXxIzR7onBOu61O9SbzBxFxdCJT8VoFJgmb+4L69fF5JcbFvbWgcLVNNgoAtm/T89UUmn/BhlakEZzex7/JYLMUzfcYbrFM81PUYgFo0XRO1KNGQ8d1cf/alfp4DrtBtcTr83MN3k4n5BGOlaCeiR+gA7BB6B1IX1tVuCwvmDl7OhoTkvJ0iZKEmqfiMd7JGIt8a2/rB4HOIhqWymPHF0aCdSqGNOln/nNnoGlG71HaOIfhcJLqGg1Z9LoMjmmFCtTMl0M8CVO2CGJah3Ckuyww7mPOSB3KTUHBolLjS6Ex1RoAwLENsoc+kLahoBzXzhan1jvUJ7vpJUf5QFxEFx9aaAt65f4yzaveMx80bG1auqCINVvrtKyyD6dQ7gRGH/Too7DTly6zIW9+lOMMjNC8UKuLNBi8SqVN0NU0bUTjIe46xvduRWtQtnrHxIkHz0ABdT/4JKCDOsnq9V1a0IMNevCt8GEDMM8yoZzDMpxRrVOM0UNEAffTBiyDl8z0SsvymA6esrvJfI2dcXPpwusSqwvD8hRJbsUCPUuftAX3W7Uevs5sHtP Received: from sumit-X1.. ([223.178.213.44]) by smtp.gmail.com with ESMTPSA id q23-20020a170902edd700b001d923684323sm1542407plk.195.2024.02.02.05.07.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Feb 2024 05:07:17 -0800 (PST) From: Sumit Garg To: u-boot@lists.denx.de, u-boot-amlogic@groups.io, u-boot-custodians@lists.denx.de Cc: trini@konsulko.com, sjg@chromium.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor@kernel.org, neil.armstrong@linaro.org, caleb.connolly@linaro.org, ff@shokubai.tech, daniel.thompson@linaro.org, dgilmore@fedoraproject.org, pbrobinson@gmail.com, ilias.apalodimas@linaro.org, b.galvani@gmail.com, xypron.glpk@gmx.de, michal.simek@amd.com, seanga2@gmail.com, rasmus.villemoes@prevas.dk, peng.fan@nxp.com, jh80.chung@samsung.com, rfried.dev@gmail.com, marex@denx.de, mibodhi@gmail.com, bb@ti.com, mark.kettenis@xs4all.nl, festevam@gmail.com, nm@ti.com, andre.przywara@arm.com, Sumit Garg Subject: [PATCH v5 09/11] MAINTAINERS: Add myself as devicetree-rebasing maintainer Date: Fri, 2 Feb 2024 18:35:32 +0530 Message-Id: <20240202130534.1051438-10-sumit.garg@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240202130534.1051438-1-sumit.garg@linaro.org> References: <20240202130534.1051438-1-sumit.garg@linaro.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.8 at phobos.denx.de X-Virus-Status: Clean Add myself as devicetree-rebasing maintainer. Reviewed-by: Simon Glass Reviewed-by: Ilias Apalodimas Signed-off-by: Sumit Garg --- Changes in v5: - None Changes in v4: - Switched subtree to be imported as dts/upstream sub-directory rather than devicetree-rebasing sub-directory to better suite U-Boot directory structure. - Added commit description. Changes in v3: - Picked up review tags Changes in v2: - Picked up review tags MAINTAINERS | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index da477a4e6add..af05c42e5e42 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -960,6 +960,11 @@ F: cmd/cyclic.c F: common/cyclic.c F: include/cyclic.h +DEVICETREE REBASING SUBTREE +M: Sumit Garg +S: Maintained +F: dts/upstream/ + DFU M: Lukasz Majewski M: Mattijs Korpershoek From patchwork Fri Feb 2 13:05:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 769199 Delivered-To: patch@linaro.org Received: by 2002:adf:9bca:0:b0:33a:e5bd:fedd with SMTP id e10csp899067wrc; Fri, 2 Feb 2024 05:07:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IH/uh7G6PL8Fzb9+GYN/ZEDmWARtD4Lm6oaddN3n1/12IMd3iU8E9Q86PVDi5xiVYrQeZIR X-Received: by 2002:a05:600c:4507:b0:40e:e25c:41cf with SMTP id t7-20020a05600c450700b0040ee25c41cfmr4067278wmo.12.1706879278868; Fri, 02 Feb 2024 05:07:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706879278; cv=none; d=google.com; s=arc-20160816; b=L4oebVV/sJMmVOPWA0DTphznD7APL8YTIbMllNo1Ym/NQJovER2DczQfEszeJjugkH ISd40IST70PnqG+myRD0s22M15pDDp0kTuwRu8B0PCJyF6KxpW1/u7JctI/SBL1O//ij qU3kPt1Ie2oF9otFd9zjJjNY+2T4Lqefu1qpxubFYxuR/Qd1CN+qL5YAOg6npsQ6touu ugAl5fB+ln1I1AqmZflA+GnVeKuiGShTs7giByjoGZOBcQH71iwnBymN/gPFDSnf+Eod w9Mwl/FO4BUt3KG6Y2Js/YZmsFr+PCZL6tgJx/fxNTbSjJ9wkRCieZMOZcFv9kN4xHn+ MFtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=86cKOKOIikWvdQz1MxkWVNRFRquhuv/5USEoeTEMH30=; fh=+sgmCeYc9bPkf9vST5QkiXwF9f369QuLBeWhT9bihP8=; b=jjVOfoJYprcYJ4Jo0/VId773tELE8MbtxTJsJ1h8t7x7WdZd6q9YduaU1W/zOkpG0K 8f8gkb+eUZP55vq6drmTPKzRTzRaTTEpU1Ps8ayIKJ1qGROpJznE9Ff3h6JXLvO3bVew jcyBjjMFrxVH+1KhVn83E6kh+TEADVOiQhYGakICIygBj51J/1HhX9AsbPCveyqo+6/C K2NHpatRKMhESErr7EztRoWkn8eskFHexQh+Ed91rYJHBTOcXk4KiGp2S3pfk0AP/e5z Pa2haKnM+42Go3zRpQQkbRW+LDjoi1f+AEloyuZxWU1KvOYjW1+MeZqBHDNhyNAJMSR/ ATug==; darn=linaro.org ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cgWLHstd; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org X-Forwarded-Encrypted: i=0; AJvYcCV2Vjz86aaQqXR4uddukv2haeq27xbY0YXCpfps648kI6HH5yDXw8l5/AUHxaAj2sSQsbLCy0CzcO27YGODFpHk+IygtrFx3/GA9MvdftPohEgW6moNywLe0KGhL5Q16Bh4YZaGEc/9/yJq+VjlPnRrvWP79y9NqShZL4i5fEUX7eHaBC5Z3iaXkfF2ki6p1p2NGa3LkgwkhbdsVMIXmTTsuK3QnD4XhvD7PWeKZUpyg19daF8PEUvT7ov5Mmm7yXV1HosNmDbHZOydmEbEOqbcOyVzkw4j8xX+Ce46YuyuO+81zjOZ5UEbahRzRt5Mjf5hzktyEHImZmwl3wrCO0DUNTTfYFWUt5eNadO+wC+5TErakGtOfXLKDD28Ggtj05qp1r0Ap1LJNg4YtWP6XBgKQmHYBxGtz72pYh9d4zhOXbgOwWhzYphgQGfVd460IxxFn9P3HjHrw2knmiMv9NF8xkO0FVCIwpFO6IAvlxAlIOtQAy1T1e4SPw1IUrlgV5sETYBZD9XIn3NB6joP6+gO/RImNTXqsW/z/xM1U/FnWg2co3M98Ijn+iMd/oHpMKdUv2GiwaJEQzCsbPUmt5gJDXOlEyD0wJqkH0sOdlGzzdPtYRyF71KgS/QedfbeVGUuptNcfqGqkZCcqrzFUWDFSVUg8MCNN0XrFI/VIKu6tvd1xOlh8XyZbNleT+h6Thujkg3HnPvlDZKjiSIdnQHfuiYsgSTZZENUp/TZya2bXoYmyZB+2nVDGE6EkQPHx3IPu54a1ycV8XTwNLBGlvKZT9SBjgFRRXk2IN6EMwW4g5QCdJWGKqY87XIjv1H4UAz4CllGN0OHTA== Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id r15-20020a05600c458f00b0040e9d0a3888si3442361wmo.31.2024.02.02.05.07.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Feb 2024 05:07:58 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cgWLHstd; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 70D8A87D25; Fri, 2 Feb 2024 14:07:34 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="cgWLHstd"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6E01387C74; Fri, 2 Feb 2024 14:07:32 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: * X-Spam-Status: No, score=1.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_SBL_CSS,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.2 Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) (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 CED4E87D27 for ; Fri, 2 Feb 2024 14:07:28 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sumit.garg@linaro.org Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-1d934c8f8f7so18333785ad.2 for ; Fri, 02 Feb 2024 05:07:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706879247; x=1707484047; darn=lists.denx.de; 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=86cKOKOIikWvdQz1MxkWVNRFRquhuv/5USEoeTEMH30=; b=cgWLHstd5oDSVSDHfyYAN4bDNWJMeBk4bEYsrvC7mWWNKjHRCHFIxdigSb9SQCNovv KtWZDgCqET9fRUkgnaVxyJ8bO91qRqO+k/XVkZ72qMSPiZEpVeYFZ8dc5MPMwdT20P1N aXWqPczSyavrqds2LxnYBl9kw5kh7vJ9hJ5VA1RvnSZlbLLDj8qCiZdOtMREenA+QrOZ LddYrRD0JGrgLVBTzRbzJetwN3pjPn+l8xk6TIa3xYipKIaYxE827qZSNzMs8BQC+ROj qeKAtSC3qCDNhcTyHUv04KFnv8yP999tYMTSQ9nhwOAuPrBH1ZgrcIELYwknZowRS+5O M9FQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706879247; x=1707484047; 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=86cKOKOIikWvdQz1MxkWVNRFRquhuv/5USEoeTEMH30=; b=EGkUTv6MbvewOic4bA1MzUDi4723PpyejCy07wXZ2OIicmAeDWS0ENSgEE1epzZtWC Po55SKSXvgjKcvR4oUsdYINibB04Bo2l08yOAhkcB4wsVK4n1UgleVvTckLVCVw6ExDm GinONRg09BEAelnVFVgGrnHOeuKQ42CMMY8vgi3roKX25WELCNqG2+08FUJCCN3aPsns QLYwGRJOSKS5iIrwceHrbRPDZq/efzDHPAwxxHEtjPVtPvvrsqY1Cq02o3iY5d8ZCQJ8 sFp3OdRdWtL0mlVYNdBP+MYohQHZt+noTxe8rBjFZf6TGNpf5pJk42CBMn/VeKDQY1xF 6G6A== X-Gm-Message-State: AOJu0YzU7dL+boOd2QRFeHOU2f9c+xY3o+LW/vjYd9mmmusb8nl2KZ5p S10YzTcv3YJhMY+LX3VCgQSMfKx4uJL7vXKpNuE7cNDqxMLwBzaAkMdWCkUV7o0tMMDb9niOkMX 7KOY= X-Received: by 2002:a17:902:f545:b0:1d9:5d65:c1b with SMTP id h5-20020a170902f54500b001d95d650c1bmr3745991plf.41.1706879246687; Fri, 02 Feb 2024 05:07:26 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCWgEEmRJ4IBTSafseozLfZ2qsD1NrKFTUPaygSAWUhF+kp7j0VYFQJ8Oj3PeDOuWZif6/St8ETNe6aTpalr5P/hb26kXAuI30tetAcC5Q0SSk8LmXbIk70AmVN2DaEEHvjSCkNHGTBgWe3wzp0uIHWzlE85OJbsXOM9AYyLq+rDHbWVcAp6Vn6e47og+8oR/BmT2BnXw7X/jKPeXOq8Ml9tyyH44vHHDxkJ4fEnCy7KMug96iekmK8LQHSQEqH07ahYdagZlJzJ+I6L1yo/k2+Ink9QsAbAYTghCrpCsBPy2G4cxRVTzfVua+flLKSE1Ke9qGq0SNeIwOQzsPwtKFWiO0IE7IWiwSMZiR5MxdDzNnmE/hgRXLwzwcMur1KyqYYtUPumTlzvwlJYimJoNU14WrlYvknzwD17sTvCaVNvhbFAThJnpZhEa/TNfa2Ffao1JjJP24j6sroeaW9zkh7GSTU8pi5lealnLPT+2sfEH+k+bnX/U2rFs1mwiOV1eg5Jf+DNV2oCivICYUs89pSPTGzvfYSDSjI4bQySoWeouaEWtrqVjI3XchvUoedPqH4OIJaOKGbU/l+pF0H1S+ykFg1EliX2dV4W249xZR7BuSAj1lKwZUr8P6LNslyKttRc2eIfVwB0GAMfKj6KeV9IOkuGVBq+okx+D35jiw4aIACo2UhZjpHGiepYttTG7sqpjHExZK6WxNQnr+HCgFKfYx6Rf+386HVOCCrtxy0KFDDawWhAo6DM8M00n5jpQMytOHW8gOhgoUDsdFil6h6ywlrmP7nVVFmHLpID1R9l3IUsxn+5hFKtwFDILzgpGW6Z6Quk3CaPg56ji1UI4FsQScsu1fVOm0mT6M+hYKbosjR3N3oILJyFYI/479isnqi9dz9qW++muGjy+zQeRR3jDaT8nEBmzGLv Received: from sumit-X1.. ([223.178.213.44]) by smtp.gmail.com with ESMTPSA id q23-20020a170902edd700b001d923684323sm1542407plk.195.2024.02.02.05.07.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Feb 2024 05:07:26 -0800 (PST) From: Sumit Garg To: u-boot@lists.denx.de, u-boot-amlogic@groups.io, u-boot-custodians@lists.denx.de Cc: trini@konsulko.com, sjg@chromium.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor@kernel.org, neil.armstrong@linaro.org, caleb.connolly@linaro.org, ff@shokubai.tech, daniel.thompson@linaro.org, dgilmore@fedoraproject.org, pbrobinson@gmail.com, ilias.apalodimas@linaro.org, b.galvani@gmail.com, xypron.glpk@gmx.de, michal.simek@amd.com, seanga2@gmail.com, rasmus.villemoes@prevas.dk, peng.fan@nxp.com, jh80.chung@samsung.com, rfried.dev@gmail.com, marex@denx.de, mibodhi@gmail.com, bb@ti.com, mark.kettenis@xs4all.nl, festevam@gmail.com, nm@ti.com, andre.przywara@arm.com, Sumit Garg Subject: [PATCH v5 10/11] dts: meson-gxbb: Switch to using upstream DT Date: Fri, 2 Feb 2024 18:35:33 +0530 Message-Id: <20240202130534.1051438-11-sumit.garg@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240202130534.1051438-1-sumit.garg@linaro.org> References: <20240202130534.1051438-1-sumit.garg@linaro.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.8 at phobos.denx.de X-Virus-Status: Clean Although there were still some variations in board DTS files based on meson-gxbb SoC but I think those were minor differences from upstream and shouldn't impact boot on these devices. So enable OF_UPSTREAM to use upstream DT and add amlogic/ prefix to the DEFAULT_DEVICE_TREE. And thereby directly build DTB from dts/upstream/src/ including *-u-boot.dtsi files from arch/$(ARCH)/dts/ directory. Reviewed-by: Neil Armstrong Reviewed-by: Simon Glass Signed-off-by: Sumit Garg --- Changes in v5: - None Changes in v4: - Picked up review tag Changes in v3: - Dropped Makefile portion and enabled OF_UPSTREAM for SoC instead. Changes in v2: - Picked up review tag arch/arm/mach-meson/Kconfig | 1 + configs/nanopi-k2_defconfig | 2 +- configs/odroid-c2_defconfig | 2 +- configs/p200_defconfig | 2 +- configs/p201_defconfig | 2 +- configs/videostrong-kii-pro_defconfig | 2 +- configs/wetek-hub_defconfig | 2 +- configs/wetek-play2_defconfig | 2 +- 8 files changed, 8 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-meson/Kconfig b/arch/arm/mach-meson/Kconfig index d6c890580617..8ddb59161a0d 100644 --- a/arch/arm/mach-meson/Kconfig +++ b/arch/arm/mach-meson/Kconfig @@ -25,6 +25,7 @@ choice config MESON_GXBB bool "GXBB" select MESON_GX + imply OF_UPSTREAM help Select this if your SoC is an S905 diff --git a/configs/nanopi-k2_defconfig b/configs/nanopi-k2_defconfig index 41dbf7981f8b..2e1c756bf7a8 100644 --- a/configs/nanopi-k2_defconfig +++ b/configs/nanopi-k2_defconfig @@ -6,7 +6,7 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="meson-gxbb-nanopi-k2" +CONFIG_DEFAULT_DEVICE_TREE="amlogic/meson-gxbb-nanopi-k2" CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_DEBUG_UART_BASE=0xc81004c0 diff --git a/configs/odroid-c2_defconfig b/configs/odroid-c2_defconfig index 5f9f323e06ea..ce5eaec3cd2a 100644 --- a/configs/odroid-c2_defconfig +++ b/configs/odroid-c2_defconfig @@ -6,7 +6,7 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="meson-gxbb-odroidc2" +CONFIG_DEFAULT_DEVICE_TREE="amlogic/meson-gxbb-odroidc2" CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_DEBUG_UART_BASE=0xc81004c0 diff --git a/configs/p200_defconfig b/configs/p200_defconfig index cd579ef5f142..b69460347954 100644 --- a/configs/p200_defconfig +++ b/configs/p200_defconfig @@ -6,7 +6,7 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="meson-gxbb-p200" +CONFIG_DEFAULT_DEVICE_TREE="amlogic/meson-gxbb-p200" CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_DEBUG_UART_BASE=0xc81004c0 diff --git a/configs/p201_defconfig b/configs/p201_defconfig index b2f0a0ccdb4a..dcc1454be16c 100644 --- a/configs/p201_defconfig +++ b/configs/p201_defconfig @@ -7,7 +7,7 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="meson-gxbb-p201" +CONFIG_DEFAULT_DEVICE_TREE="amlogic/meson-gxbb-p201" CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_DEBUG_UART_BASE=0xc81004c0 diff --git a/configs/videostrong-kii-pro_defconfig b/configs/videostrong-kii-pro_defconfig index 3eda8f14a21b..7a5af234471f 100644 --- a/configs/videostrong-kii-pro_defconfig +++ b/configs/videostrong-kii-pro_defconfig @@ -6,7 +6,7 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="meson-gxbb-kii-pro" +CONFIG_DEFAULT_DEVICE_TREE="amlogic/meson-gxbb-kii-pro" CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_DEBUG_UART_BASE=0xc81004c0 diff --git a/configs/wetek-hub_defconfig b/configs/wetek-hub_defconfig index fd92b041e739..85cff73f50f7 100644 --- a/configs/wetek-hub_defconfig +++ b/configs/wetek-hub_defconfig @@ -6,7 +6,7 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="meson-gxbb-wetek-hub" +CONFIG_DEFAULT_DEVICE_TREE="amlogic/meson-gxbb-wetek-hub" CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_DEBUG_UART_BASE=0xc81004c0 diff --git a/configs/wetek-play2_defconfig b/configs/wetek-play2_defconfig index b887419a6bab..efdf820165b5 100644 --- a/configs/wetek-play2_defconfig +++ b/configs/wetek-play2_defconfig @@ -6,7 +6,7 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="meson-gxbb-wetek-play2" +CONFIG_DEFAULT_DEVICE_TREE="amlogic/meson-gxbb-wetek-play2" CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_DEBUG_UART_BASE=0xc81004c0 From patchwork Fri Feb 2 13:05:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 769200 Delivered-To: patch@linaro.org Received: by 2002:adf:9bca:0:b0:33a:e5bd:fedd with SMTP id e10csp899181wrc; Fri, 2 Feb 2024 05:08:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IGoQFGK0j/ZQQZTU0K/U0f161qwPx9fJVISzUZoTIGktz+7VDPNHFnexSxC0qk4nk49mrQb X-Received: by 2002:adf:f18b:0:b0:33a:f73b:a1b8 with SMTP id h11-20020adff18b000000b0033af73ba1b8mr1325281wro.48.1706879292861; Fri, 02 Feb 2024 05:08:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706879292; cv=none; d=google.com; s=arc-20160816; b=rg+2UQgMdTmvkqNQwxmXtQDh3r+RMbDZWu8dCKO9xQP0zJCdADa6iSyH5aSvN9kInc ZNn0BiskTQ4DCW4V6bbptk3RPxee5kJiUeBTO1uuYlu01rH0Bix/VkoOrSxQGlQu1q6U RFQl07neJ/PjzjUlt2l+PybXcxsolA0XwmJDyXnFNAgtfAornozL6ZJTfzgXeQb8EDdK K0epG2xjBGzH/EDuf5N80xyOaCnlRrCX25SvnJZQlgVcSVkyk6TGgwcGeDbEOeORKE5M nOrupqcgyiv5VgwTe46EWip4suZvfj9EIE0Z9MQPDRcfTnkesMO7OKI2/c1STj8DlFy8 CU0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=EsEJDQ/TPRl9JocXfQ2DDxUGixMD5Puvx4aYvZg1rEs=; fh=dL9c5+EdKdAzGcu8zvdIK3fX5IPYfE7VKVt/8JDUXso=; b=df+Z+n2FGt3DgWWWU5ELZPpCAvi+Ca9gJL7aov/za0llLGeYcSjemzbB3yKdhcL2TC 7VCbMOeRr+itQRE1aLhC0NnmnPtD+OB1uyaxuT9SMj2ynbWWXNFYv0YcdWt6XuP+QiyR QQxa0CiP0Q3vA7+k+9SwOjnxxg7BnA1Ln8FUWsSZCPjzE1y7jOnOkEEiDfwRW+sXgGpl 1QP9K2dyP37vtFgIvKIN5V8XN63+R2Y4hbNlsKVHZWAfco/M0e9jQY1c8GbCWcpgQ7LD 84zgpoB58wrv1oFrv783FKoYjTkFXD67KQ5P6sKQf/HeVAStH+Qw+1AqMrqXmbFbEvGK QsJg==; darn=linaro.org ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=g9j6L5iI; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org X-Forwarded-Encrypted: i=0; AJvYcCXqvHa4hiKDa0wNddU61848vNpfmZhUNKvdJ7zODtBpGfayA8W1MEtpMz4KEKudOKa0CNsiQx8st4ozYQzbKnDkJPbyND0e5k8A9zmHFAakmnvVh+vnRf8K0Hnj3kma/+ekU+hHgCdXqGj4XDBkg1hVQMA/Qxjk6M1KHXiaGMWXBTXBtOKUF3jGGxgNPIE5pcBkUZCCkOfjzHFZYG5ooKop+FqcrwBsZlxuOcBH/OYHQLiwZP6b4+m2BlhIn2K4N8PfjR3pCDq9Zjf+0REOZYNkYUY74EptP+zb+oWSYJyZdxph4uDVEzKx5OkDJnp7Zh3uhnlGkq5Nk0HM51o8FrkVe4qOx8KKv67FpiC2PUgCxga0Ix7E4Z3mQDYjrUMFQEoH8V8OGjkq6IwiuMizDUTDXGZ1Q+hiXtj4IJ6dL+Hjld0K+t4kdvfxsHwV+TtlX7N4jq38A4/m8lwy1aUHd2sFSDaOvVRdrKaCR0tDETvh3Ash/xV8b0zOEczlYPx2HuzQY+ba5qbMXkyLKKL/Feux3Dqbylssunu3fJ6IxnIwYUeERzQ7toChb83Agv9BfB5o89+FSlEJ0AObzlSonTVgbLnEuve96MvgVQ5GbtB56TCS030uEhYNEtwUGqUm02EjXXsigiowdpdaVoebYkOA5i73y+AC5ZrP+M6Yq7L7TdpoDJXSrcKnNt3GPwvp3bDNBI4KSjQG8wYlEMEVpH5c2TrfXZmhSRS+4vNa/itFDp4D/Ghphj5pJsEmH5rlVNuaDIErDSOg62Agq8okgWIbS4Ee/xPqLdpnzM0xoNWwheUd6Xawe58c8w7XViUPc37/dFbfQhLLig== Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id o4-20020a5d4744000000b0033b248a7b60si467445wrs.353.2024.02.02.05.08.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Feb 2024 05:08:12 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=g9j6L5iI; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 04DDE87CCF; Fri, 2 Feb 2024 14:07:47 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="g9j6L5iI"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 579E887CCF; Fri, 2 Feb 2024 14:07:46 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: * X-Spam-Status: No, score=1.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_SBL_CSS,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.2 Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [IPv6:2607:f8b0:4864:20::630]) (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 B3DE487D07 for ; Fri, 2 Feb 2024 14:07:38 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sumit.garg@linaro.org Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-1d70b0e521eso14955195ad.1 for ; Fri, 02 Feb 2024 05:07:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706879257; x=1707484057; darn=lists.denx.de; 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=EsEJDQ/TPRl9JocXfQ2DDxUGixMD5Puvx4aYvZg1rEs=; b=g9j6L5iIbw2edVc7Ut5K3IARzwg6uYwNQrVaZWc4DRTo2iVrFeXB0b2NaUSLkyLeSL G1mJ+cJKdnA8KjAy2pYkrf93DaD0mge2pgo5KKbmMuYZ+nyZFkufbTykP1uW0u5lms2b xbcMZ4IEZ3oyTqguBaaaat6BVZVZ4tL9FkX+AaLUmhQXhUzLwyvBbcY9uApEWEv5ZBre p3P8Ff94ITbfUXxn6g8b1m6w1Fm8tGTuBazap/Y843loD360gLG06stvnWhoUyMeUM5M qsTDoq3V3+X8tbMTZtrqa6aATVeTLu975NajvMMIi6I+eN7DeP859jp2rFKBjAKEsZRH 6sTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706879257; x=1707484057; 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=EsEJDQ/TPRl9JocXfQ2DDxUGixMD5Puvx4aYvZg1rEs=; b=UERGkxblZaZ228+1L+302AQZpQ1Ib/aicPkbQ7Kn7Eaxw5Dqdw7Qo1RPYYiyeRSvRW D1d6ObkU8vB6bqqaWwGmVWEzZJx4ZI6kOCDWBliA3EDIx+z6FWfTPZgFakajKw2+SXAf E/nD07sRdRrGUGpQM//YL3WRFVvmOpU4WAb7SvUxSDB7Ehs1P+atQZo7VMjrI4Is+QWX TW84iG2eNM8AipSAAjwRk+bSxbUNv3TI96MGKksQzQ+3mamDpFqSjtHX82kwo6GfPpZV eHylcCH4T4BqohYN7oqMOwVONEMIJCATAcFC00OmhRhvGREOLsXB98UO+mrkSqJX1tAG BSXw== X-Gm-Message-State: AOJu0YzPLDThlpx5ckThGX4VtDViv+J22ZaLjmJ6eQLFHy9qlkvfFTgK eORIsOtQSVY96kTY2k0un4WExQ6qQaVHweHWZjH9csa27Tg8fbVA1j2zQWspqrXy49deb+XdjvV rKb0= X-Received: by 2002:a17:903:2b10:b0:1d7:61f9:a5aa with SMTP id mc16-20020a1709032b1000b001d761f9a5aamr1837718plb.49.1706879256058; Fri, 02 Feb 2024 05:07:36 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCX+o7ZG755wlPSaPoZXTOpDe4j64J5XwXEkLXIUDPj+BS2uHjuaqL2H2Sz7zYYnnuzDVdmM7Q+JTYkw7Br3e+ZJ22WaMPg/5fxL/zoMZp0xBgN+vP8REBBj1ZYX03lcpLq6PU0gQw9nSoz7onozhN4uUebkRO75bfbryjXQeqixipi4wS9JZzt8kXES+XnNL8LkjPR3hgCfZdjuC/8Lfg5G3N/cMu35c8R/mH1JMSLmRZnIilYgWIMxRpp+nFnpa/UEr774te+thHo8EhOvo9kQecTv32XYIerQ/HIwbR89vXiWj1eKfWAv98zuRb8wBeoQWs+m9WiRkftNXicTvMCGqJI4RreIBsJpl7HuNUTd03HtobnqhWEjm9UQ0XIs8ilXsbtl8fhY8suadrvO9ZWdZ6PqaT6316aJU8KNx9QN/3pH/jTEZgJ9B0b+kuNig1WlpZdQpu8FFq0sQA7a+mTW+3fx/DYn299Fkmk9Uhmolq6deEWS3Y7UanfXnzMc01B8K1cBMFnmKlVcYtOOShNl5HATXqyq7Tk+S0+D2IG/lREfFrvoUE44C+Pe1+UDHarZacbsBFqX4UZ+OlyqMyY/kM4r/gky4vAFLILVdJDG9eW2nH1ecjpjOCABVdbhFZXSxSUvIaN1ox5Nt7zPr4zjIYkMg49GOUZdyp9O/opIcHCZxMznWZ6D4Trn7Vxekj8aMUnS3AmfGzbiJcChqZm9W3/RcWMAC5b0KGYN7zqJARIWkJa5kUHO96Ev/Z/118vptAl33dnOBKpoWzbtMvKAdkbolomGqqzmyS3NspM5XMXBHiDnwI2V19ARThAYIMgJyYpJC0ee1QItVmLGM4dfi19EAMzQiqATs4Od/5STNlQizRPPLgdKxPI9JcEpx6Lq3DuYAk5BFHNYrOuuZZhJB847yVVFDrF6 Received: from sumit-X1.. ([223.178.213.44]) by smtp.gmail.com with ESMTPSA id q23-20020a170902edd700b001d923684323sm1542407plk.195.2024.02.02.05.07.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Feb 2024 05:07:35 -0800 (PST) From: Sumit Garg To: u-boot@lists.denx.de, u-boot-amlogic@groups.io, u-boot-custodians@lists.denx.de Cc: trini@konsulko.com, sjg@chromium.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor@kernel.org, neil.armstrong@linaro.org, caleb.connolly@linaro.org, ff@shokubai.tech, daniel.thompson@linaro.org, dgilmore@fedoraproject.org, pbrobinson@gmail.com, ilias.apalodimas@linaro.org, b.galvani@gmail.com, xypron.glpk@gmx.de, michal.simek@amd.com, seanga2@gmail.com, rasmus.villemoes@prevas.dk, peng.fan@nxp.com, jh80.chung@samsung.com, rfried.dev@gmail.com, marex@denx.de, mibodhi@gmail.com, bb@ti.com, mark.kettenis@xs4all.nl, festevam@gmail.com, nm@ti.com, andre.przywara@arm.com, Sumit Garg Subject: [PATCH v5 11/11] dts: meson-gxbb: Drop redundant devicetree files Date: Fri, 2 Feb 2024 18:35:34 +0530 Message-Id: <20240202130534.1051438-12-sumit.garg@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240202130534.1051438-1-sumit.garg@linaro.org> References: <20240202130534.1051438-1-sumit.garg@linaro.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.8 at phobos.denx.de X-Virus-Status: Clean Since meson-gxbb based boards switched to using upstream DT, so drop redundant files from arch/arm/dts directory. Only *-u-boot.dtsi files kept in arch/arm/dts directory for these boards. Reviewed-by: Neil Armstrong Signed-off-by: Sumit Garg --- Changes in v5: - None Changes in v4: - None Changes in v3: - Picked up review tag Changes in v2: - None arch/arm/dts/Makefile | 8 - arch/arm/dts/meson-gxbb-kii-pro.dts | 140 ---- arch/arm/dts/meson-gxbb-nanopi-k2.dts | 426 ------------ arch/arm/dts/meson-gxbb-odroidc2.dts | 414 ----------- arch/arm/dts/meson-gxbb-p200.dts | 100 --- arch/arm/dts/meson-gxbb-p201.dts | 26 - arch/arm/dts/meson-gxbb-p20x.dtsi | 250 ------- arch/arm/dts/meson-gxbb-wetek-hub.dts | 58 -- arch/arm/dts/meson-gxbb-wetek-play2.dts | 119 ---- arch/arm/dts/meson-gxbb-wetek.dtsi | 292 -------- arch/arm/dts/meson-gxbb.dtsi | 870 ------------------------ 11 files changed, 2703 deletions(-) delete mode 100644 arch/arm/dts/meson-gxbb-kii-pro.dts delete mode 100644 arch/arm/dts/meson-gxbb-nanopi-k2.dts delete mode 100644 arch/arm/dts/meson-gxbb-odroidc2.dts delete mode 100644 arch/arm/dts/meson-gxbb-p200.dts delete mode 100644 arch/arm/dts/meson-gxbb-p201.dts delete mode 100644 arch/arm/dts/meson-gxbb-p20x.dtsi delete mode 100644 arch/arm/dts/meson-gxbb-wetek-hub.dts delete mode 100644 arch/arm/dts/meson-gxbb-wetek-play2.dts delete mode 100644 arch/arm/dts/meson-gxbb-wetek.dtsi delete mode 100644 arch/arm/dts/meson-gxbb.dtsi diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 50f35e3db3f0..34ebf2b58417 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -214,14 +214,6 @@ dtb-$(CONFIG_ARCH_MESON) += \ meson-a1-ad401.dtb \ meson-axg-s400.dtb \ meson-axg-jethome-jethub-j100.dtb \ - meson-gxbb-kii-pro.dtb \ - meson-gxbb-nanopi-k2.dtb \ - meson-gxbb-odroidc2.dtb \ - meson-gxbb-nanopi-k2.dtb \ - meson-gxbb-p200.dtb \ - meson-gxbb-p201.dtb \ - meson-gxbb-wetek-hub.dtb \ - meson-gxbb-wetek-play2.dtb \ meson-gxl-s805x-libretech-ac.dtb \ meson-gxl-s905d-libretech-pc.dtb \ meson-gxl-s905w-jethome-jethub-j80.dtb \ diff --git a/arch/arm/dts/meson-gxbb-kii-pro.dts b/arch/arm/dts/meson-gxbb-kii-pro.dts deleted file mode 100644 index e238f1f10124..000000000000 --- a/arch/arm/dts/meson-gxbb-kii-pro.dts +++ /dev/null @@ -1,140 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright (c) 2019 Mohammad Rasim - */ - -/dts-v1/; - -#include "meson-gxbb-p20x.dtsi" -#include -#include -#include -#include - -/ { - compatible = "videostrong,kii-pro", "amlogic,meson-gxbb"; - model = "Videostrong KII Pro"; - - spdif_dit: audio-codec-0 { - #sound-dai-cells = <0>; - compatible = "linux,spdif-dit"; - status = "okay"; - sound-name-prefix = "DIT"; - }; - - leds { - compatible = "gpio-leds"; - led { - gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_LOW>; - color = ; - function = LED_FUNCTION_STATUS; - default-state = "off"; - }; - }; - - gpio-keys-polled { - compatible = "gpio-keys-polled"; - poll-interval = <20>; - - button-reset { - label = "reset"; - linux,code = ; - gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>; - }; - }; - - sound { - compatible = "amlogic,gx-sound-card"; - model = "KII-PRO"; - assigned-clocks = <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>, - <&clkc CLKID_MPLL2>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; - - dai-link-0 { - sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; - }; - - dai-link-1 { - sound-dai = <&aiu AIU_CPU CPU_SPDIF_FIFO>; - }; - - dai-link-2 { - sound-dai = <&aiu AIU_CPU CPU_I2S_ENCODER>; - dai-format = "i2s"; - mclk-fs = <256>; - - codec-0 { - sound-dai = <&aiu AIU_HDMI CTRL_I2S>; - }; - }; - - dai-link-3 { - sound-dai = <&aiu AIU_CPU CPU_SPDIF_ENCODER>; - - codec-0 { - sound-dai = <&spdif_dit>; - }; - }; - - dai-link-4 { - sound-dai = <&aiu AIU_HDMI CTRL_OUT>; - - codec-0 { - sound-dai = <&hdmi_tx>; - }; - }; - }; -}; - -&aiu { - status = "okay"; - pinctrl-0 = <&spdif_out_y_pins>; - pinctrl-names = "default"; -}; - -ðmac { - status = "okay"; - pinctrl-0 = <ð_rmii_pins>; - pinctrl-names = "default"; - - phy-handle = <ð_phy0>; - phy-mode = "rmii"; - - mdio { - compatible = "snps,dwmac-mdio"; - #address-cells = <1>; - #size-cells = <0>; - - eth_phy0: ethernet-phy@0 { - /* IC Plus IP101GR (0x02430c54) */ - reg = <0>; - reset-assert-us = <10000>; - reset-deassert-us = <10000>; - reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>; - }; - }; -}; - -&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"; - shutdown-gpios = <&gpio GPIOX_20 GPIO_ACTIVE_HIGH>; - host-wakeup-gpios = <&gpio GPIOX_21 GPIO_ACTIVE_HIGH>; - max-speed = <2000000>; - clocks = <&wifi32k>; - clock-names = "lpo"; - }; -}; diff --git a/arch/arm/dts/meson-gxbb-nanopi-k2.dts b/arch/arm/dts/meson-gxbb-nanopi-k2.dts deleted file mode 100644 index 7d94160f5802..000000000000 --- a/arch/arm/dts/meson-gxbb-nanopi-k2.dts +++ /dev/null @@ -1,426 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright (c) 2017 Andreas Färber - */ - -/dts-v1/; - -#include "meson-gxbb.dtsi" -#include -#include - -/ { - compatible = "friendlyarm,nanopi-k2", "amlogic,meson-gxbb"; - model = "FriendlyARM NanoPi K2"; - - aliases { - serial0 = &uart_AO; - ethernet0 = ðmac; - }; - - chosen { - stdout-path = "serial0:115200n8"; - }; - - memory@0 { - device_type = "memory"; - reg = <0x0 0x0 0x0 0x80000000>; - }; - - leds { - compatible = "gpio-leds"; - - led-stat { - label = "nanopi-k2:blue:stat"; - gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_HIGH>; - default-state = "on"; - panic-indicator; - }; - }; - - vdd_5v: regulator-vdd-5v { - compatible = "regulator-fixed"; - regulator-name = "VDD_5V"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - }; - - vddio_ao18: regulator-vddio-ao18 { - compatible = "regulator-fixed"; - regulator-name = "VDDIO_AO18"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - }; - - vddio_ao3v3: regulator-vddio-ao3v3 { - compatible = "regulator-fixed"; - regulator-name = "VDDIO_AO3.3V"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - }; - - vddio_tf: regulator-vddio-tf { - compatible = "regulator-gpio"; - - regulator-name = "VDDIO_TF"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <3300000>; - - gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_HIGH>; - gpios-states = <0>; - - states = <3300000 0>, - <1800000 1>; - - regulator-settling-time-up-us = <100>; - regulator-settling-time-down-us = <5000>; - }; - - wifi_32k: wifi-32k { - compatible = "pwm-clock"; - #clock-cells = <0>; - clock-frequency = <32768>; - pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */ - }; - - sdio_pwrseq: sdio-pwrseq { - compatible = "mmc-pwrseq-simple"; - reset-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>; - clocks = <&wifi_32k>; - clock-names = "ext_clock"; - }; - - vcc1v8: regulator-vcc1v8 { - compatible = "regulator-fixed"; - regulator-name = "VCC1.8V"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - }; - - vcc3v3: regulator-vcc3v3 { - compatible = "regulator-fixed"; - regulator-name = "VCC3.3V"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - }; - - emmc_pwrseq: emmc-pwrseq { - compatible = "mmc-pwrseq-emmc"; - reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>; - }; - - /* CVBS is available on CON1 pin 36, disabled by default */ - cvbs-connector { - compatible = "composite-video-connector"; - status = "disabled"; - - port { - cvbs_connector_in: endpoint { - remote-endpoint = <&cvbs_vdac_out>; - }; - }; - }; - - hdmi-connector { - compatible = "hdmi-connector"; - type = "a"; - - port { - hdmi_connector_in: endpoint { - remote-endpoint = <&hdmi_tx_tmds_out>; - }; - }; - }; - - sound { - compatible = "amlogic,gx-sound-card"; - model = "NANOPI-K2"; - assigned-clocks = <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>, - <&clkc CLKID_MPLL2>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; - status = "okay"; - - dai-link-0 { - sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; - }; - - dai-link-1 { - sound-dai = <&aiu AIU_CPU CPU_I2S_ENCODER>; - dai-format = "i2s"; - mclk-fs = <256>; - - codec-0 { - sound-dai = <&aiu AIU_HDMI CTRL_I2S>; - }; - }; - - dai-link-2 { - sound-dai = <&aiu AIU_HDMI CTRL_OUT>; - - codec-0 { - sound-dai = <&hdmi_tx>; - }; - }; - }; -}; - -&aiu { - status = "okay"; -}; - -&cec_AO { - status = "okay"; - pinctrl-0 = <&ao_cec_pins>; - pinctrl-names = "default"; - hdmi-phandle = <&hdmi_tx>; -}; - -&cvbs_vdac_port { - cvbs_vdac_out: endpoint { - remote-endpoint = <&cvbs_connector_in>; - }; -}; - -ðmac { - status = "okay"; - pinctrl-0 = <ð_rgmii_pins>; - pinctrl-names = "default"; - - phy-handle = <ð_phy0>; - phy-mode = "rgmii"; - - amlogic,tx-delay-ns = <2>; - - mdio { - compatible = "snps,dwmac-mdio"; - #address-cells = <1>; - #size-cells = <0>; - - eth_phy0: ethernet-phy@0 { - /* Realtek RTL8211F (0x001cc916) */ - reg = <0>; - - reset-assert-us = <10000>; - reset-deassert-us = <80000>; - reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>; - - interrupt-parent = <&gpio_intc>; - /* MAC_INTR on GPIOZ_15 */ - interrupts = <29 IRQ_TYPE_LEVEL_LOW>; - }; - }; -}; - -&hdmi_tx { - status = "okay"; - pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>; - pinctrl-names = "default"; -}; - -&hdmi_tx_tmds_port { - hdmi_tx_tmds_out: endpoint { - remote-endpoint = <&hdmi_connector_in>; - }; -}; - -&ir { - status = "okay"; - pinctrl-0 = <&remote_input_ao_pins>; - pinctrl-names = "default"; -}; - -&gpio_ao { - gpio-line-names = "UART TX", "UART RX", "Power Control", "Power Key In", - "VCCK En", "CON1 Header Pin31", - "I2S Header Pin6", "IR In", "I2S Header Pin7", - "I2S Header Pin3", "I2S Header Pin4", - "I2S Header Pin5", "HDMI CEC", "SYS LED", - /* GPIO_TEST_N */ - ""; -}; - -&gpio { - gpio-line-names = /* Bank GPIOZ */ - "Eth MDIO", "Eth MDC", "Eth RGMII RX Clk", - "Eth RX DV", "Eth RX D0", "Eth RX D1", "Eth RX D2", - "Eth RX D3", "Eth RGMII TX Clk", "Eth TX En", - "Eth TX D0", "Eth TX D1", "Eth TX D2", "Eth TX D3", - "Eth PHY nRESET", "Eth PHY Intc", - /* Bank GPIOH */ - "HDMI HPD", "HDMI DDC SDA", "HDMI DDC SCL", - "CON1 Header Pin33", - /* Bank BOOT */ - "eMMC D0", "eMMC D1", "eMMC D2", "eMMC D3", "eMMC D4", - "eMMC D5", "eMMC D6", "eMMC D7", "eMMC Clk", - "eMMC Reset", "eMMC CMD", - "", "", "", "", "eMMC DS", - "", "", - /* Bank CARD */ - "SDCard D1", "SDCard D0", "SDCard CLK", "SDCard CMD", - "SDCard D3", "SDCard D2", "SDCard Det", - /* Bank GPIODV */ - "", "", "", "", "", "", "", "", "", "", "", "", "", - "", "", "", "", "", "", "", "", "", "", "", - "I2C A SDA", "I2C A SCK", "I2C B SDA", "I2C B SCK", - "VDDEE Regulator", "VCCK Regulator", - /* Bank GPIOY */ - "CON1 Header Pin7", "CON1 Header Pin11", - "CON1 Header Pin13", "CON1 Header Pin15", - "CON1 Header Pin18", "CON1 Header Pin19", - "CON1 Header Pin22", "CON1 Header Pin21", - "CON1 Header Pin24", "CON1 Header Pin23", - "CON1 Header Pin26", "CON1 Header Pin29", - "CON1 Header Pin32", "CON1 Header Pin8", - "CON1 Header Pin10", "CON1 Header Pin16", - "CON1 Header Pin12", - /* Bank GPIOX */ - "WIFI SDIO D0", "WIFI SDIO D1", "WIFI SDIO D2", - "WIFI SDIO D3", "WIFI SDIO CLK", "WIFI SDIO CMD", - "WIFI Power Enable", "WIFI WAKE HOST", - "Bluetooth PCM DOUT", "Bluetooth PCM DIN", - "Bluetooth PCM SYNC", "Bluetooth PCM CLK", - "Bluetooth UART TX", "Bluetooth UART RX", - "Bluetooth UART CTS", "Bluetooth UART RTS", - "", "", "", "WIFI 32K", "Bluetooth Enable", - "Bluetooth WAKE HOST", "", - /* Bank GPIOCLK */ - "", "CON1 Header Pin35", "", ""; -}; - -&pwm_ef { - status = "okay"; - pinctrl-0 = <&pwm_e_pins>; - pinctrl-names = "default"; - clocks = <&clkc CLKID_FCLK_DIV4>; - clock-names = "clkin0"; -}; - -&saradc { - status = "okay"; - vref-supply = <&vddio_ao18>; -}; - -/* SDIO */ -&sd_emmc_a { - status = "okay"; - pinctrl-0 = <&sdio_pins>, <&sdio_irq_pins>; - pinctrl-1 = <&sdio_clk_gate_pins>; - pinctrl-names = "default", "clk-gate"; - #address-cells = <1>; - #size-cells = <0>; - - bus-width = <4>; - cap-sd-highspeed; - max-frequency = <50000000>; - - non-removable; - disable-wp; - - /* WiFi firmware requires power to be kept while in suspend */ - keep-power-in-suspend; - - mmc-pwrseq = <&sdio_pwrseq>; - - vmmc-supply = <&vddio_ao3v3>; - vqmmc-supply = <&vddio_ao18>; - - brcmf: wifi@1 { - compatible = "brcm,bcm4329-fmac"; - reg = <1>; - }; -}; - -/* SD */ -&sd_emmc_b { - status = "okay"; - pinctrl-0 = <&sdcard_pins>; - pinctrl-1 = <&sdcard_clk_gate_pins>; - pinctrl-names = "default", "clk-gate"; - - bus-width = <4>; - cap-sd-highspeed; - sd-uhs-sdr12; - sd-uhs-sdr25; - sd-uhs-sdr50; - sd-uhs-ddr50; - max-frequency = <100000000>; - disable-wp; - - cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>; - - vmmc-supply = <&vddio_ao3v3>; - vqmmc-supply = <&vddio_tf>; -}; - -/* eMMC */ -&sd_emmc_c { - status = "disabled"; - pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>; - pinctrl-1 = <&emmc_clk_gate_pins>; - pinctrl-names = "default", "clk-gate"; - - bus-width = <8>; - max-frequency = <200000000>; - non-removable; - disable-wp; - cap-mmc-highspeed; - mmc-ddr-1_8v; - mmc-hs200-1_8v; - - mmc-pwrseq = <&emmc_pwrseq>; - vmmc-supply = <&vcc3v3>; - vqmmc-supply = <&vcc1v8>; -}; - -/* DBG_UART */ -&uart_AO { - status = "okay"; - pinctrl-0 = <&uart_ao_a_pins>; - pinctrl-names = "default"; -}; - -/* Bluetooth on AP6212 */ -&uart_A { - status = "okay"; - pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>; - pinctrl-names = "default"; - uart-has-rtscts; - - bluetooth { - compatible = "brcm,bcm43438-bt"; - clocks = <&wifi_32k>; - clock-names = "lpo"; - vbat-supply = <&vddio_ao3v3>; - vddio-supply = <&vddio_ao18>; - host-wakeup-gpios = <&gpio GPIOX_21 GPIO_ACTIVE_HIGH>; - shutdown-gpios = <&gpio GPIOX_20 GPIO_ACTIVE_HIGH>; - }; -}; - -/* 40-pin CON1 */ -&uart_C { - status = "disabled"; - pinctrl-0 = <&uart_c_pins>; - pinctrl-names = "default"; -}; - -&usb0_phy { - status = "okay"; - phy-supply = <&vdd_5v>; -}; - -&usb1_phy { - status = "okay"; -}; - -&usb0 { - status = "okay"; -}; - -&usb1 { - status = "okay"; -}; diff --git a/arch/arm/dts/meson-gxbb-odroidc2.dts b/arch/arm/dts/meson-gxbb-odroidc2.dts deleted file mode 100644 index 01356437a077..000000000000 --- a/arch/arm/dts/meson-gxbb-odroidc2.dts +++ /dev/null @@ -1,414 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright (c) 2016 Andreas Färber - * Copyright (c) 2016 BayLibre, Inc. - * Author: Kevin Hilman - */ - -/dts-v1/; - -#include "meson-gxbb.dtsi" -#include -#include - -/ { - compatible = "hardkernel,odroid-c2", "amlogic,meson-gxbb"; - model = "Hardkernel ODROID-C2"; - - aliases { - serial0 = &uart_AO; - ethernet0 = ðmac; - }; - - chosen { - stdout-path = "serial0:115200n8"; - }; - - memory@0 { - device_type = "memory"; - reg = <0x0 0x0 0x0 0x80000000>; - }; - - usb_otg_pwr: regulator-usb-pwrs { - compatible = "regulator-fixed"; - - regulator-name = "USB_OTG_PWR"; - - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - - /* - * signal name from schematics: PWREN - */ - gpio = <&gpio_ao GPIOAO_5 GPIO_ACTIVE_HIGH>; - enable-active-high; - /* - * signal name from schematics: USB_POWER - */ - vin-supply = <&p5v0>; - }; - - leds { - compatible = "gpio-leds"; - led-blue { - label = "c2:blue:alive"; - gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_LOW>; - linux,default-trigger = "heartbeat"; - default-state = "off"; - }; - }; - - p5v0: regulator-p5v0 { - compatible = "regulator-fixed"; - - regulator-name = "P5V0"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - regulator-always-on; - }; - - hdmi_p5v0: regulator-hdmi_p5v0 { - compatible = "regulator-fixed"; - regulator-name = "HDMI_P5V0"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - /* AP2331SA-7 */ - vin-supply = <&p5v0>; - }; - - tflash_vdd: regulator-tflash_vdd { - compatible = "regulator-fixed"; - - regulator-name = "TFLASH_VDD"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - - /* - * signal name from schematics: TFLASH_VDD_EN - */ - gpio = <&gpio GPIOY_12 GPIO_ACTIVE_HIGH>; - enable-active-high; - /* U16 RT9179GB */ - vin-supply = <&vddio_ao3v3>; - }; - - tf_io: gpio-regulator-tf_io { - compatible = "regulator-gpio"; - - regulator-name = "TF_IO"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <3300000>; - - /* - * signal name from schematics: TF_3V3N_1V8_EN - */ - gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>; - gpios-states = <0>; - - states = <3300000 0>, - <1800000 1>; - /* U12/U13 RT9179GB */ - vin-supply = <&vddio_ao3v3>; - }; - - vcc1v8: regulator-vcc1v8 { - compatible = "regulator-fixed"; - regulator-name = "VCC1V8"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-always-on; - /* U18 RT9179GB */ - vin-supply = <&vddio_ao3v3>; - }; - - vcc3v3: regulator-vcc3v3 { - compatible = "regulator-fixed"; - regulator-name = "VCC3V3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - }; - - vddio_ao1v8: regulator-vddio-ao1v8 { - compatible = "regulator-fixed"; - regulator-name = "VDDIO_AO1V8"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-always-on; - /* U17 RT9179GB */ - vin-supply = <&p5v0>; - }; - - vddio_ao3v3: regulator-vddio-ao3v3 { - compatible = "regulator-fixed"; - regulator-name = "VDDIO_AO3V3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-always-on; - /* U11 MP2161GJ-C499 */ - vin-supply = <&p5v0>; - }; - - ddr3_1v5: regulator-ddr3_1v5 { - compatible = "regulator-fixed"; - regulator-name = "DDR3_1V5"; - regulator-min-microvolt = <1500000>; - regulator-max-microvolt = <1500000>; - regulator-always-on; - /* U15 MP2161GJ-C499 */ - vin-supply = <&p5v0>; - }; - - emmc_pwrseq: emmc-pwrseq { - compatible = "mmc-pwrseq-emmc"; - reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>; - }; - - hdmi-connector { - compatible = "hdmi-connector"; - type = "a"; - - port { - hdmi_connector_in: endpoint { - remote-endpoint = <&hdmi_tx_tmds_out>; - }; - }; - }; - - sound { - compatible = "amlogic,gx-sound-card"; - model = "ODROID-C2"; - assigned-clocks = <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>, - <&clkc CLKID_MPLL2>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; - status = "okay"; - - dai-link-0 { - sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; - }; - - dai-link-1 { - sound-dai = <&aiu AIU_CPU CPU_I2S_ENCODER>; - dai-format = "i2s"; - mclk-fs = <256>; - - codec-0 { - sound-dai = <&aiu AIU_HDMI CTRL_I2S>; - }; - }; - - dai-link-2 { - sound-dai = <&aiu AIU_HDMI CTRL_OUT>; - - codec-0 { - sound-dai = <&hdmi_tx>; - }; - }; - }; -}; - -&aiu { - status = "okay"; -}; - -&cec_AO { - status = "okay"; - pinctrl-0 = <&ao_cec_pins>; - pinctrl-names = "default"; - hdmi-phandle = <&hdmi_tx>; -}; - -ðmac { - status = "okay"; - pinctrl-0 = <ð_rgmii_pins>; - pinctrl-names = "default"; - phy-handle = <ð_phy0>; - phy-mode = "rgmii"; - - amlogic,tx-delay-ns = <2>; - - mdio { - compatible = "snps,dwmac-mdio"; - #address-cells = <1>; - #size-cells = <0>; - - eth_phy0: ethernet-phy@0 { - /* Realtek RTL8211F (0x001cc916) */ - reg = <0>; - - reset-assert-us = <10000>; - reset-deassert-us = <80000>; - reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>; - - interrupt-parent = <&gpio_intc>; - /* MAC_INTR on GPIOZ_15 */ - interrupts = <29 IRQ_TYPE_LEVEL_LOW>; - }; - }; -}; - -&hdmi_tx { - status = "okay"; - pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>; - pinctrl-names = "default"; - hdmi-supply = <&hdmi_p5v0>; -}; - -&hdmi_tx_tmds_port { - hdmi_tx_tmds_out: endpoint { - remote-endpoint = <&hdmi_connector_in>; - }; -}; - -&i2c_A { - status = "okay"; - pinctrl-0 = <&i2c_a_pins>; - pinctrl-names = "default"; -}; - -&ir { - status = "okay"; - pinctrl-0 = <&remote_input_ao_pins>; - pinctrl-names = "default"; - linux,rc-map-name = "rc-odroid"; -}; - -&gpio_ao { - gpio-line-names = "UART TX", "UART RX", "VCCK En", "TF 3V3/1V8 En", - "USB HUB nRESET", "USB OTG Power En", - "J7 Header Pin2", "IR In", "J7 Header Pin4", - "J7 Header Pin6", "J7 Header Pin5", "J7 Header Pin7", - "HDMI CEC", "SYS LED", - /* GPIO_TEST_N */ - ""; -}; - -&gpio { - gpio-line-names = /* Bank GPIOZ */ - "Eth MDIO", "Eth MDC", "Eth RGMII RX Clk", - "Eth RX DV", "Eth RX D0", "Eth RX D1", "Eth RX D2", - "Eth RX D3", "Eth RGMII TX Clk", "Eth TX En", - "Eth TX D0", "Eth TX D1", "Eth TX D2", "Eth TX D3", - "Eth PHY nRESET", "Eth PHY Intc", - /* Bank GPIOH */ - "HDMI HPD", "HDMI DDC SDA", "HDMI DDC SCL", "", - /* Bank BOOT */ - "eMMC D0", "eMMC D1", "eMMC D2", "eMMC D3", "eMMC D4", - "eMMC D5", "eMMC D6", "eMMC D7", "eMMC Clk", - "eMMC Reset", "eMMC CMD", - "", "", "", "", "", "", "", - /* Bank CARD */ - "SDCard D1", "SDCard D0", "SDCard CLK", "SDCard CMD", - "SDCard D3", "SDCard D2", "SDCard Det", - /* Bank GPIODV */ - "", "", "", "", "", "", "", "", "", "", "", "", "", - "", "", "", "", "", "", "", "", "", "", "", - "I2C A SDA", "I2C A SCK", "I2C B SDA", "I2C B SCK", - "PWM D", "PWM B", - /* Bank GPIOY */ - "Revision Bit0", "Revision Bit1", "", - "J2 Header Pin35", "", "", "", "J2 Header Pin36", - "J2 Header Pin31", "", "", "", "TF VDD En", - "J2 Header Pin32", "J2 Header Pin26", "", "", - /* Bank GPIOX */ - "J2 Header Pin29", "J2 Header Pin24", - "J2 Header Pin23", "J2 Header Pin22", - "J2 Header Pin21", "J2 Header Pin18", - "J2 Header Pin33", "J2 Header Pin19", - "J2 Header Pin16", "J2 Header Pin15", - "J2 Header Pin12", "J2 Header Pin13", - "J2 Header Pin8", "J2 Header Pin10", - "", "", "", "", "", - "J2 Header Pin11", "", "J2 Header Pin7", "", - /* Bank GPIOCLK */ - "", "", "", ""; -}; - -&saradc { - status = "okay"; - vref-supply = <&vcc1v8>; -}; - -&scpi_clocks { - status = "disabled"; -}; - -/* SD */ -&sd_emmc_b { - status = "okay"; - pinctrl-0 = <&sdcard_pins>; - pinctrl-1 = <&sdcard_clk_gate_pins>; - pinctrl-names = "default", "clk-gate"; - - bus-width = <4>; - cap-sd-highspeed; - sd-uhs-sdr12; - sd-uhs-sdr25; - sd-uhs-sdr50; - sd-uhs-ddr50; - max-frequency = <100000000>; - disable-wp; - - cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>; - - vmmc-supply = <&tflash_vdd>; - vqmmc-supply = <&tf_io>; -}; - -/* eMMC */ -&sd_emmc_c { - status = "okay"; - pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>; - pinctrl-1 = <&emmc_clk_gate_pins>; - pinctrl-names = "default", "clk-gate"; - - bus-width = <8>; - max-frequency = <200000000>; - non-removable; - disable-wp; - cap-mmc-highspeed; - mmc-ddr-1_8v; - mmc-hs200-1_8v; - - mmc-pwrseq = <&emmc_pwrseq>; - vmmc-supply = <&vcc3v3>; - vqmmc-supply = <&vcc1v8>; -}; - -&uart_AO { - status = "okay"; - pinctrl-0 = <&uart_ao_a_pins>; - pinctrl-names = "default"; -}; - -&usb0_phy { - status = "disabled"; - phy-supply = <&usb_otg_pwr>; -}; - -&usb1_phy { - status = "okay"; - phy-supply = <&usb_otg_pwr>; -}; - -&usb0 { - status = "disabled"; -}; - -&usb1 { - dr_mode = "host"; - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; - - hub@1 { - /* Genesys Logic GL852G USB 2.0 hub */ - compatible = "usb5e3,610"; - reg = <1>; - vdd-supply = <&p5v0>; - reset-gpio = <&gpio_ao GPIOAO_4 GPIO_ACTIVE_LOW>; - }; -}; diff --git a/arch/arm/dts/meson-gxbb-p200.dts b/arch/arm/dts/meson-gxbb-p200.dts deleted file mode 100644 index 3c93d1898b40..000000000000 --- a/arch/arm/dts/meson-gxbb-p200.dts +++ /dev/null @@ -1,100 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright (c) 2016 Andreas Färber - * Copyright (c) 2016 BayLibre, Inc. - * Author: Kevin Hilman - */ - -/dts-v1/; - -#include "meson-gxbb-p20x.dtsi" -#include - -/ { - compatible = "amlogic,p200", "amlogic,meson-gxbb"; - model = "Amlogic Meson GXBB P200 Development Board"; - - avdd18_usb_adc: regulator-avdd18_usb_adc { - compatible = "regulator-fixed"; - regulator-name = "AVDD18_USB_ADC"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - }; - - adc_keys { - compatible = "adc-keys"; - io-channels = <&saradc 0>; - io-channel-names = "buttons"; - keyup-threshold-microvolt = <1800000>; - - button-home { - label = "Home"; - linux,code = ; - press-threshold-microvolt = <900000>; /* 50% */ - }; - - button-esc { - label = "Esc"; - linux,code = ; - press-threshold-microvolt = <684000>; /* 38% */ - }; - - button-up { - label = "Volume Up"; - linux,code = ; - press-threshold-microvolt = <468000>; /* 26% */ - }; - - button-down { - label = "Volume Down"; - linux,code = ; - press-threshold-microvolt = <252000>; /* 14% */ - }; - - button-menu { - label = "Menu"; - linux,code = ; - press-threshold-microvolt = <0>; /* 0% */ - }; - }; -}; - -ðmac { - status = "okay"; - pinctrl-0 = <ð_rgmii_pins>; - pinctrl-names = "default"; - phy-handle = <ð_phy0>; - phy-mode = "rgmii"; - - amlogic,tx-delay-ns = <2>; - - mdio { - compatible = "snps,dwmac-mdio"; - #address-cells = <1>; - #size-cells = <0>; - - eth_phy0: ethernet-phy@3 { - /* Micrel KSZ9031 (0x00221620) */ - reg = <3>; - - reset-assert-us = <10000>; - reset-deassert-us = <30000>; - reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>; - - interrupt-parent = <&gpio_intc>; - /* MAC_INTR on GPIOZ_15 */ - interrupts = <29 IRQ_TYPE_LEVEL_LOW>; - }; - }; -}; - -&i2c_B { - status = "okay"; - pinctrl-0 = <&i2c_b_pins>; - pinctrl-names = "default"; -}; - -&saradc { - status = "okay"; - vref-supply = <&avdd18_usb_adc>; -}; diff --git a/arch/arm/dts/meson-gxbb-p201.dts b/arch/arm/dts/meson-gxbb-p201.dts deleted file mode 100644 index 150a82f3b2d7..000000000000 --- a/arch/arm/dts/meson-gxbb-p201.dts +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright (c) 2016 Andreas Färber - * Copyright (c) 2016 BayLibre, Inc. - * Author: Kevin Hilman - */ - -/dts-v1/; - -#include "meson-gxbb-p20x.dtsi" - -/ { - compatible = "amlogic,p201", "amlogic,meson-gxbb"; - model = "Amlogic Meson GXBB P201 Development Board"; -}; - -ðmac { - status = "okay"; - pinctrl-0 = <ð_rmii_pins>; - pinctrl-names = "default"; - phy-mode = "rmii"; - - snps,reset-gpio = <&gpio GPIOZ_14 0>; - snps,reset-delays-us = <0>, <10000>, <1000000>; - snps,reset-active-low; -}; diff --git a/arch/arm/dts/meson-gxbb-p20x.dtsi b/arch/arm/dts/meson-gxbb-p20x.dtsi deleted file mode 100644 index e803a466fe4e..000000000000 --- a/arch/arm/dts/meson-gxbb-p20x.dtsi +++ /dev/null @@ -1,250 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright (c) 2016 Andreas Färber - * Copyright (c) 2016 BayLibre, Inc. - * Author: Kevin Hilman - */ - -#include "meson-gxbb.dtsi" - -/ { - aliases { - serial0 = &uart_AO; - ethernet0 = ðmac; - }; - - chosen { - stdout-path = "serial0:115200n8"; - }; - - memory@0 { - device_type = "memory"; - reg = <0x0 0x0 0x0 0x40000000>; - }; - - usb_pwr: regulator-usb-pwrs { - compatible = "regulator-fixed"; - - regulator-name = "USB_PWR"; - - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - - /* signal name in schematic: USB_PWR_EN */ - gpio = <&gpio GPIODV_24 GPIO_ACTIVE_HIGH>; - enable-active-high; - }; - - vddio_card: gpio-regulator { - compatible = "regulator-gpio"; - - regulator-name = "VDDIO_CARD"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <3300000>; - - gpios = <&gpio_ao GPIOAO_5 GPIO_ACTIVE_HIGH>; - gpios-states = <1>; - - /* Based on P200 schematics, signal CARD_1.8V/3.3V_CTR */ - states = <1800000 0>, - <3300000 1>; - - regulator-settling-time-up-us = <10000>; - regulator-settling-time-down-us = <150000>; - }; - - vddio_boot: regulator-vddio_boot { - compatible = "regulator-fixed"; - regulator-name = "VDDIO_BOOT"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - }; - - vddao_3v3: regulator-vddao_3v3 { - compatible = "regulator-fixed"; - regulator-name = "VDDAO_3V3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - }; - - vcc_3v3: regulator-vcc_3v3 { - compatible = "regulator-fixed"; - regulator-name = "VCC_3V3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - }; - - emmc_pwrseq: emmc-pwrseq { - compatible = "mmc-pwrseq-emmc"; - reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>; - }; - - wifi32k: wifi32k { - compatible = "pwm-clock"; - #clock-cells = <0>; - clock-frequency = <32768>; - pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */ - }; - - sdio_pwrseq: sdio-pwrseq { - compatible = "mmc-pwrseq-simple"; - reset-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>; - clocks = <&wifi32k>; - clock-names = "ext_clock"; - }; - - cvbs_connector: cvbs-connector { - compatible = "composite-video-connector"; - - port { - cvbs_connector_in: endpoint { - remote-endpoint = <&cvbs_vdac_out>; - }; - }; - }; - - hdmi-connector { - compatible = "hdmi-connector"; - type = "a"; - - port { - hdmi_connector_in: endpoint { - remote-endpoint = <&hdmi_tx_tmds_out>; - }; - }; - }; -}; - -&cec_AO { - status = "okay"; - pinctrl-0 = <&ao_cec_pins>; - pinctrl-names = "default"; - hdmi-phandle = <&hdmi_tx>; -}; - -&cvbs_vdac_port { - cvbs_vdac_out: endpoint { - remote-endpoint = <&cvbs_connector_in>; - }; -}; - -&hdmi_tx { - status = "okay"; - pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>; - pinctrl-names = "default"; -}; - -&hdmi_tx_tmds_port { - hdmi_tx_tmds_out: endpoint { - remote-endpoint = <&hdmi_connector_in>; - }; -}; - -&ir { - status = "okay"; - pinctrl-0 = <&remote_input_ao_pins>; - pinctrl-names = "default"; -}; - -&pwm_ef { - status = "okay"; - pinctrl-0 = <&pwm_e_pins>; - pinctrl-names = "default"; - clocks = <&clkc CLKID_FCLK_DIV4>; - clock-names = "clkin0"; -}; - -/* Wireless SDIO Module */ -&sd_emmc_a { - status = "okay"; - pinctrl-0 = <&sdio_pins>; - pinctrl-1 = <&sdio_clk_gate_pins>; - pinctrl-names = "default", "clk-gate"; - #address-cells = <1>; - #size-cells = <0>; - - bus-width = <4>; - cap-sd-highspeed; - max-frequency = <50000000>; - - non-removable; - disable-wp; - - /* WiFi firmware requires power to be kept while in suspend */ - keep-power-in-suspend; - - mmc-pwrseq = <&sdio_pwrseq>; - - vmmc-supply = <&vddao_3v3>; - vqmmc-supply = <&vddio_boot>; - - brcmf: wifi@1 { - reg = <1>; - compatible = "brcm,bcm4329-fmac"; - }; -}; - -/* SD card */ -&sd_emmc_b { - status = "okay"; - pinctrl-0 = <&sdcard_pins>; - pinctrl-1 = <&sdcard_clk_gate_pins>; - pinctrl-names = "default", "clk-gate"; - - bus-width = <4>; - cap-sd-highspeed; - sd-uhs-sdr12; - sd-uhs-sdr25; - sd-uhs-sdr50; - max-frequency = <100000000>; - disable-wp; - - cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>; - - vmmc-supply = <&vddao_3v3>; - vqmmc-supply = <&vddio_card>; -}; - -/* eMMC */ -&sd_emmc_c { - status = "okay"; - pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>; - pinctrl-1 = <&emmc_clk_gate_pins>; - pinctrl-names = "default", "clk-gate"; - - bus-width = <8>; - cap-mmc-highspeed; - max-frequency = <200000000>; - non-removable; - disable-wp; - mmc-ddr-1_8v; - mmc-hs200-1_8v; - - mmc-pwrseq = <&emmc_pwrseq>; - vmmc-supply = <&vcc_3v3>; - vqmmc-supply = <&vddio_boot>; -}; - -/* This UART is brought out to the DB9 connector */ -&uart_AO { - status = "okay"; - pinctrl-0 = <&uart_ao_a_pins>; - pinctrl-names = "default"; -}; - -&usb0_phy { - status = "okay"; - phy-supply = <&usb_pwr>; -}; - -&usb1_phy { - status = "okay"; -}; - -&usb0 { - status = "okay"; -}; - -&usb1 { - status = "okay"; -}; diff --git a/arch/arm/dts/meson-gxbb-wetek-hub.dts b/arch/arm/dts/meson-gxbb-wetek-hub.dts deleted file mode 100644 index 58733017eda8..000000000000 --- a/arch/arm/dts/meson-gxbb-wetek-hub.dts +++ /dev/null @@ -1,58 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright (c) 2016 BayLibre, Inc. - * Author: Neil Armstrong - */ - -/dts-v1/; - -#include "meson-gxbb-wetek.dtsi" -#include - -/ { - compatible = "wetek,hub", "amlogic,meson-gxbb"; - model = "WeTek Hub"; - - sound { - compatible = "amlogic,gx-sound-card"; - model = "WETEK-HUB"; - assigned-clocks = <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>, - <&clkc CLKID_MPLL2>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; - status = "okay"; - - dai-link-0 { - sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; - }; - - dai-link-1 { - sound-dai = <&aiu AIU_CPU CPU_I2S_ENCODER>; - dai-format = "i2s"; - mclk-fs = <256>; - - codec-0 { - sound-dai = <&aiu AIU_HDMI CTRL_I2S>; - }; - }; - - dai-link-2 { - sound-dai = <&aiu AIU_HDMI CTRL_OUT>; - - codec-0 { - sound-dai = <&hdmi_tx>; - }; - }; - }; -}; - -&aiu { - status = "okay"; -}; - -&ir { - linux,rc-map-name = "rc-wetek-hub"; -}; diff --git a/arch/arm/dts/meson-gxbb-wetek-play2.dts b/arch/arm/dts/meson-gxbb-wetek-play2.dts deleted file mode 100644 index 505ffcd8eb76..000000000000 --- a/arch/arm/dts/meson-gxbb-wetek-play2.dts +++ /dev/null @@ -1,119 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright (c) 2016 BayLibre, Inc. - * Author: Neil Armstrong - */ - -/dts-v1/; - -#include "meson-gxbb-wetek.dtsi" -#include -#include - -/ { - compatible = "wetek,play2", "amlogic,meson-gxbb"; - model = "WeTek Play 2"; - - spdif_dit: audio-codec-0 { - #sound-dai-cells = <0>; - compatible = "linux,spdif-dit"; - status = "okay"; - sound-name-prefix = "DIT"; - }; - - leds { - led-wifi { - label = "wetek-play:wifi-status"; - gpios = <&gpio GPIODV_26 GPIO_ACTIVE_HIGH>; - default-state = "off"; - }; - - led-ethernet { - label = "wetek-play:ethernet-status"; - gpios = <&gpio GPIODV_27 GPIO_ACTIVE_HIGH>; - default-state = "off"; - }; - }; - - gpio-keys-polled { - compatible = "gpio-keys-polled"; - poll-interval = <100>; - - button { - label = "reset"; - linux,code = ; - gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_LOW>; - }; - }; - - sound { - compatible = "amlogic,gx-sound-card"; - model = "WETEK-PLAY2"; - assigned-clocks = <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>, - <&clkc CLKID_MPLL2>; - assigned-clock-parents = <0>, <0>, <0>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; - status = "okay"; - - dai-link-0 { - sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; - }; - - dai-link-1 { - sound-dai = <&aiu AIU_CPU CPU_SPDIF_FIFO>; - }; - - dai-link-2 { - sound-dai = <&aiu AIU_CPU CPU_I2S_ENCODER>; - dai-format = "i2s"; - mclk-fs = <256>; - - codec-0 { - sound-dai = <&aiu AIU_HDMI CTRL_I2S>; - }; - }; - - dai-link-3 { - sound-dai = <&aiu AIU_CPU CPU_SPDIF_ENCODER>; - - codec-0 { - sound-dai = <&spdif_dit>; - }; - }; - - dai-link-4 { - sound-dai = <&aiu AIU_HDMI CTRL_OUT>; - - codec-0 { - sound-dai = <&hdmi_tx>; - }; - }; - }; -}; - -&aiu { - status = "okay"; - pinctrl-0 = <&spdif_out_y_pins>; - pinctrl-names = "default"; -}; - -&i2c_A { - status = "okay"; - pinctrl-0 = <&i2c_a_pins>; - pinctrl-names = "default"; -}; - -&usb1_phy { - status = "okay"; -}; - -&usb1 { - status = "okay"; -}; - -&ir { - linux,rc-map-name = "rc-wetek-play2"; -}; diff --git a/arch/arm/dts/meson-gxbb-wetek.dtsi b/arch/arm/dts/meson-gxbb-wetek.dtsi deleted file mode 100644 index 94dafb955301..000000000000 --- a/arch/arm/dts/meson-gxbb-wetek.dtsi +++ /dev/null @@ -1,292 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright (c) 2016 Andreas Färber - * Copyright (c) 2016 BayLibre, Inc. - * Author: Kevin Hilman - */ - -#include "meson-gxbb.dtsi" -#include -#include - -/ { - aliases { - serial0 = &uart_AO; - ethernet0 = ðmac; - }; - - chosen { - stdout-path = "serial0:115200n8"; - }; - - memory@0 { - device_type = "memory"; - reg = <0x0 0x0 0x0 0x40000000>; - }; - - leds { - compatible = "gpio-leds"; - - led-power { - /* red in suspend or power-off */ - color = ; - function = LED_FUNCTION_POWER; - gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_HIGH>; - default-state = "on"; - panic-indicator; - }; - }; - - usb_pwr: regulator-usb-pwrs { - compatible = "regulator-fixed"; - - regulator-name = "USB_PWR"; - - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - - gpio = <&gpio GPIODV_24 GPIO_ACTIVE_HIGH>; - enable-active-high; - }; - - vddio_boot: regulator-vddio_boot { - compatible = "regulator-fixed"; - regulator-name = "VDDIO_BOOT"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - }; - - vddao_3v3: regulator-vddao_3v3 { - compatible = "regulator-fixed"; - regulator-name = "VDDAO_3V3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - }; - - vddio_ao18: regulator-vddio_ao18 { - compatible = "regulator-fixed"; - regulator-name = "VDDIO_AO18"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-always-on; - }; - - vcc_3v3: regulator-vcc_3v3 { - compatible = "regulator-fixed"; - regulator-name = "VCC_3V3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - }; - - emmc_pwrseq: emmc-pwrseq { - compatible = "mmc-pwrseq-emmc"; - reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>; - }; - - wifi32k: wifi32k { - compatible = "pwm-clock"; - #clock-cells = <0>; - clock-frequency = <32768>; - pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */ - }; - - sdio_pwrseq: sdio-pwrseq { - compatible = "mmc-pwrseq-simple"; - reset-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>; - clocks = <&wifi32k>; - clock-names = "ext_clock"; - }; - - cvbs-connector { - compatible = "composite-video-connector"; - - port { - cvbs_connector_in: endpoint { - remote-endpoint = <&cvbs_vdac_out>; - }; - }; - }; - - hdmi-connector { - compatible = "hdmi-connector"; - type = "a"; - - port { - hdmi_connector_in: endpoint { - remote-endpoint = <&hdmi_tx_tmds_out>; - }; - }; - }; -}; - -&cec_AO { - status = "okay"; - pinctrl-0 = <&ao_cec_pins>; - pinctrl-names = "default"; - hdmi-phandle = <&hdmi_tx>; -}; - -&cvbs_vdac_port { - cvbs_vdac_out: endpoint { - remote-endpoint = <&cvbs_connector_in>; - }; -}; - -ðmac { - status = "okay"; - pinctrl-0 = <ð_rgmii_pins>; - pinctrl-names = "default"; - - phy-handle = <ð_phy0>; - phy-mode = "rgmii"; - - amlogic,tx-delay-ns = <2>; - - mdio { - compatible = "snps,dwmac-mdio"; - #address-cells = <1>; - #size-cells = <0>; - - eth_phy0: ethernet-phy@0 { - /* Realtek RTL8211F (0x001cc916) */ - reg = <0>; - - reset-assert-us = <10000>; - reset-deassert-us = <80000>; - reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>; - - interrupt-parent = <&gpio_intc>; - /* MAC_INTR on GPIOZ_15 */ - interrupts = <29 IRQ_TYPE_LEVEL_LOW>; - }; - }; -}; - -&hdmi_tx { - status = "okay"; - pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>; - pinctrl-names = "default"; - hdmi-supply = <&vddio_ao18>; -}; - -&hdmi_tx_tmds_port { - hdmi_tx_tmds_out: endpoint { - remote-endpoint = <&hdmi_connector_in>; - }; -}; - -&ir { - status = "okay"; - pinctrl-0 = <&remote_input_ao_pins>; - pinctrl-names = "default"; -}; - -&pwm_ef { - status = "okay"; - pinctrl-0 = <&pwm_e_pins>; - pinctrl-names = "default"; - clocks = <&clkc CLKID_FCLK_DIV4>; - clock-names = "clkin0"; -}; - -&saradc { - status = "okay"; - vref-supply = <&vddio_ao18>; -}; - -/* Wireless SDIO Module */ -&sd_emmc_a { - status = "okay"; - pinctrl-0 = <&sdio_pins>; - pinctrl-1 = <&sdio_clk_gate_pins>; - pinctrl-names = "default", "clk-gate"; - #address-cells = <1>; - #size-cells = <0>; - - bus-width = <4>; - cap-sd-highspeed; - max-frequency = <50000000>; - - non-removable; - disable-wp; - - /* WiFi firmware requires power to be kept while in suspend */ - keep-power-in-suspend; - - mmc-pwrseq = <&sdio_pwrseq>; - - vmmc-supply = <&vddao_3v3>; - vqmmc-supply = <&vddio_boot>; - - brcmf: wifi@1 { - reg = <1>; - compatible = "brcm,bcm4329-fmac"; - }; -}; - -/* SD card */ -&sd_emmc_b { - status = "okay"; - pinctrl-0 = <&sdcard_pins>; - pinctrl-1 = <&sdcard_clk_gate_pins>; - pinctrl-names = "default", "clk-gate"; - - bus-width = <4>; - cap-sd-highspeed; - max-frequency = <50000000>; - disable-wp; - - cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>; - - vmmc-supply = <&vddao_3v3>; - vqmmc-supply = <&vcc_3v3>; -}; - -/* eMMC */ -&sd_emmc_c { - status = "okay"; - pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>; - pinctrl-1 = <&emmc_clk_gate_pins>; - pinctrl-names = "default", "clk-gate"; - - bus-width = <8>; - cap-mmc-highspeed; - max-frequency = <200000000>; - non-removable; - disable-wp; - mmc-ddr-1_8v; - mmc-hs200-1_8v; - - mmc-pwrseq = <&emmc_pwrseq>; - vmmc-supply = <&vcc_3v3>; - vqmmc-supply = <&vddio_boot>; -}; - -/* This is connected to the Bluetooth module: */ -&uart_A { - status = "okay"; - pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>; - pinctrl-names = "default"; - uart-has-rtscts; - - bluetooth { - compatible = "brcm,bcm43438-bt"; - shutdown-gpios = <&gpio GPIOX_20 GPIO_ACTIVE_HIGH>; - }; -}; - -/* This UART is brought out to the DB9 connector */ -&uart_AO { - status = "okay"; - pinctrl-0 = <&uart_ao_a_pins>; - pinctrl-names = "default"; -}; - -&usb0_phy { - status = "okay"; - phy-supply = <&usb_pwr>; -}; - -&usb0 { - status = "okay"; -}; diff --git a/arch/arm/dts/meson-gxbb.dtsi b/arch/arm/dts/meson-gxbb.dtsi deleted file mode 100644 index 12ef6e81c8bd..000000000000 --- a/arch/arm/dts/meson-gxbb.dtsi +++ /dev/null @@ -1,870 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright (c) 2016 Andreas Färber - */ - -#include "meson-gx.dtsi" -#include "meson-gx-mali450.dtsi" -#include -#include -#include -#include -#include - -/ { - compatible = "amlogic,meson-gxbb"; - - soc { - usb0_phy: phy@c0000000 { - compatible = "amlogic,meson-gxbb-usb2-phy"; - #phy-cells = <0>; - reg = <0x0 0xc0000000 0x0 0x20>; - resets = <&reset RESET_USB_OTG>; - clocks = <&clkc CLKID_USB>, <&clkc CLKID_USB0>; - clock-names = "usb_general", "usb"; - status = "disabled"; - }; - - usb1_phy: phy@c0000020 { - compatible = "amlogic,meson-gxbb-usb2-phy"; - #phy-cells = <0>; - reg = <0x0 0xc0000020 0x0 0x20>; - resets = <&reset RESET_USB_OTG>; - clocks = <&clkc CLKID_USB>, <&clkc CLKID_USB1>; - clock-names = "usb_general", "usb"; - status = "disabled"; - }; - - usb0: usb@c9000000 { - compatible = "amlogic,meson-gxbb-usb", "snps,dwc2"; - reg = <0x0 0xc9000000 0x0 0x40000>; - interrupts = ; - clocks = <&clkc CLKID_USB0_DDR_BRIDGE>; - clock-names = "otg"; - phys = <&usb0_phy>; - phy-names = "usb2-phy"; - dr_mode = "host"; - status = "disabled"; - }; - - usb1: usb@c9100000 { - compatible = "amlogic,meson-gxbb-usb", "snps,dwc2"; - reg = <0x0 0xc9100000 0x0 0x40000>; - interrupts = ; - clocks = <&clkc CLKID_USB1_DDR_BRIDGE>; - clock-names = "otg"; - phys = <&usb1_phy>; - phy-names = "usb2-phy"; - dr_mode = "host"; - status = "disabled"; - }; - }; -}; - -&aiu { - compatible = "amlogic,aiu-gxbb", "amlogic,aiu"; - clocks = <&clkc CLKID_AIU_GLUE>, - <&clkc CLKID_I2S_OUT>, - <&clkc CLKID_AOCLK_GATE>, - <&clkc CLKID_CTS_AMCLK>, - <&clkc CLKID_MIXER_IFACE>, - <&clkc CLKID_IEC958>, - <&clkc CLKID_IEC958_GATE>, - <&clkc CLKID_CTS_MCLK_I958>, - <&clkc CLKID_CTS_I958>; - clock-names = "pclk", - "i2s_pclk", - "i2s_aoclk", - "i2s_mclk", - "i2s_mixer", - "spdif_pclk", - "spdif_aoclk", - "spdif_mclk", - "spdif_mclk_sel"; - resets = <&reset RESET_AIU>; -}; - -&aobus { - pinctrl_aobus: pinctrl@14 { - compatible = "amlogic,meson-gxbb-aobus-pinctrl"; - #address-cells = <2>; - #size-cells = <2>; - ranges; - - gpio_ao: bank@14 { - reg = <0x0 0x00014 0x0 0x8>, - <0x0 0x0002c 0x0 0x4>, - <0x0 0x00024 0x0 0x8>; - reg-names = "mux", "pull", "gpio"; - gpio-controller; - #gpio-cells = <2>; - gpio-ranges = <&pinctrl_aobus 0 0 14>; - }; - - uart_ao_a_pins: uart_ao_a { - mux { - groups = "uart_tx_ao_a", "uart_rx_ao_a"; - function = "uart_ao"; - bias-disable; - }; - }; - - uart_ao_a_cts_rts_pins: uart_ao_a_cts_rts { - mux { - groups = "uart_cts_ao_a", - "uart_rts_ao_a"; - function = "uart_ao"; - bias-disable; - }; - }; - - uart_ao_b_pins: uart_ao_b { - mux { - groups = "uart_tx_ao_b", "uart_rx_ao_b"; - function = "uart_ao_b"; - bias-disable; - }; - }; - - uart_ao_b_cts_rts_pins: uart_ao_b_cts_rts { - mux { - groups = "uart_cts_ao_b", - "uart_rts_ao_b"; - function = "uart_ao_b"; - bias-disable; - }; - }; - - remote_input_ao_pins: remote_input_ao { - mux { - groups = "remote_input_ao"; - function = "remote_input_ao"; - bias-disable; - }; - }; - - i2c_ao_pins: i2c_ao { - mux { - groups = "i2c_sck_ao", - "i2c_sda_ao"; - function = "i2c_ao"; - bias-disable; - }; - }; - - pwm_ao_a_3_pins: pwm_ao_a_3 { - mux { - groups = "pwm_ao_a_3"; - function = "pwm_ao_a_3"; - bias-disable; - }; - }; - - pwm_ao_a_6_pins: pwm_ao_a_6 { - mux { - groups = "pwm_ao_a_6"; - function = "pwm_ao_a_6"; - bias-disable; - }; - }; - - pwm_ao_a_12_pins: pwm_ao_a_12 { - mux { - groups = "pwm_ao_a_12"; - function = "pwm_ao_a_12"; - bias-disable; - }; - }; - - pwm_ao_b_pins: pwm_ao_b { - mux { - groups = "pwm_ao_b"; - function = "pwm_ao_b"; - bias-disable; - }; - }; - - i2s_am_clk_pins: i2s_am_clk { - mux { - groups = "i2s_am_clk"; - function = "i2s_out_ao"; - bias-disable; - }; - }; - - i2s_out_ao_clk_pins: i2s_out_ao_clk { - mux { - groups = "i2s_out_ao_clk"; - function = "i2s_out_ao"; - bias-disable; - }; - }; - - i2s_out_lr_clk_pins: i2s_out_lr_clk { - mux { - groups = "i2s_out_lr_clk"; - function = "i2s_out_ao"; - bias-disable; - }; - }; - - i2s_out_ch01_ao_pins: i2s_out_ch01_ao { - mux { - groups = "i2s_out_ch01_ao"; - function = "i2s_out_ao"; - bias-disable; - }; - }; - - i2s_out_ch23_ao_pins: i2s_out_ch23_ao { - mux { - groups = "i2s_out_ch23_ao"; - function = "i2s_out_ao"; - bias-disable; - }; - }; - - i2s_out_ch45_ao_pins: i2s_out_ch45_ao { - mux { - groups = "i2s_out_ch45_ao"; - function = "i2s_out_ao"; - bias-disable; - }; - }; - - spdif_out_ao_6_pins: spdif_out_ao_6 { - mux { - groups = "spdif_out_ao_6"; - function = "spdif_out_ao"; - }; - }; - - spdif_out_ao_13_pins: spdif_out_ao_13 { - mux { - groups = "spdif_out_ao_13"; - function = "spdif_out_ao"; - bias-disable; - }; - }; - - ao_cec_pins: ao_cec { - mux { - groups = "ao_cec"; - function = "cec_ao"; - bias-disable; - }; - }; - - ee_cec_pins: ee_cec { - mux { - groups = "ee_cec"; - function = "cec_ao"; - bias-disable; - }; - }; - }; -}; - -&cbus { - spifc: spi@8c80 { - compatible = "amlogic,meson-gxbb-spifc"; - reg = <0x0 0x08c80 0x0 0x80>; - #address-cells = <1>; - #size-cells = <0>; - clocks = <&clkc CLKID_SPI>; - status = "disabled"; - }; -}; - -&cec_AO { - clocks = <&clkc_AO CLKID_AO_CEC_32K>; - clock-names = "core"; -}; - -&clkc_AO { - compatible = "amlogic,meson-gxbb-aoclkc", "amlogic,meson-gx-aoclkc"; - clocks = <&xtal>, <&clkc CLKID_CLK81>; - clock-names = "xtal", "mpeg-clk"; -}; - -&efuse { - clocks = <&clkc CLKID_EFUSE>; -}; - -ðmac { - clocks = <&clkc CLKID_ETH>, - <&clkc CLKID_FCLK_DIV2>, - <&clkc CLKID_MPLL2>, - <&clkc CLKID_FCLK_DIV2>; - clock-names = "stmmaceth", "clkin0", "clkin1", "timing-adjustment"; -}; - -&gpio_intc { - compatible = "amlogic,meson-gxbb-gpio-intc", - "amlogic,meson-gpio-intc"; - status = "okay"; -}; - -&hdmi_tx { - compatible = "amlogic,meson-gxbb-dw-hdmi", "amlogic,meson-gx-dw-hdmi"; - resets = <&reset RESET_HDMITX_CAPB3>, - <&reset RESET_HDMI_SYSTEM_RESET>, - <&reset RESET_HDMI_TX>; - reset-names = "hdmitx_apb", "hdmitx", "hdmitx_phy"; - clocks = <&clkc CLKID_HDMI_PCLK>, - <&clkc CLKID_CLK81>, - <&clkc CLKID_GCLK_VENCI_INT0>; - clock-names = "isfr", "iahb", "venci"; -}; - -&sysctrl { - clkc: clock-controller { - compatible = "amlogic,gxbb-clkc"; - #clock-cells = <1>; - clocks = <&xtal>; - clock-names = "xtal"; - }; -}; - -&hwrng { - clocks = <&clkc CLKID_RNG0>; - clock-names = "core"; -}; - -&i2c_A { - clocks = <&clkc CLKID_I2C>; -}; - -&i2c_AO { - clocks = <&clkc CLKID_AO_I2C>; -}; - -&i2c_B { - clocks = <&clkc CLKID_I2C>; -}; - -&i2c_C { - clocks = <&clkc CLKID_I2C>; -}; - -&mali { - compatible = "amlogic,meson-gxbb-mali", "arm,mali-450"; - - clocks = <&clkc CLKID_CLK81>, <&clkc CLKID_MALI>; - clock-names = "bus", "core"; - - assigned-clocks = <&clkc CLKID_GP0_PLL>; - assigned-clock-rates = <744000000>; -}; - -&periphs { - pinctrl_periphs: pinctrl@4b0 { - compatible = "amlogic,meson-gxbb-periphs-pinctrl"; - #address-cells = <2>; - #size-cells = <2>; - ranges; - - gpio: bank@4b0 { - reg = <0x0 0x004b0 0x0 0x28>, - <0x0 0x004e8 0x0 0x14>, - <0x0 0x00520 0x0 0x14>, - <0x0 0x00430 0x0 0x40>; - reg-names = "mux", "pull", "pull-enable", "gpio"; - gpio-controller; - #gpio-cells = <2>; - gpio-ranges = <&pinctrl_periphs 0 0 119>; - }; - - emmc_pins: emmc { - mux-0 { - groups = "emmc_nand_d07", - "emmc_cmd"; - function = "emmc"; - bias-pull-up; - }; - - mux-1 { - groups = "emmc_clk"; - function = "emmc"; - bias-disable; - }; - }; - - emmc_ds_pins: emmc-ds { - mux { - groups = "emmc_ds"; - function = "emmc"; - bias-pull-down; - }; - }; - - emmc_clk_gate_pins: emmc_clk_gate { - mux { - groups = "BOOT_8"; - function = "gpio_periphs"; - bias-pull-down; - }; - }; - - nor_pins: nor { - mux { - groups = "nor_d", - "nor_q", - "nor_c", - "nor_cs"; - function = "nor"; - bias-disable; - }; - }; - - spi_pins: spi-pins { - mux { - groups = "spi_miso", - "spi_mosi", - "spi_sclk"; - function = "spi"; - bias-disable; - }; - }; - - spi_idle_high_pins: spi-idle-high-pins { - mux { - groups = "spi_sclk"; - bias-pull-up; - }; - }; - - spi_idle_low_pins: spi-idle-low-pins { - mux { - groups = "spi_sclk"; - bias-pull-down; - }; - }; - - spi_ss0_pins: spi-ss0 { - mux { - groups = "spi_ss0"; - function = "spi"; - bias-disable; - }; - }; - - sdcard_pins: sdcard { - mux-0 { - groups = "sdcard_d0", - "sdcard_d1", - "sdcard_d2", - "sdcard_d3", - "sdcard_cmd"; - function = "sdcard"; - bias-pull-up; - }; - - mux-1 { - groups = "sdcard_clk"; - function = "sdcard"; - bias-disable; - }; - }; - - sdcard_clk_gate_pins: sdcard_clk_gate { - mux { - groups = "CARD_2"; - function = "gpio_periphs"; - bias-pull-down; - }; - }; - - sdio_pins: sdio { - mux-0 { - groups = "sdio_d0", - "sdio_d1", - "sdio_d2", - "sdio_d3", - "sdio_cmd"; - function = "sdio"; - bias-pull-up; - }; - - mux-1 { - groups = "sdio_clk"; - function = "sdio"; - bias-disable; - }; - }; - - sdio_clk_gate_pins: sdio_clk_gate { - mux { - groups = "GPIOX_4"; - function = "gpio_periphs"; - bias-pull-down; - }; - }; - - sdio_irq_pins: sdio_irq { - mux { - groups = "sdio_irq"; - function = "sdio"; - bias-disable; - }; - }; - - uart_a_pins: uart_a { - mux { - groups = "uart_tx_a", - "uart_rx_a"; - function = "uart_a"; - bias-disable; - }; - }; - - uart_a_cts_rts_pins: uart_a_cts_rts { - mux { - groups = "uart_cts_a", - "uart_rts_a"; - function = "uart_a"; - bias-disable; - }; - }; - - uart_b_pins: uart_b { - mux { - groups = "uart_tx_b", - "uart_rx_b"; - function = "uart_b"; - bias-disable; - }; - }; - - uart_b_cts_rts_pins: uart_b_cts_rts { - mux { - groups = "uart_cts_b", - "uart_rts_b"; - function = "uart_b"; - bias-disable; - }; - }; - - uart_c_pins: uart_c { - mux { - groups = "uart_tx_c", - "uart_rx_c"; - function = "uart_c"; - bias-disable; - }; - }; - - uart_c_cts_rts_pins: uart_c_cts_rts { - mux { - groups = "uart_cts_c", - "uart_rts_c"; - function = "uart_c"; - bias-disable; - }; - }; - - i2c_a_pins: i2c_a { - mux { - groups = "i2c_sck_a", - "i2c_sda_a"; - function = "i2c_a"; - bias-disable; - }; - }; - - i2c_b_pins: i2c_b { - mux { - groups = "i2c_sck_b", - "i2c_sda_b"; - function = "i2c_b"; - bias-disable; - }; - }; - - i2c_c_pins: i2c_c { - mux { - groups = "i2c_sck_c", - "i2c_sda_c"; - function = "i2c_c"; - bias-disable; - }; - }; - - eth_rgmii_pins: eth-rgmii { - mux { - groups = "eth_mdio", - "eth_mdc", - "eth_clk_rx_clk", - "eth_rx_dv", - "eth_rxd0", - "eth_rxd1", - "eth_rxd2", - "eth_rxd3", - "eth_rgmii_tx_clk", - "eth_tx_en", - "eth_txd0", - "eth_txd1", - "eth_txd2", - "eth_txd3"; - function = "eth"; - bias-disable; - }; - }; - - eth_rmii_pins: eth-rmii { - mux { - groups = "eth_mdio", - "eth_mdc", - "eth_clk_rx_clk", - "eth_rx_dv", - "eth_rxd0", - "eth_rxd1", - "eth_tx_en", - "eth_txd0", - "eth_txd1"; - function = "eth"; - bias-disable; - }; - }; - - pwm_a_x_pins: pwm_a_x { - mux { - groups = "pwm_a_x"; - function = "pwm_a_x"; - bias-disable; - }; - }; - - pwm_a_y_pins: pwm_a_y { - mux { - groups = "pwm_a_y"; - function = "pwm_a_y"; - bias-disable; - }; - }; - - pwm_b_pins: pwm_b { - mux { - groups = "pwm_b"; - function = "pwm_b"; - bias-disable; - }; - }; - - pwm_d_pins: pwm_d { - mux { - groups = "pwm_d"; - function = "pwm_d"; - bias-disable; - }; - }; - - pwm_e_pins: pwm_e { - mux { - groups = "pwm_e"; - function = "pwm_e"; - bias-disable; - }; - }; - - pwm_f_x_pins: pwm_f_x { - mux { - groups = "pwm_f_x"; - function = "pwm_f_x"; - bias-disable; - }; - }; - - pwm_f_y_pins: pwm_f_y { - mux { - groups = "pwm_f_y"; - function = "pwm_f_y"; - bias-disable; - }; - }; - - hdmi_hpd_pins: hdmi_hpd { - mux { - groups = "hdmi_hpd"; - function = "hdmi_hpd"; - bias-disable; - }; - }; - - hdmi_i2c_pins: hdmi_i2c { - mux { - groups = "hdmi_sda", "hdmi_scl"; - function = "hdmi_i2c"; - bias-disable; - }; - }; - - i2sout_ch23_y_pins: i2sout_ch23_y { - mux { - groups = "i2sout_ch23_y"; - function = "i2s_out"; - bias-disable; - }; - }; - - i2sout_ch45_y_pins: i2sout_ch45_y { - mux { - groups = "i2sout_ch45_y"; - function = "i2s_out"; - bias-disable; - }; - }; - - i2sout_ch67_y_pins: i2sout_ch67_y { - mux { - groups = "i2sout_ch67_y"; - function = "i2s_out"; - bias-disable; - }; - }; - - spdif_out_y_pins: spdif_out_y { - mux { - groups = "spdif_out_y"; - function = "spdif_out"; - bias-disable; - }; - }; - }; -}; - -&pwrc { - resets = <&reset RESET_VIU>, - <&reset RESET_VENC>, - <&reset RESET_VCBUS>, - <&reset RESET_BT656>, - <&reset RESET_DVIN_RESET>, - <&reset RESET_RDMA>, - <&reset RESET_VENCI>, - <&reset RESET_VENCP>, - <&reset RESET_VDAC>, - <&reset RESET_VDI6>, - <&reset RESET_VENCL>, - <&reset RESET_VID_LOCK>; - reset-names = "viu", "venc", "vcbus", "bt656", - "dvin", "rdma", "venci", "vencp", - "vdac", "vdi6", "vencl", "vid_lock"; - clocks = <&clkc CLKID_VPU>, - <&clkc CLKID_VAPB>; - clock-names = "vpu", "vapb"; - /* - * VPU clocking is provided by two identical clock paths - * VPU_0 and VPU_1 muxed to a single clock by a glitch - * free mux to safely change frequency while running. - * Same for VAPB but with a final gate after the glitch free mux. - */ - assigned-clocks = <&clkc CLKID_VPU_0_SEL>, - <&clkc CLKID_VPU_0>, - <&clkc CLKID_VPU>, /* Glitch free mux */ - <&clkc CLKID_VAPB_0_SEL>, - <&clkc CLKID_VAPB_0>, - <&clkc CLKID_VAPB_SEL>; /* Glitch free mux */ - assigned-clock-parents = <&clkc CLKID_FCLK_DIV3>, - <0>, /* Do Nothing */ - <&clkc CLKID_VPU_0>, - <&clkc CLKID_FCLK_DIV4>, - <0>, /* Do Nothing */ - <&clkc CLKID_VAPB_0>; - assigned-clock-rates = <0>, /* Do Nothing */ - <666666666>, - <0>, /* Do Nothing */ - <0>, /* Do Nothing */ - <250000000>, - <0>; /* Do Nothing */ -}; - -&saradc { - compatible = "amlogic,meson-gxbb-saradc", "amlogic,meson-saradc"; - clocks = <&xtal>, - <&clkc CLKID_SAR_ADC>, - <&clkc CLKID_SAR_ADC_CLK>, - <&clkc CLKID_SAR_ADC_SEL>; - clock-names = "clkin", "core", "adc_clk", "adc_sel"; -}; - -&sd_emmc_a { - clocks = <&clkc CLKID_SD_EMMC_A>, - <&clkc CLKID_SD_EMMC_A_CLK0>, - <&clkc CLKID_FCLK_DIV2>; - clock-names = "core", "clkin0", "clkin1"; - resets = <&reset RESET_SD_EMMC_A>; -}; - -&sd_emmc_b { - clocks = <&clkc CLKID_SD_EMMC_B>, - <&clkc CLKID_SD_EMMC_B_CLK0>, - <&clkc CLKID_FCLK_DIV2>; - clock-names = "core", "clkin0", "clkin1"; - resets = <&reset RESET_SD_EMMC_B>; -}; - -&sd_emmc_c { - clocks = <&clkc CLKID_SD_EMMC_C>, - <&clkc CLKID_SD_EMMC_C_CLK0>, - <&clkc CLKID_FCLK_DIV2>; - clock-names = "core", "clkin0", "clkin1"; - resets = <&reset RESET_SD_EMMC_C>; -}; - -&simplefb_hdmi { - clocks = <&clkc CLKID_HDMI_PCLK>, - <&clkc CLKID_CLK81>, - <&clkc CLKID_GCLK_VENCI_INT0>; -}; - -&spicc { - clocks = <&clkc CLKID_SPICC>; - clock-names = "core"; - resets = <&reset RESET_PERIPHS_SPICC>; - num-cs = <1>; -}; - -&spifc { - clocks = <&clkc CLKID_SPI>; -}; - -&uart_A { - clocks = <&xtal>, <&clkc CLKID_UART0>, <&xtal>; - clock-names = "xtal", "pclk", "baud"; -}; - -&uart_AO { - clocks = <&xtal>, <&clkc_AO CLKID_AO_UART1>, <&xtal>; - clock-names = "xtal", "pclk", "baud"; -}; - -&uart_AO_B { - clocks = <&xtal>, <&clkc_AO CLKID_AO_UART2>, <&xtal>; - clock-names = "xtal", "pclk", "baud"; -}; - -&uart_B { - clocks = <&xtal>, <&clkc CLKID_UART1>, <&xtal>; - clock-names = "xtal", "pclk", "baud"; -}; - -&uart_C { - clocks = <&xtal>, <&clkc CLKID_UART2>, <&xtal>; - clock-names = "xtal", "pclk", "baud"; -}; - -&vpu { - compatible = "amlogic,meson-gxbb-vpu", "amlogic,meson-gx-vpu"; - power-domains = <&pwrc PWRC_GXBB_VPU_ID>; -}; - -&vdec { - compatible = "amlogic,gxbb-vdec", "amlogic,gx-vdec"; - clocks = <&clkc CLKID_DOS_PARSER>, - <&clkc CLKID_DOS>, - <&clkc CLKID_VDEC_1>, - <&clkc CLKID_VDEC_HEVC>; - clock-names = "dos_parser", "dos", "vdec_1", "vdec_hevc"; - resets = <&reset RESET_PARSER>; - reset-names = "esparser"; -};