From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 79E3FC433E1 for ; Mon, 20 Jul 2020 10:57:29 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 452632068F for ; Mon, 20 Jul 2020 10:57:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="sxV73GMq"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="MM+l6kte" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 452632068F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=z1Xwbq8LpC9OzMw8rwcDj7iQ+NoB6jBerQHjxkHH0Ic=; b=sxV73GMq1nec27jZreDinSFmVL zrnyrXoRDOdcVFLQHXfXfMhw0ez+W+2gAbSllJMf0/qQ89pZSdW0XnBPCWIRi8Y5HbY1GcCdhTwT3 iOPLhe9XZQ2N51TnSxNhdDOgtYDlG0HuJdV92YmF684ruzQzLmbl4K9haDEwVEVoH6N2c91mT4+4j 6057XO7UGXxHS3SoAxqw73P8YeYF3ow2C5uXUXHBGwYDUgRAQMEVBgYzaKq/vEqCxbmGKURaN8/Ti aNLNwC/YUAHUH9AgWWFq4WOX+TM7TQfrNuRW/NSWf8dnSvSuxnMxmsVQgJ1KscGfzQ3K3F1S7fqG8 dEXK505w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jxTSo-0004ej-80; Mon, 20 Jul 2020 10:56:06 +0000 Received: from mail-pj1-x1041.google.com ([2607:f8b0:4864:20::1041]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jxTSk-0004cn-Nt for linux-arm-kernel@lists.infradead.org; Mon, 20 Jul 2020 10:56:03 +0000 Received: by mail-pj1-x1041.google.com with SMTP id k1so276962pjt.5 for ; Mon, 20 Jul 2020 03:56:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=87hFulUMTLYcYtfb5/q1HiR84qe1kMeDg6xrZ7BQkqI=; b=MM+l6kteqQzEpnQ/ywvSjIFlpM9azD+mxwXxGGlCUwlkklIaJBa9+GDaW7Htux8/Ze N6XiO0NF+0Rt5PgioLbTBsUPJWJT7tSKInjVLe88qAYGJsoTaJ0xKY5i5+7lLVFUhPGq 6ZfRVWeLAL/lW1q+B4w9Ofv9plQJdHNYspXjk= 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:mime-version :content-transfer-encoding; bh=87hFulUMTLYcYtfb5/q1HiR84qe1kMeDg6xrZ7BQkqI=; b=r7irLF4xMXW+tISNapD4IDpac9KDl0mE48syUIWrv5JgzDq7/p/5rN8/PT7G8Lt3ss 7AO6rYnSncpaigEWkpmiEEUNMtGzubEatTibgKFUJoPhQ2f5MNX2h/fbULqxrGKat0/6 CGpIoQQz+/Gim6dwjbD7+5QPITpuv7BJZEH1FaNmlBMZXFvM8kr1DIUD93fyRbUZgd92 9zqeGGzK7s9mH/snRGyFgYYqPr5E6HZQPPzunEQO+Giul0n4pdUcbpQvsfWl5UKm9zRv ANkrKQsVo9af8/d8cuAGGFujIGEYcVuQyiJAsjQNawM5eh/c+YSBjjiE6jBOIp3JzcfH c/Yg== X-Gm-Message-State: AOAM5302BXtYQ9x3ANxSibboJ1Nn7NIffzcsm9OqMFbkDeI2/+S5GCgy rJDaEpsB1JUwVXWFRN9Qy10ONg== X-Google-Smtp-Source: ABdhPJzjoQNKzZ+yDhrVCkGBwPkfdrqM2z3JHRSN3Qbebmu8oZ0F7c5A9NPns6yP/9LViF/8Ba/LMA== X-Received: by 2002:a17:90a:a0a:: with SMTP id o10mr22464206pjo.12.1595242560305; Mon, 20 Jul 2020 03:56:00 -0700 (PDT) Received: from localhost.localdomain ([2405:201:c809:c7d5:8c21:db7b:4558:fba3]) by smtp.gmail.com with ESMTPSA id j5sm13984721pgi.42.2020.07.20.03.55.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2020 03:55:59 -0700 (PDT) From: Jagan Teki To: Heiko Stuebner , Rob Herring Subject: [PATCH 1/3] arm64: dts: rockchip: Mark rock-pi-4 as rock-pi-4a dts Date: Mon, 20 Jul 2020 16:25:29 +0530 Message-Id: <20200720105531.367671-1-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200720_065603_040668_A6EA6227 X-CRM114-Status: GOOD ( 14.22 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Jagan Teki , Suniel Mahesh , Michael Trimarchi , linux-amarula , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Rock PI 4 has 3 variants of hardware platforms called RockPI 4A, 4B, and 4C. - Rock PI 4A has no Wif/BT. - Rock PI 4B has AP6256 Wifi/BT, PoE. - Rock PI 4C has AP6256 Wifi/BT, PoE, miniDP, USB Host enable 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 --- 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 3923ec01ef66..c39334b139cc 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..d96dd3ebd3e0 --- /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,rockpi4", "rockchip,rk3399"; +}; -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel