From patchwork Fri Aug 7 09:48:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1585 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 8F1803F22D for ; Fri, 7 Aug 2020 11:48:47 +0200 (CEST) Received: by mail-pf1-f200.google.com with SMTP id a73sf1370225pfa.10 for ; Fri, 07 Aug 2020 02:48:47 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1596793725; cv=pass; d=google.com; s=arc-20160816; b=algqzISHs+wcFR/pFGggOsFgGqE2J0VkmQvdKVLV3VK+FyTrTcrdQU41yKnOGURyF0 RJ7cayPr6hD8P1CSGd6PFA7JkwF3D5SQX08WOD5uGNh2nEoV1TAcKGhzyvYB1OWaCkhq HDGMVec8pW3QZPKFF7M+CuMsfaI7VRFfo9X7Ad0vHjxeQnySShDplpKI90LtOtdGnqE8 g3zMR+kUSCD7IsBERECBWNy9XSq6u4nIwjdtYqnvdSIf+MopC9GO1Mk45dM4Ctu3CgC0 9V1zJylaMbY7ZrczlF3l9xH511TR8hBVVKj/GDPsH0zUKhAQuUEDHSqRwdV3o9+QIFJc ofZA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=3DHxQQOtnzBy3hkln2JDTQ5wGmYh7MKIRudweO8zL6E=; b=e5e+6gssbi9TmsBxwzYfHTdeh/YYBwh5Du+zALi9GiKTZLpbpiY4eTV4bRYI8149bM kLthJ1wOyiwgUXGMWm3nIbteHAA9AWB3yKbT9LxnAuOtBEoiCBHcqNpjAgVsAIIgjwXK dDXqGBb86FgqXHQBixYnPwlL+yUs+z/xAIPwiY7E26RNoqY5/u8qokf1bspoPhPWhAfc XZomlrU5nKZ7soskj9RDrx4nV8atoeHBSYyg3rxp81YIrkRJII1aV0xGfW3fHdiGF3xb MOYVZprml9/wHiN5XIbHsXuBRRjvxlSD8piebTXU2yzBbqu9oqhKlz0tzgWyPYURmIOZ ZOWw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=RGpxzowG; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=3DHxQQOtnzBy3hkln2JDTQ5wGmYh7MKIRudweO8zL6E=; b=IE0qneLRztm1p9UT8QGtjT+e50EIwb86h2uFdpiy27+3URybfzINpKDFdi/nJg7qgh HKjVOBwEYCdPqtsuBCE6MHYxhD7mmK6vFgMVaaCS4VJ/J1PwxrbVCMv7Hcfdpwyz9HfC Ks6Vx7stM4as1gys2n+EB4Jo5qzlBsPxegU8M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=3DHxQQOtnzBy3hkln2JDTQ5wGmYh7MKIRudweO8zL6E=; b=H+V5rrNtAD2aRcm67Kyo0BVk8WmxDitxOMPvkiuVxsoYcHfKEk2E2S9WEGKzffHifz 3bwbWbrNBVThxl+3vwmVeLt2rUwuB0GfUtTBJiLJkLKKysnq+8fcJqnbI4zzUdG6aviU EyIfy6GB28O38+8ffqjvwKie6cpwgA+uXdVcab6FS1nNzWz1Bfbeb6rGP0YFq/aY/2Pd tbQrQdEpKIEFcWiAKw8hMtymB/3fgQOFAGwgEojKT641pvOTUzhQH7IGLiZIX9wkjRfE JeZfoZj7E7gYxpORHWqDa6qOIZZ9/o1kI4XyUNcdo/WpeWZdk1tUCXQlbGRw8ytTbZ9N 7VPA== X-Gm-Message-State: AOAM532wFw1tXssXZeN5XebwGrwZgVNx+KtaeC5ZLTMkbslbpcyMwCHA UDlVd39ysIApBeT2gxIVvfprxcoE X-Google-Smtp-Source: ABdhPJyr9KzuV4mSAJiHg6x7BfMalzUf8YX+alsSIvAxLvFlPpLDSuYW5g1Vu/I+UqJ8Zc1PwblyFg== X-Received: by 2002:a17:902:8609:: with SMTP id f9mr12055638plo.324.1596793725494; Fri, 07 Aug 2020 02:48:45 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a62:8cc7:: with SMTP id m190ls155992pfd.2.gmail; Fri, 07 Aug 2020 02:48:45 -0700 (PDT) X-Received: by 2002:a62:482:: with SMTP id 124mr8212879pfe.310.1596793725027; Fri, 07 Aug 2020 02:48:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1596793725; cv=none; d=google.com; s=arc-20160816; b=xs7AhY1CuOkKANWfQlbJGT+n+qoRstkoUU8pkAkXF0iK3d5LxAPeM3dfvFuzVuwLvB zZ6+t2HUuS9qK12dpqaRMFVTvENGlqMnFT115BV4185u7j7BWRWk2QndCalwUowqB1HS mPDpkU+vJMx6K9ESN+F/y6pcj7aXQiCGpfufKVsvS2GcpxQq/L7PK+G3eL53VBLg8an1 U+jzYsiFYIYOa7zCmSdPMvbA4wB7PzaNKtuGbRkSD1rc2m/4cknZqGBT6q/x8+dY9226 rfCl/c6Gwm/QwFzhrD+RZ3vQ9fbWzmIvnXBwEY+7reNoa3RE6xxudtLjdplM6Eox2e9Y DWbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=02o/duJFuPsa51rahLQuUkgKqOgWknYxohHZSpeLSFM=; b=dFEjERSJZtLzs9MHNX4arVqx8mgKulePt1z51cR4IXKg2hCB9HjKiOC4mSKPX2WUEO eADeFvky6MMRfPvvmlypQVZ3Btr+5D7EaQYeK6OISiyNXI1W46YJdfyuTkuxIt3YP5T3 903e0hhE1zfWlkQ5UgV5+nzi7olErBl6COtp6zuESE2nFGrutibC3KDEawyzal92Tq6i kDFjwzxUcno/TTJQwnMDN4ChEMvw+ZqswGUnvWaMf4mRuk9VPmWdCY5NtXGexD+h8wsj LjMokomFaSE0F1DZTz5FeOPNaFVsF+pQRbucXkHwzvZmVVvT4JSELVNi7vPwztmt5D+Y dSng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=RGpxzowG; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id p125sor9777775pfp.94.2020.08.07.02.48.45 for (Google Transport Security); Fri, 07 Aug 2020 02:48:45 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a62:cfc1:: with SMTP id b184mr11610684pfg.262.1596793724650; Fri, 07 Aug 2020 02:48:44 -0700 (PDT) Received: from localhost.localdomain ([2405:201:c809:c7d5:6097:2d32:26bb:64fe]) by smtp.gmail.com with ESMTPSA id d65sm11412112pfc.97.2020.08.07.02.48.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Aug 2020 02:48:43 -0700 (PDT) From: Jagan Teki To: Heiko Stuebner , Rob Herring Cc: Suniel Mahesh , Michael Trimarchi , linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-amarula , Jagan Teki Subject: [PATCH v4 2/4] arm64: dts: rockchip: Mark rock-pi-4 as rock-pi-4a dts Date: Fri, 7 Aug 2020 15:18:24 +0530 Message-Id: <20200807094826.12019-2-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200807094826.12019-1-jagan@amarulasolutions.com> References: <20200807094826.12019-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=RGpxzowG; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , ROCKPi 4 has 3 variants of hardware platforms called RockPI 4A, 4B, and 4C. - ROCKPi 4A has no Wif/BT. - ROCKPi 4B has AP6256 Wifi/BT, PoE. - ROCKPi 4C has AP6256 Wifi/BT, PoE, miniDP, USB Host enabled GPIO pin change compared to 4B, 4C So move common nodes, properties into dtsi file and include on respective variant dts files. Signed-off-by: Jagan Teki --- Changes for v4, v3: - none Changes for v2: - update commit message - add radxa,rockpi4a arch/arm64/boot/dts/rockchip/Makefile | 2 +- .../{rk3399-rock-pi-4.dts => rk3399-rock-pi-4.dtsi} | 3 --- arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts | 13 +++++++++++++ 3 files changed, 14 insertions(+), 4 deletions(-) rename arch/arm64/boot/dts/rockchip/{rk3399-rock-pi-4.dts => rk3399-rock-pi-4.dtsi} (99%) create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile index b87b1f773083..42f9e1861461 100644 --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile @@ -33,7 +33,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-pinebook-pro.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-mezzanine.dtb -dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4a.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock960.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64-v2.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64.dtb diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi similarity index 99% rename from arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts rename to arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi index 60f98a3e19d8..e163f438f836 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi @@ -11,9 +11,6 @@ #include "rk3399-opp.dtsi" / { - model = "Radxa ROCK Pi 4"; - compatible = "radxa,rockpi4", "rockchip,rk3399"; - chosen { stdout-path = "serial2:1500000n8"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts new file mode 100644 index 000000000000..89f2af5e111d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts @@ -0,0 +1,13 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2019 Akash Gajjar + * Copyright (c) 2019 Pragnesh Patel + */ + +/dts-v1/; +#include "rk3399-rock-pi-4.dtsi" + +/ { + model = "Radxa ROCK Pi 4A"; + compatible = "radxa,rockpi4a", "radxa,rockpi4", "rockchip,rk3399"; +};